/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-11-26 23:08:17 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

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
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
67
65
import types
68
66
import binascii
69
67
import tempfile
70
 
import itertools
71
68
 
72
69
import dbus
73
70
import dbus.service
88
85
    except ImportError:
89
86
        SO_BINDTODEVICE = None
90
87
 
91
 
version = "1.5.3"
 
88
 
 
89
version = "1.4.1"
92
90
stored_state_file = "clients.pickle"
93
91
 
94
92
logger = logging.getLogger()
113
111
        return interface_index
114
112
 
115
113
 
116
 
def initlogger(debug, level=logging.WARNING):
 
114
def initlogger(level=logging.WARNING):
117
115
    """init logger and add loglevel"""
118
116
    
119
117
    syslogger.setFormatter(logging.Formatter
121
119
                            ' %(message)s'))
122
120
    logger.addHandler(syslogger)
123
121
    
124
 
    if debug:
125
 
        console = logging.StreamHandler()
126
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
127
 
                                               ' [%(process)d]:'
128
 
                                               ' %(levelname)s:'
129
 
                                               ' %(message)s'))
130
 
        logger.addHandler(console)
 
122
    console = logging.StreamHandler()
 
123
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
124
                                           ' [%(process)d]:'
 
125
                                           ' %(levelname)s:'
 
126
                                           ' %(message)s'))
 
127
    logger.addHandler(console)
131
128
    logger.setLevel(level)
132
129
 
133
130
 
134
 
class PGPError(Exception):
135
 
    """Exception if encryption/decryption fails"""
 
131
class CryptoError(Exception):
136
132
    pass
137
133
 
138
134
 
139
 
class PGPEngine(object):
 
135
class Crypto(object):
140
136
    """A simple class for OpenPGP symmetric encryption & decryption"""
141
137
    def __init__(self):
142
138
        self.gnupg = GnuPGInterface.GnuPG()
145
141
        self.gnupg.options.meta_interactive = False
146
142
        self.gnupg.options.homedir = self.tempdir
147
143
        self.gnupg.options.extra_args.extend(['--force-mdc',
148
 
                                              '--quiet',
149
 
                                              '--no-use-agent'])
 
144
                                              '--quiet'])
150
145
    
151
146
    def __enter__(self):
152
147
        return self
178
173
    
179
174
    def encrypt(self, data, password):
180
175
        self.gnupg.passphrase = self.password_encode(password)
181
 
        with open(os.devnull, "w") as devnull:
 
176
        with open(os.devnull) as devnull:
182
177
            try:
183
178
                proc = self.gnupg.run(['--symmetric'],
184
179
                                      create_fhs=['stdin', 'stdout'],
189
184
                    ciphertext = f.read()
190
185
                proc.wait()
191
186
            except IOError as e:
192
 
                raise PGPError(e)
 
187
                raise CryptoError(e)
193
188
        self.gnupg.passphrase = None
194
189
        return ciphertext
195
190
    
196
191
    def decrypt(self, data, password):
197
192
        self.gnupg.passphrase = self.password_encode(password)
198
 
        with open(os.devnull, "w") as devnull:
 
193
        with open(os.devnull) as devnull:
199
194
            try:
200
195
                proc = self.gnupg.run(['--decrypt'],
201
196
                                      create_fhs=['stdin', 'stdout'],
202
197
                                      attach_fhs={'stderr': devnull})
203
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
198
                with contextlib.closing(proc.handles['stdin'] ) as f:
204
199
                    f.write(data)
205
200
                with contextlib.closing(proc.handles['stdout']) as f:
206
201
                    decrypted_plaintext = f.read()
207
202
                proc.wait()
208
203
            except IOError as e:
209
 
                raise PGPError(e)
 
204
                raise CryptoError(e)
210
205
        self.gnupg.passphrase = None
211
206
        return decrypted_plaintext
212
207
 
213
208
 
 
209
 
214
210
class AvahiError(Exception):
215
211
    def __init__(self, value, *args, **kwargs):
216
212
        self.value = value
245
241
    server: D-Bus Server
246
242
    bus: dbus.SystemBus()
247
243
    """
248
 
    
249
244
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
250
245
                 servicetype = None, port = None, TXT = None,
251
246
                 domain = "", host = "", max_renames = 32768,
264
259
        self.server = None
265
260
        self.bus = bus
266
261
        self.entry_group_state_changed_match = None
267
 
    
268
262
    def rename(self):
269
263
        """Derived from the Avahi example code"""
270
264
        if self.rename_count >= self.max_renames:
280
274
        try:
281
275
            self.add()
282
276
        except dbus.exceptions.DBusException as error:
283
 
            logger.critical("D-Bus Exception", exc_info=error)
 
277
            logger.critical("DBusException: %s", error)
284
278
            self.cleanup()
285
279
            os._exit(1)
286
280
        self.rename_count += 1
287
 
    
288
281
    def remove(self):
289
282
        """Derived from the Avahi example code"""
290
283
        if self.entry_group_state_changed_match is not None:
292
285
            self.entry_group_state_changed_match = None
293
286
        if self.group is not None:
294
287
            self.group.Reset()
295
 
    
296
288
    def add(self):
297
289
        """Derived from the Avahi example code"""
298
290
        self.remove()
315
307
            dbus.UInt16(self.port),
316
308
            avahi.string_array_to_txt_array(self.TXT))
317
309
        self.group.Commit()
318
 
    
319
310
    def entry_group_state_changed(self, state, error):
320
311
        """Derived from the Avahi example code"""
321
312
        logger.debug("Avahi entry group state change: %i", state)
328
319
        elif state == avahi.ENTRY_GROUP_FAILURE:
329
320
            logger.critical("Avahi: Error in group state changed %s",
330
321
                            unicode(error))
331
 
            raise AvahiGroupError("State changed: {0!s}"
332
 
                                  .format(error))
333
 
    
 
322
            raise AvahiGroupError("State changed: %s"
 
323
                                  % unicode(error))
334
324
    def cleanup(self):
335
325
        """Derived from the Avahi example code"""
336
326
        if self.group is not None:
341
331
                pass
342
332
            self.group = None
343
333
        self.remove()
344
 
    
345
334
    def server_state_changed(self, state, error=None):
346
335
        """Derived from the Avahi example code"""
347
336
        logger.debug("Avahi server state change: %i", state)
366
355
                logger.debug("Unknown state: %r", state)
367
356
            else:
368
357
                logger.debug("Unknown state: %r: %r", state, error)
369
 
    
370
358
    def activate(self):
371
359
        """Derived from the Avahi example code"""
372
360
        if self.server is None:
379
367
                                 self.server_state_changed)
380
368
        self.server_state_changed(self.server.GetState())
381
369
 
382
 
 
383
370
class AvahiServiceToSyslog(AvahiService):
384
371
    def rename(self):
385
372
        """Add the new name to the syslog messages"""
386
373
        ret = AvahiService.rename(self)
387
374
        syslogger.setFormatter(logging.Formatter
388
 
                               ('Mandos ({0}) [%(process)d]:'
389
 
                                ' %(levelname)s: %(message)s'
390
 
                                .format(self.name)))
 
375
                               ('Mandos (%s) [%%(process)d]:'
 
376
                                ' %%(levelname)s: %%(message)s'
 
377
                                % self.name))
391
378
        return ret
392
379
 
393
 
 
394
 
def timedelta_to_milliseconds(td):
 
380
def _timedelta_to_milliseconds(td):
395
381
    "Convert a datetime.timedelta() to milliseconds"
396
382
    return ((td.days * 24 * 60 * 60 * 1000)
397
383
            + (td.seconds * 1000)
398
384
            + (td.microseconds // 1000))
399
 
 
400
 
 
 
385
        
401
386
class Client(object):
402
387
    """A representation of a client host served by this server.
403
388
    
404
389
    Attributes:
405
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
390
    _approved:   bool(); 'None' if not yet approved/disapproved
406
391
    approval_delay: datetime.timedelta(); Time to wait for approval
407
392
    approval_duration: datetime.timedelta(); Duration of one approval
408
393
    checker:    subprocess.Popen(); a running checker process used
426
411
    interval:   datetime.timedelta(); How often to start a new checker
427
412
    last_approval_request: datetime.datetime(); (UTC) or None
428
413
    last_checked_ok: datetime.datetime(); (UTC) or None
 
414
 
429
415
    last_checker_status: integer between 0 and 255 reflecting exit
430
416
                         status of last checker. -1 reflects crashed
431
 
                         checker, -2 means no checker completed yet.
 
417
                         checker, or None.
432
418
    last_enabled: datetime.datetime(); (UTC) or None
433
419
    name:       string; from the config file, used in log messages and
434
420
                        D-Bus identifiers
435
421
    secret:     bytestring; sent verbatim (over TLS) to client
436
422
    timeout:    datetime.timedelta(); How long from last_checked_ok
437
423
                                      until this client is disabled
438
 
    extended_timeout:   extra long timeout when secret has been sent
 
424
    extended_timeout:   extra long timeout when password has been sent
439
425
    runtime_expansions: Allowed attributes for runtime expansion.
440
426
    expires:    datetime.datetime(); time (UTC) when a client will be
441
427
                disabled, or None
445
431
                          "created", "enabled", "fingerprint",
446
432
                          "host", "interval", "last_checked_ok",
447
433
                          "last_enabled", "name", "timeout")
448
 
    client_defaults = { "timeout": "5m",
449
 
                        "extended_timeout": "15m",
450
 
                        "interval": "2m",
451
 
                        "checker": "fping -q -- %%(host)s",
452
 
                        "host": "",
453
 
                        "approval_delay": "0s",
454
 
                        "approval_duration": "1s",
455
 
                        "approved_by_default": "True",
456
 
                        "enabled": "True",
457
 
                        }
458
434
    
459
435
    def timeout_milliseconds(self):
460
436
        "Return the 'timeout' attribute in milliseconds"
461
 
        return timedelta_to_milliseconds(self.timeout)
 
437
        return _timedelta_to_milliseconds(self.timeout)
462
438
    
463
439
    def extended_timeout_milliseconds(self):
464
440
        "Return the 'extended_timeout' attribute in milliseconds"
465
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
441
        return _timedelta_to_milliseconds(self.extended_timeout)
466
442
    
467
443
    def interval_milliseconds(self):
468
444
        "Return the 'interval' attribute in milliseconds"
469
 
        return timedelta_to_milliseconds(self.interval)
 
445
        return _timedelta_to_milliseconds(self.interval)
470
446
    
471
447
    def approval_delay_milliseconds(self):
472
 
        return timedelta_to_milliseconds(self.approval_delay)
473
 
    
474
 
    @staticmethod
475
 
    def config_parser(config):
476
 
        """Construct a new dict of client settings of this form:
477
 
        { client_name: {setting_name: value, ...}, ...}
478
 
        with exceptions for any special settings as defined above.
479
 
        NOTE: Must be a pure function. Must return the same result
480
 
        value given the same arguments.
481
 
        """
482
 
        settings = {}
483
 
        for client_name in config.sections():
484
 
            section = dict(config.items(client_name))
485
 
            client = settings[client_name] = {}
486
 
            
487
 
            client["host"] = section["host"]
488
 
            # Reformat values from string types to Python types
489
 
            client["approved_by_default"] = config.getboolean(
490
 
                client_name, "approved_by_default")
491
 
            client["enabled"] = config.getboolean(client_name,
492
 
                                                  "enabled")
493
 
            
494
 
            client["fingerprint"] = (section["fingerprint"].upper()
495
 
                                     .replace(" ", ""))
496
 
            if "secret" in section:
497
 
                client["secret"] = section["secret"].decode("base64")
498
 
            elif "secfile" in section:
499
 
                with open(os.path.expanduser(os.path.expandvars
500
 
                                             (section["secfile"])),
501
 
                          "rb") as secfile:
502
 
                    client["secret"] = secfile.read()
503
 
            else:
504
 
                raise TypeError("No secret or secfile for section {0}"
505
 
                                .format(section))
506
 
            client["timeout"] = string_to_delta(section["timeout"])
507
 
            client["extended_timeout"] = string_to_delta(
508
 
                section["extended_timeout"])
509
 
            client["interval"] = string_to_delta(section["interval"])
510
 
            client["approval_delay"] = string_to_delta(
511
 
                section["approval_delay"])
512
 
            client["approval_duration"] = string_to_delta(
513
 
                section["approval_duration"])
514
 
            client["checker_command"] = section["checker"]
515
 
            client["last_approval_request"] = None
516
 
            client["last_checked_ok"] = None
517
 
            client["last_checker_status"] = -2
518
 
        
519
 
        return settings
520
 
    
521
 
    def __init__(self, settings, name = None):
 
448
        return _timedelta_to_milliseconds(self.approval_delay)
 
449
    
 
450
    def __init__(self, name = None, config=None):
 
451
        """Note: the 'checker' key in 'config' sets the
 
452
        'checker_command' attribute and *not* the 'checker'
 
453
        attribute."""
522
454
        self.name = name
523
 
        # adding all client settings
524
 
        for setting, value in settings.iteritems():
525
 
            setattr(self, setting, value)
526
 
        
527
 
        if self.enabled:
528
 
            if not hasattr(self, "last_enabled"):
529
 
                self.last_enabled = datetime.datetime.utcnow()
530
 
            if not hasattr(self, "expires"):
531
 
                self.expires = (datetime.datetime.utcnow()
532
 
                                + self.timeout)
533
 
        else:
534
 
            self.last_enabled = None
535
 
            self.expires = None
536
 
        
 
455
        if config is None:
 
456
            config = {}
537
457
        logger.debug("Creating client %r", self.name)
538
458
        # Uppercase and remove spaces from fingerprint for later
539
459
        # comparison purposes with return value from the fingerprint()
540
460
        # function
 
461
        self.fingerprint = (config["fingerprint"].upper()
 
462
                            .replace(" ", ""))
541
463
        logger.debug("  Fingerprint: %s", self.fingerprint)
542
 
        self.created = settings.get("created",
543
 
                                    datetime.datetime.utcnow())
544
 
        
545
 
        # attributes specific for this server instance
 
464
        if "secret" in config:
 
465
            self.secret = config["secret"].decode("base64")
 
466
        elif "secfile" in config:
 
467
            with open(os.path.expanduser(os.path.expandvars
 
468
                                         (config["secfile"])),
 
469
                      "rb") as secfile:
 
470
                self.secret = secfile.read()
 
471
        else:
 
472
            raise TypeError("No secret or secfile for client %s"
 
473
                            % self.name)
 
474
        self.host = config.get("host", "")
 
475
        self.created = datetime.datetime.utcnow()
 
476
        self.enabled = config.get("enabled", True)
 
477
        self.last_approval_request = None
 
478
        if self.enabled:
 
479
            self.last_enabled = datetime.datetime.utcnow()
 
480
        else:
 
481
            self.last_enabled = None
 
482
        self.last_checked_ok = None
 
483
        self.last_checker_status = None
 
484
        self.timeout = string_to_delta(config["timeout"])
 
485
        self.extended_timeout = string_to_delta(config
 
486
                                                ["extended_timeout"])
 
487
        self.interval = string_to_delta(config["interval"])
546
488
        self.checker = None
547
489
        self.checker_initiator_tag = None
548
490
        self.disable_initiator_tag = None
 
491
        if self.enabled:
 
492
            self.expires = datetime.datetime.utcnow() + self.timeout
 
493
        else:
 
494
            self.expires = None
549
495
        self.checker_callback_tag = None
 
496
        self.checker_command = config["checker"]
550
497
        self.current_checker_command = None
551
 
        self.approved = None
 
498
        self._approved = None
 
499
        self.approved_by_default = config.get("approved_by_default",
 
500
                                              True)
552
501
        self.approvals_pending = 0
 
502
        self.approval_delay = string_to_delta(
 
503
            config["approval_delay"])
 
504
        self.approval_duration = string_to_delta(
 
505
            config["approval_duration"])
553
506
        self.changedstate = (multiprocessing_manager
554
507
                             .Condition(multiprocessing_manager
555
508
                                        .Lock()))
575
528
        if getattr(self, "enabled", False):
576
529
            # Already enabled
577
530
            return
 
531
        self.send_changedstate()
578
532
        self.expires = datetime.datetime.utcnow() + self.timeout
579
533
        self.enabled = True
580
534
        self.last_enabled = datetime.datetime.utcnow()
581
535
        self.init_checker()
582
 
        self.send_changedstate()
583
536
    
584
537
    def disable(self, quiet=True):
585
538
        """Disable this client."""
586
539
        if not getattr(self, "enabled", False):
587
540
            return False
588
541
        if not quiet:
 
542
            self.send_changedstate()
 
543
        if not quiet:
589
544
            logger.info("Disabling client %s", self.name)
590
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
545
        if getattr(self, "disable_initiator_tag", False):
591
546
            gobject.source_remove(self.disable_initiator_tag)
592
547
            self.disable_initiator_tag = None
593
548
        self.expires = None
594
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
549
        if getattr(self, "checker_initiator_tag", False):
595
550
            gobject.source_remove(self.checker_initiator_tag)
596
551
            self.checker_initiator_tag = None
597
552
        self.stop_checker()
598
553
        self.enabled = False
599
 
        if not quiet:
600
 
            self.send_changedstate()
601
554
        # Do not run this again if called by a gobject.timeout_add
602
555
        return False
603
556
    
607
560
    def init_checker(self):
608
561
        # Schedule a new checker to be started an 'interval' from now,
609
562
        # and every interval from then on.
610
 
        if self.checker_initiator_tag is not None:
611
 
            gobject.source_remove(self.checker_initiator_tag)
612
563
        self.checker_initiator_tag = (gobject.timeout_add
613
564
                                      (self.interval_milliseconds(),
614
565
                                       self.start_checker))
615
566
        # Schedule a disable() when 'timeout' has passed
616
 
        if self.disable_initiator_tag is not None:
617
 
            gobject.source_remove(self.disable_initiator_tag)
618
567
        self.disable_initiator_tag = (gobject.timeout_add
619
568
                                   (self.timeout_milliseconds(),
620
569
                                    self.disable))
626
575
        self.checker_callback_tag = None
627
576
        self.checker = None
628
577
        if os.WIFEXITED(condition):
629
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
578
            self.last_checker_status =  os.WEXITSTATUS(condition)
630
579
            if self.last_checker_status == 0:
631
580
                logger.info("Checker for %(name)s succeeded",
632
581
                            vars(self))
639
588
            logger.warning("Checker for %(name)s crashed?",
640
589
                           vars(self))
641
590
    
642
 
    def checked_ok(self):
643
 
        """Assert that the client has been seen, alive and well."""
644
 
        self.last_checked_ok = datetime.datetime.utcnow()
645
 
        self.last_checker_status = 0
646
 
        self.bump_timeout()
647
 
    
648
 
    def bump_timeout(self, timeout=None):
649
 
        """Bump up the timeout for this client."""
 
591
    def checked_ok(self, timeout=None):
 
592
        """Bump up the timeout for this client.
 
593
        
 
594
        This should only be called when the client has been seen,
 
595
        alive and well.
 
596
        """
650
597
        if timeout is None:
651
598
            timeout = self.timeout
 
599
        self.last_checked_ok = datetime.datetime.utcnow()
652
600
        if self.disable_initiator_tag is not None:
653
601
            gobject.source_remove(self.disable_initiator_tag)
654
 
            self.disable_initiator_tag = None
655
602
        if getattr(self, "enabled", False):
656
603
            self.disable_initiator_tag = (gobject.timeout_add
657
 
                                          (timedelta_to_milliseconds
 
604
                                          (_timedelta_to_milliseconds
658
605
                                           (timeout), self.disable))
659
606
            self.expires = datetime.datetime.utcnow() + timeout
660
607
    
667
614
        If a checker already exists, leave it running and do
668
615
        nothing."""
669
616
        # The reason for not killing a running checker is that if we
670
 
        # did that, and if a checker (for some reason) started running
671
 
        # slowly and taking more than 'interval' time, then the client
672
 
        # would inevitably timeout, since no checker would get a
673
 
        # chance to run to completion.  If we instead leave running
 
617
        # did that, then if a checker (for some reason) started
 
618
        # running slowly and taking more than 'interval' time, the
 
619
        # client would inevitably timeout, since no checker would get
 
620
        # a chance to run to completion.  If we instead leave running
674
621
        # checkers alone, the checker would have to take more time
675
622
        # than 'timeout' for the client to be disabled, which is as it
676
623
        # should be.
706
653
                try:
707
654
                    command = self.checker_command % escaped_attrs
708
655
                except TypeError as error:
709
 
                    logger.error('Could not format string "%s"',
710
 
                                 self.checker_command, exc_info=error)
 
656
                    logger.error('Could not format string "%s":'
 
657
                                 ' %s', self.checker_command, error)
711
658
                    return True # Try again later
712
659
            self.current_checker_command = command
713
660
            try:
731
678
                    gobject.source_remove(self.checker_callback_tag)
732
679
                    self.checker_callback(pid, status, command)
733
680
            except OSError as error:
734
 
                logger.error("Failed to start subprocess",
735
 
                             exc_info=error)
 
681
                logger.error("Failed to start subprocess: %s",
 
682
                             error)
736
683
        # Re-run this periodically if run by gobject.timeout_add
737
684
        return True
738
685
    
745
692
            return
746
693
        logger.debug("Stopping checker for %(name)s", vars(self))
747
694
        try:
748
 
            self.checker.terminate()
 
695
            os.kill(self.checker.pid, signal.SIGTERM)
749
696
            #time.sleep(0.5)
750
697
            #if self.checker.poll() is None:
751
 
            #    self.checker.kill()
 
698
            #    os.kill(self.checker.pid, signal.SIGKILL)
752
699
        except OSError as error:
753
700
            if error.errno != errno.ESRCH: # No such process
754
701
                raise
771
718
    # "Set" method, so we fail early here:
772
719
    if byte_arrays and signature != "ay":
773
720
        raise ValueError("Byte arrays not supported for non-'ay'"
774
 
                         " signature {0!r}".format(signature))
 
721
                         " signature %r" % signature)
775
722
    def decorator(func):
776
723
        func._dbus_is_property = True
777
724
        func._dbus_interface = dbus_interface
785
732
    return decorator
786
733
 
787
734
 
788
 
def dbus_interface_annotations(dbus_interface):
789
 
    """Decorator for marking functions returning interface annotations
790
 
    
791
 
    Usage:
792
 
    
793
 
    @dbus_interface_annotations("org.example.Interface")
794
 
    def _foo(self):  # Function name does not matter
795
 
        return {"org.freedesktop.DBus.Deprecated": "true",
796
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
797
 
                    "false"}
798
 
    """
799
 
    def decorator(func):
800
 
        func._dbus_is_interface = True
801
 
        func._dbus_interface = dbus_interface
802
 
        func._dbus_name = dbus_interface
803
 
        return func
804
 
    return decorator
805
 
 
806
 
 
807
 
def dbus_annotations(annotations):
808
 
    """Decorator to annotate D-Bus methods, signals or properties
809
 
    Usage:
810
 
    
811
 
    @dbus_service_property("org.example.Interface", signature="b",
812
 
                           access="r")
813
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
814
 
                        "org.freedesktop.DBus.Property."
815
 
                        "EmitsChangedSignal": "false"})
816
 
    def Property_dbus_property(self):
817
 
        return dbus.Boolean(False)
818
 
    """
819
 
    def decorator(func):
820
 
        func._dbus_annotations = annotations
821
 
        return func
822
 
    return decorator
823
 
 
824
 
 
825
735
class DBusPropertyException(dbus.exceptions.DBusException):
826
736
    """A base class for D-Bus property-related exceptions
827
737
    """
850
760
    """
851
761
    
852
762
    @staticmethod
853
 
    def _is_dbus_thing(thing):
854
 
        """Returns a function testing if an attribute is a D-Bus thing
855
 
        
856
 
        If called like _is_dbus_thing("method") it returns a function
857
 
        suitable for use as predicate to inspect.getmembers().
858
 
        """
859
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
860
 
                                   False)
 
763
    def _is_dbus_property(obj):
 
764
        return getattr(obj, "_dbus_is_property", False)
861
765
    
862
 
    def _get_all_dbus_things(self, thing):
 
766
    def _get_all_dbus_properties(self):
863
767
        """Returns a generator of (name, attribute) pairs
864
768
        """
865
 
        return ((getattr(athing.__get__(self), "_dbus_name",
866
 
                         name),
867
 
                 athing.__get__(self))
 
769
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
868
770
                for cls in self.__class__.__mro__
869
 
                for name, athing in
870
 
                inspect.getmembers(cls,
871
 
                                   self._is_dbus_thing(thing)))
 
771
                for name, prop in
 
772
                inspect.getmembers(cls, self._is_dbus_property))
872
773
    
873
774
    def _get_dbus_property(self, interface_name, property_name):
874
775
        """Returns a bound method if one exists which is a D-Bus
876
777
        """
877
778
        for cls in  self.__class__.__mro__:
878
779
            for name, value in (inspect.getmembers
879
 
                                (cls,
880
 
                                 self._is_dbus_thing("property"))):
 
780
                                (cls, self._is_dbus_property)):
881
781
                if (value._dbus_name == property_name
882
782
                    and value._dbus_interface == interface_name):
883
783
                    return value.__get__(self)
912
812
            # signatures other than "ay".
913
813
            if prop._dbus_signature != "ay":
914
814
                raise ValueError
915
 
            value = dbus.ByteArray(b''.join(chr(byte)
916
 
                                            for byte in value))
 
815
            value = dbus.ByteArray(''.join(unichr(byte)
 
816
                                           for byte in value))
917
817
        prop(value)
918
818
    
919
819
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
925
825
        Note: Will not include properties with access="write".
926
826
        """
927
827
        properties = {}
928
 
        for name, prop in self._get_all_dbus_things("property"):
 
828
        for name, prop in self._get_all_dbus_properties():
929
829
            if (interface_name
930
830
                and interface_name != prop._dbus_interface):
931
831
                # Interface non-empty but did not match
946
846
                         path_keyword='object_path',
947
847
                         connection_keyword='connection')
948
848
    def Introspect(self, object_path, connection):
949
 
        """Overloading of standard D-Bus method.
950
 
        
951
 
        Inserts property tags and interface annotation tags.
 
849
        """Standard D-Bus method, overloaded to insert property tags.
952
850
        """
953
851
        xmlstring = dbus.service.Object.Introspect(self, object_path,
954
852
                                                   connection)
961
859
                e.setAttribute("access", prop._dbus_access)
962
860
                return e
963
861
            for if_tag in document.getElementsByTagName("interface"):
964
 
                # Add property tags
965
862
                for tag in (make_tag(document, name, prop)
966
863
                            for name, prop
967
 
                            in self._get_all_dbus_things("property")
 
864
                            in self._get_all_dbus_properties()
968
865
                            if prop._dbus_interface
969
866
                            == if_tag.getAttribute("name")):
970
867
                    if_tag.appendChild(tag)
971
 
                # Add annotation tags
972
 
                for typ in ("method", "signal", "property"):
973
 
                    for tag in if_tag.getElementsByTagName(typ):
974
 
                        annots = dict()
975
 
                        for name, prop in (self.
976
 
                                           _get_all_dbus_things(typ)):
977
 
                            if (name == tag.getAttribute("name")
978
 
                                and prop._dbus_interface
979
 
                                == if_tag.getAttribute("name")):
980
 
                                annots.update(getattr
981
 
                                              (prop,
982
 
                                               "_dbus_annotations",
983
 
                                               {}))
984
 
                        for name, value in annots.iteritems():
985
 
                            ann_tag = document.createElement(
986
 
                                "annotation")
987
 
                            ann_tag.setAttribute("name", name)
988
 
                            ann_tag.setAttribute("value", value)
989
 
                            tag.appendChild(ann_tag)
990
 
                # Add interface annotation tags
991
 
                for annotation, value in dict(
992
 
                    itertools.chain.from_iterable(
993
 
                        annotations().iteritems()
994
 
                        for name, annotations in
995
 
                        self._get_all_dbus_things("interface")
996
 
                        if name == if_tag.getAttribute("name")
997
 
                        )).iteritems():
998
 
                    ann_tag = document.createElement("annotation")
999
 
                    ann_tag.setAttribute("name", annotation)
1000
 
                    ann_tag.setAttribute("value", value)
1001
 
                    if_tag.appendChild(ann_tag)
1002
868
                # Add the names to the return values for the
1003
869
                # "org.freedesktop.DBus.Properties" methods
1004
870
                if (if_tag.getAttribute("name")
1019
885
        except (AttributeError, xml.dom.DOMException,
1020
886
                xml.parsers.expat.ExpatError) as error:
1021
887
            logger.error("Failed to override Introspection method",
1022
 
                         exc_info=error)
 
888
                         error)
1023
889
        return xmlstring
1024
890
 
1025
891
 
1031
897
                       variant_level=variant_level)
1032
898
 
1033
899
 
1034
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1035
 
    """A class decorator; applied to a subclass of
1036
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1037
 
    interface names according to the "alt_interface_names" mapping.
1038
 
    Usage:
1039
 
    
1040
 
    @alternate_dbus_names({"org.example.Interface":
1041
 
                               "net.example.AlternateInterface"})
1042
 
    class SampleDBusObject(dbus.service.Object):
1043
 
        @dbus.service.method("org.example.Interface")
1044
 
        def SampleDBusMethod():
1045
 
            pass
1046
 
    
1047
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1048
 
    reachable via two interfaces: "org.example.Interface" and
1049
 
    "net.example.AlternateInterface", the latter of which will have
1050
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1051
 
    "true", unless "deprecate" is passed with a False value.
1052
 
    
1053
 
    This works for methods and signals, and also for D-Bus properties
1054
 
    (from DBusObjectWithProperties) and interfaces (from the
1055
 
    dbus_interface_annotations decorator).
 
900
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
901
                                  .__metaclass__):
 
902
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
903
    will add additional D-Bus attributes matching a certain pattern.
1056
904
    """
1057
 
    def wrapper(cls):
1058
 
        for orig_interface_name, alt_interface_name in (
1059
 
            alt_interface_names.iteritems()):
1060
 
            attr = {}
1061
 
            interface_names = set()
1062
 
            # Go though all attributes of the class
1063
 
            for attrname, attribute in inspect.getmembers(cls):
 
905
    def __new__(mcs, name, bases, attr):
 
906
        # Go through all the base classes which could have D-Bus
 
907
        # methods, signals, or properties in them
 
908
        for base in (b for b in bases
 
909
                     if issubclass(b, dbus.service.Object)):
 
910
            # Go though all attributes of the base class
 
911
            for attrname, attribute in inspect.getmembers(base):
1064
912
                # Ignore non-D-Bus attributes, and D-Bus attributes
1065
913
                # with the wrong interface name
1066
914
                if (not hasattr(attribute, "_dbus_interface")
1067
915
                    or not attribute._dbus_interface
1068
 
                    .startswith(orig_interface_name)):
 
916
                    .startswith("se.recompile.Mandos")):
1069
917
                    continue
1070
918
                # Create an alternate D-Bus interface name based on
1071
919
                # the current name
1072
920
                alt_interface = (attribute._dbus_interface
1073
 
                                 .replace(orig_interface_name,
1074
 
                                          alt_interface_name))
1075
 
                interface_names.add(alt_interface)
 
921
                                 .replace("se.recompile.Mandos",
 
922
                                          "se.bsnet.fukt.Mandos"))
1076
923
                # Is this a D-Bus signal?
1077
924
                if getattr(attribute, "_dbus_is_signal", False):
1078
925
                    # Extract the original non-method function by
1093
940
                                nonmethod_func.func_name,
1094
941
                                nonmethod_func.func_defaults,
1095
942
                                nonmethod_func.func_closure)))
1096
 
                    # Copy annotations, if any
1097
 
                    try:
1098
 
                        new_function._dbus_annotations = (
1099
 
                            dict(attribute._dbus_annotations))
1100
 
                    except AttributeError:
1101
 
                        pass
1102
943
                    # Define a creator of a function to call both the
1103
 
                    # original and alternate functions, so both the
1104
 
                    # original and alternate signals gets sent when
1105
 
                    # the function is called
 
944
                    # old and new functions, so both the old and new
 
945
                    # signals gets sent when the function is called
1106
946
                    def fixscope(func1, func2):
1107
947
                        """This function is a scope container to pass
1108
948
                        func1 and func2 to the "call_both" function
1115
955
                        return call_both
1116
956
                    # Create the "call_both" function and add it to
1117
957
                    # the class
1118
 
                    attr[attrname] = fixscope(attribute, new_function)
 
958
                    attr[attrname] = fixscope(attribute,
 
959
                                              new_function)
1119
960
                # Is this a D-Bus method?
1120
961
                elif getattr(attribute, "_dbus_is_method", False):
1121
962
                    # Create a new, but exactly alike, function
1132
973
                                        attribute.func_name,
1133
974
                                        attribute.func_defaults,
1134
975
                                        attribute.func_closure)))
1135
 
                    # Copy annotations, if any
1136
 
                    try:
1137
 
                        attr[attrname]._dbus_annotations = (
1138
 
                            dict(attribute._dbus_annotations))
1139
 
                    except AttributeError:
1140
 
                        pass
1141
976
                # Is this a D-Bus property?
1142
977
                elif getattr(attribute, "_dbus_is_property", False):
1143
978
                    # Create a new, but exactly alike, function
1157
992
                                        attribute.func_name,
1158
993
                                        attribute.func_defaults,
1159
994
                                        attribute.func_closure)))
1160
 
                    # Copy annotations, if any
1161
 
                    try:
1162
 
                        attr[attrname]._dbus_annotations = (
1163
 
                            dict(attribute._dbus_annotations))
1164
 
                    except AttributeError:
1165
 
                        pass
1166
 
                # Is this a D-Bus interface?
1167
 
                elif getattr(attribute, "_dbus_is_interface", False):
1168
 
                    # Create a new, but exactly alike, function
1169
 
                    # object.  Decorate it to be a new D-Bus interface
1170
 
                    # with the alternate D-Bus interface name.  Add it
1171
 
                    # to the class.
1172
 
                    attr[attrname] = (dbus_interface_annotations
1173
 
                                      (alt_interface)
1174
 
                                      (types.FunctionType
1175
 
                                       (attribute.func_code,
1176
 
                                        attribute.func_globals,
1177
 
                                        attribute.func_name,
1178
 
                                        attribute.func_defaults,
1179
 
                                        attribute.func_closure)))
1180
 
            if deprecate:
1181
 
                # Deprecate all alternate interfaces
1182
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1183
 
                for interface_name in interface_names:
1184
 
                    @dbus_interface_annotations(interface_name)
1185
 
                    def func(self):
1186
 
                        return { "org.freedesktop.DBus.Deprecated":
1187
 
                                     "true" }
1188
 
                    # Find an unused name
1189
 
                    for aname in (iname.format(i)
1190
 
                                  for i in itertools.count()):
1191
 
                        if aname not in attr:
1192
 
                            attr[aname] = func
1193
 
                            break
1194
 
            if interface_names:
1195
 
                # Replace the class with a new subclass of it with
1196
 
                # methods, signals, etc. as created above.
1197
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1198
 
                           (cls,), attr)
1199
 
        return cls
1200
 
    return wrapper
1201
 
 
1202
 
 
1203
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1204
 
                                "se.bsnet.fukt.Mandos"})
 
995
        return type.__new__(mcs, name, bases, attr)
 
996
 
 
997
 
1205
998
class ClientDBus(Client, DBusObjectWithProperties):
1206
999
    """A Client class using D-Bus
1207
1000
    
1218
1011
    def __init__(self, bus = None, *args, **kwargs):
1219
1012
        self.bus = bus
1220
1013
        Client.__init__(self, *args, **kwargs)
 
1014
        
 
1015
        self._approvals_pending = 0
1221
1016
        # Only now, when this client is initialized, can it show up on
1222
1017
        # the D-Bus
1223
1018
        client_object_name = unicode(self.name).translate(
1227
1022
                                 ("/clients/" + client_object_name))
1228
1023
        DBusObjectWithProperties.__init__(self, self.bus,
1229
1024
                                          self.dbus_object_path)
1230
 
    
 
1025
        
1231
1026
    def notifychangeproperty(transform_func,
1232
1027
                             dbus_name, type_func=lambda x: x,
1233
1028
                             variant_level=1):
1256
1051
        
1257
1052
        return property(lambda self: getattr(self, attrname), setter)
1258
1053
    
 
1054
    
1259
1055
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1260
1056
    approvals_pending = notifychangeproperty(dbus.Boolean,
1261
1057
                                             "ApprovalPending",
1268
1064
                                       checker is not None)
1269
1065
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1270
1066
                                           "LastCheckedOK")
1271
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1272
 
                                               "LastCheckerStatus")
1273
1067
    last_approval_request = notifychangeproperty(
1274
1068
        datetime_to_dbus, "LastApprovalRequest")
1275
1069
    approved_by_default = notifychangeproperty(dbus.Boolean,
1276
1070
                                               "ApprovedByDefault")
1277
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1071
    approval_delay = notifychangeproperty(dbus.UInt16,
1278
1072
                                          "ApprovalDelay",
1279
1073
                                          type_func =
1280
 
                                          timedelta_to_milliseconds)
 
1074
                                          _timedelta_to_milliseconds)
1281
1075
    approval_duration = notifychangeproperty(
1282
 
        dbus.UInt64, "ApprovalDuration",
1283
 
        type_func = timedelta_to_milliseconds)
 
1076
        dbus.UInt16, "ApprovalDuration",
 
1077
        type_func = _timedelta_to_milliseconds)
1284
1078
    host = notifychangeproperty(dbus.String, "Host")
1285
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1079
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1286
1080
                                   type_func =
1287
 
                                   timedelta_to_milliseconds)
 
1081
                                   _timedelta_to_milliseconds)
1288
1082
    extended_timeout = notifychangeproperty(
1289
 
        dbus.UInt64, "ExtendedTimeout",
1290
 
        type_func = timedelta_to_milliseconds)
1291
 
    interval = notifychangeproperty(dbus.UInt64,
 
1083
        dbus.UInt16, "ExtendedTimeout",
 
1084
        type_func = _timedelta_to_milliseconds)
 
1085
    interval = notifychangeproperty(dbus.UInt16,
1292
1086
                                    "Interval",
1293
1087
                                    type_func =
1294
 
                                    timedelta_to_milliseconds)
 
1088
                                    _timedelta_to_milliseconds)
1295
1089
    checker_command = notifychangeproperty(dbus.String, "Checker")
1296
1090
    
1297
1091
    del notifychangeproperty
1339
1133
        return r
1340
1134
    
1341
1135
    def _reset_approved(self):
1342
 
        self.approved = None
 
1136
        self._approved = None
1343
1137
        return False
1344
1138
    
1345
1139
    def approve(self, value=True):
1346
 
        self.approved = value
1347
 
        gobject.timeout_add(timedelta_to_milliseconds
 
1140
        self.send_changedstate()
 
1141
        self._approved = value
 
1142
        gobject.timeout_add(_timedelta_to_milliseconds
1348
1143
                            (self.approval_duration),
1349
1144
                            self._reset_approved)
1350
 
        self.send_changedstate()
 
1145
    
1351
1146
    
1352
1147
    ## D-Bus methods, signals & properties
1353
1148
    _interface = "se.recompile.Mandos.Client"
1354
1149
    
1355
 
    ## Interfaces
1356
 
    
1357
 
    @dbus_interface_annotations(_interface)
1358
 
    def _foo(self):
1359
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1360
 
                     "false"}
1361
 
    
1362
1150
    ## Signals
1363
1151
    
1364
1152
    # CheckerCompleted - signal
1400
1188
        "D-Bus signal"
1401
1189
        return self.need_approval()
1402
1190
    
 
1191
    # NeRwequest - signal
 
1192
    @dbus.service.signal(_interface, signature="s")
 
1193
    def NewRequest(self, ip):
 
1194
        """D-Bus signal
 
1195
        Is sent after a client request a password.
 
1196
        """
 
1197
        pass
 
1198
    
1403
1199
    ## Methods
1404
1200
    
1405
1201
    # Approve - method
1463
1259
                           access="readwrite")
1464
1260
    def ApprovalDuration_dbus_property(self, value=None):
1465
1261
        if value is None:       # get
1466
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1262
            return dbus.UInt64(_timedelta_to_milliseconds(
1467
1263
                    self.approval_duration))
1468
1264
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1469
1265
    
1483
1279
    def Host_dbus_property(self, value=None):
1484
1280
        if value is None:       # get
1485
1281
            return dbus.String(self.host)
1486
 
        self.host = unicode(value)
 
1282
        self.host = value
1487
1283
    
1488
1284
    # Created - property
1489
1285
    @dbus_service_property(_interface, signature="s", access="read")
1515
1311
            return
1516
1312
        return datetime_to_dbus(self.last_checked_ok)
1517
1313
    
1518
 
    # LastCheckerStatus - property
1519
 
    @dbus_service_property(_interface, signature="n",
1520
 
                           access="read")
1521
 
    def LastCheckerStatus_dbus_property(self):
1522
 
        return dbus.Int16(self.last_checker_status)
1523
 
    
1524
1314
    # Expires - property
1525
1315
    @dbus_service_property(_interface, signature="s", access="read")
1526
1316
    def Expires_dbus_property(self):
1537
1327
    def Timeout_dbus_property(self, value=None):
1538
1328
        if value is None:       # get
1539
1329
            return dbus.UInt64(self.timeout_milliseconds())
1540
 
        old_timeout = self.timeout
1541
1330
        self.timeout = datetime.timedelta(0, 0, 0, value)
1542
 
        # Reschedule disabling
1543
 
        if self.enabled:
1544
 
            now = datetime.datetime.utcnow()
1545
 
            self.expires += self.timeout - old_timeout
1546
 
            if self.expires <= now:
1547
 
                # The timeout has passed
1548
 
                self.disable()
1549
 
            else:
1550
 
                if (getattr(self, "disable_initiator_tag", None)
1551
 
                    is None):
1552
 
                    return
1553
 
                gobject.source_remove(self.disable_initiator_tag)
1554
 
                self.disable_initiator_tag = (
1555
 
                    gobject.timeout_add(
1556
 
                        timedelta_to_milliseconds(self.expires - now),
1557
 
                        self.disable))
 
1331
        if getattr(self, "disable_initiator_tag", None) is None:
 
1332
            return
 
1333
        # Reschedule timeout
 
1334
        gobject.source_remove(self.disable_initiator_tag)
 
1335
        self.disable_initiator_tag = None
 
1336
        self.expires = None
 
1337
        time_to_die = _timedelta_to_milliseconds((self
 
1338
                                                  .last_checked_ok
 
1339
                                                  + self.timeout)
 
1340
                                                 - datetime.datetime
 
1341
                                                 .utcnow())
 
1342
        if time_to_die <= 0:
 
1343
            # The timeout has passed
 
1344
            self.disable()
 
1345
        else:
 
1346
            self.expires = (datetime.datetime.utcnow()
 
1347
                            + datetime.timedelta(milliseconds =
 
1348
                                                 time_to_die))
 
1349
            self.disable_initiator_tag = (gobject.timeout_add
 
1350
                                          (time_to_die, self.disable))
1558
1351
    
1559
1352
    # ExtendedTimeout - property
1560
1353
    @dbus_service_property(_interface, signature="t",
1586
1379
    def Checker_dbus_property(self, value=None):
1587
1380
        if value is None:       # get
1588
1381
            return dbus.String(self.checker_command)
1589
 
        self.checker_command = unicode(value)
 
1382
        self.checker_command = value
1590
1383
    
1591
1384
    # CheckerRunning - property
1592
1385
    @dbus_service_property(_interface, signature="b",
1621
1414
            raise KeyError()
1622
1415
    
1623
1416
    def __getattribute__(self, name):
1624
 
        if name == '_pipe':
 
1417
        if(name == '_pipe'):
1625
1418
            return super(ProxyClient, self).__getattribute__(name)
1626
1419
        self._pipe.send(('getattr', name))
1627
1420
        data = self._pipe.recv()
1634
1427
            return func
1635
1428
    
1636
1429
    def __setattr__(self, name, value):
1637
 
        if name == '_pipe':
 
1430
        if(name == '_pipe'):
1638
1431
            return super(ProxyClient, self).__setattr__(name, value)
1639
1432
        self._pipe.send(('setattr', name, value))
1640
1433
 
1641
1434
 
 
1435
class ClientDBusTransitional(ClientDBus):
 
1436
    __metaclass__ = AlternateDBusNamesMetaclass
 
1437
 
 
1438
 
1642
1439
class ClientHandler(socketserver.BaseRequestHandler, object):
1643
1440
    """A class to handle client connections.
1644
1441
    
1705
1502
                    logger.warning("Bad certificate: %s", error)
1706
1503
                    return
1707
1504
                logger.debug("Fingerprint: %s", fpr)
 
1505
                if self.server.use_dbus:
 
1506
                    # Emit D-Bus signal
 
1507
                    client.NewRequest(str(self.client_address))
1708
1508
                
1709
1509
                try:
1710
1510
                    client = ProxyClient(child_pipe, fpr,
1726
1526
                            client.Rejected("Disabled")
1727
1527
                        return
1728
1528
                    
1729
 
                    if client.approved or not client.approval_delay:
 
1529
                    if client._approved or not client.approval_delay:
1730
1530
                        #We are approved or approval is disabled
1731
1531
                        break
1732
 
                    elif client.approved is None:
 
1532
                    elif client._approved is None:
1733
1533
                        logger.info("Client %s needs approval",
1734
1534
                                    client.name)
1735
1535
                        if self.server.use_dbus:
1748
1548
                    #wait until timeout or approved
1749
1549
                    time = datetime.datetime.now()
1750
1550
                    client.changedstate.acquire()
1751
 
                    client.changedstate.wait(
1752
 
                        float(timedelta_to_milliseconds(delay)
1753
 
                              / 1000))
 
1551
                    (client.changedstate.wait
 
1552
                     (float(client._timedelta_to_milliseconds(delay)
 
1553
                            / 1000)))
1754
1554
                    client.changedstate.release()
1755
1555
                    time2 = datetime.datetime.now()
1756
1556
                    if (time2 - time) >= delay:
1772
1572
                    try:
1773
1573
                        sent = session.send(client.secret[sent_size:])
1774
1574
                    except gnutls.errors.GNUTLSError as error:
1775
 
                        logger.warning("gnutls send failed",
1776
 
                                       exc_info=error)
 
1575
                        logger.warning("gnutls send failed")
1777
1576
                        return
1778
1577
                    logger.debug("Sent: %d, remaining: %d",
1779
1578
                                 sent, len(client.secret)
1782
1581
                
1783
1582
                logger.info("Sending secret to %s", client.name)
1784
1583
                # bump the timeout using extended_timeout
1785
 
                client.bump_timeout(client.extended_timeout)
 
1584
                client.checked_ok(client.extended_timeout)
1786
1585
                if self.server.use_dbus:
1787
1586
                    # Emit D-Bus signal
1788
1587
                    client.GotSecret()
1793
1592
                try:
1794
1593
                    session.bye()
1795
1594
                except gnutls.errors.GNUTLSError as error:
1796
 
                    logger.warning("GnuTLS bye failed",
1797
 
                                   exc_info=error)
 
1595
                    logger.warning("GnuTLS bye failed")
1798
1596
    
1799
1597
    @staticmethod
1800
1598
    def peer_certificate(session):
1865
1663
    def sub_process_main(self, request, address):
1866
1664
        try:
1867
1665
            self.finish_request(request, address)
1868
 
        except Exception:
 
1666
        except:
1869
1667
            self.handle_error(request, address)
1870
1668
        self.close_request(request)
1871
1669
    
1872
1670
    def process_request(self, request, address):
1873
1671
        """Start a new process to process the request."""
1874
1672
        proc = multiprocessing.Process(target = self.sub_process_main,
1875
 
                                       args = (request, address))
 
1673
                                       args = (request,
 
1674
                                               address))
1876
1675
        proc.start()
1877
1676
        return proc
1878
1677
 
1928
1727
                                           str(self.interface
1929
1728
                                               + '\0'))
1930
1729
                except socket.error as error:
1931
 
                    if error.errno == errno.EPERM:
 
1730
                    if error[0] == errno.EPERM:
1932
1731
                        logger.error("No permission to"
1933
1732
                                     " bind to interface %s",
1934
1733
                                     self.interface)
1935
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1734
                    elif error[0] == errno.ENOPROTOOPT:
1936
1735
                        logger.error("SO_BINDTODEVICE not available;"
1937
1736
                                     " cannot bind to interface %s",
1938
1737
                                     self.interface)
1939
 
                    elif error.errno == errno.ENODEV:
1940
 
                        logger.error("Interface %s does not"
1941
 
                                     " exist, cannot bind",
1942
 
                                     self.interface)
1943
1738
                    else:
1944
1739
                        raise
1945
1740
        # Only bind(2) the socket if we really need to.
2004
1799
    
2005
1800
    def handle_ipc(self, source, condition, parent_pipe=None,
2006
1801
                   proc = None, client_object=None):
 
1802
        condition_names = {
 
1803
            gobject.IO_IN: "IN",   # There is data to read.
 
1804
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1805
                                    # blocking).
 
1806
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1807
            gobject.IO_ERR: "ERR", # Error condition.
 
1808
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1809
                                    # broken, usually for pipes and
 
1810
                                    # sockets).
 
1811
            }
 
1812
        conditions_string = ' | '.join(name
 
1813
                                       for cond, name in
 
1814
                                       condition_names.iteritems()
 
1815
                                       if cond & condition)
2007
1816
        # error, or the other end of multiprocessing.Pipe has closed
2008
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1817
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2009
1818
            # Wait for other process to exit
2010
1819
            proc.join()
2011
1820
            return False
2101
1910
            elif suffix == "w":
2102
1911
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2103
1912
            else:
2104
 
                raise ValueError("Unknown suffix {0!r}"
2105
 
                                 .format(suffix))
 
1913
                raise ValueError("Unknown suffix %r" % suffix)
2106
1914
        except (ValueError, IndexError) as e:
2107
1915
            raise ValueError(*(e.args))
2108
1916
        timevalue += delta
2122
1930
        sys.exit()
2123
1931
    if not noclose:
2124
1932
        # Close all standard open file descriptors
2125
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1933
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2126
1934
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2127
1935
            raise OSError(errno.ENODEV,
2128
 
                          "{0} not a character device"
2129
 
                          .format(os.devnull))
 
1936
                          "%s not a character device"
 
1937
                          % os.path.devnull)
2130
1938
        os.dup2(null, sys.stdin.fileno())
2131
1939
        os.dup2(null, sys.stdout.fileno())
2132
1940
        os.dup2(null, sys.stderr.fileno())
2141
1949
    
2142
1950
    parser = argparse.ArgumentParser()
2143
1951
    parser.add_argument("-v", "--version", action="version",
2144
 
                        version = "%(prog)s {0}".format(version),
 
1952
                        version = "%%(prog)s %s" % version,
2145
1953
                        help="show version number and exit")
2146
1954
    parser.add_argument("-i", "--interface", metavar="IF",
2147
1955
                        help="Bind to interface IF")
2240
2048
                                     stored_state_file)
2241
2049
    
2242
2050
    if debug:
2243
 
        initlogger(debug, logging.DEBUG)
 
2051
        initlogger(logging.DEBUG)
2244
2052
    else:
2245
2053
        if not debuglevel:
2246
 
            initlogger(debug)
 
2054
            initlogger()
2247
2055
        else:
2248
2056
            level = getattr(logging, debuglevel.upper())
2249
 
            initlogger(debug, level)
 
2057
            initlogger(level)
2250
2058
    
2251
2059
    if server_settings["servicename"] != "Mandos":
2252
2060
        syslogger.setFormatter(logging.Formatter
2253
 
                               ('Mandos ({0}) [%(process)d]:'
2254
 
                                ' %(levelname)s: %(message)s'
2255
 
                                .format(server_settings
2256
 
                                        ["servicename"])))
 
2061
                               ('Mandos (%s) [%%(process)d]:'
 
2062
                                ' %%(levelname)s: %%(message)s'
 
2063
                                % server_settings["servicename"]))
2257
2064
    
2258
2065
    # Parse config file with clients
2259
 
    client_config = configparser.SafeConfigParser(Client
2260
 
                                                  .client_defaults)
 
2066
    client_defaults = { "timeout": "5m",
 
2067
                        "extended_timeout": "15m",
 
2068
                        "interval": "2m",
 
2069
                        "checker": "fping -q -- %%(host)s",
 
2070
                        "host": "",
 
2071
                        "approval_delay": "0s",
 
2072
                        "approval_duration": "1s",
 
2073
                        }
 
2074
    client_config = configparser.SafeConfigParser(client_defaults)
2261
2075
    client_config.read(os.path.join(server_settings["configdir"],
2262
2076
                                    "clients.conf"))
2263
2077
    
2277
2091
        pidfilename = "/var/run/mandos.pid"
2278
2092
        try:
2279
2093
            pidfile = open(pidfilename, "w")
2280
 
        except IOError as e:
2281
 
            logger.error("Could not open file %r", pidfilename,
2282
 
                         exc_info=e)
 
2094
        except IOError:
 
2095
            logger.error("Could not open file %r", pidfilename)
2283
2096
    
2284
 
    for name in ("_mandos", "mandos", "nobody"):
 
2097
    try:
 
2098
        uid = pwd.getpwnam("_mandos").pw_uid
 
2099
        gid = pwd.getpwnam("_mandos").pw_gid
 
2100
    except KeyError:
2285
2101
        try:
2286
 
            uid = pwd.getpwnam(name).pw_uid
2287
 
            gid = pwd.getpwnam(name).pw_gid
2288
 
            break
 
2102
            uid = pwd.getpwnam("mandos").pw_uid
 
2103
            gid = pwd.getpwnam("mandos").pw_gid
2289
2104
        except KeyError:
2290
 
            continue
2291
 
    else:
2292
 
        uid = 65534
2293
 
        gid = 65534
 
2105
            try:
 
2106
                uid = pwd.getpwnam("nobody").pw_uid
 
2107
                gid = pwd.getpwnam("nobody").pw_gid
 
2108
            except KeyError:
 
2109
                uid = 65534
 
2110
                gid = 65534
2294
2111
    try:
2295
2112
        os.setgid(gid)
2296
2113
        os.setuid(uid)
2313
2130
         .gnutls_global_set_log_function(debug_gnutls))
2314
2131
        
2315
2132
        # Redirect stdin so all checkers get /dev/null
2316
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2133
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2317
2134
        os.dup2(null, sys.stdin.fileno())
2318
2135
        if null > 2:
2319
2136
            os.close(null)
 
2137
    else:
 
2138
        # No console logging
 
2139
        logger.removeHandler(console)
2320
2140
    
2321
2141
    # Need to fork before connecting to D-Bus
2322
2142
    if not debug:
2323
2143
        # Close all input and output, do double fork, etc.
2324
2144
        daemon()
2325
2145
    
2326
 
    gobject.threads_init()
2327
 
    
2328
2146
    global main_loop
2329
2147
    # From the Avahi example code
2330
 
    DBusGMainLoop(set_as_default=True)
 
2148
    DBusGMainLoop(set_as_default=True )
2331
2149
    main_loop = gobject.MainLoop()
2332
2150
    bus = dbus.SystemBus()
2333
2151
    # End of Avahi example code
2339
2157
                            ("se.bsnet.fukt.Mandos", bus,
2340
2158
                             do_not_queue=True))
2341
2159
        except dbus.exceptions.NameExistsException as e:
2342
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2160
            logger.error(unicode(e) + ", disabling D-Bus")
2343
2161
            use_dbus = False
2344
2162
            server_settings["use_dbus"] = False
2345
2163
            tcp_server.use_dbus = False
2357
2175
    
2358
2176
    client_class = Client
2359
2177
    if use_dbus:
2360
 
        client_class = functools.partial(ClientDBus, bus = bus)
2361
 
    
2362
 
    client_settings = Client.config_parser(client_config)
 
2178
        client_class = functools.partial(ClientDBusTransitional,
 
2179
                                         bus = bus)
 
2180
    
 
2181
    special_settings = {
 
2182
        # Some settings need to be accessd by special methods;
 
2183
        # booleans need .getboolean(), etc.  Here is a list of them:
 
2184
        "approved_by_default":
 
2185
            lambda section:
 
2186
            client_config.getboolean(section, "approved_by_default"),
 
2187
        "enabled":
 
2188
            lambda section:
 
2189
            client_config.getboolean(section, "enabled"),
 
2190
        }
 
2191
    # Construct a new dict of client settings of this form:
 
2192
    # { client_name: {setting_name: value, ...}, ...}
 
2193
    # with exceptions for any special settings as defined above
 
2194
    client_settings = dict((clientname,
 
2195
                           dict((setting,
 
2196
                                 (value
 
2197
                                  if setting not in special_settings
 
2198
                                  else special_settings[setting]
 
2199
                                  (clientname)))
 
2200
                                for setting, value in
 
2201
                                client_config.items(clientname)))
 
2202
                          for clientname in client_config.sections())
 
2203
    
2363
2204
    old_client_settings = {}
2364
 
    clients_data = {}
 
2205
    clients_data = []
2365
2206
    
2366
2207
    # Get client data and settings from last running state.
2367
2208
    if server_settings["restore"]:
2371
2212
                                                     (stored_state))
2372
2213
            os.remove(stored_state_path)
2373
2214
        except IOError as e:
2374
 
            if e.errno == errno.ENOENT:
2375
 
                logger.warning("Could not load persistent state: {0}"
2376
 
                                .format(os.strerror(e.errno)))
2377
 
            else:
2378
 
                logger.critical("Could not load persistent state:",
2379
 
                                exc_info=e)
 
2215
            logger.warning("Could not load persistent state: {0}"
 
2216
                           .format(e))
 
2217
            if e.errno != errno.ENOENT:
2380
2218
                raise
2381
 
        except EOFError as e:
2382
 
            logger.warning("Could not load persistent state: "
2383
 
                           "EOFError:", exc_info=e)
2384
2219
    
2385
 
    with PGPEngine() as pgp:
2386
 
        for client_name, client in clients_data.iteritems():
 
2220
    with Crypto() as crypt:
 
2221
        for client in clients_data:
 
2222
            client_name = client["name"]
 
2223
            
2387
2224
            # Decide which value to use after restoring saved state.
2388
2225
            # We have three different values: Old config file,
2389
2226
            # new config file, and saved state.
2397
2234
                    if (name != "secret" and
2398
2235
                        value != old_client_settings[client_name]
2399
2236
                        [name]):
2400
 
                        client[name] = value
 
2237
                        setattr(client, name, value)
2401
2238
                except KeyError:
2402
2239
                    pass
2403
2240
            
2404
2241
            # Clients who has passed its expire date can still be
2405
 
            # enabled if its last checker was successful.  Clients
2406
 
            # whose checker succeeded before we stored its state is
2407
 
            # assumed to have successfully run all checkers during
2408
 
            # downtime.
2409
 
            if client["enabled"]:
2410
 
                if datetime.datetime.utcnow() >= client["expires"]:
2411
 
                    if not client["last_checked_ok"]:
2412
 
                        logger.warning(
2413
 
                            "disabling client {0} - Client never "
2414
 
                            "performed a successful checker"
2415
 
                            .format(client_name))
2416
 
                        client["enabled"] = False
2417
 
                    elif client["last_checker_status"] != 0:
2418
 
                        logger.warning(
2419
 
                            "disabling client {0} - Client "
2420
 
                            "last checker failed with error code {1}"
2421
 
                            .format(client_name,
2422
 
                                    client["last_checker_status"]))
 
2242
            # enabled if its last checker was sucessful.  Clients
 
2243
            # whose checker failed before we stored its state is
 
2244
            # assumed to have failed all checkers during downtime.
 
2245
            if client["enabled"] and client["last_checked_ok"]:
 
2246
                if ((datetime.datetime.utcnow()
 
2247
                     - client["last_checked_ok"])
 
2248
                    > client["interval"]):
 
2249
                    if client["last_checker_status"] != 0:
2423
2250
                        client["enabled"] = False
2424
2251
                    else:
2425
2252
                        client["expires"] = (datetime.datetime
2426
2253
                                             .utcnow()
2427
2254
                                             + client["timeout"])
2428
 
                        logger.debug("Last checker succeeded,"
2429
 
                                     " keeping {0} enabled"
2430
 
                                     .format(client_name))
 
2255
            
 
2256
            client["changedstate"] = (multiprocessing_manager
 
2257
                                      .Condition
 
2258
                                      (multiprocessing_manager
 
2259
                                       .Lock()))
 
2260
            if use_dbus:
 
2261
                new_client = (ClientDBusTransitional.__new__
 
2262
                              (ClientDBusTransitional))
 
2263
                tcp_server.clients[client_name] = new_client
 
2264
                new_client.bus = bus
 
2265
                for name, value in client.iteritems():
 
2266
                    setattr(new_client, name, value)
 
2267
                client_object_name = unicode(client_name).translate(
 
2268
                    {ord("."): ord("_"),
 
2269
                     ord("-"): ord("_")})
 
2270
                new_client.dbus_object_path = (dbus.ObjectPath
 
2271
                                               ("/clients/"
 
2272
                                                + client_object_name))
 
2273
                DBusObjectWithProperties.__init__(new_client,
 
2274
                                                  new_client.bus,
 
2275
                                                  new_client
 
2276
                                                  .dbus_object_path)
 
2277
            else:
 
2278
                tcp_server.clients[client_name] = (Client.__new__
 
2279
                                                   (Client))
 
2280
                for name, value in client.iteritems():
 
2281
                    setattr(tcp_server.clients[client_name],
 
2282
                            name, value)
 
2283
            
2431
2284
            try:
2432
 
                client["secret"] = (
2433
 
                    pgp.decrypt(client["encrypted_secret"],
2434
 
                                client_settings[client_name]
2435
 
                                ["secret"]))
2436
 
            except PGPError:
 
2285
                tcp_server.clients[client_name].secret = (
 
2286
                    crypt.decrypt(tcp_server.clients[client_name]
 
2287
                                  .encrypted_secret,
 
2288
                                  client_settings[client_name]
 
2289
                                  ["secret"]))
 
2290
            except CryptoError:
2437
2291
                # If decryption fails, we use secret from new settings
2438
 
                logger.debug("Failed to decrypt {0} old secret"
2439
 
                             .format(client_name))
2440
 
                client["secret"] = (
 
2292
                tcp_server.clients[client_name].secret = (
2441
2293
                    client_settings[client_name]["secret"])
2442
2294
    
2443
 
    # Add/remove clients based on new changes made to config
2444
 
    for client_name in (set(old_client_settings)
2445
 
                        - set(client_settings)):
2446
 
        del clients_data[client_name]
2447
 
    for client_name in (set(client_settings)
2448
 
                        - set(old_client_settings)):
2449
 
        clients_data[client_name] = client_settings[client_name]
2450
 
    
2451
 
    # Create all client objects
2452
 
    for client_name, client in clients_data.iteritems():
2453
 
        tcp_server.clients[client_name] = client_class(
2454
 
            name = client_name, settings = client)
 
2295
    # Create/remove clients based on new changes made to config
 
2296
    for clientname in set(old_client_settings) - set(client_settings):
 
2297
        del tcp_server.clients[clientname]
 
2298
    for clientname in set(client_settings) - set(old_client_settings):
 
2299
        tcp_server.clients[clientname] = (client_class(name
 
2300
                                                       = clientname,
 
2301
                                                       config =
 
2302
                                                       client_settings
 
2303
                                                       [clientname]))
2455
2304
    
2456
2305
    if not tcp_server.clients:
2457
2306
        logger.warning("No clients defined")
2458
 
    
 
2307
        
2459
2308
    if not debug:
2460
2309
        try:
2461
2310
            with pidfile:
2469
2318
            # "pidfile" was never created
2470
2319
            pass
2471
2320
        del pidfilename
 
2321
        
2472
2322
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2473
2323
    
2474
2324
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2475
2325
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2476
2326
    
2477
2327
    if use_dbus:
2478
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2479
 
                                        "se.bsnet.fukt.Mandos"})
2480
 
        class MandosDBusService(DBusObjectWithProperties):
 
2328
        class MandosDBusService(dbus.service.Object):
2481
2329
            """A D-Bus proxy object"""
2482
2330
            def __init__(self):
2483
2331
                dbus.service.Object.__init__(self, bus, "/")
2484
2332
            _interface = "se.recompile.Mandos"
2485
2333
            
2486
 
            @dbus_interface_annotations(_interface)
2487
 
            def _foo(self):
2488
 
                return { "org.freedesktop.DBus.Property"
2489
 
                         ".EmitsChangedSignal":
2490
 
                             "false"}
2491
 
            
2492
2334
            @dbus.service.signal(_interface, signature="o")
2493
2335
            def ClientAdded(self, objpath):
2494
2336
                "D-Bus signal"
2536
2378
            
2537
2379
            del _interface
2538
2380
        
2539
 
        mandos_dbus_service = MandosDBusService()
 
2381
        class MandosDBusServiceTransitional(MandosDBusService):
 
2382
            __metaclass__ = AlternateDBusNamesMetaclass
 
2383
        mandos_dbus_service = MandosDBusServiceTransitional()
2540
2384
    
2541
2385
    def cleanup():
2542
2386
        "Cleanup function; run on exit"
2549
2393
        # Store client before exiting. Secrets are encrypted with key
2550
2394
        # based on what config file has. If config file is
2551
2395
        # removed/edited, old secret will thus be unrecovable.
2552
 
        clients = {}
2553
 
        with PGPEngine() as pgp:
 
2396
        clients = []
 
2397
        with Crypto() as crypt:
2554
2398
            for client in tcp_server.clients.itervalues():
2555
2399
                key = client_settings[client.name]["secret"]
2556
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2557
 
                                                      key)
 
2400
                client.encrypted_secret = crypt.encrypt(client.secret,
 
2401
                                                        key)
2558
2402
                client_dict = {}
2559
2403
                
2560
 
                # A list of attributes that can not be pickled
2561
 
                # + secret.
2562
 
                exclude = set(("bus", "changedstate", "secret",
2563
 
                               "checker"))
 
2404
                # A list of attributes that will not be stored when
 
2405
                # shutting down.
 
2406
                exclude = set(("bus", "changedstate", "secret"))
2564
2407
                for name, typ in (inspect.getmembers
2565
2408
                                  (dbus.service.Object)):
2566
2409
                    exclude.add(name)
2571
2414
                    if attr not in exclude:
2572
2415
                        client_dict[attr] = getattr(client, attr)
2573
2416
                
2574
 
                clients[client.name] = client_dict
 
2417
                clients.append(client_dict)
2575
2418
                del client_settings[client.name]["secret"]
2576
2419
        
2577
2420
        try:
2578
 
            with (tempfile.NamedTemporaryFile
2579
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2580
 
                   dir=os.path.dirname(stored_state_path),
2581
 
                   delete=False)) as stored_state:
 
2421
            with os.fdopen(os.open(stored_state_path,
 
2422
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
 
2423
                                   0600), "wb") as stored_state:
2582
2424
                pickle.dump((clients, client_settings), stored_state)
2583
 
                tempname=stored_state.name
2584
 
            os.rename(tempname, stored_state_path)
2585
2425
        except (IOError, OSError) as e:
2586
 
            if not debug:
2587
 
                try:
2588
 
                    os.remove(tempname)
2589
 
                except NameError:
2590
 
                    pass
2591
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2592
 
                logger.warning("Could not save persistent state: {0}"
2593
 
                               .format(os.strerror(e.errno)))
2594
 
            else:
2595
 
                logger.warning("Could not save persistent state:",
2596
 
                               exc_info=e)
2597
 
                raise e
 
2426
            logger.warning("Could not save persistent state: {0}"
 
2427
                           .format(e))
 
2428
            if e.errno not in (errno.ENOENT, errno.EACCES):
 
2429
                raise
2598
2430
        
2599
2431
        # Delete all clients, and settings from config
2600
2432
        while tcp_server.clients:
2627
2459
    service.port = tcp_server.socket.getsockname()[1]
2628
2460
    if use_ipv6:
2629
2461
        logger.info("Now listening on address %r, port %d,"
2630
 
                    " flowinfo %d, scope_id %d",
2631
 
                    *tcp_server.socket.getsockname())
 
2462
                    " flowinfo %d, scope_id %d"
 
2463
                    % tcp_server.socket.getsockname())
2632
2464
    else:                       # IPv4
2633
 
        logger.info("Now listening on address %r, port %d",
2634
 
                    *tcp_server.socket.getsockname())
 
2465
        logger.info("Now listening on address %r, port %d"
 
2466
                    % tcp_server.socket.getsockname())
2635
2467
    
2636
2468
    #service.interface = tcp_server.socket.getsockname()[3]
2637
2469
    
2640
2472
        try:
2641
2473
            service.activate()
2642
2474
        except dbus.exceptions.DBusException as error:
2643
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2475
            logger.critical("DBusException: %s", error)
2644
2476
            cleanup()
2645
2477
            sys.exit(1)
2646
2478
        # End of Avahi example code
2653
2485
        logger.debug("Starting main loop")
2654
2486
        main_loop.run()
2655
2487
    except AvahiError as error:
2656
 
        logger.critical("Avahi Error", exc_info=error)
 
2488
        logger.critical("AvahiError: %s", error)
2657
2489
        cleanup()
2658
2490
        sys.exit(1)
2659
2491
    except KeyboardInterrupt:
2664
2496
    # Must run before the D-Bus bus name gets deregistered
2665
2497
    cleanup()
2666
2498
 
 
2499
 
2667
2500
if __name__ == '__main__':
2668
2501
    main()