/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-08-07 14:49:02 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110807144902-ika77xz6rgaijwmw
* plugins.d/mandos-client.c (main): Do not even try to work around
                                    Debian bug 633582 if --seckey or
                                    --pubkey specifies a different
                                    directory.  Bug fix: Remove all
                                    files in GPG temporary directory.

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-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 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@recompile.se>.
 
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
65
 
import types
66
 
import binascii
67
 
import tempfile
68
 
import itertools
69
65
 
70
66
import dbus
71
67
import dbus.service
76
72
import ctypes.util
77
73
import xml.dom.minidom
78
74
import inspect
79
 
import GnuPGInterface
80
75
 
81
76
try:
82
77
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
81
    except ImportError:
87
82
        SO_BINDTODEVICE = None
88
83
 
89
 
version = "1.5.3"
90
 
stored_state_file = "clients.pickle"
91
 
 
92
 
logger = logging.getLogger()
 
84
 
 
85
version = "1.3.1"
 
86
 
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
93
89
syslogger = (logging.handlers.SysLogHandler
94
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
91
              address = str("/dev/log")))
96
 
 
97
 
try:
98
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
99
 
                      (ctypes.util.find_library("c"))
100
 
                      .if_nametoindex)
101
 
except (OSError, AttributeError):
102
 
    def if_nametoindex(interface):
103
 
        "Get an interface index the hard way, i.e. using fcntl()"
104
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
105
 
        with contextlib.closing(socket.socket()) as s:
106
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
 
                                struct.pack(str("16s16x"),
108
 
                                            interface))
109
 
        interface_index = struct.unpack(str("I"),
110
 
                                        ifreq[16:20])[0]
111
 
        return interface_index
112
 
 
113
 
 
114
 
def initlogger(debug, level=logging.WARNING):
115
 
    """init logger and add loglevel"""
116
 
    
117
 
    syslogger.setFormatter(logging.Formatter
118
 
                           ('Mandos [%(process)d]: %(levelname)s:'
119
 
                            ' %(message)s'))
120
 
    logger.addHandler(syslogger)
121
 
    
122
 
    if debug:
123
 
        console = logging.StreamHandler()
124
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
125
 
                                               ' [%(process)d]:'
126
 
                                               ' %(levelname)s:'
127
 
                                               ' %(message)s'))
128
 
        logger.addHandler(console)
129
 
    logger.setLevel(level)
130
 
 
131
 
 
132
 
class PGPError(Exception):
133
 
    """Exception if encryption/decryption fails"""
134
 
    pass
135
 
 
136
 
 
137
 
class PGPEngine(object):
138
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
139
 
    def __init__(self):
140
 
        self.gnupg = GnuPGInterface.GnuPG()
141
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
142
 
        self.gnupg = GnuPGInterface.GnuPG()
143
 
        self.gnupg.options.meta_interactive = False
144
 
        self.gnupg.options.homedir = self.tempdir
145
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
146
 
                                              '--quiet',
147
 
                                              '--no-use-agent'])
148
 
    
149
 
    def __enter__(self):
150
 
        return self
151
 
    
152
 
    def __exit__ (self, exc_type, exc_value, traceback):
153
 
        self._cleanup()
154
 
        return False
155
 
    
156
 
    def __del__(self):
157
 
        self._cleanup()
158
 
    
159
 
    def _cleanup(self):
160
 
        if self.tempdir is not None:
161
 
            # Delete contents of tempdir
162
 
            for root, dirs, files in os.walk(self.tempdir,
163
 
                                             topdown = False):
164
 
                for filename in files:
165
 
                    os.remove(os.path.join(root, filename))
166
 
                for dirname in dirs:
167
 
                    os.rmdir(os.path.join(root, dirname))
168
 
            # Remove tempdir
169
 
            os.rmdir(self.tempdir)
170
 
            self.tempdir = None
171
 
    
172
 
    def password_encode(self, password):
173
 
        # Passphrase can not be empty and can not contain newlines or
174
 
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        return b"mandos" + binascii.hexlify(password)
176
 
    
177
 
    def encrypt(self, data, password):
178
 
        self.gnupg.passphrase = self.password_encode(password)
179
 
        with open(os.devnull, "w") as devnull:
180
 
            try:
181
 
                proc = self.gnupg.run(['--symmetric'],
182
 
                                      create_fhs=['stdin', 'stdout'],
183
 
                                      attach_fhs={'stderr': devnull})
184
 
                with contextlib.closing(proc.handles['stdin']) as f:
185
 
                    f.write(data)
186
 
                with contextlib.closing(proc.handles['stdout']) as f:
187
 
                    ciphertext = f.read()
188
 
                proc.wait()
189
 
            except IOError as e:
190
 
                raise PGPError(e)
191
 
        self.gnupg.passphrase = None
192
 
        return ciphertext
193
 
    
194
 
    def decrypt(self, data, password):
195
 
        self.gnupg.passphrase = self.password_encode(password)
196
 
        with open(os.devnull, "w") as devnull:
197
 
            try:
198
 
                proc = self.gnupg.run(['--decrypt'],
199
 
                                      create_fhs=['stdin', 'stdout'],
200
 
                                      attach_fhs={'stderr': devnull})
201
 
                with contextlib.closing(proc.handles['stdin']) as f:
202
 
                    f.write(data)
203
 
                with contextlib.closing(proc.handles['stdout']) as f:
204
 
                    decrypted_plaintext = f.read()
205
 
                proc.wait()
206
 
            except IOError as e:
207
 
                raise PGPError(e)
208
 
        self.gnupg.passphrase = None
209
 
        return decrypted_plaintext
210
 
 
 
92
syslogger.setFormatter(logging.Formatter
 
93
                       ('Mandos [%(process)d]: %(levelname)s:'
 
94
                        ' %(message)s'))
 
95
logger.addHandler(syslogger)
 
96
 
 
97
console = logging.StreamHandler()
 
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
99
                                       ' %(levelname)s:'
 
100
                                       ' %(message)s'))
 
101
logger.addHandler(console)
211
102
 
212
103
class AvahiError(Exception):
213
104
    def __init__(self, value, *args, **kwargs):
243
134
    server: D-Bus Server
244
135
    bus: dbus.SystemBus()
245
136
    """
246
 
    
247
137
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
248
138
                 servicetype = None, port = None, TXT = None,
249
139
                 domain = "", host = "", max_renames = 32768,
262
152
        self.server = None
263
153
        self.bus = bus
264
154
        self.entry_group_state_changed_match = None
265
 
    
266
155
    def rename(self):
267
156
        """Derived from the Avahi example code"""
268
157
        if self.rename_count >= self.max_renames:
270
159
                            " after %i retries, exiting.",
271
160
                            self.rename_count)
272
161
            raise AvahiServiceError("Too many renames")
273
 
        self.name = unicode(self.server
274
 
                            .GetAlternativeServiceName(self.name))
 
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
275
163
        logger.info("Changing Zeroconf service name to %r ...",
276
164
                    self.name)
 
165
        syslogger.setFormatter(logging.Formatter
 
166
                               ('Mandos (%s) [%%(process)d]:'
 
167
                                ' %%(levelname)s: %%(message)s'
 
168
                                % self.name))
277
169
        self.remove()
278
170
        try:
279
171
            self.add()
280
172
        except dbus.exceptions.DBusException as error:
281
 
            logger.critical("D-Bus Exception", exc_info=error)
 
173
            logger.critical("DBusException: %s", error)
282
174
            self.cleanup()
283
175
            os._exit(1)
284
176
        self.rename_count += 1
285
 
    
286
177
    def remove(self):
287
178
        """Derived from the Avahi example code"""
288
179
        if self.entry_group_state_changed_match is not None:
290
181
            self.entry_group_state_changed_match = None
291
182
        if self.group is not None:
292
183
            self.group.Reset()
293
 
    
294
184
    def add(self):
295
185
        """Derived from the Avahi example code"""
296
186
        self.remove()
301
191
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
302
192
        self.entry_group_state_changed_match = (
303
193
            self.group.connect_to_signal(
304
 
                'StateChanged', self.entry_group_state_changed))
 
194
                'StateChanged', self .entry_group_state_changed))
305
195
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
306
196
                     self.name, self.type)
307
197
        self.group.AddService(
313
203
            dbus.UInt16(self.port),
314
204
            avahi.string_array_to_txt_array(self.TXT))
315
205
        self.group.Commit()
316
 
    
317
206
    def entry_group_state_changed(self, state, error):
318
207
        """Derived from the Avahi example code"""
319
208
        logger.debug("Avahi entry group state change: %i", state)
326
215
        elif state == avahi.ENTRY_GROUP_FAILURE:
327
216
            logger.critical("Avahi: Error in group state changed %s",
328
217
                            unicode(error))
329
 
            raise AvahiGroupError("State changed: {0!s}"
330
 
                                  .format(error))
331
 
    
 
218
            raise AvahiGroupError("State changed: %s"
 
219
                                  % unicode(error))
332
220
    def cleanup(self):
333
221
        """Derived from the Avahi example code"""
334
222
        if self.group is not None:
335
223
            try:
336
224
                self.group.Free()
337
225
            except (dbus.exceptions.UnknownMethodException,
338
 
                    dbus.exceptions.DBusException):
 
226
                    dbus.exceptions.DBusException) as e:
339
227
                pass
340
228
            self.group = None
341
229
        self.remove()
342
 
    
343
230
    def server_state_changed(self, state, error=None):
344
231
        """Derived from the Avahi example code"""
345
232
        logger.debug("Avahi server state change: %i", state)
364
251
                logger.debug("Unknown state: %r", state)
365
252
            else:
366
253
                logger.debug("Unknown state: %r: %r", state, error)
367
 
    
368
254
    def activate(self):
369
255
        """Derived from the Avahi example code"""
370
256
        if self.server is None:
377
263
                                 self.server_state_changed)
378
264
        self.server_state_changed(self.server.GetState())
379
265
 
380
 
class AvahiServiceToSyslog(AvahiService):
381
 
    def rename(self):
382
 
        """Add the new name to the syslog messages"""
383
 
        ret = AvahiService.rename(self)
384
 
        syslogger.setFormatter(logging.Formatter
385
 
                               ('Mandos ({0}) [%(process)d]:'
386
 
                                ' %(levelname)s: %(message)s'
387
 
                                .format(self.name)))
388
 
        return ret
389
 
 
390
 
def timedelta_to_milliseconds(td):
391
 
    "Convert a datetime.timedelta() to milliseconds"
392
 
    return ((td.days * 24 * 60 * 60 * 1000)
393
 
            + (td.seconds * 1000)
394
 
            + (td.microseconds // 1000))
395
266
 
396
267
class Client(object):
397
268
    """A representation of a client host served by this server.
398
269
    
399
270
    Attributes:
400
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
271
    _approved:   bool(); 'None' if not yet approved/disapproved
401
272
    approval_delay: datetime.timedelta(); Time to wait for approval
402
273
    approval_duration: datetime.timedelta(); Duration of one approval
403
274
    checker:    subprocess.Popen(); a running checker process used
410
281
                     instance %(name)s can be used in the command.
411
282
    checker_initiator_tag: a gobject event source tag, or None
412
283
    created:    datetime.datetime(); (UTC) object creation
413
 
    client_structure: Object describing what attributes a client has
414
 
                      and is used for storing the client at exit
415
284
    current_checker_command: string; current running checker_command
 
285
    disable_hook:  If set, called by disable() as disable_hook(self)
416
286
    disable_initiator_tag: a gobject event source tag, or None
417
287
    enabled:    bool()
418
288
    fingerprint: string (40 or 32 hexadecimal digits); used to
421
291
    interval:   datetime.timedelta(); How often to start a new checker
422
292
    last_approval_request: datetime.datetime(); (UTC) or None
423
293
    last_checked_ok: datetime.datetime(); (UTC) or None
424
 
    last_checker_status: integer between 0 and 255 reflecting exit
425
 
                         status of last checker. -1 reflects crashed
426
 
                         checker, -2 means no checker completed yet.
427
 
    last_enabled: datetime.datetime(); (UTC) or None
 
294
    last_enabled: datetime.datetime(); (UTC)
428
295
    name:       string; from the config file, used in log messages and
429
296
                        D-Bus identifiers
430
297
    secret:     bytestring; sent verbatim (over TLS) to client
431
298
    timeout:    datetime.timedelta(); How long from last_checked_ok
432
299
                                      until this client is disabled
433
 
    extended_timeout:   extra long timeout when secret has been sent
434
300
    runtime_expansions: Allowed attributes for runtime expansion.
435
 
    expires:    datetime.datetime(); time (UTC) when a client will be
436
 
                disabled, or None
437
301
    """
438
302
    
439
303
    runtime_expansions = ("approval_delay", "approval_duration",
440
304
                          "created", "enabled", "fingerprint",
441
305
                          "host", "interval", "last_checked_ok",
442
306
                          "last_enabled", "name", "timeout")
443
 
    client_defaults = { "timeout": "5m",
444
 
                        "extended_timeout": "15m",
445
 
                        "interval": "2m",
446
 
                        "checker": "fping -q -- %%(host)s",
447
 
                        "host": "",
448
 
                        "approval_delay": "0s",
449
 
                        "approval_duration": "1s",
450
 
                        "approved_by_default": "True",
451
 
                        "enabled": "True",
452
 
                        }
 
307
    
 
308
    @staticmethod
 
309
    def _timedelta_to_milliseconds(td):
 
310
        "Convert a datetime.timedelta() to milliseconds"
 
311
        return ((td.days * 24 * 60 * 60 * 1000)
 
312
                + (td.seconds * 1000)
 
313
                + (td.microseconds // 1000))
453
314
    
454
315
    def timeout_milliseconds(self):
455
316
        "Return the 'timeout' attribute in milliseconds"
456
 
        return timedelta_to_milliseconds(self.timeout)
457
 
    
458
 
    def extended_timeout_milliseconds(self):
459
 
        "Return the 'extended_timeout' attribute in milliseconds"
460
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
317
        return self._timedelta_to_milliseconds(self.timeout)
461
318
    
462
319
    def interval_milliseconds(self):
463
320
        "Return the 'interval' attribute in milliseconds"
464
 
        return timedelta_to_milliseconds(self.interval)
465
 
    
 
321
        return self._timedelta_to_milliseconds(self.interval)
 
322
 
466
323
    def approval_delay_milliseconds(self):
467
 
        return timedelta_to_milliseconds(self.approval_delay)
468
 
    
469
 
    @staticmethod
470
 
    def config_parser(config):
471
 
        """Construct a new dict of client settings of this form:
472
 
        { client_name: {setting_name: value, ...}, ...}
473
 
        with exceptions for any special settings as defined above.
474
 
        NOTE: Must be a pure function. Must return the same result
475
 
        value given the same arguments.
476
 
        """
477
 
        settings = {}
478
 
        for client_name in config.sections():
479
 
            section = dict(config.items(client_name))
480
 
            client = settings[client_name] = {}
481
 
            
482
 
            client["host"] = section["host"]
483
 
            # Reformat values from string types to Python types
484
 
            client["approved_by_default"] = config.getboolean(
485
 
                client_name, "approved_by_default")
486
 
            client["enabled"] = config.getboolean(client_name,
487
 
                                                  "enabled")
488
 
            
489
 
            client["fingerprint"] = (section["fingerprint"].upper()
490
 
                                     .replace(" ", ""))
491
 
            if "secret" in section:
492
 
                client["secret"] = section["secret"].decode("base64")
493
 
            elif "secfile" in section:
494
 
                with open(os.path.expanduser(os.path.expandvars
495
 
                                             (section["secfile"])),
496
 
                          "rb") as secfile:
497
 
                    client["secret"] = secfile.read()
498
 
            else:
499
 
                raise TypeError("No secret or secfile for section {0}"
500
 
                                .format(section))
501
 
            client["timeout"] = string_to_delta(section["timeout"])
502
 
            client["extended_timeout"] = string_to_delta(
503
 
                section["extended_timeout"])
504
 
            client["interval"] = string_to_delta(section["interval"])
505
 
            client["approval_delay"] = string_to_delta(
506
 
                section["approval_delay"])
507
 
            client["approval_duration"] = string_to_delta(
508
 
                section["approval_duration"])
509
 
            client["checker_command"] = section["checker"]
510
 
            client["last_approval_request"] = None
511
 
            client["last_checked_ok"] = None
512
 
            client["last_checker_status"] = -2
513
 
        
514
 
        return settings
515
 
    
516
 
    def __init__(self, settings, name = None):
 
324
        return self._timedelta_to_milliseconds(self.approval_delay)
 
325
    
 
326
    def __init__(self, name = None, disable_hook=None, config=None):
 
327
        """Note: the 'checker' key in 'config' sets the
 
328
        'checker_command' attribute and *not* the 'checker'
 
329
        attribute."""
517
330
        self.name = name
518
 
        # adding all client settings
519
 
        for setting, value in settings.iteritems():
520
 
            setattr(self, setting, value)
521
 
        
522
 
        if self.enabled:
523
 
            if not hasattr(self, "last_enabled"):
524
 
                self.last_enabled = datetime.datetime.utcnow()
525
 
            if not hasattr(self, "expires"):
526
 
                self.expires = (datetime.datetime.utcnow()
527
 
                                + self.timeout)
528
 
        else:
529
 
            self.last_enabled = None
530
 
            self.expires = None
531
 
        
 
331
        if config is None:
 
332
            config = {}
532
333
        logger.debug("Creating client %r", self.name)
533
334
        # Uppercase and remove spaces from fingerprint for later
534
335
        # comparison purposes with return value from the fingerprint()
535
336
        # function
 
337
        self.fingerprint = (config["fingerprint"].upper()
 
338
                            .replace(" ", ""))
536
339
        logger.debug("  Fingerprint: %s", self.fingerprint)
537
 
        self.created = settings.get("created",
538
 
                                    datetime.datetime.utcnow())
539
 
        
540
 
        # attributes specific for this server instance
 
340
        if "secret" in config:
 
341
            self.secret = config["secret"].decode("base64")
 
342
        elif "secfile" in config:
 
343
            with open(os.path.expanduser(os.path.expandvars
 
344
                                         (config["secfile"])),
 
345
                      "rb") as secfile:
 
346
                self.secret = secfile.read()
 
347
        else:
 
348
            raise TypeError("No secret or secfile for client %s"
 
349
                            % self.name)
 
350
        self.host = config.get("host", "")
 
351
        self.created = datetime.datetime.utcnow()
 
352
        self.enabled = False
 
353
        self.last_approval_request = None
 
354
        self.last_enabled = None
 
355
        self.last_checked_ok = None
 
356
        self.timeout = string_to_delta(config["timeout"])
 
357
        self.interval = string_to_delta(config["interval"])
 
358
        self.disable_hook = disable_hook
541
359
        self.checker = None
542
360
        self.checker_initiator_tag = None
543
361
        self.disable_initiator_tag = None
544
362
        self.checker_callback_tag = None
 
363
        self.checker_command = config["checker"]
545
364
        self.current_checker_command = None
546
 
        self.approved = None
 
365
        self.last_connect = None
 
366
        self._approved = None
 
367
        self.approved_by_default = config.get("approved_by_default",
 
368
                                              True)
547
369
        self.approvals_pending = 0
548
 
        self.changedstate = (multiprocessing_manager
549
 
                             .Condition(multiprocessing_manager
550
 
                                        .Lock()))
551
 
        self.client_structure = [attr for attr in
552
 
                                 self.__dict__.iterkeys()
553
 
                                 if not attr.startswith("_")]
554
 
        self.client_structure.append("client_structure")
555
 
        
556
 
        for name, t in inspect.getmembers(type(self),
557
 
                                          lambda obj:
558
 
                                              isinstance(obj,
559
 
                                                         property)):
560
 
            if not name.startswith("_"):
561
 
                self.client_structure.append(name)
 
370
        self.approval_delay = string_to_delta(
 
371
            config["approval_delay"])
 
372
        self.approval_duration = string_to_delta(
 
373
            config["approval_duration"])
 
374
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
562
375
    
563
 
    # Send notice to process children that client state has changed
564
376
    def send_changedstate(self):
565
 
        with self.changedstate:
566
 
            self.changedstate.notify_all()
567
 
    
 
377
        self.changedstate.acquire()
 
378
        self.changedstate.notify_all()
 
379
        self.changedstate.release()
 
380
        
568
381
    def enable(self):
569
382
        """Start this client's checker and timeout hooks"""
570
383
        if getattr(self, "enabled", False):
571
384
            # Already enabled
572
385
            return
573
386
        self.send_changedstate()
574
 
        self.expires = datetime.datetime.utcnow() + self.timeout
575
 
        self.enabled = True
576
387
        self.last_enabled = datetime.datetime.utcnow()
577
 
        self.init_checker()
 
388
        # Schedule a new checker to be started an 'interval' from now,
 
389
        # and every interval from then on.
 
390
        self.checker_initiator_tag = (gobject.timeout_add
 
391
                                      (self.interval_milliseconds(),
 
392
                                       self.start_checker))
 
393
        # Schedule a disable() when 'timeout' has passed
 
394
        self.disable_initiator_tag = (gobject.timeout_add
 
395
                                   (self.timeout_milliseconds(),
 
396
                                    self.disable))
 
397
        self.enabled = True
 
398
        # Also start a new checker *right now*.
 
399
        self.start_checker()
578
400
    
579
401
    def disable(self, quiet=True):
580
402
        """Disable this client."""
587
409
        if getattr(self, "disable_initiator_tag", False):
588
410
            gobject.source_remove(self.disable_initiator_tag)
589
411
            self.disable_initiator_tag = None
590
 
        self.expires = None
591
412
        if getattr(self, "checker_initiator_tag", False):
592
413
            gobject.source_remove(self.checker_initiator_tag)
593
414
            self.checker_initiator_tag = None
594
415
        self.stop_checker()
 
416
        if self.disable_hook:
 
417
            self.disable_hook(self)
595
418
        self.enabled = False
596
419
        # Do not run this again if called by a gobject.timeout_add
597
420
        return False
598
421
    
599
422
    def __del__(self):
 
423
        self.disable_hook = None
600
424
        self.disable()
601
425
    
602
 
    def init_checker(self):
603
 
        # Schedule a new checker to be started an 'interval' from now,
604
 
        # and every interval from then on.
605
 
        self.checker_initiator_tag = (gobject.timeout_add
606
 
                                      (self.interval_milliseconds(),
607
 
                                       self.start_checker))
608
 
        # Schedule a disable() when 'timeout' has passed
609
 
        self.disable_initiator_tag = (gobject.timeout_add
610
 
                                   (self.timeout_milliseconds(),
611
 
                                    self.disable))
612
 
        # Also start a new checker *right now*.
613
 
        self.start_checker()
614
 
    
615
426
    def checker_callback(self, pid, condition, command):
616
427
        """The checker has completed, so take appropriate actions."""
617
428
        self.checker_callback_tag = None
618
429
        self.checker = None
619
430
        if os.WIFEXITED(condition):
620
 
            self.last_checker_status = os.WEXITSTATUS(condition)
621
 
            if self.last_checker_status == 0:
 
431
            exitstatus = os.WEXITSTATUS(condition)
 
432
            if exitstatus == 0:
622
433
                logger.info("Checker for %(name)s succeeded",
623
434
                            vars(self))
624
435
                self.checked_ok()
626
437
                logger.info("Checker for %(name)s failed",
627
438
                            vars(self))
628
439
        else:
629
 
            self.last_checker_status = -1
630
440
            logger.warning("Checker for %(name)s crashed?",
631
441
                           vars(self))
632
442
    
633
443
    def checked_ok(self):
634
 
        """Assert that the client has been seen, alive and well."""
 
444
        """Bump up the timeout for this client.
 
445
        
 
446
        This should only be called when the client has been seen,
 
447
        alive and well.
 
448
        """
635
449
        self.last_checked_ok = datetime.datetime.utcnow()
636
 
        self.last_checker_status = 0
637
 
        self.bump_timeout()
638
 
    
639
 
    def bump_timeout(self, timeout=None):
640
 
        """Bump up the timeout for this client."""
641
 
        if timeout is None:
642
 
            timeout = self.timeout
643
 
        if self.disable_initiator_tag is not None:
644
 
            gobject.source_remove(self.disable_initiator_tag)
645
 
        if getattr(self, "enabled", False):
646
 
            self.disable_initiator_tag = (gobject.timeout_add
647
 
                                          (timedelta_to_milliseconds
648
 
                                           (timeout), self.disable))
649
 
            self.expires = datetime.datetime.utcnow() + timeout
 
450
        gobject.source_remove(self.disable_initiator_tag)
 
451
        self.disable_initiator_tag = (gobject.timeout_add
 
452
                                      (self.timeout_milliseconds(),
 
453
                                       self.disable))
650
454
    
651
455
    def need_approval(self):
652
456
        self.last_approval_request = datetime.datetime.utcnow()
692
496
                                       'replace')))
693
497
                    for attr in
694
498
                    self.runtime_expansions)
695
 
                
 
499
 
696
500
                try:
697
501
                    command = self.checker_command % escaped_attrs
698
502
                except TypeError as error:
699
 
                    logger.error('Could not format string "%s"',
700
 
                                 self.checker_command, exc_info=error)
 
503
                    logger.error('Could not format string "%s":'
 
504
                                 ' %s', self.checker_command, error)
701
505
                    return True # Try again later
702
506
            self.current_checker_command = command
703
507
            try:
721
525
                    gobject.source_remove(self.checker_callback_tag)
722
526
                    self.checker_callback(pid, status, command)
723
527
            except OSError as error:
724
 
                logger.error("Failed to start subprocess",
725
 
                             exc_info=error)
 
528
                logger.error("Failed to start subprocess: %s",
 
529
                             error)
726
530
        # Re-run this periodically if run by gobject.timeout_add
727
531
        return True
728
532
    
735
539
            return
736
540
        logger.debug("Stopping checker for %(name)s", vars(self))
737
541
        try:
738
 
            self.checker.terminate()
 
542
            os.kill(self.checker.pid, signal.SIGTERM)
739
543
            #time.sleep(0.5)
740
544
            #if self.checker.poll() is None:
741
 
            #    self.checker.kill()
 
545
            #    os.kill(self.checker.pid, signal.SIGKILL)
742
546
        except OSError as error:
743
547
            if error.errno != errno.ESRCH: # No such process
744
548
                raise
745
549
        self.checker = None
746
550
 
747
 
 
748
551
def dbus_service_property(dbus_interface, signature="v",
749
552
                          access="readwrite", byte_arrays=False):
750
553
    """Decorators for marking methods of a DBusObjectWithProperties to
761
564
    # "Set" method, so we fail early here:
762
565
    if byte_arrays and signature != "ay":
763
566
        raise ValueError("Byte arrays not supported for non-'ay'"
764
 
                         " signature {0!r}".format(signature))
 
567
                         " signature %r" % signature)
765
568
    def decorator(func):
766
569
        func._dbus_is_property = True
767
570
        func._dbus_interface = dbus_interface
775
578
    return decorator
776
579
 
777
580
 
778
 
def dbus_interface_annotations(dbus_interface):
779
 
    """Decorator for marking functions returning interface annotations
780
 
    
781
 
    Usage:
782
 
    
783
 
    @dbus_interface_annotations("org.example.Interface")
784
 
    def _foo(self):  # Function name does not matter
785
 
        return {"org.freedesktop.DBus.Deprecated": "true",
786
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
787
 
                    "false"}
788
 
    """
789
 
    def decorator(func):
790
 
        func._dbus_is_interface = True
791
 
        func._dbus_interface = dbus_interface
792
 
        func._dbus_name = dbus_interface
793
 
        return func
794
 
    return decorator
795
 
 
796
 
 
797
 
def dbus_annotations(annotations):
798
 
    """Decorator to annotate D-Bus methods, signals or properties
799
 
    Usage:
800
 
    
801
 
    @dbus_service_property("org.example.Interface", signature="b",
802
 
                           access="r")
803
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
804
 
                        "org.freedesktop.DBus.Property."
805
 
                        "EmitsChangedSignal": "false"})
806
 
    def Property_dbus_property(self):
807
 
        return dbus.Boolean(False)
808
 
    """
809
 
    def decorator(func):
810
 
        func._dbus_annotations = annotations
811
 
        return func
812
 
    return decorator
813
 
 
814
 
 
815
581
class DBusPropertyException(dbus.exceptions.DBusException):
816
582
    """A base class for D-Bus property-related exceptions
817
583
    """
833
599
 
834
600
class DBusObjectWithProperties(dbus.service.Object):
835
601
    """A D-Bus object with properties.
836
 
    
 
602
 
837
603
    Classes inheriting from this can use the dbus_service_property
838
604
    decorator to expose methods as D-Bus properties.  It exposes the
839
605
    standard Get(), Set(), and GetAll() methods on the D-Bus.
840
606
    """
841
607
    
842
608
    @staticmethod
843
 
    def _is_dbus_thing(thing):
844
 
        """Returns a function testing if an attribute is a D-Bus thing
845
 
        
846
 
        If called like _is_dbus_thing("method") it returns a function
847
 
        suitable for use as predicate to inspect.getmembers().
848
 
        """
849
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
850
 
                                   False)
 
609
    def _is_dbus_property(obj):
 
610
        return getattr(obj, "_dbus_is_property", False)
851
611
    
852
 
    def _get_all_dbus_things(self, thing):
 
612
    def _get_all_dbus_properties(self):
853
613
        """Returns a generator of (name, attribute) pairs
854
614
        """
855
 
        return ((getattr(athing.__get__(self), "_dbus_name",
856
 
                         name),
857
 
                 athing.__get__(self))
858
 
                for cls in self.__class__.__mro__
859
 
                for name, athing in
860
 
                inspect.getmembers(cls,
861
 
                                   self._is_dbus_thing(thing)))
 
615
        return ((prop._dbus_name, prop)
 
616
                for name, prop in
 
617
                inspect.getmembers(self, self._is_dbus_property))
862
618
    
863
619
    def _get_dbus_property(self, interface_name, property_name):
864
620
        """Returns a bound method if one exists which is a D-Bus
865
621
        property with the specified name and interface.
866
622
        """
867
 
        for cls in  self.__class__.__mro__:
868
 
            for name, value in (inspect.getmembers
869
 
                                (cls,
870
 
                                 self._is_dbus_thing("property"))):
871
 
                if (value._dbus_name == property_name
872
 
                    and value._dbus_interface == interface_name):
873
 
                    return value.__get__(self)
874
 
        
 
623
        for name in (property_name,
 
624
                     property_name + "_dbus_property"):
 
625
            prop = getattr(self, name, None)
 
626
            if (prop is None
 
627
                or not self._is_dbus_property(prop)
 
628
                or prop._dbus_name != property_name
 
629
                or (interface_name and prop._dbus_interface
 
630
                    and interface_name != prop._dbus_interface)):
 
631
                continue
 
632
            return prop
875
633
        # No such property
876
634
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
877
635
                                   + interface_name + "."
902
660
            # signatures other than "ay".
903
661
            if prop._dbus_signature != "ay":
904
662
                raise ValueError
905
 
            value = dbus.ByteArray(b''.join(chr(byte)
906
 
                                            for byte in value))
 
663
            value = dbus.ByteArray(''.join(unichr(byte)
 
664
                                           for byte in value))
907
665
        prop(value)
908
666
    
909
667
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
911
669
    def GetAll(self, interface_name):
912
670
        """Standard D-Bus property GetAll() method, see D-Bus
913
671
        standard.
914
 
        
 
672
 
915
673
        Note: Will not include properties with access="write".
916
674
        """
917
 
        properties = {}
918
 
        for name, prop in self._get_all_dbus_things("property"):
 
675
        all = {}
 
676
        for name, prop in self._get_all_dbus_properties():
919
677
            if (interface_name
920
678
                and interface_name != prop._dbus_interface):
921
679
                # Interface non-empty but did not match
925
683
                continue
926
684
            value = prop()
927
685
            if not hasattr(value, "variant_level"):
928
 
                properties[name] = value
 
686
                all[name] = value
929
687
                continue
930
 
            properties[name] = type(value)(value, variant_level=
931
 
                                           value.variant_level+1)
932
 
        return dbus.Dictionary(properties, signature="sv")
 
688
            all[name] = type(value)(value, variant_level=
 
689
                                    value.variant_level+1)
 
690
        return dbus.Dictionary(all, signature="sv")
933
691
    
934
692
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
935
693
                         out_signature="s",
936
694
                         path_keyword='object_path',
937
695
                         connection_keyword='connection')
938
696
    def Introspect(self, object_path, connection):
939
 
        """Overloading of standard D-Bus method.
940
 
        
941
 
        Inserts property tags and interface annotation tags.
 
697
        """Standard D-Bus method, overloaded to insert property tags.
942
698
        """
943
699
        xmlstring = dbus.service.Object.Introspect(self, object_path,
944
700
                                                   connection)
951
707
                e.setAttribute("access", prop._dbus_access)
952
708
                return e
953
709
            for if_tag in document.getElementsByTagName("interface"):
954
 
                # Add property tags
955
710
                for tag in (make_tag(document, name, prop)
956
711
                            for name, prop
957
 
                            in self._get_all_dbus_things("property")
 
712
                            in self._get_all_dbus_properties()
958
713
                            if prop._dbus_interface
959
714
                            == if_tag.getAttribute("name")):
960
715
                    if_tag.appendChild(tag)
961
 
                # Add annotation tags
962
 
                for typ in ("method", "signal", "property"):
963
 
                    for tag in if_tag.getElementsByTagName(typ):
964
 
                        annots = dict()
965
 
                        for name, prop in (self.
966
 
                                           _get_all_dbus_things(typ)):
967
 
                            if (name == tag.getAttribute("name")
968
 
                                and prop._dbus_interface
969
 
                                == if_tag.getAttribute("name")):
970
 
                                annots.update(getattr
971
 
                                              (prop,
972
 
                                               "_dbus_annotations",
973
 
                                               {}))
974
 
                        for name, value in annots.iteritems():
975
 
                            ann_tag = document.createElement(
976
 
                                "annotation")
977
 
                            ann_tag.setAttribute("name", name)
978
 
                            ann_tag.setAttribute("value", value)
979
 
                            tag.appendChild(ann_tag)
980
 
                # Add interface annotation tags
981
 
                for annotation, value in dict(
982
 
                    itertools.chain(
983
 
                        *(annotations().iteritems()
984
 
                          for name, annotations in
985
 
                          self._get_all_dbus_things("interface")
986
 
                          if name == if_tag.getAttribute("name")
987
 
                          ))).iteritems():
988
 
                    ann_tag = document.createElement("annotation")
989
 
                    ann_tag.setAttribute("name", annotation)
990
 
                    ann_tag.setAttribute("value", value)
991
 
                    if_tag.appendChild(ann_tag)
992
716
                # Add the names to the return values for the
993
717
                # "org.freedesktop.DBus.Properties" methods
994
718
                if (if_tag.getAttribute("name")
1009
733
        except (AttributeError, xml.dom.DOMException,
1010
734
                xml.parsers.expat.ExpatError) as error:
1011
735
            logger.error("Failed to override Introspection method",
1012
 
                         exc_info=error)
 
736
                         error)
1013
737
        return xmlstring
1014
738
 
1015
739
 
1016
 
def datetime_to_dbus (dt, variant_level=0):
1017
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1018
 
    if dt is None:
1019
 
        return dbus.String("", variant_level = variant_level)
1020
 
    return dbus.String(dt.isoformat(),
1021
 
                       variant_level=variant_level)
1022
 
 
1023
 
 
1024
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1025
 
    """A class decorator; applied to a subclass of
1026
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1027
 
    interface names according to the "alt_interface_names" mapping.
1028
 
    Usage:
1029
 
    
1030
 
    @alternate_dbus_names({"org.example.Interface":
1031
 
                               "net.example.AlternateInterface"})
1032
 
    class SampleDBusObject(dbus.service.Object):
1033
 
        @dbus.service.method("org.example.Interface")
1034
 
        def SampleDBusMethod():
1035
 
            pass
1036
 
    
1037
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1038
 
    reachable via two interfaces: "org.example.Interface" and
1039
 
    "net.example.AlternateInterface", the latter of which will have
1040
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1041
 
    "true", unless "deprecate" is passed with a False value.
1042
 
    
1043
 
    This works for methods and signals, and also for D-Bus properties
1044
 
    (from DBusObjectWithProperties) and interfaces (from the
1045
 
    dbus_interface_annotations decorator).
1046
 
    """
1047
 
    def wrapper(cls):
1048
 
        for orig_interface_name, alt_interface_name in (
1049
 
            alt_interface_names.iteritems()):
1050
 
            attr = {}
1051
 
            interface_names = set()
1052
 
            # Go though all attributes of the class
1053
 
            for attrname, attribute in inspect.getmembers(cls):
1054
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
1055
 
                # with the wrong interface name
1056
 
                if (not hasattr(attribute, "_dbus_interface")
1057
 
                    or not attribute._dbus_interface
1058
 
                    .startswith(orig_interface_name)):
1059
 
                    continue
1060
 
                # Create an alternate D-Bus interface name based on
1061
 
                # the current name
1062
 
                alt_interface = (attribute._dbus_interface
1063
 
                                 .replace(orig_interface_name,
1064
 
                                          alt_interface_name))
1065
 
                interface_names.add(alt_interface)
1066
 
                # Is this a D-Bus signal?
1067
 
                if getattr(attribute, "_dbus_is_signal", False):
1068
 
                    # Extract the original non-method function by
1069
 
                    # black magic
1070
 
                    nonmethod_func = (dict(
1071
 
                            zip(attribute.func_code.co_freevars,
1072
 
                                attribute.__closure__))["func"]
1073
 
                                      .cell_contents)
1074
 
                    # Create a new, but exactly alike, function
1075
 
                    # object, and decorate it to be a new D-Bus signal
1076
 
                    # with the alternate D-Bus interface name
1077
 
                    new_function = (dbus.service.signal
1078
 
                                    (alt_interface,
1079
 
                                     attribute._dbus_signature)
1080
 
                                    (types.FunctionType(
1081
 
                                nonmethod_func.func_code,
1082
 
                                nonmethod_func.func_globals,
1083
 
                                nonmethod_func.func_name,
1084
 
                                nonmethod_func.func_defaults,
1085
 
                                nonmethod_func.func_closure)))
1086
 
                    # Copy annotations, if any
1087
 
                    try:
1088
 
                        new_function._dbus_annotations = (
1089
 
                            dict(attribute._dbus_annotations))
1090
 
                    except AttributeError:
1091
 
                        pass
1092
 
                    # Define a creator of a function to call both the
1093
 
                    # original and alternate functions, so both the
1094
 
                    # original and alternate signals gets sent when
1095
 
                    # the function is called
1096
 
                    def fixscope(func1, func2):
1097
 
                        """This function is a scope container to pass
1098
 
                        func1 and func2 to the "call_both" function
1099
 
                        outside of its arguments"""
1100
 
                        def call_both(*args, **kwargs):
1101
 
                            """This function will emit two D-Bus
1102
 
                            signals by calling func1 and func2"""
1103
 
                            func1(*args, **kwargs)
1104
 
                            func2(*args, **kwargs)
1105
 
                        return call_both
1106
 
                    # Create the "call_both" function and add it to
1107
 
                    # the class
1108
 
                    attr[attrname] = fixscope(attribute, new_function)
1109
 
                # Is this a D-Bus method?
1110
 
                elif getattr(attribute, "_dbus_is_method", False):
1111
 
                    # Create a new, but exactly alike, function
1112
 
                    # object.  Decorate it to be a new D-Bus method
1113
 
                    # with the alternate D-Bus interface name.  Add it
1114
 
                    # to the class.
1115
 
                    attr[attrname] = (dbus.service.method
1116
 
                                      (alt_interface,
1117
 
                                       attribute._dbus_in_signature,
1118
 
                                       attribute._dbus_out_signature)
1119
 
                                      (types.FunctionType
1120
 
                                       (attribute.func_code,
1121
 
                                        attribute.func_globals,
1122
 
                                        attribute.func_name,
1123
 
                                        attribute.func_defaults,
1124
 
                                        attribute.func_closure)))
1125
 
                    # Copy annotations, if any
1126
 
                    try:
1127
 
                        attr[attrname]._dbus_annotations = (
1128
 
                            dict(attribute._dbus_annotations))
1129
 
                    except AttributeError:
1130
 
                        pass
1131
 
                # Is this a D-Bus property?
1132
 
                elif getattr(attribute, "_dbus_is_property", False):
1133
 
                    # Create a new, but exactly alike, function
1134
 
                    # object, and decorate it to be a new D-Bus
1135
 
                    # property with the alternate D-Bus interface
1136
 
                    # name.  Add it to the class.
1137
 
                    attr[attrname] = (dbus_service_property
1138
 
                                      (alt_interface,
1139
 
                                       attribute._dbus_signature,
1140
 
                                       attribute._dbus_access,
1141
 
                                       attribute
1142
 
                                       ._dbus_get_args_options
1143
 
                                       ["byte_arrays"])
1144
 
                                      (types.FunctionType
1145
 
                                       (attribute.func_code,
1146
 
                                        attribute.func_globals,
1147
 
                                        attribute.func_name,
1148
 
                                        attribute.func_defaults,
1149
 
                                        attribute.func_closure)))
1150
 
                    # Copy annotations, if any
1151
 
                    try:
1152
 
                        attr[attrname]._dbus_annotations = (
1153
 
                            dict(attribute._dbus_annotations))
1154
 
                    except AttributeError:
1155
 
                        pass
1156
 
                # Is this a D-Bus interface?
1157
 
                elif getattr(attribute, "_dbus_is_interface", False):
1158
 
                    # Create a new, but exactly alike, function
1159
 
                    # object.  Decorate it to be a new D-Bus interface
1160
 
                    # with the alternate D-Bus interface name.  Add it
1161
 
                    # to the class.
1162
 
                    attr[attrname] = (dbus_interface_annotations
1163
 
                                      (alt_interface)
1164
 
                                      (types.FunctionType
1165
 
                                       (attribute.func_code,
1166
 
                                        attribute.func_globals,
1167
 
                                        attribute.func_name,
1168
 
                                        attribute.func_defaults,
1169
 
                                        attribute.func_closure)))
1170
 
            if deprecate:
1171
 
                # Deprecate all alternate interfaces
1172
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1173
 
                for interface_name in interface_names:
1174
 
                    @dbus_interface_annotations(interface_name)
1175
 
                    def func(self):
1176
 
                        return { "org.freedesktop.DBus.Deprecated":
1177
 
                                     "true" }
1178
 
                    # Find an unused name
1179
 
                    for aname in (iname.format(i)
1180
 
                                  for i in itertools.count()):
1181
 
                        if aname not in attr:
1182
 
                            attr[aname] = func
1183
 
                            break
1184
 
            if interface_names:
1185
 
                # Replace the class with a new subclass of it with
1186
 
                # methods, signals, etc. as created above.
1187
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1188
 
                           (cls,), attr)
1189
 
        return cls
1190
 
    return wrapper
1191
 
 
1192
 
 
1193
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1194
 
                                "se.bsnet.fukt.Mandos"})
1195
740
class ClientDBus(Client, DBusObjectWithProperties):
1196
741
    """A Client class using D-Bus
1197
742
    
1206
751
    # dbus.service.Object doesn't use super(), so we can't either.
1207
752
    
1208
753
    def __init__(self, bus = None, *args, **kwargs):
 
754
        self._approvals_pending = 0
1209
755
        self.bus = bus
1210
756
        Client.__init__(self, *args, **kwargs)
1211
757
        # Only now, when this client is initialized, can it show up on
1217
763
                                 ("/clients/" + client_object_name))
1218
764
        DBusObjectWithProperties.__init__(self, self.bus,
1219
765
                                          self.dbus_object_path)
1220
 
    
1221
 
    def notifychangeproperty(transform_func,
1222
 
                             dbus_name, type_func=lambda x: x,
1223
 
                             variant_level=1):
1224
 
        """ Modify a variable so that it's a property which announces
1225
 
        its changes to DBus.
1226
 
        
1227
 
        transform_fun: Function that takes a value and a variant_level
1228
 
                       and transforms it to a D-Bus type.
1229
 
        dbus_name: D-Bus name of the variable
1230
 
        type_func: Function that transform the value before sending it
1231
 
                   to the D-Bus.  Default: no transform
1232
 
        variant_level: D-Bus variant level.  Default: 1
1233
 
        """
1234
 
        attrname = "_{0}".format(dbus_name)
1235
 
        def setter(self, value):
1236
 
            if hasattr(self, "dbus_object_path"):
1237
 
                if (not hasattr(self, attrname) or
1238
 
                    type_func(getattr(self, attrname, None))
1239
 
                    != type_func(value)):
1240
 
                    dbus_value = transform_func(type_func(value),
1241
 
                                                variant_level
1242
 
                                                =variant_level)
1243
 
                    self.PropertyChanged(dbus.String(dbus_name),
1244
 
                                         dbus_value)
1245
 
            setattr(self, attrname, value)
1246
 
        
1247
 
        return property(lambda self: getattr(self, attrname), setter)
1248
 
    
1249
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1250
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
1251
 
                                             "ApprovalPending",
1252
 
                                             type_func = bool)
1253
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1254
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
1255
 
                                        "LastEnabled")
1256
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1257
 
                                   type_func = lambda checker:
1258
 
                                       checker is not None)
1259
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1260
 
                                           "LastCheckedOK")
1261
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1262
 
                                               "LastCheckerStatus")
1263
 
    last_approval_request = notifychangeproperty(
1264
 
        datetime_to_dbus, "LastApprovalRequest")
1265
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
1266
 
                                               "ApprovedByDefault")
1267
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1268
 
                                          "ApprovalDelay",
1269
 
                                          type_func =
1270
 
                                          timedelta_to_milliseconds)
1271
 
    approval_duration = notifychangeproperty(
1272
 
        dbus.UInt64, "ApprovalDuration",
1273
 
        type_func = timedelta_to_milliseconds)
1274
 
    host = notifychangeproperty(dbus.String, "Host")
1275
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1276
 
                                   type_func =
1277
 
                                   timedelta_to_milliseconds)
1278
 
    extended_timeout = notifychangeproperty(
1279
 
        dbus.UInt64, "ExtendedTimeout",
1280
 
        type_func = timedelta_to_milliseconds)
1281
 
    interval = notifychangeproperty(dbus.UInt64,
1282
 
                                    "Interval",
1283
 
                                    type_func =
1284
 
                                    timedelta_to_milliseconds)
1285
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
1286
 
    
1287
 
    del notifychangeproperty
 
766
        
 
767
    def _get_approvals_pending(self):
 
768
        return self._approvals_pending
 
769
    def _set_approvals_pending(self, value):
 
770
        old_value = self._approvals_pending
 
771
        self._approvals_pending = value
 
772
        bval = bool(value)
 
773
        if (hasattr(self, "dbus_object_path")
 
774
            and bval is not bool(old_value)):
 
775
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
776
            self.PropertyChanged(dbus.String("ApprovalPending"),
 
777
                                 dbus_bool)
 
778
 
 
779
    approvals_pending = property(_get_approvals_pending,
 
780
                                 _set_approvals_pending)
 
781
    del _get_approvals_pending, _set_approvals_pending
 
782
    
 
783
    @staticmethod
 
784
    def _datetime_to_dbus(dt, variant_level=0):
 
785
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
786
        return dbus.String(dt.isoformat(),
 
787
                           variant_level=variant_level)
 
788
    
 
789
    def enable(self):
 
790
        oldstate = getattr(self, "enabled", False)
 
791
        r = Client.enable(self)
 
792
        if oldstate != self.enabled:
 
793
            # Emit D-Bus signals
 
794
            self.PropertyChanged(dbus.String("Enabled"),
 
795
                                 dbus.Boolean(True, variant_level=1))
 
796
            self.PropertyChanged(
 
797
                dbus.String("LastEnabled"),
 
798
                self._datetime_to_dbus(self.last_enabled,
 
799
                                       variant_level=1))
 
800
        return r
 
801
    
 
802
    def disable(self, quiet = False):
 
803
        oldstate = getattr(self, "enabled", False)
 
804
        r = Client.disable(self, quiet=quiet)
 
805
        if not quiet and oldstate != self.enabled:
 
806
            # Emit D-Bus signal
 
807
            self.PropertyChanged(dbus.String("Enabled"),
 
808
                                 dbus.Boolean(False, variant_level=1))
 
809
        return r
1288
810
    
1289
811
    def __del__(self, *args, **kwargs):
1290
812
        try:
1299
821
                         *args, **kwargs):
1300
822
        self.checker_callback_tag = None
1301
823
        self.checker = None
 
824
        # Emit D-Bus signal
 
825
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
826
                             dbus.Boolean(False, variant_level=1))
1302
827
        if os.WIFEXITED(condition):
1303
828
            exitstatus = os.WEXITSTATUS(condition)
1304
829
            # Emit D-Bus signal
1314
839
        return Client.checker_callback(self, pid, condition, command,
1315
840
                                       *args, **kwargs)
1316
841
    
 
842
    def checked_ok(self, *args, **kwargs):
 
843
        Client.checked_ok(self, *args, **kwargs)
 
844
        # Emit D-Bus signal
 
845
        self.PropertyChanged(
 
846
            dbus.String("LastCheckedOK"),
 
847
            (self._datetime_to_dbus(self.last_checked_ok,
 
848
                                    variant_level=1)))
 
849
    
 
850
    def need_approval(self, *args, **kwargs):
 
851
        r = Client.need_approval(self, *args, **kwargs)
 
852
        # Emit D-Bus signal
 
853
        self.PropertyChanged(
 
854
            dbus.String("LastApprovalRequest"),
 
855
            (self._datetime_to_dbus(self.last_approval_request,
 
856
                                    variant_level=1)))
 
857
        return r
 
858
    
1317
859
    def start_checker(self, *args, **kwargs):
1318
860
        old_checker = self.checker
1319
861
        if self.checker is not None:
1326
868
            and old_checker_pid != self.checker.pid):
1327
869
            # Emit D-Bus signal
1328
870
            self.CheckerStarted(self.current_checker_command)
 
871
            self.PropertyChanged(
 
872
                dbus.String("CheckerRunning"),
 
873
                dbus.Boolean(True, variant_level=1))
1329
874
        return r
1330
875
    
 
876
    def stop_checker(self, *args, **kwargs):
 
877
        old_checker = getattr(self, "checker", None)
 
878
        r = Client.stop_checker(self, *args, **kwargs)
 
879
        if (old_checker is not None
 
880
            and getattr(self, "checker", None) is None):
 
881
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
882
                                 dbus.Boolean(False, variant_level=1))
 
883
        return r
 
884
 
1331
885
    def _reset_approved(self):
1332
 
        self.approved = None
 
886
        self._approved = None
1333
887
        return False
1334
888
    
1335
889
    def approve(self, value=True):
1336
890
        self.send_changedstate()
1337
 
        self.approved = value
1338
 
        gobject.timeout_add(timedelta_to_milliseconds
 
891
        self._approved = value
 
892
        gobject.timeout_add(self._timedelta_to_milliseconds
1339
893
                            (self.approval_duration),
1340
894
                            self._reset_approved)
1341
895
    
 
896
    
1342
897
    ## D-Bus methods, signals & properties
1343
 
    _interface = "se.recompile.Mandos.Client"
1344
 
    
1345
 
    ## Interfaces
1346
 
    
1347
 
    @dbus_interface_annotations(_interface)
1348
 
    def _foo(self):
1349
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1350
 
                     "false"}
 
898
    _interface = "se.bsnet.fukt.Mandos.Client"
1351
899
    
1352
900
    ## Signals
1353
901
    
1439
987
        if value is None:       # get
1440
988
            return dbus.Boolean(self.approved_by_default)
1441
989
        self.approved_by_default = bool(value)
 
990
        # Emit D-Bus signal
 
991
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
 
992
                             dbus.Boolean(value, variant_level=1))
1442
993
    
1443
994
    # ApprovalDelay - property
1444
995
    @dbus_service_property(_interface, signature="t",
1447
998
        if value is None:       # get
1448
999
            return dbus.UInt64(self.approval_delay_milliseconds())
1449
1000
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1001
        # Emit D-Bus signal
 
1002
        self.PropertyChanged(dbus.String("ApprovalDelay"),
 
1003
                             dbus.UInt64(value, variant_level=1))
1450
1004
    
1451
1005
    # ApprovalDuration - property
1452
1006
    @dbus_service_property(_interface, signature="t",
1453
1007
                           access="readwrite")
1454
1008
    def ApprovalDuration_dbus_property(self, value=None):
1455
1009
        if value is None:       # get
1456
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1010
            return dbus.UInt64(self._timedelta_to_milliseconds(
1457
1011
                    self.approval_duration))
1458
1012
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1013
        # Emit D-Bus signal
 
1014
        self.PropertyChanged(dbus.String("ApprovalDuration"),
 
1015
                             dbus.UInt64(value, variant_level=1))
1459
1016
    
1460
1017
    # Name - property
1461
1018
    @dbus_service_property(_interface, signature="s", access="read")
1473
1030
    def Host_dbus_property(self, value=None):
1474
1031
        if value is None:       # get
1475
1032
            return dbus.String(self.host)
1476
 
        self.host = unicode(value)
 
1033
        self.host = value
 
1034
        # Emit D-Bus signal
 
1035
        self.PropertyChanged(dbus.String("Host"),
 
1036
                             dbus.String(value, variant_level=1))
1477
1037
    
1478
1038
    # Created - property
1479
1039
    @dbus_service_property(_interface, signature="s", access="read")
1480
1040
    def Created_dbus_property(self):
1481
 
        return datetime_to_dbus(self.created)
 
1041
        return dbus.String(self._datetime_to_dbus(self.created))
1482
1042
    
1483
1043
    # LastEnabled - property
1484
1044
    @dbus_service_property(_interface, signature="s", access="read")
1485
1045
    def LastEnabled_dbus_property(self):
1486
 
        return datetime_to_dbus(self.last_enabled)
 
1046
        if self.last_enabled is None:
 
1047
            return dbus.String("")
 
1048
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1487
1049
    
1488
1050
    # Enabled - property
1489
1051
    @dbus_service_property(_interface, signature="b",
1503
1065
        if value is not None:
1504
1066
            self.checked_ok()
1505
1067
            return
1506
 
        return datetime_to_dbus(self.last_checked_ok)
1507
 
    
1508
 
    # LastCheckerStatus - property
1509
 
    @dbus_service_property(_interface, signature="n",
1510
 
                           access="read")
1511
 
    def LastCheckerStatus_dbus_property(self):
1512
 
        return dbus.Int16(self.last_checker_status)
1513
 
    
1514
 
    # Expires - property
1515
 
    @dbus_service_property(_interface, signature="s", access="read")
1516
 
    def Expires_dbus_property(self):
1517
 
        return datetime_to_dbus(self.expires)
 
1068
        if self.last_checked_ok is None:
 
1069
            return dbus.String("")
 
1070
        return dbus.String(self._datetime_to_dbus(self
 
1071
                                                  .last_checked_ok))
1518
1072
    
1519
1073
    # LastApprovalRequest - property
1520
1074
    @dbus_service_property(_interface, signature="s", access="read")
1521
1075
    def LastApprovalRequest_dbus_property(self):
1522
 
        return datetime_to_dbus(self.last_approval_request)
 
1076
        if self.last_approval_request is None:
 
1077
            return dbus.String("")
 
1078
        return dbus.String(self.
 
1079
                           _datetime_to_dbus(self
 
1080
                                             .last_approval_request))
1523
1081
    
1524
1082
    # Timeout - property
1525
1083
    @dbus_service_property(_interface, signature="t",
1528
1086
        if value is None:       # get
1529
1087
            return dbus.UInt64(self.timeout_milliseconds())
1530
1088
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1089
        # Emit D-Bus signal
 
1090
        self.PropertyChanged(dbus.String("Timeout"),
 
1091
                             dbus.UInt64(value, variant_level=1))
 
1092
        if getattr(self, "disable_initiator_tag", None) is None:
 
1093
            return
1531
1094
        # Reschedule timeout
1532
 
        if self.enabled:
1533
 
            now = datetime.datetime.utcnow()
1534
 
            time_to_die = timedelta_to_milliseconds(
1535
 
                (self.last_checked_ok + self.timeout) - now)
1536
 
            if time_to_die <= 0:
1537
 
                # The timeout has passed
1538
 
                self.disable()
1539
 
            else:
1540
 
                self.expires = (now +
1541
 
                                datetime.timedelta(milliseconds =
1542
 
                                                   time_to_die))
1543
 
                if (getattr(self, "disable_initiator_tag", None)
1544
 
                    is None):
1545
 
                    return
1546
 
                gobject.source_remove(self.disable_initiator_tag)
1547
 
                self.disable_initiator_tag = (gobject.timeout_add
1548
 
                                              (time_to_die,
1549
 
                                               self.disable))
1550
 
    
1551
 
    # ExtendedTimeout - property
1552
 
    @dbus_service_property(_interface, signature="t",
1553
 
                           access="readwrite")
1554
 
    def ExtendedTimeout_dbus_property(self, value=None):
1555
 
        if value is None:       # get
1556
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
1557
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1095
        gobject.source_remove(self.disable_initiator_tag)
 
1096
        self.disable_initiator_tag = None
 
1097
        time_to_die = (self.
 
1098
                       _timedelta_to_milliseconds((self
 
1099
                                                   .last_checked_ok
 
1100
                                                   + self.timeout)
 
1101
                                                  - datetime.datetime
 
1102
                                                  .utcnow()))
 
1103
        if time_to_die <= 0:
 
1104
            # The timeout has passed
 
1105
            self.disable()
 
1106
        else:
 
1107
            self.disable_initiator_tag = (gobject.timeout_add
 
1108
                                          (time_to_die, self.disable))
1558
1109
    
1559
1110
    # Interval - property
1560
1111
    @dbus_service_property(_interface, signature="t",
1563
1114
        if value is None:       # get
1564
1115
            return dbus.UInt64(self.interval_milliseconds())
1565
1116
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1117
        # Emit D-Bus signal
 
1118
        self.PropertyChanged(dbus.String("Interval"),
 
1119
                             dbus.UInt64(value, variant_level=1))
1566
1120
        if getattr(self, "checker_initiator_tag", None) is None:
1567
1121
            return
1568
 
        if self.enabled:
1569
 
            # Reschedule checker run
1570
 
            gobject.source_remove(self.checker_initiator_tag)
1571
 
            self.checker_initiator_tag = (gobject.timeout_add
1572
 
                                          (value, self.start_checker))
1573
 
            self.start_checker()    # Start one now, too
1574
 
    
 
1122
        # Reschedule checker run
 
1123
        gobject.source_remove(self.checker_initiator_tag)
 
1124
        self.checker_initiator_tag = (gobject.timeout_add
 
1125
                                      (value, self.start_checker))
 
1126
        self.start_checker()    # Start one now, too
 
1127
 
1575
1128
    # Checker - property
1576
1129
    @dbus_service_property(_interface, signature="s",
1577
1130
                           access="readwrite")
1578
1131
    def Checker_dbus_property(self, value=None):
1579
1132
        if value is None:       # get
1580
1133
            return dbus.String(self.checker_command)
1581
 
        self.checker_command = unicode(value)
 
1134
        self.checker_command = value
 
1135
        # Emit D-Bus signal
 
1136
        self.PropertyChanged(dbus.String("Checker"),
 
1137
                             dbus.String(self.checker_command,
 
1138
                                         variant_level=1))
1582
1139
    
1583
1140
    # CheckerRunning - property
1584
1141
    @dbus_service_property(_interface, signature="b",
1611
1168
        self._pipe.send(('init', fpr, address))
1612
1169
        if not self._pipe.recv():
1613
1170
            raise KeyError()
1614
 
    
 
1171
 
1615
1172
    def __getattribute__(self, name):
1616
 
        if name == '_pipe':
 
1173
        if(name == '_pipe'):
1617
1174
            return super(ProxyClient, self).__getattribute__(name)
1618
1175
        self._pipe.send(('getattr', name))
1619
1176
        data = self._pipe.recv()
1624
1181
                self._pipe.send(('funcall', name, args, kwargs))
1625
1182
                return self._pipe.recv()[1]
1626
1183
            return func
1627
 
    
 
1184
 
1628
1185
    def __setattr__(self, name, value):
1629
 
        if name == '_pipe':
 
1186
        if(name == '_pipe'):
1630
1187
            return super(ProxyClient, self).__setattr__(name, value)
1631
1188
        self._pipe.send(('setattr', name, value))
1632
1189
 
1643
1200
                        unicode(self.client_address))
1644
1201
            logger.debug("Pipe FD: %d",
1645
1202
                         self.server.child_pipe.fileno())
1646
 
            
 
1203
 
1647
1204
            session = (gnutls.connection
1648
1205
                       .ClientSession(self.request,
1649
1206
                                      gnutls.connection
1650
1207
                                      .X509Credentials()))
1651
 
            
 
1208
 
1652
1209
            # Note: gnutls.connection.X509Credentials is really a
1653
1210
            # generic GnuTLS certificate credentials object so long as
1654
1211
            # no X.509 keys are added to it.  Therefore, we can use it
1655
1212
            # here despite using OpenPGP certificates.
1656
 
            
 
1213
 
1657
1214
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1658
1215
            #                      "+AES-256-CBC", "+SHA1",
1659
1216
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1665
1222
            (gnutls.library.functions
1666
1223
             .gnutls_priority_set_direct(session._c_object,
1667
1224
                                         priority, None))
1668
 
            
 
1225
 
1669
1226
            # Start communication using the Mandos protocol
1670
1227
            # Get protocol number
1671
1228
            line = self.request.makefile().readline()
1676
1233
            except (ValueError, IndexError, RuntimeError) as error:
1677
1234
                logger.error("Unknown protocol version: %s", error)
1678
1235
                return
1679
 
            
 
1236
 
1680
1237
            # Start GnuTLS connection
1681
1238
            try:
1682
1239
                session.handshake()
1686
1243
                # established.  Just abandon the request.
1687
1244
                return
1688
1245
            logger.debug("Handshake succeeded")
1689
 
            
 
1246
 
1690
1247
            approval_required = False
1691
1248
            try:
1692
1249
                try:
1697
1254
                    logger.warning("Bad certificate: %s", error)
1698
1255
                    return
1699
1256
                logger.debug("Fingerprint: %s", fpr)
1700
 
                
 
1257
 
1701
1258
                try:
1702
1259
                    client = ProxyClient(child_pipe, fpr,
1703
1260
                                         self.client_address)
1715
1272
                                       client.name)
1716
1273
                        if self.server.use_dbus:
1717
1274
                            # Emit D-Bus signal
1718
 
                            client.Rejected("Disabled")
 
1275
                            client.Rejected("Disabled")                    
1719
1276
                        return
1720
1277
                    
1721
 
                    if client.approved or not client.approval_delay:
 
1278
                    if client._approved or not client.approval_delay:
1722
1279
                        #We are approved or approval is disabled
1723
1280
                        break
1724
 
                    elif client.approved is None:
 
1281
                    elif client._approved is None:
1725
1282
                        logger.info("Client %s needs approval",
1726
1283
                                    client.name)
1727
1284
                        if self.server.use_dbus:
1738
1295
                        return
1739
1296
                    
1740
1297
                    #wait until timeout or approved
 
1298
                    #x = float(client._timedelta_to_milliseconds(delay))
1741
1299
                    time = datetime.datetime.now()
1742
1300
                    client.changedstate.acquire()
1743
 
                    (client.changedstate.wait
1744
 
                     (float(client.timedelta_to_milliseconds(delay)
1745
 
                            / 1000)))
 
1301
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1746
1302
                    client.changedstate.release()
1747
1303
                    time2 = datetime.datetime.now()
1748
1304
                    if (time2 - time) >= delay:
1764
1320
                    try:
1765
1321
                        sent = session.send(client.secret[sent_size:])
1766
1322
                    except gnutls.errors.GNUTLSError as error:
1767
 
                        logger.warning("gnutls send failed",
1768
 
                                       exc_info=error)
 
1323
                        logger.warning("gnutls send failed")
1769
1324
                        return
1770
1325
                    logger.debug("Sent: %d, remaining: %d",
1771
1326
                                 sent, len(client.secret)
1772
1327
                                 - (sent_size + sent))
1773
1328
                    sent_size += sent
1774
 
                
 
1329
 
1775
1330
                logger.info("Sending secret to %s", client.name)
1776
 
                # bump the timeout using extended_timeout
1777
 
                client.bump_timeout(client.extended_timeout)
 
1331
                # bump the timeout as if seen
 
1332
                client.checked_ok()
1778
1333
                if self.server.use_dbus:
1779
1334
                    # Emit D-Bus signal
1780
1335
                    client.GotSecret()
1785
1340
                try:
1786
1341
                    session.bye()
1787
1342
                except gnutls.errors.GNUTLSError as error:
1788
 
                    logger.warning("GnuTLS bye failed",
1789
 
                                   exc_info=error)
 
1343
                    logger.warning("GnuTLS bye failed")
1790
1344
    
1791
1345
    @staticmethod
1792
1346
    def peer_certificate(session):
1848
1402
        # Convert the buffer to a Python bytestring
1849
1403
        fpr = ctypes.string_at(buf, buf_len.value)
1850
1404
        # Convert the bytestring to hexadecimal notation
1851
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1405
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1852
1406
        return hex_fpr
1853
1407
 
1854
1408
 
1857
1411
    def sub_process_main(self, request, address):
1858
1412
        try:
1859
1413
            self.finish_request(request, address)
1860
 
        except Exception:
 
1414
        except:
1861
1415
            self.handle_error(request, address)
1862
1416
        self.close_request(request)
1863
 
    
 
1417
            
1864
1418
    def process_request(self, request, address):
1865
1419
        """Start a new process to process the request."""
1866
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1867
 
                                       args = (request,
1868
 
                                               address))
1869
 
        proc.start()
1870
 
        return proc
1871
 
 
 
1420
        multiprocessing.Process(target = self.sub_process_main,
 
1421
                                args = (request, address)).start()
1872
1422
 
1873
1423
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1874
1424
    """ adds a pipe to the MixIn """
1878
1428
        This function creates a new pipe in self.pipe
1879
1429
        """
1880
1430
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1881
 
        
1882
 
        proc = MultiprocessingMixIn.process_request(self, request,
1883
 
                                                    client_address)
 
1431
 
 
1432
        super(MultiprocessingMixInWithPipe,
 
1433
              self).process_request(request, client_address)
1884
1434
        self.child_pipe.close()
1885
 
        self.add_pipe(parent_pipe, proc)
1886
 
    
1887
 
    def add_pipe(self, parent_pipe, proc):
 
1435
        self.add_pipe(parent_pipe)
 
1436
 
 
1437
    def add_pipe(self, parent_pipe):
1888
1438
        """Dummy function; override as necessary"""
1889
1439
        raise NotImplementedError
1890
1440
 
1891
 
 
1892
1441
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1893
1442
                     socketserver.TCPServer, object):
1894
1443
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1968
1517
        self.enabled = False
1969
1518
        self.clients = clients
1970
1519
        if self.clients is None:
1971
 
            self.clients = {}
 
1520
            self.clients = set()
1972
1521
        self.use_dbus = use_dbus
1973
1522
        self.gnutls_priority = gnutls_priority
1974
1523
        IPv6_TCPServer.__init__(self, server_address,
1978
1527
    def server_activate(self):
1979
1528
        if self.enabled:
1980
1529
            return socketserver.TCPServer.server_activate(self)
1981
 
    
1982
1530
    def enable(self):
1983
1531
        self.enabled = True
1984
 
    
1985
 
    def add_pipe(self, parent_pipe, proc):
 
1532
    def add_pipe(self, parent_pipe):
1986
1533
        # Call "handle_ipc" for both data and EOF events
1987
1534
        gobject.io_add_watch(parent_pipe.fileno(),
1988
1535
                             gobject.IO_IN | gobject.IO_HUP,
1989
1536
                             functools.partial(self.handle_ipc,
1990
 
                                               parent_pipe =
1991
 
                                               parent_pipe,
1992
 
                                               proc = proc))
1993
 
    
 
1537
                                               parent_pipe = parent_pipe))
 
1538
        
1994
1539
    def handle_ipc(self, source, condition, parent_pipe=None,
1995
 
                   proc = None, client_object=None):
 
1540
                   client_object=None):
1996
1541
        condition_names = {
1997
1542
            gobject.IO_IN: "IN",   # There is data to read.
1998
1543
            gobject.IO_OUT: "OUT", # Data can be written (without
2007
1552
                                       for cond, name in
2008
1553
                                       condition_names.iteritems()
2009
1554
                                       if cond & condition)
2010
 
        # error, or the other end of multiprocessing.Pipe has closed
 
1555
        # error or the other end of multiprocessing.Pipe has closed
2011
1556
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2012
 
            # Wait for other process to exit
2013
 
            proc.join()
2014
1557
            return False
2015
1558
        
2016
1559
        # Read a request from the child
2021
1564
            fpr = request[1]
2022
1565
            address = request[2]
2023
1566
            
2024
 
            for c in self.clients.itervalues():
 
1567
            for c in self.clients:
2025
1568
                if c.fingerprint == fpr:
2026
1569
                    client = c
2027
1570
                    break
2030
1573
                            "dress: %s", fpr, address)
2031
1574
                if self.use_dbus:
2032
1575
                    # Emit D-Bus signal
2033
 
                    mandos_dbus_service.ClientNotFound(fpr,
2034
 
                                                       address[0])
 
1576
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
2035
1577
                parent_pipe.send(False)
2036
1578
                return False
2037
1579
            
2038
1580
            gobject.io_add_watch(parent_pipe.fileno(),
2039
1581
                                 gobject.IO_IN | gobject.IO_HUP,
2040
1582
                                 functools.partial(self.handle_ipc,
2041
 
                                                   parent_pipe =
2042
 
                                                   parent_pipe,
2043
 
                                                   proc = proc,
2044
 
                                                   client_object =
2045
 
                                                   client))
 
1583
                                                   parent_pipe = parent_pipe,
 
1584
                                                   client_object = client))
2046
1585
            parent_pipe.send(True)
2047
 
            # remove the old hook in favor of the new above hook on
2048
 
            # same fileno
 
1586
            # remove the old hook in favor of the new above hook on same fileno
2049
1587
            return False
2050
1588
        if command == 'funcall':
2051
1589
            funcname = request[1]
2052
1590
            args = request[2]
2053
1591
            kwargs = request[3]
2054
1592
            
2055
 
            parent_pipe.send(('data', getattr(client_object,
2056
 
                                              funcname)(*args,
2057
 
                                                         **kwargs)))
2058
 
        
 
1593
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1594
 
2059
1595
        if command == 'getattr':
2060
1596
            attrname = request[1]
2061
1597
            if callable(client_object.__getattribute__(attrname)):
2062
1598
                parent_pipe.send(('function',))
2063
1599
            else:
2064
 
                parent_pipe.send(('data', client_object
2065
 
                                  .__getattribute__(attrname)))
 
1600
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2066
1601
        
2067
1602
        if command == 'setattr':
2068
1603
            attrname = request[1]
2069
1604
            value = request[2]
2070
1605
            setattr(client_object, attrname, value)
2071
 
        
 
1606
 
2072
1607
        return True
2073
1608
 
2074
1609
 
2104
1639
            elif suffix == "w":
2105
1640
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2106
1641
            else:
2107
 
                raise ValueError("Unknown suffix {0!r}"
2108
 
                                 .format(suffix))
 
1642
                raise ValueError("Unknown suffix %r" % suffix)
2109
1643
        except (ValueError, IndexError) as e:
2110
1644
            raise ValueError(*(e.args))
2111
1645
        timevalue += delta
2112
1646
    return timevalue
2113
1647
 
2114
1648
 
 
1649
def if_nametoindex(interface):
 
1650
    """Call the C function if_nametoindex(), or equivalent
 
1651
    
 
1652
    Note: This function cannot accept a unicode string."""
 
1653
    global if_nametoindex
 
1654
    try:
 
1655
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1656
                          (ctypes.util.find_library("c"))
 
1657
                          .if_nametoindex)
 
1658
    except (OSError, AttributeError):
 
1659
        logger.warning("Doing if_nametoindex the hard way")
 
1660
        def if_nametoindex(interface):
 
1661
            "Get an interface index the hard way, i.e. using fcntl()"
 
1662
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1663
            with contextlib.closing(socket.socket()) as s:
 
1664
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1665
                                    struct.pack(str("16s16x"),
 
1666
                                                interface))
 
1667
            interface_index = struct.unpack(str("I"),
 
1668
                                            ifreq[16:20])[0]
 
1669
            return interface_index
 
1670
    return if_nametoindex(interface)
 
1671
 
 
1672
 
2115
1673
def daemon(nochdir = False, noclose = False):
2116
1674
    """See daemon(3).  Standard BSD Unix function.
2117
1675
    
2125
1683
        sys.exit()
2126
1684
    if not noclose:
2127
1685
        # Close all standard open file descriptors
2128
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1686
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2129
1687
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2130
1688
            raise OSError(errno.ENODEV,
2131
 
                          "{0} not a character device"
2132
 
                          .format(os.devnull))
 
1689
                          "%s not a character device"
 
1690
                          % os.path.devnull)
2133
1691
        os.dup2(null, sys.stdin.fileno())
2134
1692
        os.dup2(null, sys.stdout.fileno())
2135
1693
        os.dup2(null, sys.stderr.fileno())
2144
1702
    
2145
1703
    parser = argparse.ArgumentParser()
2146
1704
    parser.add_argument("-v", "--version", action="version",
2147
 
                        version = "%(prog)s {0}".format(version),
 
1705
                        version = "%%(prog)s %s" % version,
2148
1706
                        help="show version number and exit")
2149
1707
    parser.add_argument("-i", "--interface", metavar="IF",
2150
1708
                        help="Bind to interface IF")
2172
1730
                        " system bus interface")
2173
1731
    parser.add_argument("--no-ipv6", action="store_false",
2174
1732
                        dest="use_ipv6", help="Do not use IPv6")
2175
 
    parser.add_argument("--no-restore", action="store_false",
2176
 
                        dest="restore", help="Do not restore stored"
2177
 
                        " state")
2178
 
    parser.add_argument("--statedir", metavar="DIR",
2179
 
                        help="Directory to save/restore state in")
2180
 
    
2181
1733
    options = parser.parse_args()
2182
1734
    
2183
1735
    if options.check:
2196
1748
                        "use_dbus": "True",
2197
1749
                        "use_ipv6": "True",
2198
1750
                        "debuglevel": "",
2199
 
                        "restore": "True",
2200
 
                        "statedir": "/var/lib/mandos"
2201
1751
                        }
2202
1752
    
2203
1753
    # Parse config file for server-global settings
2220
1770
    # options, if set.
2221
1771
    for option in ("interface", "address", "port", "debug",
2222
1772
                   "priority", "servicename", "configdir",
2223
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2224
 
                   "statedir"):
 
1773
                   "use_dbus", "use_ipv6", "debuglevel"):
2225
1774
        value = getattr(options, option)
2226
1775
        if value is not None:
2227
1776
            server_settings[option] = value
2239
1788
    debuglevel = server_settings["debuglevel"]
2240
1789
    use_dbus = server_settings["use_dbus"]
2241
1790
    use_ipv6 = server_settings["use_ipv6"]
2242
 
    stored_state_path = os.path.join(server_settings["statedir"],
2243
 
                                     stored_state_file)
2244
 
    
2245
 
    if debug:
2246
 
        initlogger(debug, logging.DEBUG)
2247
 
    else:
2248
 
        if not debuglevel:
2249
 
            initlogger(debug)
2250
 
        else:
2251
 
            level = getattr(logging, debuglevel.upper())
2252
 
            initlogger(debug, level)
2253
 
    
 
1791
 
2254
1792
    if server_settings["servicename"] != "Mandos":
2255
1793
        syslogger.setFormatter(logging.Formatter
2256
 
                               ('Mandos ({0}) [%(process)d]:'
2257
 
                                ' %(levelname)s: %(message)s'
2258
 
                                .format(server_settings
2259
 
                                        ["servicename"])))
 
1794
                               ('Mandos (%s) [%%(process)d]:'
 
1795
                                ' %%(levelname)s: %%(message)s'
 
1796
                                % server_settings["servicename"]))
2260
1797
    
2261
1798
    # Parse config file with clients
2262
 
    client_config = configparser.SafeConfigParser(Client
2263
 
                                                  .client_defaults)
 
1799
    client_defaults = { "timeout": "1h",
 
1800
                        "interval": "5m",
 
1801
                        "checker": "fping -q -- %%(host)s",
 
1802
                        "host": "",
 
1803
                        "approval_delay": "0s",
 
1804
                        "approval_duration": "1s",
 
1805
                        }
 
1806
    client_config = configparser.SafeConfigParser(client_defaults)
2264
1807
    client_config.read(os.path.join(server_settings["configdir"],
2265
1808
                                    "clients.conf"))
2266
1809
    
2280
1823
        pidfilename = "/var/run/mandos.pid"
2281
1824
        try:
2282
1825
            pidfile = open(pidfilename, "w")
2283
 
        except IOError as e:
2284
 
            logger.error("Could not open file %r", pidfilename,
2285
 
                         exc_info=e)
 
1826
        except IOError:
 
1827
            logger.error("Could not open file %r", pidfilename)
2286
1828
    
2287
 
    for name in ("_mandos", "mandos", "nobody"):
 
1829
    try:
 
1830
        uid = pwd.getpwnam("_mandos").pw_uid
 
1831
        gid = pwd.getpwnam("_mandos").pw_gid
 
1832
    except KeyError:
2288
1833
        try:
2289
 
            uid = pwd.getpwnam(name).pw_uid
2290
 
            gid = pwd.getpwnam(name).pw_gid
2291
 
            break
 
1834
            uid = pwd.getpwnam("mandos").pw_uid
 
1835
            gid = pwd.getpwnam("mandos").pw_gid
2292
1836
        except KeyError:
2293
 
            continue
2294
 
    else:
2295
 
        uid = 65534
2296
 
        gid = 65534
 
1837
            try:
 
1838
                uid = pwd.getpwnam("nobody").pw_uid
 
1839
                gid = pwd.getpwnam("nobody").pw_gid
 
1840
            except KeyError:
 
1841
                uid = 65534
 
1842
                gid = 65534
2297
1843
    try:
2298
1844
        os.setgid(gid)
2299
1845
        os.setuid(uid)
2301
1847
        if error[0] != errno.EPERM:
2302
1848
            raise error
2303
1849
    
 
1850
    if not debug and not debuglevel:
 
1851
        syslogger.setLevel(logging.WARNING)
 
1852
        console.setLevel(logging.WARNING)
 
1853
    if debuglevel:
 
1854
        level = getattr(logging, debuglevel.upper())
 
1855
        syslogger.setLevel(level)
 
1856
        console.setLevel(level)
 
1857
 
2304
1858
    if debug:
2305
1859
        # Enable all possible GnuTLS debugging
2306
1860
        
2316
1870
         .gnutls_global_set_log_function(debug_gnutls))
2317
1871
        
2318
1872
        # Redirect stdin so all checkers get /dev/null
2319
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1873
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2320
1874
        os.dup2(null, sys.stdin.fileno())
2321
1875
        if null > 2:
2322
1876
            os.close(null)
 
1877
    else:
 
1878
        # No console logging
 
1879
        logger.removeHandler(console)
2323
1880
    
2324
1881
    # Need to fork before connecting to D-Bus
2325
1882
    if not debug:
2326
1883
        # Close all input and output, do double fork, etc.
2327
1884
        daemon()
2328
1885
    
2329
 
    gobject.threads_init()
2330
 
    
2331
1886
    global main_loop
2332
1887
    # From the Avahi example code
2333
 
    DBusGMainLoop(set_as_default=True)
 
1888
    DBusGMainLoop(set_as_default=True )
2334
1889
    main_loop = gobject.MainLoop()
2335
1890
    bus = dbus.SystemBus()
2336
1891
    # End of Avahi example code
2337
1892
    if use_dbus:
2338
1893
        try:
2339
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1894
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2340
1895
                                            bus, do_not_queue=True)
2341
 
            old_bus_name = (dbus.service.BusName
2342
 
                            ("se.bsnet.fukt.Mandos", bus,
2343
 
                             do_not_queue=True))
2344
1896
        except dbus.exceptions.NameExistsException as e:
2345
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
1897
            logger.error(unicode(e) + ", disabling D-Bus")
2346
1898
            use_dbus = False
2347
1899
            server_settings["use_dbus"] = False
2348
1900
            tcp_server.use_dbus = False
2349
1901
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2350
 
    service = AvahiServiceToSyslog(name =
2351
 
                                   server_settings["servicename"],
2352
 
                                   servicetype = "_mandos._tcp",
2353
 
                                   protocol = protocol, bus = bus)
 
1902
    service = AvahiService(name = server_settings["servicename"],
 
1903
                           servicetype = "_mandos._tcp",
 
1904
                           protocol = protocol, bus = bus)
2354
1905
    if server_settings["interface"]:
2355
1906
        service.interface = (if_nametoindex
2356
1907
                             (str(server_settings["interface"])))
2361
1912
    client_class = Client
2362
1913
    if use_dbus:
2363
1914
        client_class = functools.partial(ClientDBus, bus = bus)
2364
 
    
2365
 
    client_settings = Client.config_parser(client_config)
2366
 
    old_client_settings = {}
2367
 
    clients_data = {}
2368
 
    
2369
 
    # Get client data and settings from last running state.
2370
 
    if server_settings["restore"]:
2371
 
        try:
2372
 
            with open(stored_state_path, "rb") as stored_state:
2373
 
                clients_data, old_client_settings = (pickle.load
2374
 
                                                     (stored_state))
2375
 
            os.remove(stored_state_path)
2376
 
        except IOError as e:
2377
 
            if e.errno == errno.ENOENT:
2378
 
                logger.warning("Could not load persistent state: {0}"
2379
 
                                .format(os.strerror(e.errno)))
2380
 
            else:
2381
 
                logger.critical("Could not load persistent state:",
2382
 
                                exc_info=e)
2383
 
                raise
2384
 
        except EOFError as e:
2385
 
            logger.warning("Could not load persistent state: "
2386
 
                           "EOFError:", exc_info=e)
2387
 
    
2388
 
    with PGPEngine() as pgp:
2389
 
        for client_name, client in clients_data.iteritems():
2390
 
            # Decide which value to use after restoring saved state.
2391
 
            # We have three different values: Old config file,
2392
 
            # new config file, and saved state.
2393
 
            # New config value takes precedence if it differs from old
2394
 
            # config value, otherwise use saved state.
2395
 
            for name, value in client_settings[client_name].items():
2396
 
                try:
2397
 
                    # For each value in new config, check if it
2398
 
                    # differs from the old config value (Except for
2399
 
                    # the "secret" attribute)
2400
 
                    if (name != "secret" and
2401
 
                        value != old_client_settings[client_name]
2402
 
                        [name]):
2403
 
                        client[name] = value
2404
 
                except KeyError:
2405
 
                    pass
2406
 
            
2407
 
            # Clients who has passed its expire date can still be
2408
 
            # enabled if its last checker was successful.  Clients
2409
 
            # whose checker succeeded before we stored its state is
2410
 
            # assumed to have successfully run all checkers during
2411
 
            # downtime.
2412
 
            if client["enabled"]:
2413
 
                if datetime.datetime.utcnow() >= client["expires"]:
2414
 
                    if not client["last_checked_ok"]:
2415
 
                        logger.warning(
2416
 
                            "disabling client {0} - Client never "
2417
 
                            "performed a successful checker"
2418
 
                            .format(client_name))
2419
 
                        client["enabled"] = False
2420
 
                    elif client["last_checker_status"] != 0:
2421
 
                        logger.warning(
2422
 
                            "disabling client {0} - Client "
2423
 
                            "last checker failed with error code {1}"
2424
 
                            .format(client_name,
2425
 
                                    client["last_checker_status"]))
2426
 
                        client["enabled"] = False
2427
 
                    else:
2428
 
                        client["expires"] = (datetime.datetime
2429
 
                                             .utcnow()
2430
 
                                             + client["timeout"])
2431
 
                        logger.debug("Last checker succeeded,"
2432
 
                                     " keeping {0} enabled"
2433
 
                                     .format(client_name))
 
1915
    def client_config_items(config, section):
 
1916
        special_settings = {
 
1917
            "approved_by_default":
 
1918
                lambda: config.getboolean(section,
 
1919
                                          "approved_by_default"),
 
1920
            }
 
1921
        for name, value in config.items(section):
2434
1922
            try:
2435
 
                client["secret"] = (
2436
 
                    pgp.decrypt(client["encrypted_secret"],
2437
 
                                client_settings[client_name]
2438
 
                                ["secret"]))
2439
 
            except PGPError:
2440
 
                # If decryption fails, we use secret from new settings
2441
 
                logger.debug("Failed to decrypt {0} old secret"
2442
 
                             .format(client_name))
2443
 
                client["secret"] = (
2444
 
                    client_settings[client_name]["secret"])
2445
 
    
2446
 
    # Add/remove clients based on new changes made to config
2447
 
    for client_name in (set(old_client_settings)
2448
 
                        - set(client_settings)):
2449
 
        del clients_data[client_name]
2450
 
    for client_name in (set(client_settings)
2451
 
                        - set(old_client_settings)):
2452
 
        clients_data[client_name] = client_settings[client_name]
2453
 
    
2454
 
    # Create all client objects
2455
 
    for client_name, client in clients_data.iteritems():
2456
 
        tcp_server.clients[client_name] = client_class(
2457
 
            name = client_name, settings = client)
2458
 
    
 
1923
                yield (name, special_settings[name]())
 
1924
            except KeyError:
 
1925
                yield (name, value)
 
1926
    
 
1927
    tcp_server.clients.update(set(
 
1928
            client_class(name = section,
 
1929
                         config= dict(client_config_items(
 
1930
                        client_config, section)))
 
1931
            for section in client_config.sections()))
2459
1932
    if not tcp_server.clients:
2460
1933
        logger.warning("No clients defined")
2461
 
    
 
1934
        
2462
1935
    if not debug:
2463
1936
        try:
2464
1937
            with pidfile:
2472
1945
            # "pidfile" was never created
2473
1946
            pass
2474
1947
        del pidfilename
 
1948
        
2475
1949
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2476
 
    
 
1950
 
2477
1951
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2478
1952
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2479
1953
    
2480
1954
    if use_dbus:
2481
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2482
 
                                        "se.bsnet.fukt.Mandos"})
2483
 
        class MandosDBusService(DBusObjectWithProperties):
 
1955
        class MandosDBusService(dbus.service.Object):
2484
1956
            """A D-Bus proxy object"""
2485
1957
            def __init__(self):
2486
1958
                dbus.service.Object.__init__(self, bus, "/")
2487
 
            _interface = "se.recompile.Mandos"
2488
 
            
2489
 
            @dbus_interface_annotations(_interface)
2490
 
            def _foo(self):
2491
 
                return { "org.freedesktop.DBus.Property"
2492
 
                         ".EmitsChangedSignal":
2493
 
                             "false"}
 
1959
            _interface = "se.bsnet.fukt.Mandos"
2494
1960
            
2495
1961
            @dbus.service.signal(_interface, signature="o")
2496
1962
            def ClientAdded(self, objpath):
2511
1977
            def GetAllClients(self):
2512
1978
                "D-Bus method"
2513
1979
                return dbus.Array(c.dbus_object_path
2514
 
                                  for c in
2515
 
                                  tcp_server.clients.itervalues())
 
1980
                                  for c in tcp_server.clients)
2516
1981
            
2517
1982
            @dbus.service.method(_interface,
2518
1983
                                 out_signature="a{oa{sv}}")
2520
1985
                "D-Bus method"
2521
1986
                return dbus.Dictionary(
2522
1987
                    ((c.dbus_object_path, c.GetAll(""))
2523
 
                     for c in tcp_server.clients.itervalues()),
 
1988
                     for c in tcp_server.clients),
2524
1989
                    signature="oa{sv}")
2525
1990
            
2526
1991
            @dbus.service.method(_interface, in_signature="o")
2527
1992
            def RemoveClient(self, object_path):
2528
1993
                "D-Bus method"
2529
 
                for c in tcp_server.clients.itervalues():
 
1994
                for c in tcp_server.clients:
2530
1995
                    if c.dbus_object_path == object_path:
2531
 
                        del tcp_server.clients[c.name]
 
1996
                        tcp_server.clients.remove(c)
2532
1997
                        c.remove_from_connection()
2533
1998
                        # Don't signal anything except ClientRemoved
2534
1999
                        c.disable(quiet=True)
2545
2010
        "Cleanup function; run on exit"
2546
2011
        service.cleanup()
2547
2012
        
2548
 
        multiprocessing.active_children()
2549
 
        if not (tcp_server.clients or client_settings):
2550
 
            return
2551
 
        
2552
 
        # Store client before exiting. Secrets are encrypted with key
2553
 
        # based on what config file has. If config file is
2554
 
        # removed/edited, old secret will thus be unrecovable.
2555
 
        clients = {}
2556
 
        with PGPEngine() as pgp:
2557
 
            for client in tcp_server.clients.itervalues():
2558
 
                key = client_settings[client.name]["secret"]
2559
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2560
 
                                                      key)
2561
 
                client_dict = {}
2562
 
                
2563
 
                # A list of attributes that can not be pickled
2564
 
                # + secret.
2565
 
                exclude = set(("bus", "changedstate", "secret",
2566
 
                               "checker"))
2567
 
                for name, typ in (inspect.getmembers
2568
 
                                  (dbus.service.Object)):
2569
 
                    exclude.add(name)
2570
 
                
2571
 
                client_dict["encrypted_secret"] = (client
2572
 
                                                   .encrypted_secret)
2573
 
                for attr in client.client_structure:
2574
 
                    if attr not in exclude:
2575
 
                        client_dict[attr] = getattr(client, attr)
2576
 
                
2577
 
                clients[client.name] = client_dict
2578
 
                del client_settings[client.name]["secret"]
2579
 
        
2580
 
        try:
2581
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2582
 
                                                prefix="clients-",
2583
 
                                                dir=os.path.dirname
2584
 
                                                (stored_state_path))
2585
 
            with os.fdopen(tempfd, "wb") as stored_state:
2586
 
                pickle.dump((clients, client_settings), stored_state)
2587
 
            os.rename(tempname, stored_state_path)
2588
 
        except (IOError, OSError) as e:
2589
 
            if not debug:
2590
 
                try:
2591
 
                    os.remove(tempname)
2592
 
                except NameError:
2593
 
                    pass
2594
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2595
 
                logger.warning("Could not save persistent state: {0}"
2596
 
                               .format(os.strerror(e.errno)))
2597
 
            else:
2598
 
                logger.warning("Could not save persistent state:",
2599
 
                               exc_info=e)
2600
 
                raise e
2601
 
        
2602
 
        # Delete all clients, and settings from config
2603
2013
        while tcp_server.clients:
2604
 
            name, client = tcp_server.clients.popitem()
 
2014
            client = tcp_server.clients.pop()
2605
2015
            if use_dbus:
2606
2016
                client.remove_from_connection()
 
2017
            client.disable_hook = None
2607
2018
            # Don't signal anything except ClientRemoved
2608
2019
            client.disable(quiet=True)
2609
2020
            if use_dbus:
2610
2021
                # Emit D-Bus signal
2611
 
                mandos_dbus_service.ClientRemoved(client
2612
 
                                                  .dbus_object_path,
 
2022
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2613
2023
                                                  client.name)
2614
 
        client_settings.clear()
2615
2024
    
2616
2025
    atexit.register(cleanup)
2617
2026
    
2618
 
    for client in tcp_server.clients.itervalues():
 
2027
    for client in tcp_server.clients:
2619
2028
        if use_dbus:
2620
2029
            # Emit D-Bus signal
2621
2030
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2622
 
        # Need to initiate checking of clients
2623
 
        if client.enabled:
2624
 
            client.init_checker()
 
2031
        client.enable()
2625
2032
    
2626
2033
    tcp_server.enable()
2627
2034
    tcp_server.server_activate()
2630
2037
    service.port = tcp_server.socket.getsockname()[1]
2631
2038
    if use_ipv6:
2632
2039
        logger.info("Now listening on address %r, port %d,"
2633
 
                    " flowinfo %d, scope_id %d",
2634
 
                    *tcp_server.socket.getsockname())
 
2040
                    " flowinfo %d, scope_id %d"
 
2041
                    % tcp_server.socket.getsockname())
2635
2042
    else:                       # IPv4
2636
 
        logger.info("Now listening on address %r, port %d",
2637
 
                    *tcp_server.socket.getsockname())
 
2043
        logger.info("Now listening on address %r, port %d"
 
2044
                    % tcp_server.socket.getsockname())
2638
2045
    
2639
2046
    #service.interface = tcp_server.socket.getsockname()[3]
2640
2047
    
2643
2050
        try:
2644
2051
            service.activate()
2645
2052
        except dbus.exceptions.DBusException as error:
2646
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2053
            logger.critical("DBusException: %s", error)
2647
2054
            cleanup()
2648
2055
            sys.exit(1)
2649
2056
        # End of Avahi example code
2656
2063
        logger.debug("Starting main loop")
2657
2064
        main_loop.run()
2658
2065
    except AvahiError as error:
2659
 
        logger.critical("Avahi Error", exc_info=error)
 
2066
        logger.critical("AvahiError: %s", error)
2660
2067
        cleanup()
2661
2068
        sys.exit(1)
2662
2069
    except KeyboardInterrupt: