/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

Merge from Teddy

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
 
import collections
72
68
 
73
69
import dbus
74
70
import dbus.service
89
85
    except ImportError:
90
86
        SO_BINDTODEVICE = None
91
87
 
92
 
version = "1.6.0"
 
88
version = "1.4.1"
93
89
stored_state_file = "clients.pickle"
94
90
 
95
91
logger = logging.getLogger()
114
110
        return interface_index
115
111
 
116
112
 
117
 
def initlogger(debug, level=logging.WARNING):
 
113
def initlogger(level=logging.WARNING):
118
114
    """init logger and add loglevel"""
119
115
    
120
116
    syslogger.setFormatter(logging.Formatter
122
118
                            ' %(message)s'))
123
119
    logger.addHandler(syslogger)
124
120
    
125
 
    if debug:
126
 
        console = logging.StreamHandler()
127
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
128
 
                                               ' [%(process)d]:'
129
 
                                               ' %(levelname)s:'
130
 
                                               ' %(message)s'))
131
 
        logger.addHandler(console)
 
121
    console = logging.StreamHandler()
 
122
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
123
                                           ' [%(process)d]:'
 
124
                                           ' %(levelname)s:'
 
125
                                           ' %(message)s'))
 
126
    logger.addHandler(console)
132
127
    logger.setLevel(level)
133
128
 
134
129
 
146
141
        self.gnupg.options.meta_interactive = False
147
142
        self.gnupg.options.homedir = self.tempdir
148
143
        self.gnupg.options.extra_args.extend(['--force-mdc',
149
 
                                              '--quiet',
150
 
                                              '--no-use-agent'])
 
144
                                              '--quiet'])
151
145
    
152
146
    def __enter__(self):
153
147
        return self
154
148
    
155
 
    def __exit__(self, exc_type, exc_value, traceback):
 
149
    def __exit__ (self, exc_type, exc_value, traceback):
156
150
        self._cleanup()
157
151
        return False
158
152
    
179
173
    
180
174
    def encrypt(self, data, password):
181
175
        self.gnupg.passphrase = self.password_encode(password)
182
 
        with open(os.devnull, "w") as devnull:
 
176
        with open(os.devnull) as devnull:
183
177
            try:
184
178
                proc = self.gnupg.run(['--symmetric'],
185
179
                                      create_fhs=['stdin', 'stdout'],
196
190
    
197
191
    def decrypt(self, data, password):
198
192
        self.gnupg.passphrase = self.password_encode(password)
199
 
        with open(os.devnull, "w") as devnull:
 
193
        with open(os.devnull) as devnull:
200
194
            try:
201
195
                proc = self.gnupg.run(['--decrypt'],
202
196
                                      create_fhs=['stdin', 'stdout'],
203
197
                                      attach_fhs={'stderr': devnull})
204
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
198
                with contextlib.closing(proc.handles['stdin'] ) as f:
205
199
                    f.write(data)
206
200
                with contextlib.closing(proc.handles['stdout']) as f:
207
201
                    decrypted_plaintext = f.read()
212
206
        return decrypted_plaintext
213
207
 
214
208
 
 
209
 
215
210
class AvahiError(Exception):
216
211
    def __init__(self, value, *args, **kwargs):
217
212
        self.value = value
246
241
    server: D-Bus Server
247
242
    bus: dbus.SystemBus()
248
243
    """
249
 
    
250
244
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
245
                 servicetype = None, port = None, TXT = None,
252
246
                 domain = "", host = "", max_renames = 32768,
265
259
        self.server = None
266
260
        self.bus = bus
267
261
        self.entry_group_state_changed_match = None
268
 
    
269
262
    def rename(self):
270
263
        """Derived from the Avahi example code"""
271
264
        if self.rename_count >= self.max_renames:
281
274
        try:
282
275
            self.add()
283
276
        except dbus.exceptions.DBusException as error:
284
 
            logger.critical("D-Bus Exception", exc_info=error)
 
277
            logger.critical("DBusException: %s", error)
285
278
            self.cleanup()
286
279
            os._exit(1)
287
280
        self.rename_count += 1
288
 
    
289
281
    def remove(self):
290
282
        """Derived from the Avahi example code"""
291
283
        if self.entry_group_state_changed_match is not None:
293
285
            self.entry_group_state_changed_match = None
294
286
        if self.group is not None:
295
287
            self.group.Reset()
296
 
    
297
288
    def add(self):
298
289
        """Derived from the Avahi example code"""
299
290
        self.remove()
316
307
            dbus.UInt16(self.port),
317
308
            avahi.string_array_to_txt_array(self.TXT))
318
309
        self.group.Commit()
319
 
    
320
310
    def entry_group_state_changed(self, state, error):
321
311
        """Derived from the Avahi example code"""
322
312
        logger.debug("Avahi entry group state change: %i", state)
329
319
        elif state == avahi.ENTRY_GROUP_FAILURE:
330
320
            logger.critical("Avahi: Error in group state changed %s",
331
321
                            unicode(error))
332
 
            raise AvahiGroupError("State changed: {0!s}"
333
 
                                  .format(error))
334
 
    
 
322
            raise AvahiGroupError("State changed: %s"
 
323
                                  % unicode(error))
335
324
    def cleanup(self):
336
325
        """Derived from the Avahi example code"""
337
326
        if self.group is not None:
342
331
                pass
343
332
            self.group = None
344
333
        self.remove()
345
 
    
346
334
    def server_state_changed(self, state, error=None):
347
335
        """Derived from the Avahi example code"""
348
336
        logger.debug("Avahi server state change: %i", state)
367
355
                logger.debug("Unknown state: %r", state)
368
356
            else:
369
357
                logger.debug("Unknown state: %r: %r", state, error)
370
 
    
371
358
    def activate(self):
372
359
        """Derived from the Avahi example code"""
373
360
        if self.server is None:
380
367
                                 self.server_state_changed)
381
368
        self.server_state_changed(self.server.GetState())
382
369
 
383
 
 
384
370
class AvahiServiceToSyslog(AvahiService):
385
371
    def rename(self):
386
372
        """Add the new name to the syslog messages"""
387
373
        ret = AvahiService.rename(self)
388
374
        syslogger.setFormatter(logging.Formatter
389
 
                               ('Mandos ({0}) [%(process)d]:'
390
 
                                ' %(levelname)s: %(message)s'
391
 
                                .format(self.name)))
 
375
                               ('Mandos (%s) [%%(process)d]:'
 
376
                                ' %%(levelname)s: %%(message)s'
 
377
                                % self.name))
392
378
        return ret
393
379
 
394
 
 
395
380
def timedelta_to_milliseconds(td):
396
381
    "Convert a datetime.timedelta() to milliseconds"
397
382
    return ((td.days * 24 * 60 * 60 * 1000)
398
383
            + (td.seconds * 1000)
399
384
            + (td.microseconds // 1000))
400
 
 
401
 
 
 
385
        
402
386
class Client(object):
403
387
    """A representation of a client host served by this server.
404
388
    
429
413
    last_checked_ok: datetime.datetime(); (UTC) or None
430
414
    last_checker_status: integer between 0 and 255 reflecting exit
431
415
                         status of last checker. -1 reflects crashed
432
 
                         checker, -2 means no checker completed yet.
 
416
                         checker, or None.
433
417
    last_enabled: datetime.datetime(); (UTC) or None
434
418
    name:       string; from the config file, used in log messages and
435
419
                        D-Bus identifiers
436
420
    secret:     bytestring; sent verbatim (over TLS) to client
437
421
    timeout:    datetime.timedelta(); How long from last_checked_ok
438
422
                                      until this client is disabled
439
 
    extended_timeout:   extra long timeout when secret has been sent
 
423
    extended_timeout:   extra long timeout when password has been sent
440
424
    runtime_expansions: Allowed attributes for runtime expansion.
441
425
    expires:    datetime.datetime(); time (UTC) when a client will be
442
426
                disabled, or None
443
427
    """
444
428
    
445
429
    runtime_expansions = ("approval_delay", "approval_duration",
446
 
                          "created", "enabled", "expires",
447
 
                          "fingerprint", "host", "interval",
448
 
                          "last_approval_request", "last_checked_ok",
 
430
                          "created", "enabled", "fingerprint",
 
431
                          "host", "interval", "last_checked_ok",
449
432
                          "last_enabled", "name", "timeout")
450
 
    client_defaults = { "timeout": "PT5M",
451
 
                        "extended_timeout": "PT15M",
452
 
                        "interval": "PT2M",
 
433
    client_defaults = { "timeout": "5m",
 
434
                        "extended_timeout": "15m",
 
435
                        "interval": "2m",
453
436
                        "checker": "fping -q -- %%(host)s",
454
437
                        "host": "",
455
 
                        "approval_delay": "PT0S",
456
 
                        "approval_duration": "PT1S",
 
438
                        "approval_delay": "0s",
 
439
                        "approval_duration": "1s",
457
440
                        "approved_by_default": "True",
458
441
                        "enabled": "True",
459
442
                        }
472
455
    
473
456
    def approval_delay_milliseconds(self):
474
457
        return timedelta_to_milliseconds(self.approval_delay)
475
 
    
 
458
 
476
459
    @staticmethod
477
460
    def config_parser(config):
478
 
        """Construct a new dict of client settings of this form:
 
461
        """ Construct a new dict of client settings of this form:
479
462
        { client_name: {setting_name: value, ...}, ...}
480
 
        with exceptions for any special settings as defined above.
481
 
        NOTE: Must be a pure function. Must return the same result
482
 
        value given the same arguments.
483
 
        """
 
463
        with exceptions for any special settings as defined above"""
484
464
        settings = {}
485
465
        for client_name in config.sections():
486
466
            section = dict(config.items(client_name))
490
470
            # Reformat values from string types to Python types
491
471
            client["approved_by_default"] = config.getboolean(
492
472
                client_name, "approved_by_default")
493
 
            client["enabled"] = config.getboolean(client_name,
494
 
                                                  "enabled")
 
473
            client["enabled"] = config.getboolean(client_name, "enabled")
495
474
            
496
475
            client["fingerprint"] = (section["fingerprint"].upper()
497
476
                                     .replace(" ", ""))
503
482
                          "rb") as secfile:
504
483
                    client["secret"] = secfile.read()
505
484
            else:
506
 
                raise TypeError("No secret or secfile for section {0}"
507
 
                                .format(section))
 
485
                raise TypeError("No secret or secfile for section %s"
 
486
                                % section)
508
487
            client["timeout"] = string_to_delta(section["timeout"])
509
488
            client["extended_timeout"] = string_to_delta(
510
489
                section["extended_timeout"])
516
495
            client["checker_command"] = section["checker"]
517
496
            client["last_approval_request"] = None
518
497
            client["last_checked_ok"] = None
519
 
            client["last_checker_status"] = -2
520
 
        
 
498
            client["last_checker_status"] = None
 
499
            if client["enabled"]:
 
500
                client["last_enabled"] = datetime.datetime.utcnow()
 
501
                client["expires"] = (datetime.datetime.utcnow()
 
502
                                     + client["timeout"])
 
503
            else:
 
504
                client["last_enabled"] = None
 
505
                client["expires"] = None
 
506
 
521
507
        return settings
522
 
    
 
508
        
 
509
        
523
510
    def __init__(self, settings, name = None):
 
511
        """Note: the 'checker' key in 'config' sets the
 
512
        'checker_command' attribute and *not* the 'checker'
 
513
        attribute."""
524
514
        self.name = name
525
515
        # adding all client settings
526
516
        for setting, value in settings.iteritems():
527
517
            setattr(self, setting, value)
528
518
        
529
 
        if self.enabled:
530
 
            if not hasattr(self, "last_enabled"):
531
 
                self.last_enabled = datetime.datetime.utcnow()
532
 
            if not hasattr(self, "expires"):
533
 
                self.expires = (datetime.datetime.utcnow()
534
 
                                + self.timeout)
535
 
        else:
536
 
            self.last_enabled = None
537
 
            self.expires = None
538
 
        
539
519
        logger.debug("Creating client %r", self.name)
540
520
        # Uppercase and remove spaces from fingerprint for later
541
521
        # comparison purposes with return value from the fingerprint()
542
522
        # function
543
523
        logger.debug("  Fingerprint: %s", self.fingerprint)
544
 
        self.created = settings.get("created",
545
 
                                    datetime.datetime.utcnow())
546
 
        
 
524
        self.created = settings.get("created", datetime.datetime.utcnow())
 
525
 
547
526
        # attributes specific for this server instance
548
527
        self.checker = None
549
528
        self.checker_initiator_tag = None
577
556
        if getattr(self, "enabled", False):
578
557
            # Already enabled
579
558
            return
 
559
        self.send_changedstate()
580
560
        self.expires = datetime.datetime.utcnow() + self.timeout
581
561
        self.enabled = True
582
562
        self.last_enabled = datetime.datetime.utcnow()
583
563
        self.init_checker()
584
 
        self.send_changedstate()
585
564
    
586
565
    def disable(self, quiet=True):
587
566
        """Disable this client."""
588
567
        if not getattr(self, "enabled", False):
589
568
            return False
590
569
        if not quiet:
 
570
            self.send_changedstate()
 
571
        if not quiet:
591
572
            logger.info("Disabling client %s", self.name)
592
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
573
        if getattr(self, "disable_initiator_tag", False):
593
574
            gobject.source_remove(self.disable_initiator_tag)
594
575
            self.disable_initiator_tag = None
595
576
        self.expires = None
596
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
577
        if getattr(self, "checker_initiator_tag", False):
597
578
            gobject.source_remove(self.checker_initiator_tag)
598
579
            self.checker_initiator_tag = None
599
580
        self.stop_checker()
600
581
        self.enabled = False
601
 
        if not quiet:
602
 
            self.send_changedstate()
603
582
        # Do not run this again if called by a gobject.timeout_add
604
583
        return False
605
584
    
609
588
    def init_checker(self):
610
589
        # Schedule a new checker to be started an 'interval' from now,
611
590
        # and every interval from then on.
612
 
        if self.checker_initiator_tag is not None:
613
 
            gobject.source_remove(self.checker_initiator_tag)
614
591
        self.checker_initiator_tag = (gobject.timeout_add
615
592
                                      (self.interval_milliseconds(),
616
593
                                       self.start_checker))
617
594
        # Schedule a disable() when 'timeout' has passed
618
 
        if self.disable_initiator_tag is not None:
619
 
            gobject.source_remove(self.disable_initiator_tag)
620
595
        self.disable_initiator_tag = (gobject.timeout_add
621
596
                                   (self.timeout_milliseconds(),
622
597
                                    self.disable))
641
616
            logger.warning("Checker for %(name)s crashed?",
642
617
                           vars(self))
643
618
    
644
 
    def checked_ok(self):
645
 
        """Assert that the client has been seen, alive and well."""
646
 
        self.last_checked_ok = datetime.datetime.utcnow()
647
 
        self.last_checker_status = 0
648
 
        self.bump_timeout()
649
 
    
650
 
    def bump_timeout(self, timeout=None):
651
 
        """Bump up the timeout for this client."""
 
619
    def checked_ok(self, timeout=None):
 
620
        """Bump up the timeout for this client.
 
621
        
 
622
        This should only be called when the client has been seen,
 
623
        alive and well.
 
624
        """
652
625
        if timeout is None:
653
626
            timeout = self.timeout
 
627
        self.last_checked_ok = datetime.datetime.utcnow()
654
628
        if self.disable_initiator_tag is not None:
655
629
            gobject.source_remove(self.disable_initiator_tag)
656
 
            self.disable_initiator_tag = None
657
630
        if getattr(self, "enabled", False):
658
631
            self.disable_initiator_tag = (gobject.timeout_add
659
632
                                          (timedelta_to_milliseconds
669
642
        If a checker already exists, leave it running and do
670
643
        nothing."""
671
644
        # The reason for not killing a running checker is that if we
672
 
        # did that, and if a checker (for some reason) started running
673
 
        # slowly and taking more than 'interval' time, then the client
674
 
        # would inevitably timeout, since no checker would get a
675
 
        # chance to run to completion.  If we instead leave running
 
645
        # did that, then if a checker (for some reason) started
 
646
        # running slowly and taking more than 'interval' time, the
 
647
        # client would inevitably timeout, since no checker would get
 
648
        # a chance to run to completion.  If we instead leave running
676
649
        # checkers alone, the checker would have to take more time
677
650
        # than 'timeout' for the client to be disabled, which is as it
678
651
        # should be.
692
665
                                      self.current_checker_command)
693
666
        # Start a new checker if needed
694
667
        if self.checker is None:
695
 
            # Escape attributes for the shell
696
 
            escaped_attrs = dict(
697
 
                (attr, re.escape(unicode(getattr(self, attr))))
698
 
                for attr in
699
 
                self.runtime_expansions)
700
668
            try:
701
 
                command = self.checker_command % escaped_attrs
702
 
            except TypeError as error:
703
 
                logger.error('Could not format string "%s"',
704
 
                             self.checker_command, exc_info=error)
705
 
                return True # Try again later
 
669
                # In case checker_command has exactly one % operator
 
670
                command = self.checker_command % self.host
 
671
            except TypeError:
 
672
                # Escape attributes for the shell
 
673
                escaped_attrs = dict(
 
674
                    (attr,
 
675
                     re.escape(unicode(str(getattr(self, attr, "")),
 
676
                                       errors=
 
677
                                       'replace')))
 
678
                    for attr in
 
679
                    self.runtime_expansions)
 
680
                
 
681
                try:
 
682
                    command = self.checker_command % escaped_attrs
 
683
                except TypeError as error:
 
684
                    logger.error('Could not format string "%s":'
 
685
                                 ' %s', self.checker_command, error)
 
686
                    return True # Try again later
706
687
            self.current_checker_command = command
707
688
            try:
708
689
                logger.info("Starting checker %r for %s",
714
695
                self.checker = subprocess.Popen(command,
715
696
                                                close_fds=True,
716
697
                                                shell=True, cwd="/")
717
 
            except OSError as error:
718
 
                logger.error("Failed to start subprocess",
719
 
                             exc_info=error)
720
 
                return True
721
 
            self.checker_callback_tag = (gobject.child_watch_add
722
 
                                         (self.checker.pid,
723
 
                                          self.checker_callback,
724
 
                                          data=command))
725
 
            # The checker may have completed before the gobject
726
 
            # watch was added.  Check for this.
727
 
            try:
 
698
                self.checker_callback_tag = (gobject.child_watch_add
 
699
                                             (self.checker.pid,
 
700
                                              self.checker_callback,
 
701
                                              data=command))
 
702
                # The checker may have completed before the gobject
 
703
                # watch was added.  Check for this.
728
704
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
705
                if pid:
 
706
                    gobject.source_remove(self.checker_callback_tag)
 
707
                    self.checker_callback(pid, status, command)
729
708
            except OSError as error:
730
 
                if error.errno == errno.ECHILD:
731
 
                    # This should never happen
732
 
                    logger.error("Child process vanished",
733
 
                                 exc_info=error)
734
 
                    return True
735
 
                raise
736
 
            if pid:
737
 
                gobject.source_remove(self.checker_callback_tag)
738
 
                self.checker_callback(pid, status, command)
 
709
                logger.error("Failed to start subprocess: %s",
 
710
                             error)
739
711
        # Re-run this periodically if run by gobject.timeout_add
740
712
        return True
741
713
    
748
720
            return
749
721
        logger.debug("Stopping checker for %(name)s", vars(self))
750
722
        try:
751
 
            self.checker.terminate()
 
723
            os.kill(self.checker.pid, signal.SIGTERM)
752
724
            #time.sleep(0.5)
753
725
            #if self.checker.poll() is None:
754
 
            #    self.checker.kill()
 
726
            #    os.kill(self.checker.pid, signal.SIGKILL)
755
727
        except OSError as error:
756
728
            if error.errno != errno.ESRCH: # No such process
757
729
                raise
774
746
    # "Set" method, so we fail early here:
775
747
    if byte_arrays and signature != "ay":
776
748
        raise ValueError("Byte arrays not supported for non-'ay'"
777
 
                         " signature {0!r}".format(signature))
 
749
                         " signature %r" % signature)
778
750
    def decorator(func):
779
751
        func._dbus_is_property = True
780
752
        func._dbus_interface = dbus_interface
788
760
    return decorator
789
761
 
790
762
 
791
 
def dbus_interface_annotations(dbus_interface):
792
 
    """Decorator for marking functions returning interface annotations
793
 
    
794
 
    Usage:
795
 
    
796
 
    @dbus_interface_annotations("org.example.Interface")
797
 
    def _foo(self):  # Function name does not matter
798
 
        return {"org.freedesktop.DBus.Deprecated": "true",
799
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
800
 
                    "false"}
801
 
    """
802
 
    def decorator(func):
803
 
        func._dbus_is_interface = True
804
 
        func._dbus_interface = dbus_interface
805
 
        func._dbus_name = dbus_interface
806
 
        return func
807
 
    return decorator
808
 
 
809
 
 
810
 
def dbus_annotations(annotations):
811
 
    """Decorator to annotate D-Bus methods, signals or properties
812
 
    Usage:
813
 
    
814
 
    @dbus_service_property("org.example.Interface", signature="b",
815
 
                           access="r")
816
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
817
 
                        "org.freedesktop.DBus.Property."
818
 
                        "EmitsChangedSignal": "false"})
819
 
    def Property_dbus_property(self):
820
 
        return dbus.Boolean(False)
821
 
    """
822
 
    def decorator(func):
823
 
        func._dbus_annotations = annotations
824
 
        return func
825
 
    return decorator
826
 
 
827
 
 
828
763
class DBusPropertyException(dbus.exceptions.DBusException):
829
764
    """A base class for D-Bus property-related exceptions
830
765
    """
853
788
    """
854
789
    
855
790
    @staticmethod
856
 
    def _is_dbus_thing(thing):
857
 
        """Returns a function testing if an attribute is a D-Bus thing
858
 
        
859
 
        If called like _is_dbus_thing("method") it returns a function
860
 
        suitable for use as predicate to inspect.getmembers().
861
 
        """
862
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
863
 
                                   False)
 
791
    def _is_dbus_property(obj):
 
792
        return getattr(obj, "_dbus_is_property", False)
864
793
    
865
 
    def _get_all_dbus_things(self, thing):
 
794
    def _get_all_dbus_properties(self):
866
795
        """Returns a generator of (name, attribute) pairs
867
796
        """
868
 
        return ((getattr(athing.__get__(self), "_dbus_name",
869
 
                         name),
870
 
                 athing.__get__(self))
 
797
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
871
798
                for cls in self.__class__.__mro__
872
 
                for name, athing in
873
 
                inspect.getmembers(cls,
874
 
                                   self._is_dbus_thing(thing)))
 
799
                for name, prop in
 
800
                inspect.getmembers(cls, self._is_dbus_property))
875
801
    
876
802
    def _get_dbus_property(self, interface_name, property_name):
877
803
        """Returns a bound method if one exists which is a D-Bus
879
805
        """
880
806
        for cls in  self.__class__.__mro__:
881
807
            for name, value in (inspect.getmembers
882
 
                                (cls,
883
 
                                 self._is_dbus_thing("property"))):
 
808
                                (cls, self._is_dbus_property)):
884
809
                if (value._dbus_name == property_name
885
810
                    and value._dbus_interface == interface_name):
886
811
                    return value.__get__(self)
915
840
            # signatures other than "ay".
916
841
            if prop._dbus_signature != "ay":
917
842
                raise ValueError
918
 
            value = dbus.ByteArray(b''.join(chr(byte)
919
 
                                            for byte in value))
 
843
            value = dbus.ByteArray(''.join(unichr(byte)
 
844
                                           for byte in value))
920
845
        prop(value)
921
846
    
922
847
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
928
853
        Note: Will not include properties with access="write".
929
854
        """
930
855
        properties = {}
931
 
        for name, prop in self._get_all_dbus_things("property"):
 
856
        for name, prop in self._get_all_dbus_properties():
932
857
            if (interface_name
933
858
                and interface_name != prop._dbus_interface):
934
859
                # Interface non-empty but did not match
949
874
                         path_keyword='object_path',
950
875
                         connection_keyword='connection')
951
876
    def Introspect(self, object_path, connection):
952
 
        """Overloading of standard D-Bus method.
953
 
        
954
 
        Inserts property tags and interface annotation tags.
 
877
        """Standard D-Bus method, overloaded to insert property tags.
955
878
        """
956
879
        xmlstring = dbus.service.Object.Introspect(self, object_path,
957
880
                                                   connection)
964
887
                e.setAttribute("access", prop._dbus_access)
965
888
                return e
966
889
            for if_tag in document.getElementsByTagName("interface"):
967
 
                # Add property tags
968
890
                for tag in (make_tag(document, name, prop)
969
891
                            for name, prop
970
 
                            in self._get_all_dbus_things("property")
 
892
                            in self._get_all_dbus_properties()
971
893
                            if prop._dbus_interface
972
894
                            == if_tag.getAttribute("name")):
973
895
                    if_tag.appendChild(tag)
974
 
                # Add annotation tags
975
 
                for typ in ("method", "signal", "property"):
976
 
                    for tag in if_tag.getElementsByTagName(typ):
977
 
                        annots = dict()
978
 
                        for name, prop in (self.
979
 
                                           _get_all_dbus_things(typ)):
980
 
                            if (name == tag.getAttribute("name")
981
 
                                and prop._dbus_interface
982
 
                                == if_tag.getAttribute("name")):
983
 
                                annots.update(getattr
984
 
                                              (prop,
985
 
                                               "_dbus_annotations",
986
 
                                               {}))
987
 
                        for name, value in annots.iteritems():
988
 
                            ann_tag = document.createElement(
989
 
                                "annotation")
990
 
                            ann_tag.setAttribute("name", name)
991
 
                            ann_tag.setAttribute("value", value)
992
 
                            tag.appendChild(ann_tag)
993
 
                # Add interface annotation tags
994
 
                for annotation, value in dict(
995
 
                    itertools.chain.from_iterable(
996
 
                        annotations().iteritems()
997
 
                        for name, annotations in
998
 
                        self._get_all_dbus_things("interface")
999
 
                        if name == if_tag.getAttribute("name")
1000
 
                        )).iteritems():
1001
 
                    ann_tag = document.createElement("annotation")
1002
 
                    ann_tag.setAttribute("name", annotation)
1003
 
                    ann_tag.setAttribute("value", value)
1004
 
                    if_tag.appendChild(ann_tag)
1005
896
                # Add the names to the return values for the
1006
897
                # "org.freedesktop.DBus.Properties" methods
1007
898
                if (if_tag.getAttribute("name")
1022
913
        except (AttributeError, xml.dom.DOMException,
1023
914
                xml.parsers.expat.ExpatError) as error:
1024
915
            logger.error("Failed to override Introspection method",
1025
 
                         exc_info=error)
 
916
                         error)
1026
917
        return xmlstring
1027
918
 
1028
919
 
1029
 
def datetime_to_dbus(dt, variant_level=0):
 
920
def datetime_to_dbus (dt, variant_level=0):
1030
921
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1031
922
    if dt is None:
1032
923
        return dbus.String("", variant_level = variant_level)
1034
925
                       variant_level=variant_level)
1035
926
 
1036
927
 
1037
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1038
 
    """A class decorator; applied to a subclass of
1039
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1040
 
    interface names according to the "alt_interface_names" mapping.
1041
 
    Usage:
1042
 
    
1043
 
    @alternate_dbus_interfaces({"org.example.Interface":
1044
 
                                    "net.example.AlternateInterface"})
1045
 
    class SampleDBusObject(dbus.service.Object):
1046
 
        @dbus.service.method("org.example.Interface")
1047
 
        def SampleDBusMethod():
1048
 
            pass
1049
 
    
1050
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1051
 
    reachable via two interfaces: "org.example.Interface" and
1052
 
    "net.example.AlternateInterface", the latter of which will have
1053
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1054
 
    "true", unless "deprecate" is passed with a False value.
1055
 
    
1056
 
    This works for methods and signals, and also for D-Bus properties
1057
 
    (from DBusObjectWithProperties) and interfaces (from the
1058
 
    dbus_interface_annotations decorator).
 
928
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
929
                                  .__metaclass__):
 
930
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
931
    will add additional D-Bus attributes matching a certain pattern.
1059
932
    """
1060
 
    def wrapper(cls):
1061
 
        for orig_interface_name, alt_interface_name in (
1062
 
            alt_interface_names.iteritems()):
1063
 
            attr = {}
1064
 
            interface_names = set()
1065
 
            # Go though all attributes of the class
1066
 
            for attrname, attribute in inspect.getmembers(cls):
 
933
    def __new__(mcs, name, bases, attr):
 
934
        # Go through all the base classes which could have D-Bus
 
935
        # methods, signals, or properties in them
 
936
        for base in (b for b in bases
 
937
                     if issubclass(b, dbus.service.Object)):
 
938
            # Go though all attributes of the base class
 
939
            for attrname, attribute in inspect.getmembers(base):
1067
940
                # Ignore non-D-Bus attributes, and D-Bus attributes
1068
941
                # with the wrong interface name
1069
942
                if (not hasattr(attribute, "_dbus_interface")
1070
943
                    or not attribute._dbus_interface
1071
 
                    .startswith(orig_interface_name)):
 
944
                    .startswith("se.recompile.Mandos")):
1072
945
                    continue
1073
946
                # Create an alternate D-Bus interface name based on
1074
947
                # the current name
1075
948
                alt_interface = (attribute._dbus_interface
1076
 
                                 .replace(orig_interface_name,
1077
 
                                          alt_interface_name))
1078
 
                interface_names.add(alt_interface)
 
949
                                 .replace("se.recompile.Mandos",
 
950
                                          "se.bsnet.fukt.Mandos"))
1079
951
                # Is this a D-Bus signal?
1080
952
                if getattr(attribute, "_dbus_is_signal", False):
1081
953
                    # Extract the original non-method function by
1096
968
                                nonmethod_func.func_name,
1097
969
                                nonmethod_func.func_defaults,
1098
970
                                nonmethod_func.func_closure)))
1099
 
                    # Copy annotations, if any
1100
 
                    try:
1101
 
                        new_function._dbus_annotations = (
1102
 
                            dict(attribute._dbus_annotations))
1103
 
                    except AttributeError:
1104
 
                        pass
1105
971
                    # Define a creator of a function to call both the
1106
 
                    # original and alternate functions, so both the
1107
 
                    # original and alternate signals gets sent when
1108
 
                    # the function is called
 
972
                    # old and new functions, so both the old and new
 
973
                    # signals gets sent when the function is called
1109
974
                    def fixscope(func1, func2):
1110
975
                        """This function is a scope container to pass
1111
976
                        func1 and func2 to the "call_both" function
1118
983
                        return call_both
1119
984
                    # Create the "call_both" function and add it to
1120
985
                    # the class
1121
 
                    attr[attrname] = fixscope(attribute, new_function)
 
986
                    attr[attrname] = fixscope(attribute,
 
987
                                              new_function)
1122
988
                # Is this a D-Bus method?
1123
989
                elif getattr(attribute, "_dbus_is_method", False):
1124
990
                    # Create a new, but exactly alike, function
1135
1001
                                        attribute.func_name,
1136
1002
                                        attribute.func_defaults,
1137
1003
                                        attribute.func_closure)))
1138
 
                    # Copy annotations, if any
1139
 
                    try:
1140
 
                        attr[attrname]._dbus_annotations = (
1141
 
                            dict(attribute._dbus_annotations))
1142
 
                    except AttributeError:
1143
 
                        pass
1144
1004
                # Is this a D-Bus property?
1145
1005
                elif getattr(attribute, "_dbus_is_property", False):
1146
1006
                    # Create a new, but exactly alike, function
1160
1020
                                        attribute.func_name,
1161
1021
                                        attribute.func_defaults,
1162
1022
                                        attribute.func_closure)))
1163
 
                    # Copy annotations, if any
1164
 
                    try:
1165
 
                        attr[attrname]._dbus_annotations = (
1166
 
                            dict(attribute._dbus_annotations))
1167
 
                    except AttributeError:
1168
 
                        pass
1169
 
                # Is this a D-Bus interface?
1170
 
                elif getattr(attribute, "_dbus_is_interface", False):
1171
 
                    # Create a new, but exactly alike, function
1172
 
                    # object.  Decorate it to be a new D-Bus interface
1173
 
                    # with the alternate D-Bus interface name.  Add it
1174
 
                    # to the class.
1175
 
                    attr[attrname] = (dbus_interface_annotations
1176
 
                                      (alt_interface)
1177
 
                                      (types.FunctionType
1178
 
                                       (attribute.func_code,
1179
 
                                        attribute.func_globals,
1180
 
                                        attribute.func_name,
1181
 
                                        attribute.func_defaults,
1182
 
                                        attribute.func_closure)))
1183
 
            if deprecate:
1184
 
                # Deprecate all alternate interfaces
1185
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1186
 
                for interface_name in interface_names:
1187
 
                    @dbus_interface_annotations(interface_name)
1188
 
                    def func(self):
1189
 
                        return { "org.freedesktop.DBus.Deprecated":
1190
 
                                     "true" }
1191
 
                    # Find an unused name
1192
 
                    for aname in (iname.format(i)
1193
 
                                  for i in itertools.count()):
1194
 
                        if aname not in attr:
1195
 
                            attr[aname] = func
1196
 
                            break
1197
 
            if interface_names:
1198
 
                # Replace the class with a new subclass of it with
1199
 
                # methods, signals, etc. as created above.
1200
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1201
 
                           (cls,), attr)
1202
 
        return cls
1203
 
    return wrapper
1204
 
 
1205
 
 
1206
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1207
 
                                "se.bsnet.fukt.Mandos"})
 
1023
        return type.__new__(mcs, name, bases, attr)
 
1024
 
 
1025
 
1208
1026
class ClientDBus(Client, DBusObjectWithProperties):
1209
1027
    """A Client class using D-Bus
1210
1028
    
1221
1039
    def __init__(self, bus = None, *args, **kwargs):
1222
1040
        self.bus = bus
1223
1041
        Client.__init__(self, *args, **kwargs)
 
1042
        self._approvals_pending = 0
 
1043
        
 
1044
        self._approvals_pending = 0
1224
1045
        # Only now, when this client is initialized, can it show up on
1225
1046
        # the D-Bus
1226
1047
        client_object_name = unicode(self.name).translate(
1230
1051
                                 ("/clients/" + client_object_name))
1231
1052
        DBusObjectWithProperties.__init__(self, self.bus,
1232
1053
                                          self.dbus_object_path)
1233
 
    
 
1054
        
1234
1055
    def notifychangeproperty(transform_func,
1235
1056
                             dbus_name, type_func=lambda x: x,
1236
1057
                             variant_level=1):
1259
1080
        
1260
1081
        return property(lambda self: getattr(self, attrname), setter)
1261
1082
    
 
1083
    
1262
1084
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1263
1085
    approvals_pending = notifychangeproperty(dbus.Boolean,
1264
1086
                                             "ApprovalPending",
1271
1093
                                       checker is not None)
1272
1094
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1273
1095
                                           "LastCheckedOK")
1274
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1275
 
                                               "LastCheckerStatus")
1276
1096
    last_approval_request = notifychangeproperty(
1277
1097
        datetime_to_dbus, "LastApprovalRequest")
1278
1098
    approved_by_default = notifychangeproperty(dbus.Boolean,
1346
1166
        return False
1347
1167
    
1348
1168
    def approve(self, value=True):
 
1169
        self.send_changedstate()
1349
1170
        self.approved = value
1350
1171
        gobject.timeout_add(timedelta_to_milliseconds
1351
1172
                            (self.approval_duration),
1352
1173
                            self._reset_approved)
1353
 
        self.send_changedstate()
 
1174
    
1354
1175
    
1355
1176
    ## D-Bus methods, signals & properties
1356
1177
    _interface = "se.recompile.Mandos.Client"
1357
1178
    
1358
 
    ## Interfaces
1359
 
    
1360
 
    @dbus_interface_annotations(_interface)
1361
 
    def _foo(self):
1362
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1363
 
                     "false"}
1364
 
    
1365
1179
    ## Signals
1366
1180
    
1367
1181
    # CheckerCompleted - signal
1403
1217
        "D-Bus signal"
1404
1218
        return self.need_approval()
1405
1219
    
 
1220
    # NeRwequest - signal
 
1221
    @dbus.service.signal(_interface, signature="s")
 
1222
    def NewRequest(self, ip):
 
1223
        """D-Bus signal
 
1224
        Is sent after a client request a password.
 
1225
        """
 
1226
        pass
 
1227
    
1406
1228
    ## Methods
1407
1229
    
1408
1230
    # Approve - method
1518
1340
            return
1519
1341
        return datetime_to_dbus(self.last_checked_ok)
1520
1342
    
1521
 
    # LastCheckerStatus - property
1522
 
    @dbus_service_property(_interface, signature="n",
1523
 
                           access="read")
1524
 
    def LastCheckerStatus_dbus_property(self):
1525
 
        return dbus.Int16(self.last_checker_status)
1526
 
    
1527
1343
    # Expires - property
1528
1344
    @dbus_service_property(_interface, signature="s", access="read")
1529
1345
    def Expires_dbus_property(self):
1540
1356
    def Timeout_dbus_property(self, value=None):
1541
1357
        if value is None:       # get
1542
1358
            return dbus.UInt64(self.timeout_milliseconds())
1543
 
        old_timeout = self.timeout
1544
1359
        self.timeout = datetime.timedelta(0, 0, 0, value)
1545
 
        # Reschedule disabling
1546
 
        if self.enabled:
1547
 
            now = datetime.datetime.utcnow()
1548
 
            self.expires += self.timeout - old_timeout
1549
 
            if self.expires <= now:
1550
 
                # The timeout has passed
1551
 
                self.disable()
1552
 
            else:
1553
 
                if (getattr(self, "disable_initiator_tag", None)
1554
 
                    is None):
1555
 
                    return
1556
 
                gobject.source_remove(self.disable_initiator_tag)
1557
 
                self.disable_initiator_tag = (
1558
 
                    gobject.timeout_add(
1559
 
                        timedelta_to_milliseconds(self.expires - now),
1560
 
                        self.disable))
 
1360
        if getattr(self, "disable_initiator_tag", None) is None:
 
1361
            return
 
1362
        # Reschedule timeout
 
1363
        gobject.source_remove(self.disable_initiator_tag)
 
1364
        self.disable_initiator_tag = None
 
1365
        self.expires = None
 
1366
        time_to_die = timedelta_to_milliseconds((self
 
1367
                                                 .last_checked_ok
 
1368
                                                 + self.timeout)
 
1369
                                                - datetime.datetime
 
1370
                                                .utcnow())
 
1371
        if time_to_die <= 0:
 
1372
            # The timeout has passed
 
1373
            self.disable()
 
1374
        else:
 
1375
            self.expires = (datetime.datetime.utcnow()
 
1376
                            + datetime.timedelta(milliseconds =
 
1377
                                                 time_to_die))
 
1378
            self.disable_initiator_tag = (gobject.timeout_add
 
1379
                                          (time_to_die, self.disable))
1561
1380
    
1562
1381
    # ExtendedTimeout - property
1563
1382
    @dbus_service_property(_interface, signature="t",
1642
1461
        self._pipe.send(('setattr', name, value))
1643
1462
 
1644
1463
 
 
1464
class ClientDBusTransitional(ClientDBus):
 
1465
    __metaclass__ = AlternateDBusNamesMetaclass
 
1466
 
 
1467
 
1645
1468
class ClientHandler(socketserver.BaseRequestHandler, object):
1646
1469
    """A class to handle client connections.
1647
1470
    
1715
1538
                except KeyError:
1716
1539
                    return
1717
1540
                
 
1541
                if self.server.use_dbus:
 
1542
                    # Emit D-Bus signal
 
1543
                    client.NewRequest(str(self.client_address))
 
1544
                
1718
1545
                if client.approval_delay:
1719
1546
                    delay = client.approval_delay
1720
1547
                    client.approvals_pending += 1
1751
1578
                    #wait until timeout or approved
1752
1579
                    time = datetime.datetime.now()
1753
1580
                    client.changedstate.acquire()
1754
 
                    client.changedstate.wait(
1755
 
                        float(timedelta_to_milliseconds(delay)
1756
 
                              / 1000))
 
1581
                    (client.changedstate.wait
 
1582
                     (float(client.timedelta_to_milliseconds(delay)
 
1583
                            / 1000)))
1757
1584
                    client.changedstate.release()
1758
1585
                    time2 = datetime.datetime.now()
1759
1586
                    if (time2 - time) >= delay:
1775
1602
                    try:
1776
1603
                        sent = session.send(client.secret[sent_size:])
1777
1604
                    except gnutls.errors.GNUTLSError as error:
1778
 
                        logger.warning("gnutls send failed",
1779
 
                                       exc_info=error)
 
1605
                        logger.warning("gnutls send failed")
1780
1606
                        return
1781
1607
                    logger.debug("Sent: %d, remaining: %d",
1782
1608
                                 sent, len(client.secret)
1785
1611
                
1786
1612
                logger.info("Sending secret to %s", client.name)
1787
1613
                # bump the timeout using extended_timeout
1788
 
                client.bump_timeout(client.extended_timeout)
 
1614
                client.checked_ok(client.extended_timeout)
1789
1615
                if self.server.use_dbus:
1790
1616
                    # Emit D-Bus signal
1791
1617
                    client.GotSecret()
1796
1622
                try:
1797
1623
                    session.bye()
1798
1624
                except gnutls.errors.GNUTLSError as error:
1799
 
                    logger.warning("GnuTLS bye failed",
1800
 
                                   exc_info=error)
 
1625
                    logger.warning("GnuTLS bye failed")
1801
1626
    
1802
1627
    @staticmethod
1803
1628
    def peer_certificate(session):
1875
1700
    def process_request(self, request, address):
1876
1701
        """Start a new process to process the request."""
1877
1702
        proc = multiprocessing.Process(target = self.sub_process_main,
1878
 
                                       args = (request, address))
 
1703
                                       args = (request,
 
1704
                                               address))
1879
1705
        proc.start()
1880
1706
        return proc
1881
1707
 
1909
1735
        use_ipv6:       Boolean; to use IPv6 or not
1910
1736
    """
1911
1737
    def __init__(self, server_address, RequestHandlerClass,
1912
 
                 interface=None, use_ipv6=True, socketfd=None):
1913
 
        """If socketfd is set, use that file descriptor instead of
1914
 
        creating a new one with socket.socket().
1915
 
        """
 
1738
                 interface=None, use_ipv6=True):
1916
1739
        self.interface = interface
1917
1740
        if use_ipv6:
1918
1741
            self.address_family = socket.AF_INET6
1919
 
        if socketfd is not None:
1920
 
            # Save the file descriptor
1921
 
            self.socketfd = socketfd
1922
 
            # Save the original socket.socket() function
1923
 
            self.socket_socket = socket.socket
1924
 
            # To implement --socket, we monkey patch socket.socket.
1925
 
            # 
1926
 
            # (When socketserver.TCPServer is a new-style class, we
1927
 
            # could make self.socket into a property instead of monkey
1928
 
            # patching socket.socket.)
1929
 
            # 
1930
 
            # Create a one-time-only replacement for socket.socket()
1931
 
            @functools.wraps(socket.socket)
1932
 
            def socket_wrapper(*args, **kwargs):
1933
 
                # Restore original function so subsequent calls are
1934
 
                # not affected.
1935
 
                socket.socket = self.socket_socket
1936
 
                del self.socket_socket
1937
 
                # This time only, return a new socket object from the
1938
 
                # saved file descriptor.
1939
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1940
 
            # Replace socket.socket() function with wrapper
1941
 
            socket.socket = socket_wrapper
1942
 
        # The socketserver.TCPServer.__init__ will call
1943
 
        # socket.socket(), which might be our replacement,
1944
 
        # socket_wrapper(), if socketfd was set.
1945
1742
        socketserver.TCPServer.__init__(self, server_address,
1946
1743
                                        RequestHandlerClass)
1947
 
    
1948
1744
    def server_bind(self):
1949
1745
        """This overrides the normal server_bind() function
1950
1746
        to bind to an interface if one was specified, and also NOT to
1958
1754
                try:
1959
1755
                    self.socket.setsockopt(socket.SOL_SOCKET,
1960
1756
                                           SO_BINDTODEVICE,
1961
 
                                           str(self.interface + '\0'))
 
1757
                                           str(self.interface
 
1758
                                               + '\0'))
1962
1759
                except socket.error as error:
1963
 
                    if error.errno == errno.EPERM:
1964
 
                        logger.error("No permission to bind to"
1965
 
                                     " interface %s", self.interface)
1966
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1760
                    if error[0] == errno.EPERM:
 
1761
                        logger.error("No permission to"
 
1762
                                     " bind to interface %s",
 
1763
                                     self.interface)
 
1764
                    elif error[0] == errno.ENOPROTOOPT:
1967
1765
                        logger.error("SO_BINDTODEVICE not available;"
1968
1766
                                     " cannot bind to interface %s",
1969
1767
                                     self.interface)
1970
 
                    elif error.errno == errno.ENODEV:
1971
 
                        logger.error("Interface %s does not exist,"
1972
 
                                     " cannot bind", self.interface)
1973
1768
                    else:
1974
1769
                        raise
1975
1770
        # Only bind(2) the socket if we really need to.
2005
1800
    """
2006
1801
    def __init__(self, server_address, RequestHandlerClass,
2007
1802
                 interface=None, use_ipv6=True, clients=None,
2008
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1803
                 gnutls_priority=None, use_dbus=True):
2009
1804
        self.enabled = False
2010
1805
        self.clients = clients
2011
1806
        if self.clients is None:
2015
1810
        IPv6_TCPServer.__init__(self, server_address,
2016
1811
                                RequestHandlerClass,
2017
1812
                                interface = interface,
2018
 
                                use_ipv6 = use_ipv6,
2019
 
                                socketfd = socketfd)
 
1813
                                use_ipv6 = use_ipv6)
2020
1814
    def server_activate(self):
2021
1815
        if self.enabled:
2022
1816
            return socketserver.TCPServer.server_activate(self)
2035
1829
    
2036
1830
    def handle_ipc(self, source, condition, parent_pipe=None,
2037
1831
                   proc = None, client_object=None):
 
1832
        condition_names = {
 
1833
            gobject.IO_IN: "IN",   # There is data to read.
 
1834
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1835
                                    # blocking).
 
1836
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1837
            gobject.IO_ERR: "ERR", # Error condition.
 
1838
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1839
                                    # broken, usually for pipes and
 
1840
                                    # sockets).
 
1841
            }
 
1842
        conditions_string = ' | '.join(name
 
1843
                                       for cond, name in
 
1844
                                       condition_names.iteritems()
 
1845
                                       if cond & condition)
2038
1846
        # error, or the other end of multiprocessing.Pipe has closed
2039
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1847
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2040
1848
            # Wait for other process to exit
2041
1849
            proc.join()
2042
1850
            return False
2100
1908
        return True
2101
1909
 
2102
1910
 
2103
 
def rfc3339_duration_to_delta(duration):
2104
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2105
 
    
2106
 
    >>> rfc3339_duration_to_delta("P7D")
2107
 
    datetime.timedelta(7)
2108
 
    >>> rfc3339_duration_to_delta("PT60S")
2109
 
    datetime.timedelta(0, 60)
2110
 
    >>> rfc3339_duration_to_delta("PT60M")
2111
 
    datetime.timedelta(0, 3600)
2112
 
    >>> rfc3339_duration_to_delta("PT24H")
2113
 
    datetime.timedelta(1)
2114
 
    >>> rfc3339_duration_to_delta("P1W")
2115
 
    datetime.timedelta(7)
2116
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2117
 
    datetime.timedelta(0, 330)
2118
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2119
 
    datetime.timedelta(1, 200)
2120
 
    """
2121
 
    
2122
 
    # Parsing an RFC 3339 duration with regular expressions is not
2123
 
    # possible - there would have to be multiple places for the same
2124
 
    # values, like seconds.  The current code, while more esoteric, is
2125
 
    # cleaner without depending on a parsing library.  If Python had a
2126
 
    # built-in library for parsing we would use it, but we'd like to
2127
 
    # avoid excessive use of external libraries.
2128
 
    
2129
 
    # New type for defining tokens, syntax, and semantics all-in-one
2130
 
    Token = collections.namedtuple("Token",
2131
 
                                   ("regexp", # To match token; if
2132
 
                                              # "value" is not None,
2133
 
                                              # must have a "group"
2134
 
                                              # containing digits
2135
 
                                    "value",  # datetime.timedelta or
2136
 
                                              # None
2137
 
                                    "followers")) # Tokens valid after
2138
 
                                                  # this token
2139
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2140
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2141
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2142
 
    token_second = Token(re.compile(r"(\d+)S"),
2143
 
                         datetime.timedelta(seconds=1),
2144
 
                         frozenset((token_end,)))
2145
 
    token_minute = Token(re.compile(r"(\d+)M"),
2146
 
                         datetime.timedelta(minutes=1),
2147
 
                         frozenset((token_second, token_end)))
2148
 
    token_hour = Token(re.compile(r"(\d+)H"),
2149
 
                       datetime.timedelta(hours=1),
2150
 
                       frozenset((token_minute, token_end)))
2151
 
    token_time = Token(re.compile(r"T"),
2152
 
                       None,
2153
 
                       frozenset((token_hour, token_minute,
2154
 
                                  token_second)))
2155
 
    token_day = Token(re.compile(r"(\d+)D"),
2156
 
                      datetime.timedelta(days=1),
2157
 
                      frozenset((token_time, token_end)))
2158
 
    token_month = Token(re.compile(r"(\d+)M"),
2159
 
                        datetime.timedelta(weeks=4),
2160
 
                        frozenset((token_day, token_end)))
2161
 
    token_year = Token(re.compile(r"(\d+)Y"),
2162
 
                       datetime.timedelta(weeks=52),
2163
 
                       frozenset((token_month, token_end)))
2164
 
    token_week = Token(re.compile(r"(\d+)W"),
2165
 
                       datetime.timedelta(weeks=1),
2166
 
                       frozenset((token_end,)))
2167
 
    token_duration = Token(re.compile(r"P"), None,
2168
 
                           frozenset((token_year, token_month,
2169
 
                                      token_day, token_time,
2170
 
                                      token_week))),
2171
 
    # Define starting values
2172
 
    value = datetime.timedelta() # Value so far
2173
 
    found_token = None
2174
 
    followers = frozenset(token_duration,) # Following valid tokens
2175
 
    s = duration                # String left to parse
2176
 
    # Loop until end token is found
2177
 
    while found_token is not token_end:
2178
 
        # Search for any currently valid tokens
2179
 
        for token in followers:
2180
 
            match = token.regexp.match(s)
2181
 
            if match is not None:
2182
 
                # Token found
2183
 
                if token.value is not None:
2184
 
                    # Value found, parse digits
2185
 
                    factor = int(match.group(1), 10)
2186
 
                    # Add to value so far
2187
 
                    value += factor * token.value
2188
 
                # Strip token from string
2189
 
                s = token.regexp.sub("", s, 1)
2190
 
                # Go to found token
2191
 
                found_token = token
2192
 
                # Set valid next tokens
2193
 
                followers = found_token.followers
2194
 
                break
2195
 
        else:
2196
 
            # No currently valid tokens were found
2197
 
            raise ValueError("Invalid RFC 3339 duration")
2198
 
    # End token found
2199
 
    return value
2200
 
 
2201
 
 
2202
1911
def string_to_delta(interval):
2203
1912
    """Parse a string and return a datetime.timedelta
2204
1913
    
2215
1924
    >>> string_to_delta('5m 30s')
2216
1925
    datetime.timedelta(0, 330)
2217
1926
    """
2218
 
    
2219
 
    try:
2220
 
        return rfc3339_duration_to_delta(interval)
2221
 
    except ValueError:
2222
 
        pass
2223
 
    
2224
1927
    timevalue = datetime.timedelta(0)
2225
1928
    for s in interval.split():
2226
1929
        try:
2237
1940
            elif suffix == "w":
2238
1941
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2239
1942
            else:
2240
 
                raise ValueError("Unknown suffix {0!r}"
2241
 
                                 .format(suffix))
 
1943
                raise ValueError("Unknown suffix %r" % suffix)
2242
1944
        except (ValueError, IndexError) as e:
2243
1945
            raise ValueError(*(e.args))
2244
1946
        timevalue += delta
2258
1960
        sys.exit()
2259
1961
    if not noclose:
2260
1962
        # Close all standard open file descriptors
2261
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1963
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2262
1964
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2263
1965
            raise OSError(errno.ENODEV,
2264
 
                          "{0} not a character device"
2265
 
                          .format(os.devnull))
 
1966
                          "%s not a character device"
 
1967
                          % os.path.devnull)
2266
1968
        os.dup2(null, sys.stdin.fileno())
2267
1969
        os.dup2(null, sys.stdout.fileno())
2268
1970
        os.dup2(null, sys.stderr.fileno())
2277
1979
    
2278
1980
    parser = argparse.ArgumentParser()
2279
1981
    parser.add_argument("-v", "--version", action="version",
2280
 
                        version = "%(prog)s {0}".format(version),
 
1982
                        version = "%%(prog)s %s" % version,
2281
1983
                        help="show version number and exit")
2282
1984
    parser.add_argument("-i", "--interface", metavar="IF",
2283
1985
                        help="Bind to interface IF")
2308
2010
    parser.add_argument("--no-restore", action="store_false",
2309
2011
                        dest="restore", help="Do not restore stored"
2310
2012
                        " state")
2311
 
    parser.add_argument("--socket", type=int,
2312
 
                        help="Specify a file descriptor to a network"
2313
 
                        " socket to use instead of creating one")
2314
2013
    parser.add_argument("--statedir", metavar="DIR",
2315
2014
                        help="Directory to save/restore state in")
2316
 
    parser.add_argument("--foreground", action="store_true",
2317
 
                        help="Run in foreground")
2318
2015
    
2319
2016
    options = parser.parse_args()
2320
2017
    
2335
2032
                        "use_ipv6": "True",
2336
2033
                        "debuglevel": "",
2337
2034
                        "restore": "True",
2338
 
                        "socket": "",
2339
 
                        "statedir": "/var/lib/mandos",
2340
 
                        "foreground": "False",
 
2035
                        "statedir": "/var/lib/mandos"
2341
2036
                        }
2342
2037
    
2343
2038
    # Parse config file for server-global settings
2348
2043
    # Convert the SafeConfigParser object to a dict
2349
2044
    server_settings = server_config.defaults()
2350
2045
    # Use the appropriate methods on the non-string config options
2351
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2046
    for option in ("debug", "use_dbus", "use_ipv6"):
2352
2047
        server_settings[option] = server_config.getboolean("DEFAULT",
2353
2048
                                                           option)
2354
2049
    if server_settings["port"]:
2355
2050
        server_settings["port"] = server_config.getint("DEFAULT",
2356
2051
                                                       "port")
2357
 
    if server_settings["socket"]:
2358
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2359
 
                                                         "socket")
2360
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2361
 
        # over with an opened os.devnull.  But we don't want this to
2362
 
        # happen with a supplied network socket.
2363
 
        if 0 <= server_settings["socket"] <= 2:
2364
 
            server_settings["socket"] = os.dup(server_settings
2365
 
                                               ["socket"])
2366
2052
    del server_config
2367
2053
    
2368
2054
    # Override the settings from the config file with command line
2370
2056
    for option in ("interface", "address", "port", "debug",
2371
2057
                   "priority", "servicename", "configdir",
2372
2058
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2373
 
                   "statedir", "socket", "foreground"):
 
2059
                   "statedir"):
2374
2060
        value = getattr(options, option)
2375
2061
        if value is not None:
2376
2062
            server_settings[option] = value
2379
2065
    for option in server_settings.keys():
2380
2066
        if type(server_settings[option]) is str:
2381
2067
            server_settings[option] = unicode(server_settings[option])
2382
 
    # Debug implies foreground
2383
 
    if server_settings["debug"]:
2384
 
        server_settings["foreground"] = True
2385
2068
    # Now we have our good server settings in "server_settings"
2386
2069
    
2387
2070
    ##################################################################
2393
2076
    use_ipv6 = server_settings["use_ipv6"]
2394
2077
    stored_state_path = os.path.join(server_settings["statedir"],
2395
2078
                                     stored_state_file)
2396
 
    foreground = server_settings["foreground"]
2397
2079
    
2398
2080
    if debug:
2399
 
        initlogger(debug, logging.DEBUG)
 
2081
        initlogger(logging.DEBUG)
2400
2082
    else:
2401
2083
        if not debuglevel:
2402
 
            initlogger(debug)
 
2084
            initlogger()
2403
2085
        else:
2404
2086
            level = getattr(logging, debuglevel.upper())
2405
 
            initlogger(debug, level)
 
2087
            initlogger(level)
2406
2088
    
2407
2089
    if server_settings["servicename"] != "Mandos":
2408
2090
        syslogger.setFormatter(logging.Formatter
2409
 
                               ('Mandos ({0}) [%(process)d]:'
2410
 
                                ' %(levelname)s: %(message)s'
2411
 
                                .format(server_settings
2412
 
                                        ["servicename"])))
 
2091
                               ('Mandos (%s) [%%(process)d]:'
 
2092
                                ' %%(levelname)s: %%(message)s'
 
2093
                                % server_settings["servicename"]))
2413
2094
    
2414
2095
    # Parse config file with clients
2415
 
    client_config = configparser.SafeConfigParser(Client
2416
 
                                                  .client_defaults)
 
2096
    client_config = configparser.SafeConfigParser(Client.client_defaults)
2417
2097
    client_config.read(os.path.join(server_settings["configdir"],
2418
2098
                                    "clients.conf"))
2419
2099
    
2428
2108
                              use_ipv6=use_ipv6,
2429
2109
                              gnutls_priority=
2430
2110
                              server_settings["priority"],
2431
 
                              use_dbus=use_dbus,
2432
 
                              socketfd=(server_settings["socket"]
2433
 
                                        or None))
2434
 
    if not foreground:
 
2111
                              use_dbus=use_dbus)
 
2112
    if not debug:
2435
2113
        pidfilename = "/var/run/mandos.pid"
2436
 
        pidfile = None
2437
2114
        try:
2438
2115
            pidfile = open(pidfilename, "w")
2439
 
        except IOError as e:
2440
 
            logger.error("Could not open file %r", pidfilename,
2441
 
                         exc_info=e)
 
2116
        except IOError:
 
2117
            logger.error("Could not open file %r", pidfilename)
2442
2118
    
2443
 
    for name in ("_mandos", "mandos", "nobody"):
 
2119
    try:
 
2120
        uid = pwd.getpwnam("_mandos").pw_uid
 
2121
        gid = pwd.getpwnam("_mandos").pw_gid
 
2122
    except KeyError:
2444
2123
        try:
2445
 
            uid = pwd.getpwnam(name).pw_uid
2446
 
            gid = pwd.getpwnam(name).pw_gid
2447
 
            break
 
2124
            uid = pwd.getpwnam("mandos").pw_uid
 
2125
            gid = pwd.getpwnam("mandos").pw_gid
2448
2126
        except KeyError:
2449
 
            continue
2450
 
    else:
2451
 
        uid = 65534
2452
 
        gid = 65534
 
2127
            try:
 
2128
                uid = pwd.getpwnam("nobody").pw_uid
 
2129
                gid = pwd.getpwnam("nobody").pw_gid
 
2130
            except KeyError:
 
2131
                uid = 65534
 
2132
                gid = 65534
2453
2133
    try:
2454
2134
        os.setgid(gid)
2455
2135
        os.setuid(uid)
2456
2136
    except OSError as error:
2457
 
        if error.errno != errno.EPERM:
 
2137
        if error[0] != errno.EPERM:
2458
2138
            raise error
2459
2139
    
2460
2140
    if debug:
2472
2152
         .gnutls_global_set_log_function(debug_gnutls))
2473
2153
        
2474
2154
        # Redirect stdin so all checkers get /dev/null
2475
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2155
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2476
2156
        os.dup2(null, sys.stdin.fileno())
2477
2157
        if null > 2:
2478
2158
            os.close(null)
 
2159
    else:
 
2160
        # No console logging
 
2161
        logger.removeHandler(console)
2479
2162
    
2480
2163
    # Need to fork before connecting to D-Bus
2481
 
    if not foreground:
 
2164
    if not debug:
2482
2165
        # Close all input and output, do double fork, etc.
2483
2166
        daemon()
2484
2167
    
2485
 
    # multiprocessing will use threads, so before we use gobject we
2486
 
    # need to inform gobject that threads will be used.
2487
2168
    gobject.threads_init()
2488
2169
    
2489
2170
    global main_loop
2490
2171
    # From the Avahi example code
2491
 
    DBusGMainLoop(set_as_default=True)
 
2172
    DBusGMainLoop(set_as_default=True )
2492
2173
    main_loop = gobject.MainLoop()
2493
2174
    bus = dbus.SystemBus()
2494
2175
    # End of Avahi example code
2500
2181
                            ("se.bsnet.fukt.Mandos", bus,
2501
2182
                             do_not_queue=True))
2502
2183
        except dbus.exceptions.NameExistsException as e:
2503
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2184
            logger.error(unicode(e) + ", disabling D-Bus")
2504
2185
            use_dbus = False
2505
2186
            server_settings["use_dbus"] = False
2506
2187
            tcp_server.use_dbus = False
2518
2199
    
2519
2200
    client_class = Client
2520
2201
    if use_dbus:
2521
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2202
        client_class = functools.partial(ClientDBusTransitional,
 
2203
                                         bus = bus)
2522
2204
    
2523
2205
    client_settings = Client.config_parser(client_config)
2524
2206
    old_client_settings = {}
2532
2214
                                                     (stored_state))
2533
2215
            os.remove(stored_state_path)
2534
2216
        except IOError as e:
2535
 
            if e.errno == errno.ENOENT:
2536
 
                logger.warning("Could not load persistent state: {0}"
2537
 
                                .format(os.strerror(e.errno)))
2538
 
            else:
2539
 
                logger.critical("Could not load persistent state:",
2540
 
                                exc_info=e)
 
2217
            logger.warning("Could not load persistent state: {0}"
 
2218
                           .format(e))
 
2219
            if e.errno != errno.ENOENT:
2541
2220
                raise
2542
2221
        except EOFError as e:
2543
2222
            logger.warning("Could not load persistent state: "
2544
 
                           "EOFError:", exc_info=e)
 
2223
                           "EOFError: {0}".format(e))
2545
2224
    
2546
2225
    with PGPEngine() as pgp:
2547
2226
        for client_name, client in clients_data.iteritems():
2564
2243
            
2565
2244
            # Clients who has passed its expire date can still be
2566
2245
            # enabled if its last checker was successful.  Clients
2567
 
            # whose checker succeeded before we stored its state is
2568
 
            # assumed to have successfully run all checkers during
2569
 
            # downtime.
 
2246
            # whose checker failed before we stored its state is
 
2247
            # assumed to have failed all checkers during downtime.
2570
2248
            if client["enabled"]:
2571
2249
                if datetime.datetime.utcnow() >= client["expires"]:
2572
2250
                    if not client["last_checked_ok"]:
2573
2251
                        logger.warning(
2574
2252
                            "disabling client {0} - Client never "
2575
 
                            "performed a successful checker"
2576
 
                            .format(client_name))
 
2253
                            "performed a successfull checker"
 
2254
                            .format(client["name"]))
2577
2255
                        client["enabled"] = False
2578
2256
                    elif client["last_checker_status"] != 0:
2579
2257
                        logger.warning(
2580
2258
                            "disabling client {0} - Client "
2581
2259
                            "last checker failed with error code {1}"
2582
 
                            .format(client_name,
 
2260
                            .format(client["name"],
2583
2261
                                    client["last_checker_status"]))
2584
2262
                        client["enabled"] = False
2585
2263
                    else:
2586
2264
                        client["expires"] = (datetime.datetime
2587
2265
                                             .utcnow()
2588
2266
                                             + client["timeout"])
2589
 
                        logger.debug("Last checker succeeded,"
2590
 
                                     " keeping {0} enabled"
2591
 
                                     .format(client_name))
 
2267
                    
2592
2268
            try:
2593
2269
                client["secret"] = (
2594
2270
                    pgp.decrypt(client["encrypted_secret"],
2600
2276
                             .format(client_name))
2601
2277
                client["secret"] = (
2602
2278
                    client_settings[client_name]["secret"])
 
2279
 
2603
2280
    
2604
2281
    # Add/remove clients based on new changes made to config
2605
 
    for client_name in (set(old_client_settings)
2606
 
                        - set(client_settings)):
 
2282
    for client_name in set(old_client_settings) - set(client_settings):
2607
2283
        del clients_data[client_name]
2608
 
    for client_name in (set(client_settings)
2609
 
                        - set(old_client_settings)):
 
2284
    for client_name in set(client_settings) - set(old_client_settings):
2610
2285
        clients_data[client_name] = client_settings[client_name]
2611
 
    
2612
 
    # Create all client objects
 
2286
 
 
2287
    # Create clients all clients
2613
2288
    for client_name, client in clients_data.iteritems():
2614
2289
        tcp_server.clients[client_name] = client_class(
2615
2290
            name = client_name, settings = client)
2616
2291
    
2617
2292
    if not tcp_server.clients:
2618
2293
        logger.warning("No clients defined")
2619
 
    
2620
 
    if not foreground:
2621
 
        if pidfile is not None:
2622
 
            try:
2623
 
                with pidfile:
2624
 
                    pid = os.getpid()
2625
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2626
 
            except IOError:
2627
 
                logger.error("Could not write to file %r with PID %d",
2628
 
                             pidfilename, pid)
2629
 
        del pidfile
 
2294
        
 
2295
    if not debug:
 
2296
        try:
 
2297
            with pidfile:
 
2298
                pid = os.getpid()
 
2299
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2300
            del pidfile
 
2301
        except IOError:
 
2302
            logger.error("Could not write to file %r with PID %d",
 
2303
                         pidfilename, pid)
 
2304
        except NameError:
 
2305
            # "pidfile" was never created
 
2306
            pass
2630
2307
        del pidfilename
 
2308
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2631
2309
    
2632
2310
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2633
2311
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2634
2312
    
2635
2313
    if use_dbus:
2636
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2637
 
                                        "se.bsnet.fukt.Mandos"})
2638
 
        class MandosDBusService(DBusObjectWithProperties):
 
2314
        class MandosDBusService(dbus.service.Object):
2639
2315
            """A D-Bus proxy object"""
2640
2316
            def __init__(self):
2641
2317
                dbus.service.Object.__init__(self, bus, "/")
2642
2318
            _interface = "se.recompile.Mandos"
2643
2319
            
2644
 
            @dbus_interface_annotations(_interface)
2645
 
            def _foo(self):
2646
 
                return { "org.freedesktop.DBus.Property"
2647
 
                         ".EmitsChangedSignal":
2648
 
                             "false"}
2649
 
            
2650
2320
            @dbus.service.signal(_interface, signature="o")
2651
2321
            def ClientAdded(self, objpath):
2652
2322
                "D-Bus signal"
2694
2364
            
2695
2365
            del _interface
2696
2366
        
2697
 
        mandos_dbus_service = MandosDBusService()
 
2367
        class MandosDBusServiceTransitional(MandosDBusService):
 
2368
            __metaclass__ = AlternateDBusNamesMetaclass
 
2369
        mandos_dbus_service = MandosDBusServiceTransitional()
2698
2370
    
2699
2371
    def cleanup():
2700
2372
        "Cleanup function; run on exit"
2733
2405
                del client_settings[client.name]["secret"]
2734
2406
        
2735
2407
        try:
2736
 
            with (tempfile.NamedTemporaryFile
2737
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2738
 
                   dir=os.path.dirname(stored_state_path),
2739
 
                   delete=False)) as stored_state:
 
2408
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2409
                                                prefix="clients-",
 
2410
                                                dir=os.path.dirname
 
2411
                                                (stored_state_path))
 
2412
            with os.fdopen(tempfd, "wb") as stored_state:
2740
2413
                pickle.dump((clients, client_settings), stored_state)
2741
 
                tempname=stored_state.name
2742
2414
            os.rename(tempname, stored_state_path)
2743
2415
        except (IOError, OSError) as e:
2744
 
            if not debug:
2745
 
                try:
2746
 
                    os.remove(tempname)
2747
 
                except NameError:
2748
 
                    pass
2749
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2750
 
                logger.warning("Could not save persistent state: {0}"
2751
 
                               .format(os.strerror(e.errno)))
2752
 
            else:
2753
 
                logger.warning("Could not save persistent state:",
2754
 
                               exc_info=e)
2755
 
                raise e
 
2416
            logger.warning("Could not save persistent state: {0}"
 
2417
                           .format(e))
 
2418
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2419
                                   errno.EEXIST)):
 
2420
                raise
2756
2421
        
2757
2422
        # Delete all clients, and settings from config
2758
2423
        while tcp_server.clients:
2785
2450
    service.port = tcp_server.socket.getsockname()[1]
2786
2451
    if use_ipv6:
2787
2452
        logger.info("Now listening on address %r, port %d,"
2788
 
                    " flowinfo %d, scope_id %d",
2789
 
                    *tcp_server.socket.getsockname())
 
2453
                    " flowinfo %d, scope_id %d"
 
2454
                    % tcp_server.socket.getsockname())
2790
2455
    else:                       # IPv4
2791
 
        logger.info("Now listening on address %r, port %d",
2792
 
                    *tcp_server.socket.getsockname())
 
2456
        logger.info("Now listening on address %r, port %d"
 
2457
                    % tcp_server.socket.getsockname())
2793
2458
    
2794
2459
    #service.interface = tcp_server.socket.getsockname()[3]
2795
2460
    
2798
2463
        try:
2799
2464
            service.activate()
2800
2465
        except dbus.exceptions.DBusException as error:
2801
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2466
            logger.critical("DBusException: %s", error)
2802
2467
            cleanup()
2803
2468
            sys.exit(1)
2804
2469
        # End of Avahi example code
2811
2476
        logger.debug("Starting main loop")
2812
2477
        main_loop.run()
2813
2478
    except AvahiError as error:
2814
 
        logger.critical("Avahi Error", exc_info=error)
 
2479
        logger.critical("AvahiError: %s", error)
2815
2480
        cleanup()
2816
2481
        sys.exit(1)
2817
2482
    except KeyboardInterrupt: