/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-01-08 10:19:33 UTC
  • Revision ID: teddy@recompile.se-20120108101933-xbtodqgepxax8hn1
Tags: version-1.5.2-1
* Makefile (version): Changed to "1.5.2".
* NEWS (Version 1.5.2): New entry.
* debian/changelog (1.5.2-1): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2010 Teddy Hogeborn
15
 
# Copyright © 2008-2010 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
31
# Contact the authors at <mandos@recompile.se>.
32
32
33
33
 
34
 
from __future__ import division, with_statement, absolute_import
 
34
from __future__ import (division, absolute_import, print_function,
 
35
                        unicode_literals)
35
36
 
36
37
import SocketServer as socketserver
37
38
import socket
38
 
import optparse
 
39
import argparse
39
40
import datetime
40
41
import errno
41
42
import gnutls.crypto
61
62
import functools
62
63
import cPickle as pickle
63
64
import multiprocessing
 
65
import types
 
66
import binascii
 
67
import tempfile
64
68
 
65
69
import dbus
66
70
import dbus.service
71
75
import ctypes.util
72
76
import xml.dom.minidom
73
77
import inspect
 
78
import GnuPGInterface
74
79
 
75
80
try:
76
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
80
85
    except ImportError:
81
86
        SO_BINDTODEVICE = None
82
87
 
83
 
 
84
 
version = "1.0.14"
85
 
 
86
 
#logger = logging.getLogger(u'mandos')
87
 
logger = logging.Logger(u'mandos')
 
88
version = "1.5.2"
 
89
stored_state_file = "clients.pickle"
 
90
 
 
91
logger = logging.getLogger()
88
92
syslogger = (logging.handlers.SysLogHandler
89
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
90
 
              address = "/dev/log"))
91
 
syslogger.setFormatter(logging.Formatter
92
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
93
 
                        u' %(message)s'))
94
 
logger.addHandler(syslogger)
95
 
 
96
 
console = logging.StreamHandler()
97
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
98
 
                                       u' %(levelname)s:'
99
 
                                       u' %(message)s'))
100
 
logger.addHandler(console)
 
94
              address = str("/dev/log")))
 
95
 
 
96
try:
 
97
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
98
                      (ctypes.util.find_library("c"))
 
99
                      .if_nametoindex)
 
100
except (OSError, AttributeError):
 
101
    def if_nametoindex(interface):
 
102
        "Get an interface index the hard way, i.e. using fcntl()"
 
103
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
104
        with contextlib.closing(socket.socket()) as s:
 
105
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
106
                                struct.pack(str("16s16x"),
 
107
                                            interface))
 
108
        interface_index = struct.unpack(str("I"),
 
109
                                        ifreq[16:20])[0]
 
110
        return interface_index
 
111
 
 
112
 
 
113
def initlogger(debug, level=logging.WARNING):
 
114
    """init logger and add loglevel"""
 
115
    
 
116
    syslogger.setFormatter(logging.Formatter
 
117
                           ('Mandos [%(process)d]: %(levelname)s:'
 
118
                            ' %(message)s'))
 
119
    logger.addHandler(syslogger)
 
120
    
 
121
    if debug:
 
122
        console = logging.StreamHandler()
 
123
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
124
                                               ' [%(process)d]:'
 
125
                                               ' %(levelname)s:'
 
126
                                               ' %(message)s'))
 
127
        logger.addHandler(console)
 
128
    logger.setLevel(level)
 
129
 
 
130
 
 
131
class PGPError(Exception):
 
132
    """Exception if encryption/decryption fails"""
 
133
    pass
 
134
 
 
135
 
 
136
class PGPEngine(object):
 
137
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
138
    def __init__(self):
 
139
        self.gnupg = GnuPGInterface.GnuPG()
 
140
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
141
        self.gnupg = GnuPGInterface.GnuPG()
 
142
        self.gnupg.options.meta_interactive = False
 
143
        self.gnupg.options.homedir = self.tempdir
 
144
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
145
                                              '--quiet',
 
146
                                              '--no-use-agent'])
 
147
    
 
148
    def __enter__(self):
 
149
        return self
 
150
    
 
151
    def __exit__ (self, exc_type, exc_value, traceback):
 
152
        self._cleanup()
 
153
        return False
 
154
    
 
155
    def __del__(self):
 
156
        self._cleanup()
 
157
    
 
158
    def _cleanup(self):
 
159
        if self.tempdir is not None:
 
160
            # Delete contents of tempdir
 
161
            for root, dirs, files in os.walk(self.tempdir,
 
162
                                             topdown = False):
 
163
                for filename in files:
 
164
                    os.remove(os.path.join(root, filename))
 
165
                for dirname in dirs:
 
166
                    os.rmdir(os.path.join(root, dirname))
 
167
            # Remove tempdir
 
168
            os.rmdir(self.tempdir)
 
169
            self.tempdir = None
 
170
    
 
171
    def password_encode(self, password):
 
172
        # Passphrase can not be empty and can not contain newlines or
 
173
        # NUL bytes.  So we prefix it and hex encode it.
 
174
        return b"mandos" + binascii.hexlify(password)
 
175
    
 
176
    def encrypt(self, data, password):
 
177
        self.gnupg.passphrase = self.password_encode(password)
 
178
        with open(os.devnull) as devnull:
 
179
            try:
 
180
                proc = self.gnupg.run(['--symmetric'],
 
181
                                      create_fhs=['stdin', 'stdout'],
 
182
                                      attach_fhs={'stderr': devnull})
 
183
                with contextlib.closing(proc.handles['stdin']) as f:
 
184
                    f.write(data)
 
185
                with contextlib.closing(proc.handles['stdout']) as f:
 
186
                    ciphertext = f.read()
 
187
                proc.wait()
 
188
            except IOError as e:
 
189
                raise PGPError(e)
 
190
        self.gnupg.passphrase = None
 
191
        return ciphertext
 
192
    
 
193
    def decrypt(self, data, password):
 
194
        self.gnupg.passphrase = self.password_encode(password)
 
195
        with open(os.devnull) as devnull:
 
196
            try:
 
197
                proc = self.gnupg.run(['--decrypt'],
 
198
                                      create_fhs=['stdin', 'stdout'],
 
199
                                      attach_fhs={'stderr': devnull})
 
200
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
201
                    f.write(data)
 
202
                with contextlib.closing(proc.handles['stdout']) as f:
 
203
                    decrypted_plaintext = f.read()
 
204
                proc.wait()
 
205
            except IOError as e:
 
206
                raise PGPError(e)
 
207
        self.gnupg.passphrase = None
 
208
        return decrypted_plaintext
 
209
 
 
210
 
101
211
 
102
212
class AvahiError(Exception):
103
213
    def __init__(self, value, *args, **kwargs):
119
229
    Attributes:
120
230
    interface: integer; avahi.IF_UNSPEC or an interface index.
121
231
               Used to optionally bind to the specified interface.
122
 
    name: string; Example: u'Mandos'
123
 
    type: string; Example: u'_mandos._tcp'.
 
232
    name: string; Example: 'Mandos'
 
233
    type: string; Example: '_mandos._tcp'.
124
234
                  See <http://www.dns-sd.org/ServiceTypes.html>
125
235
    port: integer; what port to announce
126
236
    TXT: list of strings; TXT record for the service
135
245
    """
136
246
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
137
247
                 servicetype = None, port = None, TXT = None,
138
 
                 domain = u"", host = u"", max_renames = 32768,
 
248
                 domain = "", host = "", max_renames = 32768,
139
249
                 protocol = avahi.PROTO_UNSPEC, bus = None):
140
250
        self.interface = interface
141
251
        self.name = name
150
260
        self.group = None       # our entry group
151
261
        self.server = None
152
262
        self.bus = bus
 
263
        self.entry_group_state_changed_match = None
153
264
    def rename(self):
154
265
        """Derived from the Avahi example code"""
155
266
        if self.rename_count >= self.max_renames:
156
 
            logger.critical(u"No suitable Zeroconf service name found"
157
 
                            u" after %i retries, exiting.",
 
267
            logger.critical("No suitable Zeroconf service name found"
 
268
                            " after %i retries, exiting.",
158
269
                            self.rename_count)
159
 
            raise AvahiServiceError(u"Too many renames")
160
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
 
        logger.info(u"Changing Zeroconf service name to %r ...",
 
270
            raise AvahiServiceError("Too many renames")
 
271
        self.name = unicode(self.server
 
272
                            .GetAlternativeServiceName(self.name))
 
273
        logger.info("Changing Zeroconf service name to %r ...",
162
274
                    self.name)
163
 
        syslogger.setFormatter(logging.Formatter
164
 
                               (u'Mandos (%s) [%%(process)d]:'
165
 
                                u' %%(levelname)s: %%(message)s'
166
 
                                % self.name))
167
275
        self.remove()
168
276
        try:
169
277
            self.add()
170
 
        except dbus.exceptions.DBusException, error:
171
 
            logger.critical(u"DBusException: %s", error)
 
278
        except dbus.exceptions.DBusException as error:
 
279
            logger.critical("DBusException: %s", error)
172
280
            self.cleanup()
173
281
            os._exit(1)
174
282
        self.rename_count += 1
175
283
    def remove(self):
176
284
        """Derived from the Avahi example code"""
 
285
        if self.entry_group_state_changed_match is not None:
 
286
            self.entry_group_state_changed_match.remove()
 
287
            self.entry_group_state_changed_match = None
177
288
        if self.group is not None:
178
289
            self.group.Reset()
179
290
    def add(self):
180
291
        """Derived from the Avahi example code"""
 
292
        self.remove()
181
293
        if self.group is None:
182
294
            self.group = dbus.Interface(
183
295
                self.bus.get_object(avahi.DBUS_NAME,
184
296
                                    self.server.EntryGroupNew()),
185
297
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
186
 
            self.group.connect_to_signal('StateChanged',
187
 
                                         self
188
 
                                         .entry_group_state_changed)
189
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
298
        self.entry_group_state_changed_match = (
 
299
            self.group.connect_to_signal(
 
300
                'StateChanged', self.entry_group_state_changed))
 
301
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
190
302
                     self.name, self.type)
191
303
        self.group.AddService(
192
304
            self.interface,
199
311
        self.group.Commit()
200
312
    def entry_group_state_changed(self, state, error):
201
313
        """Derived from the Avahi example code"""
202
 
        logger.debug(u"Avahi entry group state change: %i", state)
 
314
        logger.debug("Avahi entry group state change: %i", state)
203
315
        
204
316
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
 
            logger.debug(u"Zeroconf service established.")
 
317
            logger.debug("Zeroconf service established.")
206
318
        elif state == avahi.ENTRY_GROUP_COLLISION:
207
 
            logger.warning(u"Zeroconf service name collision.")
 
319
            logger.info("Zeroconf service name collision.")
208
320
            self.rename()
209
321
        elif state == avahi.ENTRY_GROUP_FAILURE:
210
 
            logger.critical(u"Avahi: Error in group state changed %s",
 
322
            logger.critical("Avahi: Error in group state changed %s",
211
323
                            unicode(error))
212
 
            raise AvahiGroupError(u"State changed: %s"
 
324
            raise AvahiGroupError("State changed: %s"
213
325
                                  % unicode(error))
214
326
    def cleanup(self):
215
327
        """Derived from the Avahi example code"""
216
328
        if self.group is not None:
217
 
            self.group.Free()
 
329
            try:
 
330
                self.group.Free()
 
331
            except (dbus.exceptions.UnknownMethodException,
 
332
                    dbus.exceptions.DBusException):
 
333
                pass
218
334
            self.group = None
219
 
    def server_state_changed(self, state):
 
335
        self.remove()
 
336
    def server_state_changed(self, state, error=None):
220
337
        """Derived from the Avahi example code"""
221
 
        logger.debug(u"Avahi server state change: %i", state)
222
 
        if state == avahi.SERVER_COLLISION:
223
 
            logger.error(u"Zeroconf server name collision")
224
 
            self.remove()
 
338
        logger.debug("Avahi server state change: %i", state)
 
339
        bad_states = { avahi.SERVER_INVALID:
 
340
                           "Zeroconf server invalid",
 
341
                       avahi.SERVER_REGISTERING: None,
 
342
                       avahi.SERVER_COLLISION:
 
343
                           "Zeroconf server name collision",
 
344
                       avahi.SERVER_FAILURE:
 
345
                           "Zeroconf server failure" }
 
346
        if state in bad_states:
 
347
            if bad_states[state] is not None:
 
348
                if error is None:
 
349
                    logger.error(bad_states[state])
 
350
                else:
 
351
                    logger.error(bad_states[state] + ": %r", error)
 
352
            self.cleanup()
225
353
        elif state == avahi.SERVER_RUNNING:
226
354
            self.add()
 
355
        else:
 
356
            if error is None:
 
357
                logger.debug("Unknown state: %r", state)
 
358
            else:
 
359
                logger.debug("Unknown state: %r: %r", state, error)
227
360
    def activate(self):
228
361
        """Derived from the Avahi example code"""
229
362
        if self.server is None:
230
363
            self.server = dbus.Interface(
231
364
                self.bus.get_object(avahi.DBUS_NAME,
232
 
                                    avahi.DBUS_PATH_SERVER),
 
365
                                    avahi.DBUS_PATH_SERVER,
 
366
                                    follow_name_owner_changes=True),
233
367
                avahi.DBUS_INTERFACE_SERVER)
234
 
        self.server.connect_to_signal(u"StateChanged",
 
368
        self.server.connect_to_signal("StateChanged",
235
369
                                 self.server_state_changed)
236
370
        self.server_state_changed(self.server.GetState())
237
371
 
 
372
class AvahiServiceToSyslog(AvahiService):
 
373
    def rename(self):
 
374
        """Add the new name to the syslog messages"""
 
375
        ret = AvahiService.rename(self)
 
376
        syslogger.setFormatter(logging.Formatter
 
377
                               ('Mandos (%s) [%%(process)d]:'
 
378
                                ' %%(levelname)s: %%(message)s'
 
379
                                % self.name))
 
380
        return ret
238
381
 
 
382
def timedelta_to_milliseconds(td):
 
383
    "Convert a datetime.timedelta() to milliseconds"
 
384
    return ((td.days * 24 * 60 * 60 * 1000)
 
385
            + (td.seconds * 1000)
 
386
            + (td.microseconds // 1000))
 
387
        
239
388
class Client(object):
240
389
    """A representation of a client host served by this server.
241
390
    
242
391
    Attributes:
243
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
392
    approved:   bool(); 'None' if not yet approved/disapproved
244
393
    approval_delay: datetime.timedelta(); Time to wait for approval
245
394
    approval_duration: datetime.timedelta(); Duration of one approval
246
395
    checker:    subprocess.Popen(); a running checker process used
253
402
                     instance %(name)s can be used in the command.
254
403
    checker_initiator_tag: a gobject event source tag, or None
255
404
    created:    datetime.datetime(); (UTC) object creation
 
405
    client_structure: Object describing what attributes a client has
 
406
                      and is used for storing the client at exit
256
407
    current_checker_command: string; current running checker_command
257
 
    disable_hook:  If set, called by disable() as disable_hook(self)
258
408
    disable_initiator_tag: a gobject event source tag, or None
259
409
    enabled:    bool()
260
410
    fingerprint: string (40 or 32 hexadecimal digits); used to
263
413
    interval:   datetime.timedelta(); How often to start a new checker
264
414
    last_approval_request: datetime.datetime(); (UTC) or None
265
415
    last_checked_ok: datetime.datetime(); (UTC) or None
266
 
    last_enabled: datetime.datetime(); (UTC)
 
416
    last_checker_status: integer between 0 and 255 reflecting exit
 
417
                         status of last checker. -1 reflects crashed
 
418
                         checker, or None.
 
419
    last_enabled: datetime.datetime(); (UTC) or None
267
420
    name:       string; from the config file, used in log messages and
268
421
                        D-Bus identifiers
269
422
    secret:     bytestring; sent verbatim (over TLS) to client
270
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
271
424
                                      until this client is disabled
 
425
    extended_timeout:   extra long timeout when secret has been sent
272
426
    runtime_expansions: Allowed attributes for runtime expansion.
 
427
    expires:    datetime.datetime(); time (UTC) when a client will be
 
428
                disabled, or None
273
429
    """
274
430
    
275
 
    runtime_expansions = (u"approval_delay", u"approval_duration",
276
 
                          u"created", u"enabled", u"fingerprint",
277
 
                          u"host", u"interval", u"last_checked_ok",
278
 
                          u"last_enabled", u"name", u"timeout")
279
 
    
280
 
    @staticmethod
281
 
    def _timedelta_to_milliseconds(td):
282
 
        "Convert a datetime.timedelta() to milliseconds"
283
 
        return ((td.days * 24 * 60 * 60 * 1000)
284
 
                + (td.seconds * 1000)
285
 
                + (td.microseconds // 1000))
 
431
    runtime_expansions = ("approval_delay", "approval_duration",
 
432
                          "created", "enabled", "fingerprint",
 
433
                          "host", "interval", "last_checked_ok",
 
434
                          "last_enabled", "name", "timeout")
 
435
    client_defaults = { "timeout": "5m",
 
436
                        "extended_timeout": "15m",
 
437
                        "interval": "2m",
 
438
                        "checker": "fping -q -- %%(host)s",
 
439
                        "host": "",
 
440
                        "approval_delay": "0s",
 
441
                        "approval_duration": "1s",
 
442
                        "approved_by_default": "True",
 
443
                        "enabled": "True",
 
444
                        }
286
445
    
287
446
    def timeout_milliseconds(self):
288
447
        "Return the 'timeout' attribute in milliseconds"
289
 
        return self._timedelta_to_milliseconds(self.timeout)
 
448
        return timedelta_to_milliseconds(self.timeout)
 
449
    
 
450
    def extended_timeout_milliseconds(self):
 
451
        "Return the 'extended_timeout' attribute in milliseconds"
 
452
        return timedelta_to_milliseconds(self.extended_timeout)
290
453
    
291
454
    def interval_milliseconds(self):
292
455
        "Return the 'interval' attribute in milliseconds"
293
 
        return self._timedelta_to_milliseconds(self.interval)
294
 
 
 
456
        return timedelta_to_milliseconds(self.interval)
 
457
    
295
458
    def approval_delay_milliseconds(self):
296
 
        return self._timedelta_to_milliseconds(self.approval_delay)
297
 
    
298
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
459
        return timedelta_to_milliseconds(self.approval_delay)
 
460
 
 
461
    @staticmethod
 
462
    def config_parser(config):
 
463
        """Construct a new dict of client settings of this form:
 
464
        { client_name: {setting_name: value, ...}, ...}
 
465
        with exceptions for any special settings as defined above.
 
466
        NOTE: Must be a pure function. Must return the same result
 
467
        value given the same arguments.
 
468
        """
 
469
        settings = {}
 
470
        for client_name in config.sections():
 
471
            section = dict(config.items(client_name))
 
472
            client = settings[client_name] = {}
 
473
            
 
474
            client["host"] = section["host"]
 
475
            # Reformat values from string types to Python types
 
476
            client["approved_by_default"] = config.getboolean(
 
477
                client_name, "approved_by_default")
 
478
            client["enabled"] = config.getboolean(client_name,
 
479
                                                  "enabled")
 
480
            
 
481
            client["fingerprint"] = (section["fingerprint"].upper()
 
482
                                     .replace(" ", ""))
 
483
            if "secret" in section:
 
484
                client["secret"] = section["secret"].decode("base64")
 
485
            elif "secfile" in section:
 
486
                with open(os.path.expanduser(os.path.expandvars
 
487
                                             (section["secfile"])),
 
488
                          "rb") as secfile:
 
489
                    client["secret"] = secfile.read()
 
490
            else:
 
491
                raise TypeError("No secret or secfile for section %s"
 
492
                                % section)
 
493
            client["timeout"] = string_to_delta(section["timeout"])
 
494
            client["extended_timeout"] = string_to_delta(
 
495
                section["extended_timeout"])
 
496
            client["interval"] = string_to_delta(section["interval"])
 
497
            client["approval_delay"] = string_to_delta(
 
498
                section["approval_delay"])
 
499
            client["approval_duration"] = string_to_delta(
 
500
                section["approval_duration"])
 
501
            client["checker_command"] = section["checker"]
 
502
            client["last_approval_request"] = None
 
503
            client["last_checked_ok"] = None
 
504
            client["last_checker_status"] = None
 
505
        
 
506
        return settings
 
507
        
 
508
        
 
509
    def __init__(self, settings, name = None):
299
510
        """Note: the 'checker' key in 'config' sets the
300
511
        'checker_command' attribute and *not* the 'checker'
301
512
        attribute."""
302
513
        self.name = name
303
 
        if config is None:
304
 
            config = {}
305
 
        logger.debug(u"Creating client %r", self.name)
 
514
        # adding all client settings
 
515
        for setting, value in settings.iteritems():
 
516
            setattr(self, setting, value)
 
517
        
 
518
        if self.enabled:
 
519
            if not hasattr(self, "last_enabled"):
 
520
                self.last_enabled = datetime.datetime.utcnow()
 
521
            if not hasattr(self, "expires"):
 
522
                self.expires = (datetime.datetime.utcnow()
 
523
                                + self.timeout)
 
524
        else:
 
525
            self.last_enabled = None
 
526
            self.expires = None
 
527
       
 
528
        logger.debug("Creating client %r", self.name)
306
529
        # Uppercase and remove spaces from fingerprint for later
307
530
        # comparison purposes with return value from the fingerprint()
308
531
        # function
309
 
        self.fingerprint = (config[u"fingerprint"].upper()
310
 
                            .replace(u" ", u""))
311
 
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
312
 
        if u"secret" in config:
313
 
            self.secret = config[u"secret"].decode(u"base64")
314
 
        elif u"secfile" in config:
315
 
            with open(os.path.expanduser(os.path.expandvars
316
 
                                         (config[u"secfile"])),
317
 
                      "rb") as secfile:
318
 
                self.secret = secfile.read()
319
 
        else:
320
 
            raise TypeError(u"No secret or secfile for client %s"
321
 
                            % self.name)
322
 
        self.host = config.get(u"host", u"")
323
 
        self.created = datetime.datetime.utcnow()
324
 
        self.enabled = False
325
 
        self.last_approval_request = None
326
 
        self.last_enabled = None
327
 
        self.last_checked_ok = None
328
 
        self.timeout = string_to_delta(config[u"timeout"])
329
 
        self.interval = string_to_delta(config[u"interval"])
330
 
        self.disable_hook = disable_hook
 
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
533
        self.created = settings.get("created",
 
534
                                    datetime.datetime.utcnow())
 
535
 
 
536
        # attributes specific for this server instance
331
537
        self.checker = None
332
538
        self.checker_initiator_tag = None
333
539
        self.disable_initiator_tag = None
334
540
        self.checker_callback_tag = None
335
 
        self.checker_command = config[u"checker"]
336
541
        self.current_checker_command = None
337
 
        self.last_connect = None
338
 
        self._approved = None
339
 
        self.approved_by_default = config.get(u"approved_by_default",
340
 
                                              True)
 
542
        self.approved = None
341
543
        self.approvals_pending = 0
342
 
        self.approval_delay = string_to_delta(
343
 
            config[u"approval_delay"])
344
 
        self.approval_duration = string_to_delta(
345
 
            config[u"approval_duration"])
346
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
544
        self.changedstate = (multiprocessing_manager
 
545
                             .Condition(multiprocessing_manager
 
546
                                        .Lock()))
 
547
        self.client_structure = [attr for attr in
 
548
                                 self.__dict__.iterkeys()
 
549
                                 if not attr.startswith("_")]
 
550
        self.client_structure.append("client_structure")
 
551
        
 
552
        for name, t in inspect.getmembers(type(self),
 
553
                                          lambda obj:
 
554
                                              isinstance(obj,
 
555
                                                         property)):
 
556
            if not name.startswith("_"):
 
557
                self.client_structure.append(name)
347
558
    
 
559
    # Send notice to process children that client state has changed
348
560
    def send_changedstate(self):
349
 
        self.changedstate.acquire()
350
 
        self.changedstate.notify_all()
351
 
        self.changedstate.release()
352
 
        
 
561
        with self.changedstate:
 
562
            self.changedstate.notify_all()
 
563
    
353
564
    def enable(self):
354
565
        """Start this client's checker and timeout hooks"""
355
 
        if getattr(self, u"enabled", False):
 
566
        if getattr(self, "enabled", False):
356
567
            # Already enabled
357
568
            return
358
569
        self.send_changedstate()
 
570
        self.expires = datetime.datetime.utcnow() + self.timeout
 
571
        self.enabled = True
359
572
        self.last_enabled = datetime.datetime.utcnow()
 
573
        self.init_checker()
 
574
    
 
575
    def disable(self, quiet=True):
 
576
        """Disable this client."""
 
577
        if not getattr(self, "enabled", False):
 
578
            return False
 
579
        if not quiet:
 
580
            self.send_changedstate()
 
581
        if not quiet:
 
582
            logger.info("Disabling client %s", self.name)
 
583
        if getattr(self, "disable_initiator_tag", False):
 
584
            gobject.source_remove(self.disable_initiator_tag)
 
585
            self.disable_initiator_tag = None
 
586
        self.expires = None
 
587
        if getattr(self, "checker_initiator_tag", False):
 
588
            gobject.source_remove(self.checker_initiator_tag)
 
589
            self.checker_initiator_tag = None
 
590
        self.stop_checker()
 
591
        self.enabled = False
 
592
        # Do not run this again if called by a gobject.timeout_add
 
593
        return False
 
594
    
 
595
    def __del__(self):
 
596
        self.disable()
 
597
    
 
598
    def init_checker(self):
360
599
        # Schedule a new checker to be started an 'interval' from now,
361
600
        # and every interval from then on.
362
601
        self.checker_initiator_tag = (gobject.timeout_add
366
605
        self.disable_initiator_tag = (gobject.timeout_add
367
606
                                   (self.timeout_milliseconds(),
368
607
                                    self.disable))
369
 
        self.enabled = True
370
608
        # Also start a new checker *right now*.
371
609
        self.start_checker()
372
610
    
373
 
    def disable(self, quiet=True):
374
 
        """Disable this client."""
375
 
        if not getattr(self, "enabled", False):
376
 
            return False
377
 
        if not quiet:
378
 
            self.send_changedstate()
379
 
        if not quiet:
380
 
            logger.info(u"Disabling client %s", self.name)
381
 
        if getattr(self, u"disable_initiator_tag", False):
382
 
            gobject.source_remove(self.disable_initiator_tag)
383
 
            self.disable_initiator_tag = None
384
 
        if getattr(self, u"checker_initiator_tag", False):
385
 
            gobject.source_remove(self.checker_initiator_tag)
386
 
            self.checker_initiator_tag = None
387
 
        self.stop_checker()
388
 
        if self.disable_hook:
389
 
            self.disable_hook(self)
390
 
        self.enabled = False
391
 
        # Do not run this again if called by a gobject.timeout_add
392
 
        return False
393
 
    
394
 
    def __del__(self):
395
 
        self.disable_hook = None
396
 
        self.disable()
397
 
    
398
611
    def checker_callback(self, pid, condition, command):
399
612
        """The checker has completed, so take appropriate actions."""
400
613
        self.checker_callback_tag = None
401
614
        self.checker = None
402
615
        if os.WIFEXITED(condition):
403
 
            exitstatus = os.WEXITSTATUS(condition)
404
 
            if exitstatus == 0:
405
 
                logger.info(u"Checker for %(name)s succeeded",
 
616
            self.last_checker_status = os.WEXITSTATUS(condition)
 
617
            if self.last_checker_status == 0:
 
618
                logger.info("Checker for %(name)s succeeded",
406
619
                            vars(self))
407
620
                self.checked_ok()
408
621
            else:
409
 
                logger.info(u"Checker for %(name)s failed",
 
622
                logger.info("Checker for %(name)s failed",
410
623
                            vars(self))
411
624
        else:
412
 
            logger.warning(u"Checker for %(name)s crashed?",
 
625
            self.last_checker_status = -1
 
626
            logger.warning("Checker for %(name)s crashed?",
413
627
                           vars(self))
414
628
    
415
 
    def checked_ok(self):
 
629
    def checked_ok(self, timeout=None):
416
630
        """Bump up the timeout for this client.
417
631
        
418
632
        This should only be called when the client has been seen,
419
633
        alive and well.
420
634
        """
 
635
        if timeout is None:
 
636
            timeout = self.timeout
421
637
        self.last_checked_ok = datetime.datetime.utcnow()
422
 
        gobject.source_remove(self.disable_initiator_tag)
423
 
        self.disable_initiator_tag = (gobject.timeout_add
424
 
                                      (self.timeout_milliseconds(),
425
 
                                       self.disable))
 
638
        if self.disable_initiator_tag is not None:
 
639
            gobject.source_remove(self.disable_initiator_tag)
 
640
        if getattr(self, "enabled", False):
 
641
            self.disable_initiator_tag = (gobject.timeout_add
 
642
                                          (timedelta_to_milliseconds
 
643
                                           (timeout), self.disable))
 
644
            self.expires = datetime.datetime.utcnow() + timeout
426
645
    
427
646
    def need_approval(self):
428
647
        self.last_approval_request = datetime.datetime.utcnow()
444
663
        # If a checker exists, make sure it is not a zombie
445
664
        try:
446
665
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
447
 
        except (AttributeError, OSError), error:
 
666
        except (AttributeError, OSError) as error:
448
667
            if (isinstance(error, OSError)
449
668
                and error.errno != errno.ECHILD):
450
669
                raise error
451
670
        else:
452
671
            if pid:
453
 
                logger.warning(u"Checker was a zombie")
 
672
                logger.warning("Checker was a zombie")
454
673
                gobject.source_remove(self.checker_callback_tag)
455
674
                self.checker_callback(pid, status,
456
675
                                      self.current_checker_command)
463
682
                # Escape attributes for the shell
464
683
                escaped_attrs = dict(
465
684
                    (attr,
466
 
                     re.escape(unicode(str(getattr(self, attr, u"")),
 
685
                     re.escape(unicode(str(getattr(self, attr, "")),
467
686
                                       errors=
468
 
                                       u'replace')))
 
687
                                       'replace')))
469
688
                    for attr in
470
689
                    self.runtime_expansions)
471
 
 
 
690
                
472
691
                try:
473
692
                    command = self.checker_command % escaped_attrs
474
 
                except TypeError, error:
475
 
                    logger.error(u'Could not format string "%s":'
476
 
                                 u' %s', self.checker_command, error)
 
693
                except TypeError as error:
 
694
                    logger.error('Could not format string "%s":'
 
695
                                 ' %s', self.checker_command, error)
477
696
                    return True # Try again later
478
697
            self.current_checker_command = command
479
698
            try:
480
 
                logger.info(u"Starting checker %r for %s",
 
699
                logger.info("Starting checker %r for %s",
481
700
                            command, self.name)
482
701
                # We don't need to redirect stdout and stderr, since
483
702
                # in normal mode, that is already done by daemon(),
485
704
                # always replaced by /dev/null.)
486
705
                self.checker = subprocess.Popen(command,
487
706
                                                close_fds=True,
488
 
                                                shell=True, cwd=u"/")
 
707
                                                shell=True, cwd="/")
489
708
                self.checker_callback_tag = (gobject.child_watch_add
490
709
                                             (self.checker.pid,
491
710
                                              self.checker_callback,
496
715
                if pid:
497
716
                    gobject.source_remove(self.checker_callback_tag)
498
717
                    self.checker_callback(pid, status, command)
499
 
            except OSError, error:
500
 
                logger.error(u"Failed to start subprocess: %s",
 
718
            except OSError as error:
 
719
                logger.error("Failed to start subprocess: %s",
501
720
                             error)
502
721
        # Re-run this periodically if run by gobject.timeout_add
503
722
        return True
507
726
        if self.checker_callback_tag:
508
727
            gobject.source_remove(self.checker_callback_tag)
509
728
            self.checker_callback_tag = None
510
 
        if getattr(self, u"checker", None) is None:
 
729
        if getattr(self, "checker", None) is None:
511
730
            return
512
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
731
        logger.debug("Stopping checker for %(name)s", vars(self))
513
732
        try:
514
733
            os.kill(self.checker.pid, signal.SIGTERM)
515
734
            #time.sleep(0.5)
516
735
            #if self.checker.poll() is None:
517
736
            #    os.kill(self.checker.pid, signal.SIGKILL)
518
 
        except OSError, error:
 
737
        except OSError as error:
519
738
            if error.errno != errno.ESRCH: # No such process
520
739
                raise
521
740
        self.checker = None
522
741
 
523
 
def dbus_service_property(dbus_interface, signature=u"v",
524
 
                          access=u"readwrite", byte_arrays=False):
 
742
 
 
743
def dbus_service_property(dbus_interface, signature="v",
 
744
                          access="readwrite", byte_arrays=False):
525
745
    """Decorators for marking methods of a DBusObjectWithProperties to
526
746
    become properties on the D-Bus.
527
747
    
534
754
    """
535
755
    # Encoding deeply encoded byte arrays is not supported yet by the
536
756
    # "Set" method, so we fail early here:
537
 
    if byte_arrays and signature != u"ay":
538
 
        raise ValueError(u"Byte arrays not supported for non-'ay'"
539
 
                         u" signature %r" % signature)
 
757
    if byte_arrays and signature != "ay":
 
758
        raise ValueError("Byte arrays not supported for non-'ay'"
 
759
                         " signature %r" % signature)
540
760
    def decorator(func):
541
761
        func._dbus_is_property = True
542
762
        func._dbus_interface = dbus_interface
543
763
        func._dbus_signature = signature
544
764
        func._dbus_access = access
545
765
        func._dbus_name = func.__name__
546
 
        if func._dbus_name.endswith(u"_dbus_property"):
 
766
        if func._dbus_name.endswith("_dbus_property"):
547
767
            func._dbus_name = func._dbus_name[:-14]
548
 
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
768
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
549
769
        return func
550
770
    return decorator
551
771
 
571
791
 
572
792
class DBusObjectWithProperties(dbus.service.Object):
573
793
    """A D-Bus object with properties.
574
 
 
 
794
    
575
795
    Classes inheriting from this can use the dbus_service_property
576
796
    decorator to expose methods as D-Bus properties.  It exposes the
577
797
    standard Get(), Set(), and GetAll() methods on the D-Bus.
579
799
    
580
800
    @staticmethod
581
801
    def _is_dbus_property(obj):
582
 
        return getattr(obj, u"_dbus_is_property", False)
 
802
        return getattr(obj, "_dbus_is_property", False)
583
803
    
584
804
    def _get_all_dbus_properties(self):
585
805
        """Returns a generator of (name, attribute) pairs
586
806
        """
587
 
        return ((prop._dbus_name, prop)
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
808
                for cls in self.__class__.__mro__
588
809
                for name, prop in
589
 
                inspect.getmembers(self, self._is_dbus_property))
 
810
                inspect.getmembers(cls, self._is_dbus_property))
590
811
    
591
812
    def _get_dbus_property(self, interface_name, property_name):
592
813
        """Returns a bound method if one exists which is a D-Bus
593
814
        property with the specified name and interface.
594
815
        """
595
 
        for name in (property_name,
596
 
                     property_name + u"_dbus_property"):
597
 
            prop = getattr(self, name, None)
598
 
            if (prop is None
599
 
                or not self._is_dbus_property(prop)
600
 
                or prop._dbus_name != property_name
601
 
                or (interface_name and prop._dbus_interface
602
 
                    and interface_name != prop._dbus_interface)):
603
 
                continue
604
 
            return prop
 
816
        for cls in  self.__class__.__mro__:
 
817
            for name, value in (inspect.getmembers
 
818
                                (cls, self._is_dbus_property)):
 
819
                if (value._dbus_name == property_name
 
820
                    and value._dbus_interface == interface_name):
 
821
                    return value.__get__(self)
 
822
        
605
823
        # No such property
606
 
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
607
 
                                   + interface_name + u"."
 
824
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
825
                                   + interface_name + "."
608
826
                                   + property_name)
609
827
    
610
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
611
 
                         out_signature=u"v")
 
828
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
829
                         out_signature="v")
612
830
    def Get(self, interface_name, property_name):
613
831
        """Standard D-Bus property Get() method, see D-Bus standard.
614
832
        """
615
833
        prop = self._get_dbus_property(interface_name, property_name)
616
 
        if prop._dbus_access == u"write":
 
834
        if prop._dbus_access == "write":
617
835
            raise DBusPropertyAccessException(property_name)
618
836
        value = prop()
619
 
        if not hasattr(value, u"variant_level"):
 
837
        if not hasattr(value, "variant_level"):
620
838
            return value
621
839
        return type(value)(value, variant_level=value.variant_level+1)
622
840
    
623
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
841
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
624
842
    def Set(self, interface_name, property_name, value):
625
843
        """Standard D-Bus property Set() method, see D-Bus standard.
626
844
        """
627
845
        prop = self._get_dbus_property(interface_name, property_name)
628
 
        if prop._dbus_access == u"read":
 
846
        if prop._dbus_access == "read":
629
847
            raise DBusPropertyAccessException(property_name)
630
 
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
848
        if prop._dbus_get_args_options["byte_arrays"]:
631
849
            # The byte_arrays option is not supported yet on
632
850
            # signatures other than "ay".
633
 
            if prop._dbus_signature != u"ay":
 
851
            if prop._dbus_signature != "ay":
634
852
                raise ValueError
635
 
            value = dbus.ByteArray(''.join(unichr(byte)
636
 
                                           for byte in value))
 
853
            value = dbus.ByteArray(b''.join(chr(byte)
 
854
                                            for byte in value))
637
855
        prop(value)
638
856
    
639
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
640
 
                         out_signature=u"a{sv}")
 
857
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
858
                         out_signature="a{sv}")
641
859
    def GetAll(self, interface_name):
642
860
        """Standard D-Bus property GetAll() method, see D-Bus
643
861
        standard.
644
 
 
 
862
        
645
863
        Note: Will not include properties with access="write".
646
864
        """
647
 
        all = {}
 
865
        properties = {}
648
866
        for name, prop in self._get_all_dbus_properties():
649
867
            if (interface_name
650
868
                and interface_name != prop._dbus_interface):
651
869
                # Interface non-empty but did not match
652
870
                continue
653
871
            # Ignore write-only properties
654
 
            if prop._dbus_access == u"write":
 
872
            if prop._dbus_access == "write":
655
873
                continue
656
874
            value = prop()
657
 
            if not hasattr(value, u"variant_level"):
658
 
                all[name] = value
 
875
            if not hasattr(value, "variant_level"):
 
876
                properties[name] = value
659
877
                continue
660
 
            all[name] = type(value)(value, variant_level=
661
 
                                    value.variant_level+1)
662
 
        return dbus.Dictionary(all, signature=u"sv")
 
878
            properties[name] = type(value)(value, variant_level=
 
879
                                           value.variant_level+1)
 
880
        return dbus.Dictionary(properties, signature="sv")
663
881
    
664
882
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
665
 
                         out_signature=u"s",
 
883
                         out_signature="s",
666
884
                         path_keyword='object_path',
667
885
                         connection_keyword='connection')
668
886
    def Introspect(self, object_path, connection):
673
891
        try:
674
892
            document = xml.dom.minidom.parseString(xmlstring)
675
893
            def make_tag(document, name, prop):
676
 
                e = document.createElement(u"property")
677
 
                e.setAttribute(u"name", name)
678
 
                e.setAttribute(u"type", prop._dbus_signature)
679
 
                e.setAttribute(u"access", prop._dbus_access)
 
894
                e = document.createElement("property")
 
895
                e.setAttribute("name", name)
 
896
                e.setAttribute("type", prop._dbus_signature)
 
897
                e.setAttribute("access", prop._dbus_access)
680
898
                return e
681
 
            for if_tag in document.getElementsByTagName(u"interface"):
 
899
            for if_tag in document.getElementsByTagName("interface"):
682
900
                for tag in (make_tag(document, name, prop)
683
901
                            for name, prop
684
902
                            in self._get_all_dbus_properties()
685
903
                            if prop._dbus_interface
686
 
                            == if_tag.getAttribute(u"name")):
 
904
                            == if_tag.getAttribute("name")):
687
905
                    if_tag.appendChild(tag)
688
906
                # Add the names to the return values for the
689
907
                # "org.freedesktop.DBus.Properties" methods
690
 
                if (if_tag.getAttribute(u"name")
691
 
                    == u"org.freedesktop.DBus.Properties"):
692
 
                    for cn in if_tag.getElementsByTagName(u"method"):
693
 
                        if cn.getAttribute(u"name") == u"Get":
694
 
                            for arg in cn.getElementsByTagName(u"arg"):
695
 
                                if (arg.getAttribute(u"direction")
696
 
                                    == u"out"):
697
 
                                    arg.setAttribute(u"name", u"value")
698
 
                        elif cn.getAttribute(u"name") == u"GetAll":
699
 
                            for arg in cn.getElementsByTagName(u"arg"):
700
 
                                if (arg.getAttribute(u"direction")
701
 
                                    == u"out"):
702
 
                                    arg.setAttribute(u"name", u"props")
703
 
            xmlstring = document.toxml(u"utf-8")
 
908
                if (if_tag.getAttribute("name")
 
909
                    == "org.freedesktop.DBus.Properties"):
 
910
                    for cn in if_tag.getElementsByTagName("method"):
 
911
                        if cn.getAttribute("name") == "Get":
 
912
                            for arg in cn.getElementsByTagName("arg"):
 
913
                                if (arg.getAttribute("direction")
 
914
                                    == "out"):
 
915
                                    arg.setAttribute("name", "value")
 
916
                        elif cn.getAttribute("name") == "GetAll":
 
917
                            for arg in cn.getElementsByTagName("arg"):
 
918
                                if (arg.getAttribute("direction")
 
919
                                    == "out"):
 
920
                                    arg.setAttribute("name", "props")
 
921
            xmlstring = document.toxml("utf-8")
704
922
            document.unlink()
705
923
        except (AttributeError, xml.dom.DOMException,
706
 
                xml.parsers.expat.ExpatError), error:
707
 
            logger.error(u"Failed to override Introspection method",
 
924
                xml.parsers.expat.ExpatError) as error:
 
925
            logger.error("Failed to override Introspection method",
708
926
                         error)
709
927
        return xmlstring
710
928
 
711
929
 
 
930
def datetime_to_dbus (dt, variant_level=0):
 
931
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
932
    if dt is None:
 
933
        return dbus.String("", variant_level = variant_level)
 
934
    return dbus.String(dt.isoformat(),
 
935
                       variant_level=variant_level)
 
936
 
 
937
 
 
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
939
                                  .__metaclass__):
 
940
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
941
    will add additional D-Bus attributes matching a certain pattern.
 
942
    """
 
943
    def __new__(mcs, name, bases, attr):
 
944
        # Go through all the base classes which could have D-Bus
 
945
        # methods, signals, or properties in them
 
946
        for base in (b for b in bases
 
947
                     if issubclass(b, dbus.service.Object)):
 
948
            # Go though all attributes of the base class
 
949
            for attrname, attribute in inspect.getmembers(base):
 
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
951
                # with the wrong interface name
 
952
                if (not hasattr(attribute, "_dbus_interface")
 
953
                    or not attribute._dbus_interface
 
954
                    .startswith("se.recompile.Mandos")):
 
955
                    continue
 
956
                # Create an alternate D-Bus interface name based on
 
957
                # the current name
 
958
                alt_interface = (attribute._dbus_interface
 
959
                                 .replace("se.recompile.Mandos",
 
960
                                          "se.bsnet.fukt.Mandos"))
 
961
                # Is this a D-Bus signal?
 
962
                if getattr(attribute, "_dbus_is_signal", False):
 
963
                    # Extract the original non-method function by
 
964
                    # black magic
 
965
                    nonmethod_func = (dict(
 
966
                            zip(attribute.func_code.co_freevars,
 
967
                                attribute.__closure__))["func"]
 
968
                                      .cell_contents)
 
969
                    # Create a new, but exactly alike, function
 
970
                    # object, and decorate it to be a new D-Bus signal
 
971
                    # with the alternate D-Bus interface name
 
972
                    new_function = (dbus.service.signal
 
973
                                    (alt_interface,
 
974
                                     attribute._dbus_signature)
 
975
                                    (types.FunctionType(
 
976
                                nonmethod_func.func_code,
 
977
                                nonmethod_func.func_globals,
 
978
                                nonmethod_func.func_name,
 
979
                                nonmethod_func.func_defaults,
 
980
                                nonmethod_func.func_closure)))
 
981
                    # Define a creator of a function to call both the
 
982
                    # old and new functions, so both the old and new
 
983
                    # signals gets sent when the function is called
 
984
                    def fixscope(func1, func2):
 
985
                        """This function is a scope container to pass
 
986
                        func1 and func2 to the "call_both" function
 
987
                        outside of its arguments"""
 
988
                        def call_both(*args, **kwargs):
 
989
                            """This function will emit two D-Bus
 
990
                            signals by calling func1 and func2"""
 
991
                            func1(*args, **kwargs)
 
992
                            func2(*args, **kwargs)
 
993
                        return call_both
 
994
                    # Create the "call_both" function and add it to
 
995
                    # the class
 
996
                    attr[attrname] = fixscope(attribute,
 
997
                                              new_function)
 
998
                # Is this a D-Bus method?
 
999
                elif getattr(attribute, "_dbus_is_method", False):
 
1000
                    # Create a new, but exactly alike, function
 
1001
                    # object.  Decorate it to be a new D-Bus method
 
1002
                    # with the alternate D-Bus interface name.  Add it
 
1003
                    # to the class.
 
1004
                    attr[attrname] = (dbus.service.method
 
1005
                                      (alt_interface,
 
1006
                                       attribute._dbus_in_signature,
 
1007
                                       attribute._dbus_out_signature)
 
1008
                                      (types.FunctionType
 
1009
                                       (attribute.func_code,
 
1010
                                        attribute.func_globals,
 
1011
                                        attribute.func_name,
 
1012
                                        attribute.func_defaults,
 
1013
                                        attribute.func_closure)))
 
1014
                # Is this a D-Bus property?
 
1015
                elif getattr(attribute, "_dbus_is_property", False):
 
1016
                    # Create a new, but exactly alike, function
 
1017
                    # object, and decorate it to be a new D-Bus
 
1018
                    # property with the alternate D-Bus interface
 
1019
                    # name.  Add it to the class.
 
1020
                    attr[attrname] = (dbus_service_property
 
1021
                                      (alt_interface,
 
1022
                                       attribute._dbus_signature,
 
1023
                                       attribute._dbus_access,
 
1024
                                       attribute
 
1025
                                       ._dbus_get_args_options
 
1026
                                       ["byte_arrays"])
 
1027
                                      (types.FunctionType
 
1028
                                       (attribute.func_code,
 
1029
                                        attribute.func_globals,
 
1030
                                        attribute.func_name,
 
1031
                                        attribute.func_defaults,
 
1032
                                        attribute.func_closure)))
 
1033
        return type.__new__(mcs, name, bases, attr)
 
1034
 
 
1035
 
712
1036
class ClientDBus(Client, DBusObjectWithProperties):
713
1037
    """A Client class using D-Bus
714
1038
    
718
1042
    """
719
1043
    
720
1044
    runtime_expansions = (Client.runtime_expansions
721
 
                          + (u"dbus_object_path",))
 
1045
                          + ("dbus_object_path",))
722
1046
    
723
1047
    # dbus.service.Object doesn't use super(), so we can't either.
724
1048
    
725
1049
    def __init__(self, bus = None, *args, **kwargs):
726
 
        self._approvals_pending = 0
727
1050
        self.bus = bus
728
1051
        Client.__init__(self, *args, **kwargs)
729
1052
        # Only now, when this client is initialized, can it show up on
730
1053
        # the D-Bus
731
1054
        client_object_name = unicode(self.name).translate(
732
 
            {ord(u"."): ord(u"_"),
733
 
             ord(u"-"): ord(u"_")})
 
1055
            {ord("."): ord("_"),
 
1056
             ord("-"): ord("_")})
734
1057
        self.dbus_object_path = (dbus.ObjectPath
735
 
                                 (u"/clients/" + client_object_name))
 
1058
                                 ("/clients/" + client_object_name))
736
1059
        DBusObjectWithProperties.__init__(self, self.bus,
737
1060
                                          self.dbus_object_path)
738
1061
        
739
 
    def _get_approvals_pending(self):
740
 
        return self._approvals_pending
741
 
    def _set_approvals_pending(self, value):
742
 
        old_value = self._approvals_pending
743
 
        self._approvals_pending = value
744
 
        bval = bool(value)
745
 
        if (hasattr(self, "dbus_object_path")
746
 
            and bval is not bool(old_value)):
747
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
748
 
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
749
 
                                 dbus_bool)
750
 
 
751
 
    approvals_pending = property(_get_approvals_pending,
752
 
                                 _set_approvals_pending)
753
 
    del _get_approvals_pending, _set_approvals_pending
754
 
    
755
 
    @staticmethod
756
 
    def _datetime_to_dbus(dt, variant_level=0):
757
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
758
 
        return dbus.String(dt.isoformat(),
759
 
                           variant_level=variant_level)
760
 
    
761
 
    def enable(self):
762
 
        oldstate = getattr(self, u"enabled", False)
763
 
        r = Client.enable(self)
764
 
        if oldstate != self.enabled:
765
 
            # Emit D-Bus signals
766
 
            self.PropertyChanged(dbus.String(u"Enabled"),
767
 
                                 dbus.Boolean(True, variant_level=1))
768
 
            self.PropertyChanged(
769
 
                dbus.String(u"LastEnabled"),
770
 
                self._datetime_to_dbus(self.last_enabled,
771
 
                                       variant_level=1))
772
 
        return r
773
 
    
774
 
    def disable(self, quiet = False):
775
 
        oldstate = getattr(self, u"enabled", False)
776
 
        r = Client.disable(self, quiet=quiet)
777
 
        if not quiet and oldstate != self.enabled:
778
 
            # Emit D-Bus signal
779
 
            self.PropertyChanged(dbus.String(u"Enabled"),
780
 
                                 dbus.Boolean(False, variant_level=1))
781
 
        return r
 
1062
    def notifychangeproperty(transform_func,
 
1063
                             dbus_name, type_func=lambda x: x,
 
1064
                             variant_level=1):
 
1065
        """ Modify a variable so that it's a property which announces
 
1066
        its changes to DBus.
 
1067
        
 
1068
        transform_fun: Function that takes a value and a variant_level
 
1069
                       and transforms it to a D-Bus type.
 
1070
        dbus_name: D-Bus name of the variable
 
1071
        type_func: Function that transform the value before sending it
 
1072
                   to the D-Bus.  Default: no transform
 
1073
        variant_level: D-Bus variant level.  Default: 1
 
1074
        """
 
1075
        attrname = "_{0}".format(dbus_name)
 
1076
        def setter(self, value):
 
1077
            if hasattr(self, "dbus_object_path"):
 
1078
                if (not hasattr(self, attrname) or
 
1079
                    type_func(getattr(self, attrname, None))
 
1080
                    != type_func(value)):
 
1081
                    dbus_value = transform_func(type_func(value),
 
1082
                                                variant_level
 
1083
                                                =variant_level)
 
1084
                    self.PropertyChanged(dbus.String(dbus_name),
 
1085
                                         dbus_value)
 
1086
            setattr(self, attrname, value)
 
1087
        
 
1088
        return property(lambda self: getattr(self, attrname), setter)
 
1089
    
 
1090
    
 
1091
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1092
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1093
                                             "ApprovalPending",
 
1094
                                             type_func = bool)
 
1095
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1096
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1097
                                        "LastEnabled")
 
1098
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1099
                                   type_func = lambda checker:
 
1100
                                       checker is not None)
 
1101
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1102
                                           "LastCheckedOK")
 
1103
    last_approval_request = notifychangeproperty(
 
1104
        datetime_to_dbus, "LastApprovalRequest")
 
1105
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1106
                                               "ApprovedByDefault")
 
1107
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1108
                                          "ApprovalDelay",
 
1109
                                          type_func =
 
1110
                                          timedelta_to_milliseconds)
 
1111
    approval_duration = notifychangeproperty(
 
1112
        dbus.UInt64, "ApprovalDuration",
 
1113
        type_func = timedelta_to_milliseconds)
 
1114
    host = notifychangeproperty(dbus.String, "Host")
 
1115
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1116
                                   type_func =
 
1117
                                   timedelta_to_milliseconds)
 
1118
    extended_timeout = notifychangeproperty(
 
1119
        dbus.UInt64, "ExtendedTimeout",
 
1120
        type_func = timedelta_to_milliseconds)
 
1121
    interval = notifychangeproperty(dbus.UInt64,
 
1122
                                    "Interval",
 
1123
                                    type_func =
 
1124
                                    timedelta_to_milliseconds)
 
1125
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1126
    
 
1127
    del notifychangeproperty
782
1128
    
783
1129
    def __del__(self, *args, **kwargs):
784
1130
        try:
785
1131
            self.remove_from_connection()
786
1132
        except LookupError:
787
1133
            pass
788
 
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
1134
        if hasattr(DBusObjectWithProperties, "__del__"):
789
1135
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
790
1136
        Client.__del__(self, *args, **kwargs)
791
1137
    
793
1139
                         *args, **kwargs):
794
1140
        self.checker_callback_tag = None
795
1141
        self.checker = None
796
 
        # Emit D-Bus signal
797
 
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
798
 
                             dbus.Boolean(False, variant_level=1))
799
1142
        if os.WIFEXITED(condition):
800
1143
            exitstatus = os.WEXITSTATUS(condition)
801
1144
            # Emit D-Bus signal
811
1154
        return Client.checker_callback(self, pid, condition, command,
812
1155
                                       *args, **kwargs)
813
1156
    
814
 
    def checked_ok(self, *args, **kwargs):
815
 
        r = Client.checked_ok(self, *args, **kwargs)
816
 
        # Emit D-Bus signal
817
 
        self.PropertyChanged(
818
 
            dbus.String(u"LastCheckedOK"),
819
 
            (self._datetime_to_dbus(self.last_checked_ok,
820
 
                                    variant_level=1)))
821
 
        return r
822
 
    
823
 
    def need_approval(self, *args, **kwargs):
824
 
        r = Client.need_approval(self, *args, **kwargs)
825
 
        # Emit D-Bus signal
826
 
        self.PropertyChanged(
827
 
            dbus.String(u"LastApprovalRequest"),
828
 
            (self._datetime_to_dbus(self.last_approval_request,
829
 
                                    variant_level=1)))
830
 
        return r
831
 
    
832
1157
    def start_checker(self, *args, **kwargs):
833
1158
        old_checker = self.checker
834
1159
        if self.checker is not None:
841
1166
            and old_checker_pid != self.checker.pid):
842
1167
            # Emit D-Bus signal
843
1168
            self.CheckerStarted(self.current_checker_command)
844
 
            self.PropertyChanged(
845
 
                dbus.String(u"CheckerRunning"),
846
 
                dbus.Boolean(True, variant_level=1))
847
1169
        return r
848
1170
    
849
 
    def stop_checker(self, *args, **kwargs):
850
 
        old_checker = getattr(self, u"checker", None)
851
 
        r = Client.stop_checker(self, *args, **kwargs)
852
 
        if (old_checker is not None
853
 
            and getattr(self, u"checker", None) is None):
854
 
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
855
 
                                 dbus.Boolean(False, variant_level=1))
856
 
        return r
857
 
 
858
1171
    def _reset_approved(self):
859
 
        self._approved = None
 
1172
        self.approved = None
860
1173
        return False
861
1174
    
862
1175
    def approve(self, value=True):
863
1176
        self.send_changedstate()
864
 
        self._approved = value
865
 
        gobject.timeout_add(self._timedelta_to_milliseconds
 
1177
        self.approved = value
 
1178
        gobject.timeout_add(timedelta_to_milliseconds
866
1179
                            (self.approval_duration),
867
1180
                            self._reset_approved)
868
1181
    
869
1182
    
870
1183
    ## D-Bus methods, signals & properties
871
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
1184
    _interface = "se.recompile.Mandos.Client"
872
1185
    
873
1186
    ## Signals
874
1187
    
875
1188
    # CheckerCompleted - signal
876
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
1189
    @dbus.service.signal(_interface, signature="nxs")
877
1190
    def CheckerCompleted(self, exitcode, waitstatus, command):
878
1191
        "D-Bus signal"
879
1192
        pass
880
1193
    
881
1194
    # CheckerStarted - signal
882
 
    @dbus.service.signal(_interface, signature=u"s")
 
1195
    @dbus.service.signal(_interface, signature="s")
883
1196
    def CheckerStarted(self, command):
884
1197
        "D-Bus signal"
885
1198
        pass
886
1199
    
887
1200
    # PropertyChanged - signal
888
 
    @dbus.service.signal(_interface, signature=u"sv")
 
1201
    @dbus.service.signal(_interface, signature="sv")
889
1202
    def PropertyChanged(self, property, value):
890
1203
        "D-Bus signal"
891
1204
        pass
900
1213
        pass
901
1214
    
902
1215
    # Rejected - signal
903
 
    @dbus.service.signal(_interface, signature=u"s")
 
1216
    @dbus.service.signal(_interface, signature="s")
904
1217
    def Rejected(self, reason):
905
1218
        "D-Bus signal"
906
1219
        pass
907
1220
    
908
1221
    # NeedApproval - signal
909
 
    @dbus.service.signal(_interface, signature=u"tb")
 
1222
    @dbus.service.signal(_interface, signature="tb")
910
1223
    def NeedApproval(self, timeout, default):
911
1224
        "D-Bus signal"
912
1225
        return self.need_approval()
914
1227
    ## Methods
915
1228
    
916
1229
    # Approve - method
917
 
    @dbus.service.method(_interface, in_signature=u"b")
 
1230
    @dbus.service.method(_interface, in_signature="b")
918
1231
    def Approve(self, value):
919
1232
        self.approve(value)
920
1233
    
921
1234
    # CheckedOK - method
922
1235
    @dbus.service.method(_interface)
923
1236
    def CheckedOK(self):
924
 
        return self.checked_ok()
 
1237
        self.checked_ok()
925
1238
    
926
1239
    # Enable - method
927
1240
    @dbus.service.method(_interface)
949
1262
    ## Properties
950
1263
    
951
1264
    # ApprovalPending - property
952
 
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
1265
    @dbus_service_property(_interface, signature="b", access="read")
953
1266
    def ApprovalPending_dbus_property(self):
954
1267
        return dbus.Boolean(bool(self.approvals_pending))
955
1268
    
956
1269
    # ApprovedByDefault - property
957
 
    @dbus_service_property(_interface, signature=u"b",
958
 
                           access=u"readwrite")
 
1270
    @dbus_service_property(_interface, signature="b",
 
1271
                           access="readwrite")
959
1272
    def ApprovedByDefault_dbus_property(self, value=None):
960
1273
        if value is None:       # get
961
1274
            return dbus.Boolean(self.approved_by_default)
962
1275
        self.approved_by_default = bool(value)
963
 
        # Emit D-Bus signal
964
 
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
965
 
                             dbus.Boolean(value, variant_level=1))
966
1276
    
967
1277
    # ApprovalDelay - property
968
 
    @dbus_service_property(_interface, signature=u"t",
969
 
                           access=u"readwrite")
 
1278
    @dbus_service_property(_interface, signature="t",
 
1279
                           access="readwrite")
970
1280
    def ApprovalDelay_dbus_property(self, value=None):
971
1281
        if value is None:       # get
972
1282
            return dbus.UInt64(self.approval_delay_milliseconds())
973
1283
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
974
 
        # Emit D-Bus signal
975
 
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
976
 
                             dbus.UInt64(value, variant_level=1))
977
1284
    
978
1285
    # ApprovalDuration - property
979
 
    @dbus_service_property(_interface, signature=u"t",
980
 
                           access=u"readwrite")
 
1286
    @dbus_service_property(_interface, signature="t",
 
1287
                           access="readwrite")
981
1288
    def ApprovalDuration_dbus_property(self, value=None):
982
1289
        if value is None:       # get
983
 
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
1290
            return dbus.UInt64(timedelta_to_milliseconds(
984
1291
                    self.approval_duration))
985
1292
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
986
 
        # Emit D-Bus signal
987
 
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
988
 
                             dbus.UInt64(value, variant_level=1))
989
1293
    
990
1294
    # Name - property
991
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1295
    @dbus_service_property(_interface, signature="s", access="read")
992
1296
    def Name_dbus_property(self):
993
1297
        return dbus.String(self.name)
994
1298
    
995
1299
    # Fingerprint - property
996
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1300
    @dbus_service_property(_interface, signature="s", access="read")
997
1301
    def Fingerprint_dbus_property(self):
998
1302
        return dbus.String(self.fingerprint)
999
1303
    
1000
1304
    # Host - property
1001
 
    @dbus_service_property(_interface, signature=u"s",
1002
 
                           access=u"readwrite")
 
1305
    @dbus_service_property(_interface, signature="s",
 
1306
                           access="readwrite")
1003
1307
    def Host_dbus_property(self, value=None):
1004
1308
        if value is None:       # get
1005
1309
            return dbus.String(self.host)
1006
 
        self.host = value
1007
 
        # Emit D-Bus signal
1008
 
        self.PropertyChanged(dbus.String(u"Host"),
1009
 
                             dbus.String(value, variant_level=1))
 
1310
        self.host = unicode(value)
1010
1311
    
1011
1312
    # Created - property
1012
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1313
    @dbus_service_property(_interface, signature="s", access="read")
1013
1314
    def Created_dbus_property(self):
1014
 
        return dbus.String(self._datetime_to_dbus(self.created))
 
1315
        return datetime_to_dbus(self.created)
1015
1316
    
1016
1317
    # LastEnabled - property
1017
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1318
    @dbus_service_property(_interface, signature="s", access="read")
1018
1319
    def LastEnabled_dbus_property(self):
1019
 
        if self.last_enabled is None:
1020
 
            return dbus.String(u"")
1021
 
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
1320
        return datetime_to_dbus(self.last_enabled)
1022
1321
    
1023
1322
    # Enabled - property
1024
 
    @dbus_service_property(_interface, signature=u"b",
1025
 
                           access=u"readwrite")
 
1323
    @dbus_service_property(_interface, signature="b",
 
1324
                           access="readwrite")
1026
1325
    def Enabled_dbus_property(self, value=None):
1027
1326
        if value is None:       # get
1028
1327
            return dbus.Boolean(self.enabled)
1032
1331
            self.disable()
1033
1332
    
1034
1333
    # LastCheckedOK - property
1035
 
    @dbus_service_property(_interface, signature=u"s",
1036
 
                           access=u"readwrite")
 
1334
    @dbus_service_property(_interface, signature="s",
 
1335
                           access="readwrite")
1037
1336
    def LastCheckedOK_dbus_property(self, value=None):
1038
1337
        if value is not None:
1039
1338
            self.checked_ok()
1040
1339
            return
1041
 
        if self.last_checked_ok is None:
1042
 
            return dbus.String(u"")
1043
 
        return dbus.String(self._datetime_to_dbus(self
1044
 
                                                  .last_checked_ok))
 
1340
        return datetime_to_dbus(self.last_checked_ok)
 
1341
    
 
1342
    # Expires - property
 
1343
    @dbus_service_property(_interface, signature="s", access="read")
 
1344
    def Expires_dbus_property(self):
 
1345
        return datetime_to_dbus(self.expires)
1045
1346
    
1046
1347
    # LastApprovalRequest - property
1047
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1348
    @dbus_service_property(_interface, signature="s", access="read")
1048
1349
    def LastApprovalRequest_dbus_property(self):
1049
 
        if self.last_approval_request is None:
1050
 
            return dbus.String(u"")
1051
 
        return dbus.String(self.
1052
 
                           _datetime_to_dbus(self
1053
 
                                             .last_approval_request))
 
1350
        return datetime_to_dbus(self.last_approval_request)
1054
1351
    
1055
1352
    # Timeout - property
1056
 
    @dbus_service_property(_interface, signature=u"t",
1057
 
                           access=u"readwrite")
 
1353
    @dbus_service_property(_interface, signature="t",
 
1354
                           access="readwrite")
1058
1355
    def Timeout_dbus_property(self, value=None):
1059
1356
        if value is None:       # get
1060
1357
            return dbus.UInt64(self.timeout_milliseconds())
1061
1358
        self.timeout = datetime.timedelta(0, 0, 0, value)
1062
 
        # Emit D-Bus signal
1063
 
        self.PropertyChanged(dbus.String(u"Timeout"),
1064
 
                             dbus.UInt64(value, variant_level=1))
1065
 
        if getattr(self, u"disable_initiator_tag", None) is None:
1066
 
            return
1067
1359
        # Reschedule timeout
1068
 
        gobject.source_remove(self.disable_initiator_tag)
1069
 
        self.disable_initiator_tag = None
1070
 
        time_to_die = (self.
1071
 
                       _timedelta_to_milliseconds((self
1072
 
                                                   .last_checked_ok
1073
 
                                                   + self.timeout)
1074
 
                                                  - datetime.datetime
1075
 
                                                  .utcnow()))
1076
 
        if time_to_die <= 0:
1077
 
            # The timeout has passed
1078
 
            self.disable()
1079
 
        else:
1080
 
            self.disable_initiator_tag = (gobject.timeout_add
1081
 
                                          (time_to_die, self.disable))
 
1360
        if self.enabled:
 
1361
            now = datetime.datetime.utcnow()
 
1362
            time_to_die = timedelta_to_milliseconds(
 
1363
                (self.last_checked_ok + self.timeout) - now)
 
1364
            if time_to_die <= 0:
 
1365
                # The timeout has passed
 
1366
                self.disable()
 
1367
            else:
 
1368
                self.expires = (now +
 
1369
                                datetime.timedelta(milliseconds =
 
1370
                                                   time_to_die))
 
1371
                if (getattr(self, "disable_initiator_tag", None)
 
1372
                    is None):
 
1373
                    return
 
1374
                gobject.source_remove(self.disable_initiator_tag)
 
1375
                self.disable_initiator_tag = (gobject.timeout_add
 
1376
                                              (time_to_die,
 
1377
                                               self.disable))
 
1378
    
 
1379
    # ExtendedTimeout - property
 
1380
    @dbus_service_property(_interface, signature="t",
 
1381
                           access="readwrite")
 
1382
    def ExtendedTimeout_dbus_property(self, value=None):
 
1383
        if value is None:       # get
 
1384
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1385
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1082
1386
    
1083
1387
    # Interval - property
1084
 
    @dbus_service_property(_interface, signature=u"t",
1085
 
                           access=u"readwrite")
 
1388
    @dbus_service_property(_interface, signature="t",
 
1389
                           access="readwrite")
1086
1390
    def Interval_dbus_property(self, value=None):
1087
1391
        if value is None:       # get
1088
1392
            return dbus.UInt64(self.interval_milliseconds())
1089
1393
        self.interval = datetime.timedelta(0, 0, 0, value)
1090
 
        # Emit D-Bus signal
1091
 
        self.PropertyChanged(dbus.String(u"Interval"),
1092
 
                             dbus.UInt64(value, variant_level=1))
1093
 
        if getattr(self, u"checker_initiator_tag", None) is None:
 
1394
        if getattr(self, "checker_initiator_tag", None) is None:
1094
1395
            return
1095
 
        # Reschedule checker run
1096
 
        gobject.source_remove(self.checker_initiator_tag)
1097
 
        self.checker_initiator_tag = (gobject.timeout_add
1098
 
                                      (value, self.start_checker))
1099
 
        self.start_checker()    # Start one now, too
1100
 
 
 
1396
        if self.enabled:
 
1397
            # Reschedule checker run
 
1398
            gobject.source_remove(self.checker_initiator_tag)
 
1399
            self.checker_initiator_tag = (gobject.timeout_add
 
1400
                                          (value, self.start_checker))
 
1401
            self.start_checker()    # Start one now, too
 
1402
    
1101
1403
    # Checker - property
1102
 
    @dbus_service_property(_interface, signature=u"s",
1103
 
                           access=u"readwrite")
 
1404
    @dbus_service_property(_interface, signature="s",
 
1405
                           access="readwrite")
1104
1406
    def Checker_dbus_property(self, value=None):
1105
1407
        if value is None:       # get
1106
1408
            return dbus.String(self.checker_command)
1107
 
        self.checker_command = value
1108
 
        # Emit D-Bus signal
1109
 
        self.PropertyChanged(dbus.String(u"Checker"),
1110
 
                             dbus.String(self.checker_command,
1111
 
                                         variant_level=1))
 
1409
        self.checker_command = unicode(value)
1112
1410
    
1113
1411
    # CheckerRunning - property
1114
 
    @dbus_service_property(_interface, signature=u"b",
1115
 
                           access=u"readwrite")
 
1412
    @dbus_service_property(_interface, signature="b",
 
1413
                           access="readwrite")
1116
1414
    def CheckerRunning_dbus_property(self, value=None):
1117
1415
        if value is None:       # get
1118
1416
            return dbus.Boolean(self.checker is not None)
1122
1420
            self.stop_checker()
1123
1421
    
1124
1422
    # ObjectPath - property
1125
 
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
1423
    @dbus_service_property(_interface, signature="o", access="read")
1126
1424
    def ObjectPath_dbus_property(self):
1127
1425
        return self.dbus_object_path # is already a dbus.ObjectPath
1128
1426
    
1129
1427
    # Secret = property
1130
 
    @dbus_service_property(_interface, signature=u"ay",
1131
 
                           access=u"write", byte_arrays=True)
 
1428
    @dbus_service_property(_interface, signature="ay",
 
1429
                           access="write", byte_arrays=True)
1132
1430
    def Secret_dbus_property(self, value):
1133
1431
        self.secret = str(value)
1134
1432
    
1141
1439
        self._pipe.send(('init', fpr, address))
1142
1440
        if not self._pipe.recv():
1143
1441
            raise KeyError()
1144
 
 
 
1442
    
1145
1443
    def __getattribute__(self, name):
1146
 
        if(name == '_pipe'):
 
1444
        if name == '_pipe':
1147
1445
            return super(ProxyClient, self).__getattribute__(name)
1148
1446
        self._pipe.send(('getattr', name))
1149
1447
        data = self._pipe.recv()
1154
1452
                self._pipe.send(('funcall', name, args, kwargs))
1155
1453
                return self._pipe.recv()[1]
1156
1454
            return func
1157
 
 
 
1455
    
1158
1456
    def __setattr__(self, name, value):
1159
 
        if(name == '_pipe'):
 
1457
        if name == '_pipe':
1160
1458
            return super(ProxyClient, self).__setattr__(name, value)
1161
1459
        self._pipe.send(('setattr', name, value))
1162
1460
 
1163
1461
 
 
1462
class ClientDBusTransitional(ClientDBus):
 
1463
    __metaclass__ = AlternateDBusNamesMetaclass
 
1464
 
 
1465
 
1164
1466
class ClientHandler(socketserver.BaseRequestHandler, object):
1165
1467
    """A class to handle client connections.
1166
1468
    
1169
1471
    
1170
1472
    def handle(self):
1171
1473
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1172
 
            logger.info(u"TCP connection from: %s",
 
1474
            logger.info("TCP connection from: %s",
1173
1475
                        unicode(self.client_address))
1174
 
            logger.debug(u"Pipe FD: %d",
 
1476
            logger.debug("Pipe FD: %d",
1175
1477
                         self.server.child_pipe.fileno())
1176
 
 
 
1478
            
1177
1479
            session = (gnutls.connection
1178
1480
                       .ClientSession(self.request,
1179
1481
                                      gnutls.connection
1180
1482
                                      .X509Credentials()))
1181
 
 
 
1483
            
1182
1484
            # Note: gnutls.connection.X509Credentials is really a
1183
1485
            # generic GnuTLS certificate credentials object so long as
1184
1486
            # no X.509 keys are added to it.  Therefore, we can use it
1185
1487
            # here despite using OpenPGP certificates.
1186
 
 
1187
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1188
 
            #                      u"+AES-256-CBC", u"+SHA1",
1189
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1190
 
            #                      u"+DHE-DSS"))
 
1488
            
 
1489
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1490
            #                      "+AES-256-CBC", "+SHA1",
 
1491
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
1492
            #                      "+DHE-DSS"))
1191
1493
            # Use a fallback default, since this MUST be set.
1192
1494
            priority = self.server.gnutls_priority
1193
1495
            if priority is None:
1194
 
                priority = u"NORMAL"
 
1496
                priority = "NORMAL"
1195
1497
            (gnutls.library.functions
1196
1498
             .gnutls_priority_set_direct(session._c_object,
1197
1499
                                         priority, None))
1198
 
 
 
1500
            
1199
1501
            # Start communication using the Mandos protocol
1200
1502
            # Get protocol number
1201
1503
            line = self.request.makefile().readline()
1202
 
            logger.debug(u"Protocol version: %r", line)
 
1504
            logger.debug("Protocol version: %r", line)
1203
1505
            try:
1204
1506
                if int(line.strip().split()[0]) > 1:
1205
1507
                    raise RuntimeError
1206
 
            except (ValueError, IndexError, RuntimeError), error:
1207
 
                logger.error(u"Unknown protocol version: %s", error)
 
1508
            except (ValueError, IndexError, RuntimeError) as error:
 
1509
                logger.error("Unknown protocol version: %s", error)
1208
1510
                return
1209
 
 
 
1511
            
1210
1512
            # Start GnuTLS connection
1211
1513
            try:
1212
1514
                session.handshake()
1213
 
            except gnutls.errors.GNUTLSError, error:
1214
 
                logger.warning(u"Handshake failed: %s", error)
 
1515
            except gnutls.errors.GNUTLSError as error:
 
1516
                logger.warning("Handshake failed: %s", error)
1215
1517
                # Do not run session.bye() here: the session is not
1216
1518
                # established.  Just abandon the request.
1217
1519
                return
1218
 
            logger.debug(u"Handshake succeeded")
1219
 
 
 
1520
            logger.debug("Handshake succeeded")
 
1521
            
1220
1522
            approval_required = False
1221
1523
            try:
1222
1524
                try:
1223
1525
                    fpr = self.fingerprint(self.peer_certificate
1224
1526
                                           (session))
1225
 
                except (TypeError, gnutls.errors.GNUTLSError), error:
1226
 
                    logger.warning(u"Bad certificate: %s", error)
 
1527
                except (TypeError,
 
1528
                        gnutls.errors.GNUTLSError) as error:
 
1529
                    logger.warning("Bad certificate: %s", error)
1227
1530
                    return
1228
 
                logger.debug(u"Fingerprint: %s", fpr)
1229
 
 
 
1531
                logger.debug("Fingerprint: %s", fpr)
 
1532
                
1230
1533
                try:
1231
1534
                    client = ProxyClient(child_pipe, fpr,
1232
1535
                                         self.client_address)
1240
1543
                
1241
1544
                while True:
1242
1545
                    if not client.enabled:
1243
 
                        logger.warning(u"Client %s is disabled",
 
1546
                        logger.info("Client %s is disabled",
1244
1547
                                       client.name)
1245
1548
                        if self.server.use_dbus:
1246
1549
                            # Emit D-Bus signal
1247
 
                            client.Rejected("Disabled")                    
 
1550
                            client.Rejected("Disabled")
1248
1551
                        return
1249
1552
                    
1250
 
                    if client._approved or not client.approval_delay:
 
1553
                    if client.approved or not client.approval_delay:
1251
1554
                        #We are approved or approval is disabled
1252
1555
                        break
1253
 
                    elif client._approved is None:
1254
 
                        logger.info(u"Client %s needs approval",
 
1556
                    elif client.approved is None:
 
1557
                        logger.info("Client %s needs approval",
1255
1558
                                    client.name)
1256
1559
                        if self.server.use_dbus:
1257
1560
                            # Emit D-Bus signal
1259
1562
                                client.approval_delay_milliseconds(),
1260
1563
                                client.approved_by_default)
1261
1564
                    else:
1262
 
                        logger.warning(u"Client %s was not approved",
 
1565
                        logger.warning("Client %s was not approved",
1263
1566
                                       client.name)
1264
1567
                        if self.server.use_dbus:
1265
1568
                            # Emit D-Bus signal
1267
1570
                        return
1268
1571
                    
1269
1572
                    #wait until timeout or approved
1270
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1271
1573
                    time = datetime.datetime.now()
1272
1574
                    client.changedstate.acquire()
1273
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1575
                    (client.changedstate.wait
 
1576
                     (float(client.timedelta_to_milliseconds(delay)
 
1577
                            / 1000)))
1274
1578
                    client.changedstate.release()
1275
1579
                    time2 = datetime.datetime.now()
1276
1580
                    if (time2 - time) >= delay:
1291
1595
                while sent_size < len(client.secret):
1292
1596
                    try:
1293
1597
                        sent = session.send(client.secret[sent_size:])
1294
 
                    except (gnutls.errors.GNUTLSError), error:
 
1598
                    except gnutls.errors.GNUTLSError as error:
1295
1599
                        logger.warning("gnutls send failed")
1296
1600
                        return
1297
 
                    logger.debug(u"Sent: %d, remaining: %d",
 
1601
                    logger.debug("Sent: %d, remaining: %d",
1298
1602
                                 sent, len(client.secret)
1299
1603
                                 - (sent_size + sent))
1300
1604
                    sent_size += sent
1301
 
 
1302
 
                logger.info(u"Sending secret to %s", client.name)
1303
 
                # bump the timeout as if seen
1304
 
                client.checked_ok()
 
1605
                
 
1606
                logger.info("Sending secret to %s", client.name)
 
1607
                # bump the timeout using extended_timeout
 
1608
                client.checked_ok(client.extended_timeout)
1305
1609
                if self.server.use_dbus:
1306
1610
                    # Emit D-Bus signal
1307
1611
                    client.GotSecret()
1311
1615
                    client.approvals_pending -= 1
1312
1616
                try:
1313
1617
                    session.bye()
1314
 
                except (gnutls.errors.GNUTLSError), error:
 
1618
                except gnutls.errors.GNUTLSError as error:
1315
1619
                    logger.warning("GnuTLS bye failed")
1316
1620
    
1317
1621
    @staticmethod
1328
1632
                     .gnutls_certificate_get_peers
1329
1633
                     (session._c_object, ctypes.byref(list_size)))
1330
1634
        if not bool(cert_list) and list_size.value != 0:
1331
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
1332
 
                                            u" certificate")
 
1635
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1636
                                            " certificate")
1333
1637
        if list_size.value == 0:
1334
1638
            return None
1335
1639
        cert = cert_list[0]
1361
1665
        if crtverify.value != 0:
1362
1666
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1363
1667
            raise (gnutls.errors.CertificateSecurityError
1364
 
                   (u"Verify failed"))
 
1668
                   ("Verify failed"))
1365
1669
        # New buffer for the fingerprint
1366
1670
        buf = ctypes.create_string_buffer(20)
1367
1671
        buf_len = ctypes.c_size_t()
1374
1678
        # Convert the buffer to a Python bytestring
1375
1679
        fpr = ctypes.string_at(buf, buf_len.value)
1376
1680
        # Convert the bytestring to hexadecimal notation
1377
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
1681
        hex_fpr = binascii.hexlify(fpr).upper()
1378
1682
        return hex_fpr
1379
1683
 
1380
1684
 
1383
1687
    def sub_process_main(self, request, address):
1384
1688
        try:
1385
1689
            self.finish_request(request, address)
1386
 
        except:
 
1690
        except Exception:
1387
1691
            self.handle_error(request, address)
1388
1692
        self.close_request(request)
1389
 
            
 
1693
    
1390
1694
    def process_request(self, request, address):
1391
1695
        """Start a new process to process the request."""
1392
 
        multiprocessing.Process(target = self.sub_process_main,
1393
 
                                args = (request, address)).start()
 
1696
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1697
                                       args = (request,
 
1698
                                               address))
 
1699
        proc.start()
 
1700
        return proc
 
1701
 
1394
1702
 
1395
1703
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1396
1704
    """ adds a pipe to the MixIn """
1400
1708
        This function creates a new pipe in self.pipe
1401
1709
        """
1402
1710
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1403
 
 
1404
 
        super(MultiprocessingMixInWithPipe,
1405
 
              self).process_request(request, client_address)
 
1711
        
 
1712
        proc = MultiprocessingMixIn.process_request(self, request,
 
1713
                                                    client_address)
1406
1714
        self.child_pipe.close()
1407
 
        self.add_pipe(parent_pipe)
1408
 
 
1409
 
    def add_pipe(self, parent_pipe):
 
1715
        self.add_pipe(parent_pipe, proc)
 
1716
    
 
1717
    def add_pipe(self, parent_pipe, proc):
1410
1718
        """Dummy function; override as necessary"""
1411
 
        pass
 
1719
        raise NotImplementedError
 
1720
 
1412
1721
 
1413
1722
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1414
1723
                     socketserver.TCPServer, object):
1432
1741
        bind to an address or port if they were not specified."""
1433
1742
        if self.interface is not None:
1434
1743
            if SO_BINDTODEVICE is None:
1435
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
1436
 
                             u" cannot bind to interface %s",
 
1744
                logger.error("SO_BINDTODEVICE does not exist;"
 
1745
                             " cannot bind to interface %s",
1437
1746
                             self.interface)
1438
1747
            else:
1439
1748
                try:
1440
1749
                    self.socket.setsockopt(socket.SOL_SOCKET,
1441
1750
                                           SO_BINDTODEVICE,
1442
1751
                                           str(self.interface
1443
 
                                               + u'\0'))
1444
 
                except socket.error, error:
 
1752
                                               + '\0'))
 
1753
                except socket.error as error:
1445
1754
                    if error[0] == errno.EPERM:
1446
 
                        logger.error(u"No permission to"
1447
 
                                     u" bind to interface %s",
 
1755
                        logger.error("No permission to"
 
1756
                                     " bind to interface %s",
1448
1757
                                     self.interface)
1449
1758
                    elif error[0] == errno.ENOPROTOOPT:
1450
 
                        logger.error(u"SO_BINDTODEVICE not available;"
1451
 
                                     u" cannot bind to interface %s",
 
1759
                        logger.error("SO_BINDTODEVICE not available;"
 
1760
                                     " cannot bind to interface %s",
1452
1761
                                     self.interface)
1453
1762
                    else:
1454
1763
                        raise
1456
1765
        if self.server_address[0] or self.server_address[1]:
1457
1766
            if not self.server_address[0]:
1458
1767
                if self.address_family == socket.AF_INET6:
1459
 
                    any_address = u"::" # in6addr_any
 
1768
                    any_address = "::" # in6addr_any
1460
1769
                else:
1461
1770
                    any_address = socket.INADDR_ANY
1462
1771
                self.server_address = (any_address,
1489
1798
        self.enabled = False
1490
1799
        self.clients = clients
1491
1800
        if self.clients is None:
1492
 
            self.clients = set()
 
1801
            self.clients = {}
1493
1802
        self.use_dbus = use_dbus
1494
1803
        self.gnutls_priority = gnutls_priority
1495
1804
        IPv6_TCPServer.__init__(self, server_address,
1499
1808
    def server_activate(self):
1500
1809
        if self.enabled:
1501
1810
            return socketserver.TCPServer.server_activate(self)
 
1811
    
1502
1812
    def enable(self):
1503
1813
        self.enabled = True
1504
 
    def add_pipe(self, parent_pipe):
 
1814
    
 
1815
    def add_pipe(self, parent_pipe, proc):
1505
1816
        # Call "handle_ipc" for both data and EOF events
1506
1817
        gobject.io_add_watch(parent_pipe.fileno(),
1507
1818
                             gobject.IO_IN | gobject.IO_HUP,
1508
1819
                             functools.partial(self.handle_ipc,
1509
 
                                               parent_pipe = parent_pipe))
1510
 
        
 
1820
                                               parent_pipe =
 
1821
                                               parent_pipe,
 
1822
                                               proc = proc))
 
1823
    
1511
1824
    def handle_ipc(self, source, condition, parent_pipe=None,
1512
 
                   client_object=None):
 
1825
                   proc = None, client_object=None):
1513
1826
        condition_names = {
1514
 
            gobject.IO_IN: u"IN",   # There is data to read.
1515
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
 
1827
            gobject.IO_IN: "IN",   # There is data to read.
 
1828
            gobject.IO_OUT: "OUT", # Data can be written (without
1516
1829
                                    # blocking).
1517
 
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
1518
 
            gobject.IO_ERR: u"ERR", # Error condition.
1519
 
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
 
1830
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1831
            gobject.IO_ERR: "ERR", # Error condition.
 
1832
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1520
1833
                                    # broken, usually for pipes and
1521
1834
                                    # sockets).
1522
1835
            }
1524
1837
                                       for cond, name in
1525
1838
                                       condition_names.iteritems()
1526
1839
                                       if cond & condition)
1527
 
        # error or the other end of multiprocessing.Pipe has closed
 
1840
        # error, or the other end of multiprocessing.Pipe has closed
1528
1841
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1842
            # Wait for other process to exit
 
1843
            proc.join()
1529
1844
            return False
1530
1845
        
1531
1846
        # Read a request from the child
1536
1851
            fpr = request[1]
1537
1852
            address = request[2]
1538
1853
            
1539
 
            for c in self.clients:
 
1854
            for c in self.clients.itervalues():
1540
1855
                if c.fingerprint == fpr:
1541
1856
                    client = c
1542
1857
                    break
1543
1858
            else:
1544
 
                logger.warning(u"Client not found for fingerprint: %s, ad"
1545
 
                               u"dress: %s", fpr, address)
 
1859
                logger.info("Client not found for fingerprint: %s, ad"
 
1860
                            "dress: %s", fpr, address)
1546
1861
                if self.use_dbus:
1547
1862
                    # Emit D-Bus signal
1548
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1863
                    mandos_dbus_service.ClientNotFound(fpr,
 
1864
                                                       address[0])
1549
1865
                parent_pipe.send(False)
1550
1866
                return False
1551
1867
            
1552
1868
            gobject.io_add_watch(parent_pipe.fileno(),
1553
1869
                                 gobject.IO_IN | gobject.IO_HUP,
1554
1870
                                 functools.partial(self.handle_ipc,
1555
 
                                                   parent_pipe = parent_pipe,
1556
 
                                                   client_object = client))
 
1871
                                                   parent_pipe =
 
1872
                                                   parent_pipe,
 
1873
                                                   proc = proc,
 
1874
                                                   client_object =
 
1875
                                                   client))
1557
1876
            parent_pipe.send(True)
1558
 
            # remove the old hook in favor of the new above hook on same fileno
 
1877
            # remove the old hook in favor of the new above hook on
 
1878
            # same fileno
1559
1879
            return False
1560
1880
        if command == 'funcall':
1561
1881
            funcname = request[1]
1562
1882
            args = request[2]
1563
1883
            kwargs = request[3]
1564
1884
            
1565
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1566
 
 
 
1885
            parent_pipe.send(('data', getattr(client_object,
 
1886
                                              funcname)(*args,
 
1887
                                                         **kwargs)))
 
1888
        
1567
1889
        if command == 'getattr':
1568
1890
            attrname = request[1]
1569
1891
            if callable(client_object.__getattribute__(attrname)):
1570
1892
                parent_pipe.send(('function',))
1571
1893
            else:
1572
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1894
                parent_pipe.send(('data', client_object
 
1895
                                  .__getattribute__(attrname)))
1573
1896
        
1574
1897
        if command == 'setattr':
1575
1898
            attrname = request[1]
1576
1899
            value = request[2]
1577
1900
            setattr(client_object, attrname, value)
1578
 
 
 
1901
        
1579
1902
        return True
1580
1903
 
1581
1904
 
1582
1905
def string_to_delta(interval):
1583
1906
    """Parse a string and return a datetime.timedelta
1584
1907
    
1585
 
    >>> string_to_delta(u'7d')
 
1908
    >>> string_to_delta('7d')
1586
1909
    datetime.timedelta(7)
1587
 
    >>> string_to_delta(u'60s')
 
1910
    >>> string_to_delta('60s')
1588
1911
    datetime.timedelta(0, 60)
1589
 
    >>> string_to_delta(u'60m')
 
1912
    >>> string_to_delta('60m')
1590
1913
    datetime.timedelta(0, 3600)
1591
 
    >>> string_to_delta(u'24h')
 
1914
    >>> string_to_delta('24h')
1592
1915
    datetime.timedelta(1)
1593
 
    >>> string_to_delta(u'1w')
 
1916
    >>> string_to_delta('1w')
1594
1917
    datetime.timedelta(7)
1595
 
    >>> string_to_delta(u'5m 30s')
 
1918
    >>> string_to_delta('5m 30s')
1596
1919
    datetime.timedelta(0, 330)
1597
1920
    """
1598
1921
    timevalue = datetime.timedelta(0)
1600
1923
        try:
1601
1924
            suffix = unicode(s[-1])
1602
1925
            value = int(s[:-1])
1603
 
            if suffix == u"d":
 
1926
            if suffix == "d":
1604
1927
                delta = datetime.timedelta(value)
1605
 
            elif suffix == u"s":
 
1928
            elif suffix == "s":
1606
1929
                delta = datetime.timedelta(0, value)
1607
 
            elif suffix == u"m":
 
1930
            elif suffix == "m":
1608
1931
                delta = datetime.timedelta(0, 0, 0, 0, value)
1609
 
            elif suffix == u"h":
 
1932
            elif suffix == "h":
1610
1933
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1611
 
            elif suffix == u"w":
 
1934
            elif suffix == "w":
1612
1935
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1613
1936
            else:
1614
 
                raise ValueError(u"Unknown suffix %r" % suffix)
1615
 
        except (ValueError, IndexError), e:
1616
 
            raise ValueError(e.message)
 
1937
                raise ValueError("Unknown suffix %r" % suffix)
 
1938
        except (ValueError, IndexError) as e:
 
1939
            raise ValueError(*(e.args))
1617
1940
        timevalue += delta
1618
1941
    return timevalue
1619
1942
 
1620
1943
 
1621
 
def if_nametoindex(interface):
1622
 
    """Call the C function if_nametoindex(), or equivalent
1623
 
    
1624
 
    Note: This function cannot accept a unicode string."""
1625
 
    global if_nametoindex
1626
 
    try:
1627
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1628
 
                          (ctypes.util.find_library(u"c"))
1629
 
                          .if_nametoindex)
1630
 
    except (OSError, AttributeError):
1631
 
        logger.warning(u"Doing if_nametoindex the hard way")
1632
 
        def if_nametoindex(interface):
1633
 
            "Get an interface index the hard way, i.e. using fcntl()"
1634
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1635
 
            with contextlib.closing(socket.socket()) as s:
1636
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1637
 
                                    struct.pack(str(u"16s16x"),
1638
 
                                                interface))
1639
 
            interface_index = struct.unpack(str(u"I"),
1640
 
                                            ifreq[16:20])[0]
1641
 
            return interface_index
1642
 
    return if_nametoindex(interface)
1643
 
 
1644
 
 
1645
1944
def daemon(nochdir = False, noclose = False):
1646
1945
    """See daemon(3).  Standard BSD Unix function.
1647
1946
    
1650
1949
        sys.exit()
1651
1950
    os.setsid()
1652
1951
    if not nochdir:
1653
 
        os.chdir(u"/")
 
1952
        os.chdir("/")
1654
1953
    if os.fork():
1655
1954
        sys.exit()
1656
1955
    if not noclose:
1658
1957
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1659
1958
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1660
1959
            raise OSError(errno.ENODEV,
1661
 
                          u"%s not a character device"
 
1960
                          "%s not a character device"
1662
1961
                          % os.path.devnull)
1663
1962
        os.dup2(null, sys.stdin.fileno())
1664
1963
        os.dup2(null, sys.stdout.fileno())
1672
1971
    ##################################################################
1673
1972
    # Parsing of options, both command line and config file
1674
1973
    
1675
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1676
 
    parser.add_option("-i", u"--interface", type=u"string",
1677
 
                      metavar="IF", help=u"Bind to interface IF")
1678
 
    parser.add_option("-a", u"--address", type=u"string",
1679
 
                      help=u"Address to listen for requests on")
1680
 
    parser.add_option("-p", u"--port", type=u"int",
1681
 
                      help=u"Port number to receive requests on")
1682
 
    parser.add_option("--check", action=u"store_true",
1683
 
                      help=u"Run self-test")
1684
 
    parser.add_option("--debug", action=u"store_true",
1685
 
                      help=u"Debug mode; run in foreground and log to"
1686
 
                      u" terminal")
1687
 
    parser.add_option("--debuglevel", type=u"string", metavar="LEVEL",
1688
 
                      help=u"Debug level for stdout output")
1689
 
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1690
 
                      u" priority string (see GnuTLS documentation)")
1691
 
    parser.add_option("--servicename", type=u"string",
1692
 
                      metavar=u"NAME", help=u"Zeroconf service name")
1693
 
    parser.add_option("--configdir", type=u"string",
1694
 
                      default=u"/etc/mandos", metavar=u"DIR",
1695
 
                      help=u"Directory to search for configuration"
1696
 
                      u" files")
1697
 
    parser.add_option("--no-dbus", action=u"store_false",
1698
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1699
 
                      u" system bus interface")
1700
 
    parser.add_option("--no-ipv6", action=u"store_false",
1701
 
                      dest=u"use_ipv6", help=u"Do not use IPv6")
1702
 
    options = parser.parse_args()[0]
 
1974
    parser = argparse.ArgumentParser()
 
1975
    parser.add_argument("-v", "--version", action="version",
 
1976
                        version = "%%(prog)s %s" % version,
 
1977
                        help="show version number and exit")
 
1978
    parser.add_argument("-i", "--interface", metavar="IF",
 
1979
                        help="Bind to interface IF")
 
1980
    parser.add_argument("-a", "--address",
 
1981
                        help="Address to listen for requests on")
 
1982
    parser.add_argument("-p", "--port", type=int,
 
1983
                        help="Port number to receive requests on")
 
1984
    parser.add_argument("--check", action="store_true",
 
1985
                        help="Run self-test")
 
1986
    parser.add_argument("--debug", action="store_true",
 
1987
                        help="Debug mode; run in foreground and log"
 
1988
                        " to terminal")
 
1989
    parser.add_argument("--debuglevel", metavar="LEVEL",
 
1990
                        help="Debug level for stdout output")
 
1991
    parser.add_argument("--priority", help="GnuTLS"
 
1992
                        " priority string (see GnuTLS documentation)")
 
1993
    parser.add_argument("--servicename",
 
1994
                        metavar="NAME", help="Zeroconf service name")
 
1995
    parser.add_argument("--configdir",
 
1996
                        default="/etc/mandos", metavar="DIR",
 
1997
                        help="Directory to search for configuration"
 
1998
                        " files")
 
1999
    parser.add_argument("--no-dbus", action="store_false",
 
2000
                        dest="use_dbus", help="Do not provide D-Bus"
 
2001
                        " system bus interface")
 
2002
    parser.add_argument("--no-ipv6", action="store_false",
 
2003
                        dest="use_ipv6", help="Do not use IPv6")
 
2004
    parser.add_argument("--no-restore", action="store_false",
 
2005
                        dest="restore", help="Do not restore stored"
 
2006
                        " state")
 
2007
    parser.add_argument("--statedir", metavar="DIR",
 
2008
                        help="Directory to save/restore state in")
 
2009
    
 
2010
    options = parser.parse_args()
1703
2011
    
1704
2012
    if options.check:
1705
2013
        import doctest
1707
2015
        sys.exit()
1708
2016
    
1709
2017
    # Default values for config file for server-global settings
1710
 
    server_defaults = { u"interface": u"",
1711
 
                        u"address": u"",
1712
 
                        u"port": u"",
1713
 
                        u"debug": u"False",
1714
 
                        u"priority":
1715
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1716
 
                        u"servicename": u"Mandos",
1717
 
                        u"use_dbus": u"True",
1718
 
                        u"use_ipv6": u"True",
1719
 
                        u"debuglevel": u"",
 
2018
    server_defaults = { "interface": "",
 
2019
                        "address": "",
 
2020
                        "port": "",
 
2021
                        "debug": "False",
 
2022
                        "priority":
 
2023
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2024
                        "servicename": "Mandos",
 
2025
                        "use_dbus": "True",
 
2026
                        "use_ipv6": "True",
 
2027
                        "debuglevel": "",
 
2028
                        "restore": "True",
 
2029
                        "statedir": "/var/lib/mandos"
1720
2030
                        }
1721
2031
    
1722
2032
    # Parse config file for server-global settings
1723
2033
    server_config = configparser.SafeConfigParser(server_defaults)
1724
2034
    del server_defaults
1725
2035
    server_config.read(os.path.join(options.configdir,
1726
 
                                    u"mandos.conf"))
 
2036
                                    "mandos.conf"))
1727
2037
    # Convert the SafeConfigParser object to a dict
1728
2038
    server_settings = server_config.defaults()
1729
2039
    # Use the appropriate methods on the non-string config options
1730
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1731
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
 
2040
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2041
        server_settings[option] = server_config.getboolean("DEFAULT",
1732
2042
                                                           option)
1733
2043
    if server_settings["port"]:
1734
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
1735
 
                                                       u"port")
 
2044
        server_settings["port"] = server_config.getint("DEFAULT",
 
2045
                                                       "port")
1736
2046
    del server_config
1737
2047
    
1738
2048
    # Override the settings from the config file with command line
1739
2049
    # options, if set.
1740
 
    for option in (u"interface", u"address", u"port", u"debug",
1741
 
                   u"priority", u"servicename", u"configdir",
1742
 
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
 
2050
    for option in ("interface", "address", "port", "debug",
 
2051
                   "priority", "servicename", "configdir",
 
2052
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2053
                   "statedir"):
1743
2054
        value = getattr(options, option)
1744
2055
        if value is not None:
1745
2056
            server_settings[option] = value
1753
2064
    ##################################################################
1754
2065
    
1755
2066
    # For convenience
1756
 
    debug = server_settings[u"debug"]
1757
 
    debuglevel = server_settings[u"debuglevel"]
1758
 
    use_dbus = server_settings[u"use_dbus"]
1759
 
    use_ipv6 = server_settings[u"use_ipv6"]
1760
 
 
1761
 
    if server_settings[u"servicename"] != u"Mandos":
 
2067
    debug = server_settings["debug"]
 
2068
    debuglevel = server_settings["debuglevel"]
 
2069
    use_dbus = server_settings["use_dbus"]
 
2070
    use_ipv6 = server_settings["use_ipv6"]
 
2071
    stored_state_path = os.path.join(server_settings["statedir"],
 
2072
                                     stored_state_file)
 
2073
    
 
2074
    if debug:
 
2075
        initlogger(debug, logging.DEBUG)
 
2076
    else:
 
2077
        if not debuglevel:
 
2078
            initlogger(debug)
 
2079
        else:
 
2080
            level = getattr(logging, debuglevel.upper())
 
2081
            initlogger(debug, level)
 
2082
    
 
2083
    if server_settings["servicename"] != "Mandos":
1762
2084
        syslogger.setFormatter(logging.Formatter
1763
 
                               (u'Mandos (%s) [%%(process)d]:'
1764
 
                                u' %%(levelname)s: %%(message)s'
1765
 
                                % server_settings[u"servicename"]))
 
2085
                               ('Mandos (%s) [%%(process)d]:'
 
2086
                                ' %%(levelname)s: %%(message)s'
 
2087
                                % server_settings["servicename"]))
1766
2088
    
1767
2089
    # Parse config file with clients
1768
 
    client_defaults = { u"timeout": u"1h",
1769
 
                        u"interval": u"5m",
1770
 
                        u"checker": u"fping -q -- %%(host)s",
1771
 
                        u"host": u"",
1772
 
                        u"approval_delay": u"0s",
1773
 
                        u"approval_duration": u"1s",
1774
 
                        }
1775
 
    client_config = configparser.SafeConfigParser(client_defaults)
1776
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1777
 
                                    u"clients.conf"))
 
2090
    client_config = configparser.SafeConfigParser(Client
 
2091
                                                  .client_defaults)
 
2092
    client_config.read(os.path.join(server_settings["configdir"],
 
2093
                                    "clients.conf"))
1778
2094
    
1779
2095
    global mandos_dbus_service
1780
2096
    mandos_dbus_service = None
1781
2097
    
1782
 
    tcp_server = MandosServer((server_settings[u"address"],
1783
 
                               server_settings[u"port"]),
 
2098
    tcp_server = MandosServer((server_settings["address"],
 
2099
                               server_settings["port"]),
1784
2100
                              ClientHandler,
1785
 
                              interface=(server_settings[u"interface"]
 
2101
                              interface=(server_settings["interface"]
1786
2102
                                         or None),
1787
2103
                              use_ipv6=use_ipv6,
1788
2104
                              gnutls_priority=
1789
 
                              server_settings[u"priority"],
 
2105
                              server_settings["priority"],
1790
2106
                              use_dbus=use_dbus)
1791
2107
    if not debug:
1792
 
        pidfilename = u"/var/run/mandos.pid"
 
2108
        pidfilename = "/var/run/mandos.pid"
1793
2109
        try:
1794
 
            pidfile = open(pidfilename, u"w")
 
2110
            pidfile = open(pidfilename, "w")
1795
2111
        except IOError:
1796
 
            logger.error(u"Could not open file %r", pidfilename)
 
2112
            logger.error("Could not open file %r", pidfilename)
1797
2113
    
1798
2114
    try:
1799
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1800
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
2115
        uid = pwd.getpwnam("_mandos").pw_uid
 
2116
        gid = pwd.getpwnam("_mandos").pw_gid
1801
2117
    except KeyError:
1802
2118
        try:
1803
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1804
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
2119
            uid = pwd.getpwnam("mandos").pw_uid
 
2120
            gid = pwd.getpwnam("mandos").pw_gid
1805
2121
        except KeyError:
1806
2122
            try:
1807
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1808
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
2123
                uid = pwd.getpwnam("nobody").pw_uid
 
2124
                gid = pwd.getpwnam("nobody").pw_gid
1809
2125
            except KeyError:
1810
2126
                uid = 65534
1811
2127
                gid = 65534
1812
2128
    try:
1813
2129
        os.setgid(gid)
1814
2130
        os.setuid(uid)
1815
 
    except OSError, error:
 
2131
    except OSError as error:
1816
2132
        if error[0] != errno.EPERM:
1817
2133
            raise error
1818
2134
    
1819
 
    if not debug and not debuglevel:
1820
 
        syslogger.setLevel(logging.WARNING)
1821
 
        console.setLevel(logging.WARNING)
1822
 
    if debuglevel:
1823
 
        level = getattr(logging, debuglevel.upper())
1824
 
        syslogger.setLevel(level)
1825
 
        console.setLevel(level)
1826
 
 
1827
2135
    if debug:
1828
2136
        # Enable all possible GnuTLS debugging
1829
2137
        
1833
2141
        
1834
2142
        @gnutls.library.types.gnutls_log_func
1835
2143
        def debug_gnutls(level, string):
1836
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
2144
            logger.debug("GnuTLS: %s", string[:-1])
1837
2145
        
1838
2146
        (gnutls.library.functions
1839
2147
         .gnutls_global_set_log_function(debug_gnutls))
1843
2151
        os.dup2(null, sys.stdin.fileno())
1844
2152
        if null > 2:
1845
2153
            os.close(null)
1846
 
    else:
1847
 
        # No console logging
1848
 
        logger.removeHandler(console)
1849
 
    
 
2154
    
 
2155
    # Need to fork before connecting to D-Bus
 
2156
    if not debug:
 
2157
        # Close all input and output, do double fork, etc.
 
2158
        daemon()
 
2159
    
 
2160
    gobject.threads_init()
1850
2161
    
1851
2162
    global main_loop
1852
2163
    # From the Avahi example code
1856
2167
    # End of Avahi example code
1857
2168
    if use_dbus:
1858
2169
        try:
1859
 
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
2170
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1860
2171
                                            bus, do_not_queue=True)
1861
 
        except dbus.exceptions.NameExistsException, e:
1862
 
            logger.error(unicode(e) + u", disabling D-Bus")
 
2172
            old_bus_name = (dbus.service.BusName
 
2173
                            ("se.bsnet.fukt.Mandos", bus,
 
2174
                             do_not_queue=True))
 
2175
        except dbus.exceptions.NameExistsException as e:
 
2176
            logger.error(unicode(e) + ", disabling D-Bus")
1863
2177
            use_dbus = False
1864
 
            server_settings[u"use_dbus"] = False
 
2178
            server_settings["use_dbus"] = False
1865
2179
            tcp_server.use_dbus = False
1866
2180
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1867
 
    service = AvahiService(name = server_settings[u"servicename"],
1868
 
                           servicetype = u"_mandos._tcp",
1869
 
                           protocol = protocol, bus = bus)
 
2181
    service = AvahiServiceToSyslog(name =
 
2182
                                   server_settings["servicename"],
 
2183
                                   servicetype = "_mandos._tcp",
 
2184
                                   protocol = protocol, bus = bus)
1870
2185
    if server_settings["interface"]:
1871
2186
        service.interface = (if_nametoindex
1872
 
                             (str(server_settings[u"interface"])))
1873
 
 
1874
 
    if not debug:
1875
 
        # Close all input and output, do double fork, etc.
1876
 
        daemon()
1877
 
        
 
2187
                             (str(server_settings["interface"])))
 
2188
    
1878
2189
    global multiprocessing_manager
1879
2190
    multiprocessing_manager = multiprocessing.Manager()
1880
2191
    
1881
2192
    client_class = Client
1882
2193
    if use_dbus:
1883
 
        client_class = functools.partial(ClientDBus, bus = bus)
1884
 
    def client_config_items(config, section):
1885
 
        special_settings = {
1886
 
            "approved_by_default":
1887
 
                lambda: config.getboolean(section,
1888
 
                                          "approved_by_default"),
1889
 
            }
1890
 
        for name, value in config.items(section):
 
2194
        client_class = functools.partial(ClientDBusTransitional,
 
2195
                                         bus = bus)
 
2196
    
 
2197
    client_settings = Client.config_parser(client_config)
 
2198
    old_client_settings = {}
 
2199
    clients_data = {}
 
2200
    
 
2201
    # Get client data and settings from last running state.
 
2202
    if server_settings["restore"]:
 
2203
        try:
 
2204
            with open(stored_state_path, "rb") as stored_state:
 
2205
                clients_data, old_client_settings = (pickle.load
 
2206
                                                     (stored_state))
 
2207
            os.remove(stored_state_path)
 
2208
        except IOError as e:
 
2209
            logger.warning("Could not load persistent state: {0}"
 
2210
                           .format(e))
 
2211
            if e.errno != errno.ENOENT:
 
2212
                raise
 
2213
        except EOFError as e:
 
2214
            logger.warning("Could not load persistent state: "
 
2215
                           "EOFError: {0}".format(e))
 
2216
    
 
2217
    with PGPEngine() as pgp:
 
2218
        for client_name, client in clients_data.iteritems():
 
2219
            # Decide which value to use after restoring saved state.
 
2220
            # We have three different values: Old config file,
 
2221
            # new config file, and saved state.
 
2222
            # New config value takes precedence if it differs from old
 
2223
            # config value, otherwise use saved state.
 
2224
            for name, value in client_settings[client_name].items():
 
2225
                try:
 
2226
                    # For each value in new config, check if it
 
2227
                    # differs from the old config value (Except for
 
2228
                    # the "secret" attribute)
 
2229
                    if (name != "secret" and
 
2230
                        value != old_client_settings[client_name]
 
2231
                        [name]):
 
2232
                        client[name] = value
 
2233
                except KeyError:
 
2234
                    pass
 
2235
            
 
2236
            # Clients who has passed its expire date can still be
 
2237
            # enabled if its last checker was successful.  Clients
 
2238
            # whose checker succeeded before we stored its state is
 
2239
            # assumed to have successfully run all checkers during
 
2240
            # downtime.
 
2241
            if client["enabled"]:
 
2242
                if datetime.datetime.utcnow() >= client["expires"]:
 
2243
                    if not client["last_checked_ok"]:
 
2244
                        logger.warning(
 
2245
                            "disabling client {0} - Client never "
 
2246
                            "performed a successful checker"
 
2247
                            .format(client_name))
 
2248
                        client["enabled"] = False
 
2249
                    elif client["last_checker_status"] != 0:
 
2250
                        logger.warning(
 
2251
                            "disabling client {0} - Client "
 
2252
                            "last checker failed with error code {1}"
 
2253
                            .format(client_name,
 
2254
                                    client["last_checker_status"]))
 
2255
                        client["enabled"] = False
 
2256
                    else:
 
2257
                        client["expires"] = (datetime.datetime
 
2258
                                             .utcnow()
 
2259
                                             + client["timeout"])
 
2260
                        logger.debug("Last checker succeeded,"
 
2261
                                     " keeping {0} enabled"
 
2262
                                     .format(client_name))
1891
2263
            try:
1892
 
                yield (name, special_settings[name]())
1893
 
            except KeyError:
1894
 
                yield (name, value)
1895
 
    
1896
 
    tcp_server.clients.update(set(
1897
 
            client_class(name = section,
1898
 
                         config= dict(client_config_items(
1899
 
                        client_config, section)))
1900
 
            for section in client_config.sections()))
 
2264
                client["secret"] = (
 
2265
                    pgp.decrypt(client["encrypted_secret"],
 
2266
                                client_settings[client_name]
 
2267
                                ["secret"]))
 
2268
            except PGPError:
 
2269
                # If decryption fails, we use secret from new settings
 
2270
                logger.debug("Failed to decrypt {0} old secret"
 
2271
                             .format(client_name))
 
2272
                client["secret"] = (
 
2273
                    client_settings[client_name]["secret"])
 
2274
 
 
2275
    
 
2276
    # Add/remove clients based on new changes made to config
 
2277
    for client_name in (set(old_client_settings)
 
2278
                        - set(client_settings)):
 
2279
        del clients_data[client_name]
 
2280
    for client_name in (set(client_settings)
 
2281
                        - set(old_client_settings)):
 
2282
        clients_data[client_name] = client_settings[client_name]
 
2283
 
 
2284
    # Create all client objects
 
2285
    for client_name, client in clients_data.iteritems():
 
2286
        tcp_server.clients[client_name] = client_class(
 
2287
            name = client_name, settings = client)
 
2288
    
1901
2289
    if not tcp_server.clients:
1902
 
        logger.warning(u"No clients defined")
 
2290
        logger.warning("No clients defined")
1903
2291
        
1904
2292
    if not debug:
1905
2293
        try:
1906
2294
            with pidfile:
1907
2295
                pid = os.getpid()
1908
 
                pidfile.write(str(pid) + "\n")
 
2296
                pidfile.write(str(pid) + "\n".encode("utf-8"))
1909
2297
            del pidfile
1910
2298
        except IOError:
1911
 
            logger.error(u"Could not write to file %r with PID %d",
 
2299
            logger.error("Could not write to file %r with PID %d",
1912
2300
                         pidfilename, pid)
1913
2301
        except NameError:
1914
2302
            # "pidfile" was never created
1915
2303
            pass
1916
2304
        del pidfilename
1917
 
        
1918
2305
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1919
 
 
 
2306
    
1920
2307
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1921
2308
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1922
2309
    
1924
2311
        class MandosDBusService(dbus.service.Object):
1925
2312
            """A D-Bus proxy object"""
1926
2313
            def __init__(self):
1927
 
                dbus.service.Object.__init__(self, bus, u"/")
1928
 
            _interface = u"se.bsnet.fukt.Mandos"
 
2314
                dbus.service.Object.__init__(self, bus, "/")
 
2315
            _interface = "se.recompile.Mandos"
1929
2316
            
1930
 
            @dbus.service.signal(_interface, signature=u"o")
 
2317
            @dbus.service.signal(_interface, signature="o")
1931
2318
            def ClientAdded(self, objpath):
1932
2319
                "D-Bus signal"
1933
2320
                pass
1934
2321
            
1935
 
            @dbus.service.signal(_interface, signature=u"ss")
 
2322
            @dbus.service.signal(_interface, signature="ss")
1936
2323
            def ClientNotFound(self, fingerprint, address):
1937
2324
                "D-Bus signal"
1938
2325
                pass
1939
2326
            
1940
 
            @dbus.service.signal(_interface, signature=u"os")
 
2327
            @dbus.service.signal(_interface, signature="os")
1941
2328
            def ClientRemoved(self, objpath, name):
1942
2329
                "D-Bus signal"
1943
2330
                pass
1944
2331
            
1945
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
2332
            @dbus.service.method(_interface, out_signature="ao")
1946
2333
            def GetAllClients(self):
1947
2334
                "D-Bus method"
1948
2335
                return dbus.Array(c.dbus_object_path
1949
 
                                  for c in tcp_server.clients)
 
2336
                                  for c in
 
2337
                                  tcp_server.clients.itervalues())
1950
2338
            
1951
2339
            @dbus.service.method(_interface,
1952
 
                                 out_signature=u"a{oa{sv}}")
 
2340
                                 out_signature="a{oa{sv}}")
1953
2341
            def GetAllClientsWithProperties(self):
1954
2342
                "D-Bus method"
1955
2343
                return dbus.Dictionary(
1956
 
                    ((c.dbus_object_path, c.GetAll(u""))
1957
 
                     for c in tcp_server.clients),
1958
 
                    signature=u"oa{sv}")
 
2344
                    ((c.dbus_object_path, c.GetAll(""))
 
2345
                     for c in tcp_server.clients.itervalues()),
 
2346
                    signature="oa{sv}")
1959
2347
            
1960
 
            @dbus.service.method(_interface, in_signature=u"o")
 
2348
            @dbus.service.method(_interface, in_signature="o")
1961
2349
            def RemoveClient(self, object_path):
1962
2350
                "D-Bus method"
1963
 
                for c in tcp_server.clients:
 
2351
                for c in tcp_server.clients.itervalues():
1964
2352
                    if c.dbus_object_path == object_path:
1965
 
                        tcp_server.clients.remove(c)
 
2353
                        del tcp_server.clients[c.name]
1966
2354
                        c.remove_from_connection()
1967
2355
                        # Don't signal anything except ClientRemoved
1968
2356
                        c.disable(quiet=True)
1973
2361
            
1974
2362
            del _interface
1975
2363
        
1976
 
        mandos_dbus_service = MandosDBusService()
 
2364
        class MandosDBusServiceTransitional(MandosDBusService):
 
2365
            __metaclass__ = AlternateDBusNamesMetaclass
 
2366
        mandos_dbus_service = MandosDBusServiceTransitional()
1977
2367
    
1978
2368
    def cleanup():
1979
2369
        "Cleanup function; run on exit"
1980
2370
        service.cleanup()
1981
2371
        
 
2372
        multiprocessing.active_children()
 
2373
        if not (tcp_server.clients or client_settings):
 
2374
            return
 
2375
        
 
2376
        # Store client before exiting. Secrets are encrypted with key
 
2377
        # based on what config file has. If config file is
 
2378
        # removed/edited, old secret will thus be unrecovable.
 
2379
        clients = {}
 
2380
        with PGPEngine() as pgp:
 
2381
            for client in tcp_server.clients.itervalues():
 
2382
                key = client_settings[client.name]["secret"]
 
2383
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2384
                                                      key)
 
2385
                client_dict = {}
 
2386
                
 
2387
                # A list of attributes that can not be pickled
 
2388
                # + secret.
 
2389
                exclude = set(("bus", "changedstate", "secret",
 
2390
                               "checker"))
 
2391
                for name, typ in (inspect.getmembers
 
2392
                                  (dbus.service.Object)):
 
2393
                    exclude.add(name)
 
2394
                
 
2395
                client_dict["encrypted_secret"] = (client
 
2396
                                                   .encrypted_secret)
 
2397
                for attr in client.client_structure:
 
2398
                    if attr not in exclude:
 
2399
                        client_dict[attr] = getattr(client, attr)
 
2400
                
 
2401
                clients[client.name] = client_dict
 
2402
                del client_settings[client.name]["secret"]
 
2403
        
 
2404
        try:
 
2405
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2406
                                                prefix="clients-",
 
2407
                                                dir=os.path.dirname
 
2408
                                                (stored_state_path))
 
2409
            with os.fdopen(tempfd, "wb") as stored_state:
 
2410
                pickle.dump((clients, client_settings), stored_state)
 
2411
            os.rename(tempname, stored_state_path)
 
2412
        except (IOError, OSError) as e:
 
2413
            logger.warning("Could not save persistent state: {0}"
 
2414
                           .format(e))
 
2415
            if not debug:
 
2416
                try:
 
2417
                    os.remove(tempname)
 
2418
                except NameError:
 
2419
                    pass
 
2420
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2421
                                   errno.EEXIST)):
 
2422
                raise e
 
2423
        
 
2424
        # Delete all clients, and settings from config
1982
2425
        while tcp_server.clients:
1983
 
            client = tcp_server.clients.pop()
 
2426
            name, client = tcp_server.clients.popitem()
1984
2427
            if use_dbus:
1985
2428
                client.remove_from_connection()
1986
 
            client.disable_hook = None
1987
2429
            # Don't signal anything except ClientRemoved
1988
2430
            client.disable(quiet=True)
1989
2431
            if use_dbus:
1990
2432
                # Emit D-Bus signal
1991
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2433
                mandos_dbus_service.ClientRemoved(client
 
2434
                                                  .dbus_object_path,
1992
2435
                                                  client.name)
 
2436
        client_settings.clear()
1993
2437
    
1994
2438
    atexit.register(cleanup)
1995
2439
    
1996
 
    for client in tcp_server.clients:
 
2440
    for client in tcp_server.clients.itervalues():
1997
2441
        if use_dbus:
1998
2442
            # Emit D-Bus signal
1999
2443
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2000
 
        client.enable()
 
2444
        # Need to initiate checking of clients
 
2445
        if client.enabled:
 
2446
            client.init_checker()
2001
2447
    
2002
2448
    tcp_server.enable()
2003
2449
    tcp_server.server_activate()
2005
2451
    # Find out what port we got
2006
2452
    service.port = tcp_server.socket.getsockname()[1]
2007
2453
    if use_ipv6:
2008
 
        logger.info(u"Now listening on address %r, port %d,"
 
2454
        logger.info("Now listening on address %r, port %d,"
2009
2455
                    " flowinfo %d, scope_id %d"
2010
2456
                    % tcp_server.socket.getsockname())
2011
2457
    else:                       # IPv4
2012
 
        logger.info(u"Now listening on address %r, port %d"
 
2458
        logger.info("Now listening on address %r, port %d"
2013
2459
                    % tcp_server.socket.getsockname())
2014
2460
    
2015
2461
    #service.interface = tcp_server.socket.getsockname()[3]
2018
2464
        # From the Avahi example code
2019
2465
        try:
2020
2466
            service.activate()
2021
 
        except dbus.exceptions.DBusException, error:
2022
 
            logger.critical(u"DBusException: %s", error)
 
2467
        except dbus.exceptions.DBusException as error:
 
2468
            logger.critical("DBusException: %s", error)
2023
2469
            cleanup()
2024
2470
            sys.exit(1)
2025
2471
        # End of Avahi example code
2029
2475
                             (tcp_server.handle_request
2030
2476
                              (*args[2:], **kwargs) or True))
2031
2477
        
2032
 
        logger.debug(u"Starting main loop")
 
2478
        logger.debug("Starting main loop")
2033
2479
        main_loop.run()
2034
 
    except AvahiError, error:
2035
 
        logger.critical(u"AvahiError: %s", error)
 
2480
    except AvahiError as error:
 
2481
        logger.critical("AvahiError: %s", error)
2036
2482
        cleanup()
2037
2483
        sys.exit(1)
2038
2484
    except KeyboardInterrupt:
2039
2485
        if debug:
2040
 
            print >> sys.stderr
2041
 
        logger.debug(u"Server received KeyboardInterrupt")
2042
 
    logger.debug(u"Server exiting")
 
2486
            print("", file=sys.stderr)
 
2487
        logger.debug("Server received KeyboardInterrupt")
 
2488
    logger.debug("Server exiting")
2043
2489
    # Must run before the D-Bus bus name gets deregistered
2044
2490
    cleanup()
2045
2491