/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-06-24 03:45:55 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 303.
  • Revision ID: teddy@recompile.se-20120624034555-7p0dtbpsz0dgsn4d
* mandos (Client.start_checker): Add comment.  Break long line.

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-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
 
37
from future_builtins import *
 
38
 
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
65
67
import types
66
68
import binascii
67
69
import tempfile
 
70
import itertools
 
71
import collections
68
72
 
69
73
import dbus
70
74
import dbus.service
85
89
    except ImportError:
86
90
        SO_BINDTODEVICE = None
87
91
 
88
 
version = "1.4.1"
 
92
version = "1.6.0"
89
93
stored_state_file = "clients.pickle"
90
94
 
91
95
logger = logging.getLogger()
110
114
        return interface_index
111
115
 
112
116
 
113
 
def initlogger(level=logging.WARNING):
 
117
def initlogger(debug, level=logging.WARNING):
114
118
    """init logger and add loglevel"""
115
119
    
116
120
    syslogger.setFormatter(logging.Formatter
118
122
                            ' %(message)s'))
119
123
    logger.addHandler(syslogger)
120
124
    
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)
 
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)
127
132
    logger.setLevel(level)
128
133
 
129
134
 
141
146
        self.gnupg.options.meta_interactive = False
142
147
        self.gnupg.options.homedir = self.tempdir
143
148
        self.gnupg.options.extra_args.extend(['--force-mdc',
144
 
                                              '--quiet'])
 
149
                                              '--quiet',
 
150
                                              '--no-use-agent'])
145
151
    
146
152
    def __enter__(self):
147
153
        return self
148
154
    
149
 
    def __exit__ (self, exc_type, exc_value, traceback):
 
155
    def __exit__(self, exc_type, exc_value, traceback):
150
156
        self._cleanup()
151
157
        return False
152
158
    
173
179
    
174
180
    def encrypt(self, data, password):
175
181
        self.gnupg.passphrase = self.password_encode(password)
176
 
        with open(os.devnull) as devnull:
 
182
        with open(os.devnull, "w") as devnull:
177
183
            try:
178
184
                proc = self.gnupg.run(['--symmetric'],
179
185
                                      create_fhs=['stdin', 'stdout'],
190
196
    
191
197
    def decrypt(self, data, password):
192
198
        self.gnupg.passphrase = self.password_encode(password)
193
 
        with open(os.devnull) as devnull:
 
199
        with open(os.devnull, "w") as devnull:
194
200
            try:
195
201
                proc = self.gnupg.run(['--decrypt'],
196
202
                                      create_fhs=['stdin', 'stdout'],
197
203
                                      attach_fhs={'stderr': devnull})
198
 
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
204
                with contextlib.closing(proc.handles['stdin']) as f:
199
205
                    f.write(data)
200
206
                with contextlib.closing(proc.handles['stdout']) as f:
201
207
                    decrypted_plaintext = f.read()
206
212
        return decrypted_plaintext
207
213
 
208
214
 
209
 
 
210
215
class AvahiError(Exception):
211
216
    def __init__(self, value, *args, **kwargs):
212
217
        self.value = value
241
246
    server: D-Bus Server
242
247
    bus: dbus.SystemBus()
243
248
    """
 
249
    
244
250
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
245
251
                 servicetype = None, port = None, TXT = None,
246
252
                 domain = "", host = "", max_renames = 32768,
259
265
        self.server = None
260
266
        self.bus = bus
261
267
        self.entry_group_state_changed_match = None
 
268
    
262
269
    def rename(self):
263
270
        """Derived from the Avahi example code"""
264
271
        if self.rename_count >= self.max_renames:
274
281
        try:
275
282
            self.add()
276
283
        except dbus.exceptions.DBusException as error:
277
 
            logger.critical("DBusException: %s", error)
 
284
            logger.critical("D-Bus Exception", exc_info=error)
278
285
            self.cleanup()
279
286
            os._exit(1)
280
287
        self.rename_count += 1
 
288
    
281
289
    def remove(self):
282
290
        """Derived from the Avahi example code"""
283
291
        if self.entry_group_state_changed_match is not None:
285
293
            self.entry_group_state_changed_match = None
286
294
        if self.group is not None:
287
295
            self.group.Reset()
 
296
    
288
297
    def add(self):
289
298
        """Derived from the Avahi example code"""
290
299
        self.remove()
307
316
            dbus.UInt16(self.port),
308
317
            avahi.string_array_to_txt_array(self.TXT))
309
318
        self.group.Commit()
 
319
    
310
320
    def entry_group_state_changed(self, state, error):
311
321
        """Derived from the Avahi example code"""
312
322
        logger.debug("Avahi entry group state change: %i", state)
319
329
        elif state == avahi.ENTRY_GROUP_FAILURE:
320
330
            logger.critical("Avahi: Error in group state changed %s",
321
331
                            unicode(error))
322
 
            raise AvahiGroupError("State changed: %s"
323
 
                                  % unicode(error))
 
332
            raise AvahiGroupError("State changed: {0!s}"
 
333
                                  .format(error))
 
334
    
324
335
    def cleanup(self):
325
336
        """Derived from the Avahi example code"""
326
337
        if self.group is not None:
331
342
                pass
332
343
            self.group = None
333
344
        self.remove()
 
345
    
334
346
    def server_state_changed(self, state, error=None):
335
347
        """Derived from the Avahi example code"""
336
348
        logger.debug("Avahi server state change: %i", state)
355
367
                logger.debug("Unknown state: %r", state)
356
368
            else:
357
369
                logger.debug("Unknown state: %r: %r", state, error)
 
370
    
358
371
    def activate(self):
359
372
        """Derived from the Avahi example code"""
360
373
        if self.server is None:
367
380
                                 self.server_state_changed)
368
381
        self.server_state_changed(self.server.GetState())
369
382
 
 
383
 
370
384
class AvahiServiceToSyslog(AvahiService):
371
385
    def rename(self):
372
386
        """Add the new name to the syslog messages"""
373
387
        ret = AvahiService.rename(self)
374
388
        syslogger.setFormatter(logging.Formatter
375
 
                               ('Mandos (%s) [%%(process)d]:'
376
 
                                ' %%(levelname)s: %%(message)s'
377
 
                                % self.name))
 
389
                               ('Mandos ({0}) [%(process)d]:'
 
390
                                ' %(levelname)s: %(message)s'
 
391
                                .format(self.name)))
378
392
        return ret
379
393
 
 
394
 
380
395
def timedelta_to_milliseconds(td):
381
396
    "Convert a datetime.timedelta() to milliseconds"
382
397
    return ((td.days * 24 * 60 * 60 * 1000)
383
398
            + (td.seconds * 1000)
384
399
            + (td.microseconds // 1000))
385
 
        
 
400
 
 
401
 
386
402
class Client(object):
387
403
    """A representation of a client host served by this server.
388
404
    
413
429
    last_checked_ok: datetime.datetime(); (UTC) or None
414
430
    last_checker_status: integer between 0 and 255 reflecting exit
415
431
                         status of last checker. -1 reflects crashed
416
 
                         checker, or None.
 
432
                         checker, -2 means no checker completed yet.
417
433
    last_enabled: datetime.datetime(); (UTC) or None
418
434
    name:       string; from the config file, used in log messages and
419
435
                        D-Bus identifiers
420
436
    secret:     bytestring; sent verbatim (over TLS) to client
421
437
    timeout:    datetime.timedelta(); How long from last_checked_ok
422
438
                                      until this client is disabled
423
 
    extended_timeout:   extra long timeout when password has been sent
 
439
    extended_timeout:   extra long timeout when secret has been sent
424
440
    runtime_expansions: Allowed attributes for runtime expansion.
425
441
    expires:    datetime.datetime(); time (UTC) when a client will be
426
442
                disabled, or None
427
443
    """
428
444
    
429
445
    runtime_expansions = ("approval_delay", "approval_duration",
430
 
                          "created", "enabled", "fingerprint",
431
 
                          "host", "interval", "last_checked_ok",
 
446
                          "created", "enabled", "expires",
 
447
                          "fingerprint", "host", "interval",
 
448
                          "last_approval_request", "last_checked_ok",
432
449
                          "last_enabled", "name", "timeout")
433
 
    client_defaults = { "timeout": "5m",
434
 
                        "extended_timeout": "15m",
435
 
                        "interval": "2m",
 
450
    client_defaults = { "timeout": "PT5M",
 
451
                        "extended_timeout": "PT15M",
 
452
                        "interval": "PT2M",
436
453
                        "checker": "fping -q -- %%(host)s",
437
454
                        "host": "",
438
 
                        "approval_delay": "0s",
439
 
                        "approval_duration": "1s",
 
455
                        "approval_delay": "PT0S",
 
456
                        "approval_duration": "PT1S",
440
457
                        "approved_by_default": "True",
441
458
                        "enabled": "True",
442
459
                        }
455
472
    
456
473
    def approval_delay_milliseconds(self):
457
474
        return timedelta_to_milliseconds(self.approval_delay)
458
 
 
 
475
    
459
476
    @staticmethod
460
477
    def config_parser(config):
461
 
        """ Construct a new dict of client settings of this form:
 
478
        """Construct a new dict of client settings of this form:
462
479
        { client_name: {setting_name: value, ...}, ...}
463
 
        with exceptions for any special settings as defined above"""
 
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
        """
464
484
        settings = {}
465
485
        for client_name in config.sections():
466
486
            section = dict(config.items(client_name))
470
490
            # Reformat values from string types to Python types
471
491
            client["approved_by_default"] = config.getboolean(
472
492
                client_name, "approved_by_default")
473
 
            client["enabled"] = config.getboolean(client_name, "enabled")
 
493
            client["enabled"] = config.getboolean(client_name,
 
494
                                                  "enabled")
474
495
            
475
496
            client["fingerprint"] = (section["fingerprint"].upper()
476
497
                                     .replace(" ", ""))
482
503
                          "rb") as secfile:
483
504
                    client["secret"] = secfile.read()
484
505
            else:
485
 
                raise TypeError("No secret or secfile for section %s"
486
 
                                % section)
 
506
                raise TypeError("No secret or secfile for section {0}"
 
507
                                .format(section))
487
508
            client["timeout"] = string_to_delta(section["timeout"])
488
509
            client["extended_timeout"] = string_to_delta(
489
510
                section["extended_timeout"])
495
516
            client["checker_command"] = section["checker"]
496
517
            client["last_approval_request"] = None
497
518
            client["last_checked_ok"] = None
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
 
 
 
519
            client["last_checker_status"] = -2
 
520
        
507
521
        return settings
508
 
        
509
 
        
 
522
    
510
523
    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."""
514
524
        self.name = name
515
525
        # adding all client settings
516
526
        for setting, value in settings.iteritems():
517
527
            setattr(self, setting, value)
518
528
        
 
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
        
519
539
        logger.debug("Creating client %r", self.name)
520
540
        # Uppercase and remove spaces from fingerprint for later
521
541
        # comparison purposes with return value from the fingerprint()
522
542
        # function
523
543
        logger.debug("  Fingerprint: %s", self.fingerprint)
524
 
        self.created = settings.get("created", datetime.datetime.utcnow())
525
 
 
 
544
        self.created = settings.get("created",
 
545
                                    datetime.datetime.utcnow())
 
546
        
526
547
        # attributes specific for this server instance
527
548
        self.checker = None
528
549
        self.checker_initiator_tag = None
556
577
        if getattr(self, "enabled", False):
557
578
            # Already enabled
558
579
            return
559
 
        self.send_changedstate()
560
580
        self.expires = datetime.datetime.utcnow() + self.timeout
561
581
        self.enabled = True
562
582
        self.last_enabled = datetime.datetime.utcnow()
563
583
        self.init_checker()
 
584
        self.send_changedstate()
564
585
    
565
586
    def disable(self, quiet=True):
566
587
        """Disable this client."""
567
588
        if not getattr(self, "enabled", False):
568
589
            return False
569
590
        if not quiet:
570
 
            self.send_changedstate()
571
 
        if not quiet:
572
591
            logger.info("Disabling client %s", self.name)
573
 
        if getattr(self, "disable_initiator_tag", False):
 
592
        if getattr(self, "disable_initiator_tag", None) is not None:
574
593
            gobject.source_remove(self.disable_initiator_tag)
575
594
            self.disable_initiator_tag = None
576
595
        self.expires = None
577
 
        if getattr(self, "checker_initiator_tag", False):
 
596
        if getattr(self, "checker_initiator_tag", None) is not None:
578
597
            gobject.source_remove(self.checker_initiator_tag)
579
598
            self.checker_initiator_tag = None
580
599
        self.stop_checker()
581
600
        self.enabled = False
 
601
        if not quiet:
 
602
            self.send_changedstate()
582
603
        # Do not run this again if called by a gobject.timeout_add
583
604
        return False
584
605
    
588
609
    def init_checker(self):
589
610
        # Schedule a new checker to be started an 'interval' from now,
590
611
        # and every interval from then on.
 
612
        if self.checker_initiator_tag is not None:
 
613
            gobject.source_remove(self.checker_initiator_tag)
591
614
        self.checker_initiator_tag = (gobject.timeout_add
592
615
                                      (self.interval_milliseconds(),
593
616
                                       self.start_checker))
594
617
        # Schedule a disable() when 'timeout' has passed
 
618
        if self.disable_initiator_tag is not None:
 
619
            gobject.source_remove(self.disable_initiator_tag)
595
620
        self.disable_initiator_tag = (gobject.timeout_add
596
621
                                   (self.timeout_milliseconds(),
597
622
                                    self.disable))
616
641
            logger.warning("Checker for %(name)s crashed?",
617
642
                           vars(self))
618
643
    
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
 
        """
 
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."""
625
652
        if timeout is None:
626
653
            timeout = self.timeout
627
 
        self.last_checked_ok = datetime.datetime.utcnow()
628
654
        if self.disable_initiator_tag is not None:
629
655
            gobject.source_remove(self.disable_initiator_tag)
 
656
            self.disable_initiator_tag = None
630
657
        if getattr(self, "enabled", False):
631
658
            self.disable_initiator_tag = (gobject.timeout_add
632
659
                                          (timedelta_to_milliseconds
642
669
        If a checker already exists, leave it running and do
643
670
        nothing."""
644
671
        # The reason for not killing a running checker is that if we
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
 
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
649
676
        # checkers alone, the checker would have to take more time
650
677
        # than 'timeout' for the client to be disabled, which is as it
651
678
        # should be.
665
692
                                      self.current_checker_command)
666
693
        # Start a new checker if needed
667
694
        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)
668
700
            try:
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
 
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
687
706
            self.current_checker_command = command
688
707
            try:
689
708
                logger.info("Starting checker %r for %s",
695
714
                self.checker = subprocess.Popen(command,
696
715
                                                close_fds=True,
697
716
                                                shell=True, cwd="/")
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.
 
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:
704
728
                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)
708
729
            except OSError as error:
709
 
                logger.error("Failed to start subprocess: %s",
710
 
                             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)
711
739
        # Re-run this periodically if run by gobject.timeout_add
712
740
        return True
713
741
    
720
748
            return
721
749
        logger.debug("Stopping checker for %(name)s", vars(self))
722
750
        try:
723
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
751
            self.checker.terminate()
724
752
            #time.sleep(0.5)
725
753
            #if self.checker.poll() is None:
726
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
754
            #    self.checker.kill()
727
755
        except OSError as error:
728
756
            if error.errno != errno.ESRCH: # No such process
729
757
                raise
746
774
    # "Set" method, so we fail early here:
747
775
    if byte_arrays and signature != "ay":
748
776
        raise ValueError("Byte arrays not supported for non-'ay'"
749
 
                         " signature %r" % signature)
 
777
                         " signature {0!r}".format(signature))
750
778
    def decorator(func):
751
779
        func._dbus_is_property = True
752
780
        func._dbus_interface = dbus_interface
760
788
    return decorator
761
789
 
762
790
 
 
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
 
763
828
class DBusPropertyException(dbus.exceptions.DBusException):
764
829
    """A base class for D-Bus property-related exceptions
765
830
    """
788
853
    """
789
854
    
790
855
    @staticmethod
791
 
    def _is_dbus_property(obj):
792
 
        return getattr(obj, "_dbus_is_property", False)
 
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)
793
864
    
794
 
    def _get_all_dbus_properties(self):
 
865
    def _get_all_dbus_things(self, thing):
795
866
        """Returns a generator of (name, attribute) pairs
796
867
        """
797
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
868
        return ((getattr(athing.__get__(self), "_dbus_name",
 
869
                         name),
 
870
                 athing.__get__(self))
798
871
                for cls in self.__class__.__mro__
799
 
                for name, prop in
800
 
                inspect.getmembers(cls, self._is_dbus_property))
 
872
                for name, athing in
 
873
                inspect.getmembers(cls,
 
874
                                   self._is_dbus_thing(thing)))
801
875
    
802
876
    def _get_dbus_property(self, interface_name, property_name):
803
877
        """Returns a bound method if one exists which is a D-Bus
805
879
        """
806
880
        for cls in  self.__class__.__mro__:
807
881
            for name, value in (inspect.getmembers
808
 
                                (cls, self._is_dbus_property)):
 
882
                                (cls,
 
883
                                 self._is_dbus_thing("property"))):
809
884
                if (value._dbus_name == property_name
810
885
                    and value._dbus_interface == interface_name):
811
886
                    return value.__get__(self)
840
915
            # signatures other than "ay".
841
916
            if prop._dbus_signature != "ay":
842
917
                raise ValueError
843
 
            value = dbus.ByteArray(''.join(unichr(byte)
844
 
                                           for byte in value))
 
918
            value = dbus.ByteArray(b''.join(chr(byte)
 
919
                                            for byte in value))
845
920
        prop(value)
846
921
    
847
922
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
853
928
        Note: Will not include properties with access="write".
854
929
        """
855
930
        properties = {}
856
 
        for name, prop in self._get_all_dbus_properties():
 
931
        for name, prop in self._get_all_dbus_things("property"):
857
932
            if (interface_name
858
933
                and interface_name != prop._dbus_interface):
859
934
                # Interface non-empty but did not match
874
949
                         path_keyword='object_path',
875
950
                         connection_keyword='connection')
876
951
    def Introspect(self, object_path, connection):
877
 
        """Standard D-Bus method, overloaded to insert property tags.
 
952
        """Overloading of standard D-Bus method.
 
953
        
 
954
        Inserts property tags and interface annotation tags.
878
955
        """
879
956
        xmlstring = dbus.service.Object.Introspect(self, object_path,
880
957
                                                   connection)
887
964
                e.setAttribute("access", prop._dbus_access)
888
965
                return e
889
966
            for if_tag in document.getElementsByTagName("interface"):
 
967
                # Add property tags
890
968
                for tag in (make_tag(document, name, prop)
891
969
                            for name, prop
892
 
                            in self._get_all_dbus_properties()
 
970
                            in self._get_all_dbus_things("property")
893
971
                            if prop._dbus_interface
894
972
                            == if_tag.getAttribute("name")):
895
973
                    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)
896
1005
                # Add the names to the return values for the
897
1006
                # "org.freedesktop.DBus.Properties" methods
898
1007
                if (if_tag.getAttribute("name")
913
1022
        except (AttributeError, xml.dom.DOMException,
914
1023
                xml.parsers.expat.ExpatError) as error:
915
1024
            logger.error("Failed to override Introspection method",
916
 
                         error)
 
1025
                         exc_info=error)
917
1026
        return xmlstring
918
1027
 
919
1028
 
920
 
def datetime_to_dbus (dt, variant_level=0):
 
1029
def datetime_to_dbus(dt, variant_level=0):
921
1030
    """Convert a UTC datetime.datetime() to a D-Bus type."""
922
1031
    if dt is None:
923
1032
        return dbus.String("", variant_level = variant_level)
925
1034
                       variant_level=variant_level)
926
1035
 
927
1036
 
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.
 
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).
932
1059
    """
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):
 
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):
940
1067
                # Ignore non-D-Bus attributes, and D-Bus attributes
941
1068
                # with the wrong interface name
942
1069
                if (not hasattr(attribute, "_dbus_interface")
943
1070
                    or not attribute._dbus_interface
944
 
                    .startswith("se.recompile.Mandos")):
 
1071
                    .startswith(orig_interface_name)):
945
1072
                    continue
946
1073
                # Create an alternate D-Bus interface name based on
947
1074
                # the current name
948
1075
                alt_interface = (attribute._dbus_interface
949
 
                                 .replace("se.recompile.Mandos",
950
 
                                          "se.bsnet.fukt.Mandos"))
 
1076
                                 .replace(orig_interface_name,
 
1077
                                          alt_interface_name))
 
1078
                interface_names.add(alt_interface)
951
1079
                # Is this a D-Bus signal?
952
1080
                if getattr(attribute, "_dbus_is_signal", False):
953
1081
                    # Extract the original non-method function by
968
1096
                                nonmethod_func.func_name,
969
1097
                                nonmethod_func.func_defaults,
970
1098
                                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
971
1105
                    # Define a creator of a function to call both the
972
 
                    # old and new functions, so both the old and new
973
 
                    # signals gets sent when the function is called
 
1106
                    # original and alternate functions, so both the
 
1107
                    # original and alternate signals gets sent when
 
1108
                    # the function is called
974
1109
                    def fixscope(func1, func2):
975
1110
                        """This function is a scope container to pass
976
1111
                        func1 and func2 to the "call_both" function
983
1118
                        return call_both
984
1119
                    # Create the "call_both" function and add it to
985
1120
                    # the class
986
 
                    attr[attrname] = fixscope(attribute,
987
 
                                              new_function)
 
1121
                    attr[attrname] = fixscope(attribute, new_function)
988
1122
                # Is this a D-Bus method?
989
1123
                elif getattr(attribute, "_dbus_is_method", False):
990
1124
                    # Create a new, but exactly alike, function
1001
1135
                                        attribute.func_name,
1002
1136
                                        attribute.func_defaults,
1003
1137
                                        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
1004
1144
                # Is this a D-Bus property?
1005
1145
                elif getattr(attribute, "_dbus_is_property", False):
1006
1146
                    # Create a new, but exactly alike, function
1020
1160
                                        attribute.func_name,
1021
1161
                                        attribute.func_defaults,
1022
1162
                                        attribute.func_closure)))
1023
 
        return type.__new__(mcs, name, bases, attr)
1024
 
 
1025
 
 
 
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"})
1026
1208
class ClientDBus(Client, DBusObjectWithProperties):
1027
1209
    """A Client class using D-Bus
1028
1210
    
1039
1221
    def __init__(self, bus = None, *args, **kwargs):
1040
1222
        self.bus = bus
1041
1223
        Client.__init__(self, *args, **kwargs)
1042
 
        self._approvals_pending = 0
1043
 
        
1044
 
        self._approvals_pending = 0
1045
1224
        # Only now, when this client is initialized, can it show up on
1046
1225
        # the D-Bus
1047
1226
        client_object_name = unicode(self.name).translate(
1051
1230
                                 ("/clients/" + client_object_name))
1052
1231
        DBusObjectWithProperties.__init__(self, self.bus,
1053
1232
                                          self.dbus_object_path)
1054
 
        
 
1233
    
1055
1234
    def notifychangeproperty(transform_func,
1056
1235
                             dbus_name, type_func=lambda x: x,
1057
1236
                             variant_level=1):
1080
1259
        
1081
1260
        return property(lambda self: getattr(self, attrname), setter)
1082
1261
    
1083
 
    
1084
1262
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1085
1263
    approvals_pending = notifychangeproperty(dbus.Boolean,
1086
1264
                                             "ApprovalPending",
1093
1271
                                       checker is not None)
1094
1272
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1095
1273
                                           "LastCheckedOK")
 
1274
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1275
                                               "LastCheckerStatus")
1096
1276
    last_approval_request = notifychangeproperty(
1097
1277
        datetime_to_dbus, "LastApprovalRequest")
1098
1278
    approved_by_default = notifychangeproperty(dbus.Boolean,
1166
1346
        return False
1167
1347
    
1168
1348
    def approve(self, value=True):
1169
 
        self.send_changedstate()
1170
1349
        self.approved = value
1171
1350
        gobject.timeout_add(timedelta_to_milliseconds
1172
1351
                            (self.approval_duration),
1173
1352
                            self._reset_approved)
1174
 
    
 
1353
        self.send_changedstate()
1175
1354
    
1176
1355
    ## D-Bus methods, signals & properties
1177
1356
    _interface = "se.recompile.Mandos.Client"
1178
1357
    
 
1358
    ## Interfaces
 
1359
    
 
1360
    @dbus_interface_annotations(_interface)
 
1361
    def _foo(self):
 
1362
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1363
                     "false"}
 
1364
    
1179
1365
    ## Signals
1180
1366
    
1181
1367
    # CheckerCompleted - signal
1217
1403
        "D-Bus signal"
1218
1404
        return self.need_approval()
1219
1405
    
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
 
    
1228
1406
    ## Methods
1229
1407
    
1230
1408
    # Approve - method
1340
1518
            return
1341
1519
        return datetime_to_dbus(self.last_checked_ok)
1342
1520
    
 
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
    
1343
1527
    # Expires - property
1344
1528
    @dbus_service_property(_interface, signature="s", access="read")
1345
1529
    def Expires_dbus_property(self):
1356
1540
    def Timeout_dbus_property(self, value=None):
1357
1541
        if value is None:       # get
1358
1542
            return dbus.UInt64(self.timeout_milliseconds())
 
1543
        old_timeout = self.timeout
1359
1544
        self.timeout = datetime.timedelta(0, 0, 0, value)
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))
 
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))
1380
1561
    
1381
1562
    # ExtendedTimeout - property
1382
1563
    @dbus_service_property(_interface, signature="t",
1461
1642
        self._pipe.send(('setattr', name, value))
1462
1643
 
1463
1644
 
1464
 
class ClientDBusTransitional(ClientDBus):
1465
 
    __metaclass__ = AlternateDBusNamesMetaclass
1466
 
 
1467
 
 
1468
1645
class ClientHandler(socketserver.BaseRequestHandler, object):
1469
1646
    """A class to handle client connections.
1470
1647
    
1538
1715
                except KeyError:
1539
1716
                    return
1540
1717
                
1541
 
                if self.server.use_dbus:
1542
 
                    # Emit D-Bus signal
1543
 
                    client.NewRequest(str(self.client_address))
1544
 
                
1545
1718
                if client.approval_delay:
1546
1719
                    delay = client.approval_delay
1547
1720
                    client.approvals_pending += 1
1578
1751
                    #wait until timeout or approved
1579
1752
                    time = datetime.datetime.now()
1580
1753
                    client.changedstate.acquire()
1581
 
                    (client.changedstate.wait
1582
 
                     (float(client.timedelta_to_milliseconds(delay)
1583
 
                            / 1000)))
 
1754
                    client.changedstate.wait(
 
1755
                        float(timedelta_to_milliseconds(delay)
 
1756
                              / 1000))
1584
1757
                    client.changedstate.release()
1585
1758
                    time2 = datetime.datetime.now()
1586
1759
                    if (time2 - time) >= delay:
1602
1775
                    try:
1603
1776
                        sent = session.send(client.secret[sent_size:])
1604
1777
                    except gnutls.errors.GNUTLSError as error:
1605
 
                        logger.warning("gnutls send failed")
 
1778
                        logger.warning("gnutls send failed",
 
1779
                                       exc_info=error)
1606
1780
                        return
1607
1781
                    logger.debug("Sent: %d, remaining: %d",
1608
1782
                                 sent, len(client.secret)
1611
1785
                
1612
1786
                logger.info("Sending secret to %s", client.name)
1613
1787
                # bump the timeout using extended_timeout
1614
 
                client.checked_ok(client.extended_timeout)
 
1788
                client.bump_timeout(client.extended_timeout)
1615
1789
                if self.server.use_dbus:
1616
1790
                    # Emit D-Bus signal
1617
1791
                    client.GotSecret()
1622
1796
                try:
1623
1797
                    session.bye()
1624
1798
                except gnutls.errors.GNUTLSError as error:
1625
 
                    logger.warning("GnuTLS bye failed")
 
1799
                    logger.warning("GnuTLS bye failed",
 
1800
                                   exc_info=error)
1626
1801
    
1627
1802
    @staticmethod
1628
1803
    def peer_certificate(session):
1700
1875
    def process_request(self, request, address):
1701
1876
        """Start a new process to process the request."""
1702
1877
        proc = multiprocessing.Process(target = self.sub_process_main,
1703
 
                                       args = (request,
1704
 
                                               address))
 
1878
                                       args = (request, address))
1705
1879
        proc.start()
1706
1880
        return proc
1707
1881
 
1735
1909
        use_ipv6:       Boolean; to use IPv6 or not
1736
1910
    """
1737
1911
    def __init__(self, server_address, RequestHandlerClass,
1738
 
                 interface=None, use_ipv6=True):
 
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
        """
1739
1916
        self.interface = interface
1740
1917
        if use_ipv6:
1741
1918
            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.
1742
1945
        socketserver.TCPServer.__init__(self, server_address,
1743
1946
                                        RequestHandlerClass)
 
1947
    
1744
1948
    def server_bind(self):
1745
1949
        """This overrides the normal server_bind() function
1746
1950
        to bind to an interface if one was specified, and also NOT to
1754
1958
                try:
1755
1959
                    self.socket.setsockopt(socket.SOL_SOCKET,
1756
1960
                                           SO_BINDTODEVICE,
1757
 
                                           str(self.interface
1758
 
                                               + '\0'))
 
1961
                                           str(self.interface + '\0'))
1759
1962
                except socket.error as error:
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:
 
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:
1765
1967
                        logger.error("SO_BINDTODEVICE not available;"
1766
1968
                                     " cannot bind to interface %s",
1767
1969
                                     self.interface)
 
1970
                    elif error.errno == errno.ENODEV:
 
1971
                        logger.error("Interface %s does not exist,"
 
1972
                                     " cannot bind", self.interface)
1768
1973
                    else:
1769
1974
                        raise
1770
1975
        # Only bind(2) the socket if we really need to.
1800
2005
    """
1801
2006
    def __init__(self, server_address, RequestHandlerClass,
1802
2007
                 interface=None, use_ipv6=True, clients=None,
1803
 
                 gnutls_priority=None, use_dbus=True):
 
2008
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1804
2009
        self.enabled = False
1805
2010
        self.clients = clients
1806
2011
        if self.clients is None:
1810
2015
        IPv6_TCPServer.__init__(self, server_address,
1811
2016
                                RequestHandlerClass,
1812
2017
                                interface = interface,
1813
 
                                use_ipv6 = use_ipv6)
 
2018
                                use_ipv6 = use_ipv6,
 
2019
                                socketfd = socketfd)
1814
2020
    def server_activate(self):
1815
2021
        if self.enabled:
1816
2022
            return socketserver.TCPServer.server_activate(self)
1829
2035
    
1830
2036
    def handle_ipc(self, source, condition, parent_pipe=None,
1831
2037
                   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)
1846
2038
        # error, or the other end of multiprocessing.Pipe has closed
1847
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2039
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1848
2040
            # Wait for other process to exit
1849
2041
            proc.join()
1850
2042
            return False
1908
2100
        return True
1909
2101
 
1910
2102
 
 
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
 
1911
2202
def string_to_delta(interval):
1912
2203
    """Parse a string and return a datetime.timedelta
1913
2204
    
1924
2215
    >>> string_to_delta('5m 30s')
1925
2216
    datetime.timedelta(0, 330)
1926
2217
    """
 
2218
    
 
2219
    try:
 
2220
        return rfc3339_duration_to_delta(interval)
 
2221
    except ValueError:
 
2222
        pass
 
2223
    
1927
2224
    timevalue = datetime.timedelta(0)
1928
2225
    for s in interval.split():
1929
2226
        try:
1940
2237
            elif suffix == "w":
1941
2238
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1942
2239
            else:
1943
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2240
                raise ValueError("Unknown suffix {0!r}"
 
2241
                                 .format(suffix))
1944
2242
        except (ValueError, IndexError) as e:
1945
2243
            raise ValueError(*(e.args))
1946
2244
        timevalue += delta
1960
2258
        sys.exit()
1961
2259
    if not noclose:
1962
2260
        # Close all standard open file descriptors
1963
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2261
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1964
2262
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1965
2263
            raise OSError(errno.ENODEV,
1966
 
                          "%s not a character device"
1967
 
                          % os.path.devnull)
 
2264
                          "{0} not a character device"
 
2265
                          .format(os.devnull))
1968
2266
        os.dup2(null, sys.stdin.fileno())
1969
2267
        os.dup2(null, sys.stdout.fileno())
1970
2268
        os.dup2(null, sys.stderr.fileno())
1979
2277
    
1980
2278
    parser = argparse.ArgumentParser()
1981
2279
    parser.add_argument("-v", "--version", action="version",
1982
 
                        version = "%%(prog)s %s" % version,
 
2280
                        version = "%(prog)s {0}".format(version),
1983
2281
                        help="show version number and exit")
1984
2282
    parser.add_argument("-i", "--interface", metavar="IF",
1985
2283
                        help="Bind to interface IF")
2010
2308
    parser.add_argument("--no-restore", action="store_false",
2011
2309
                        dest="restore", help="Do not restore stored"
2012
2310
                        " 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")
2013
2314
    parser.add_argument("--statedir", metavar="DIR",
2014
2315
                        help="Directory to save/restore state in")
 
2316
    parser.add_argument("--foreground", action="store_true",
 
2317
                        help="Run in foreground")
2015
2318
    
2016
2319
    options = parser.parse_args()
2017
2320
    
2032
2335
                        "use_ipv6": "True",
2033
2336
                        "debuglevel": "",
2034
2337
                        "restore": "True",
2035
 
                        "statedir": "/var/lib/mandos"
 
2338
                        "socket": "",
 
2339
                        "statedir": "/var/lib/mandos",
 
2340
                        "foreground": "False",
2036
2341
                        }
2037
2342
    
2038
2343
    # Parse config file for server-global settings
2043
2348
    # Convert the SafeConfigParser object to a dict
2044
2349
    server_settings = server_config.defaults()
2045
2350
    # Use the appropriate methods on the non-string config options
2046
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2351
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2047
2352
        server_settings[option] = server_config.getboolean("DEFAULT",
2048
2353
                                                           option)
2049
2354
    if server_settings["port"]:
2050
2355
        server_settings["port"] = server_config.getint("DEFAULT",
2051
2356
                                                       "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"])
2052
2366
    del server_config
2053
2367
    
2054
2368
    # Override the settings from the config file with command line
2056
2370
    for option in ("interface", "address", "port", "debug",
2057
2371
                   "priority", "servicename", "configdir",
2058
2372
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2059
 
                   "statedir"):
 
2373
                   "statedir", "socket", "foreground"):
2060
2374
        value = getattr(options, option)
2061
2375
        if value is not None:
2062
2376
            server_settings[option] = value
2065
2379
    for option in server_settings.keys():
2066
2380
        if type(server_settings[option]) is str:
2067
2381
            server_settings[option] = unicode(server_settings[option])
 
2382
    # Debug implies foreground
 
2383
    if server_settings["debug"]:
 
2384
        server_settings["foreground"] = True
2068
2385
    # Now we have our good server settings in "server_settings"
2069
2386
    
2070
2387
    ##################################################################
2076
2393
    use_ipv6 = server_settings["use_ipv6"]
2077
2394
    stored_state_path = os.path.join(server_settings["statedir"],
2078
2395
                                     stored_state_file)
 
2396
    foreground = server_settings["foreground"]
2079
2397
    
2080
2398
    if debug:
2081
 
        initlogger(logging.DEBUG)
 
2399
        initlogger(debug, logging.DEBUG)
2082
2400
    else:
2083
2401
        if not debuglevel:
2084
 
            initlogger()
 
2402
            initlogger(debug)
2085
2403
        else:
2086
2404
            level = getattr(logging, debuglevel.upper())
2087
 
            initlogger(level)
 
2405
            initlogger(debug, level)
2088
2406
    
2089
2407
    if server_settings["servicename"] != "Mandos":
2090
2408
        syslogger.setFormatter(logging.Formatter
2091
 
                               ('Mandos (%s) [%%(process)d]:'
2092
 
                                ' %%(levelname)s: %%(message)s'
2093
 
                                % server_settings["servicename"]))
 
2409
                               ('Mandos ({0}) [%(process)d]:'
 
2410
                                ' %(levelname)s: %(message)s'
 
2411
                                .format(server_settings
 
2412
                                        ["servicename"])))
2094
2413
    
2095
2414
    # Parse config file with clients
2096
 
    client_config = configparser.SafeConfigParser(Client.client_defaults)
 
2415
    client_config = configparser.SafeConfigParser(Client
 
2416
                                                  .client_defaults)
2097
2417
    client_config.read(os.path.join(server_settings["configdir"],
2098
2418
                                    "clients.conf"))
2099
2419
    
2108
2428
                              use_ipv6=use_ipv6,
2109
2429
                              gnutls_priority=
2110
2430
                              server_settings["priority"],
2111
 
                              use_dbus=use_dbus)
2112
 
    if not debug:
 
2431
                              use_dbus=use_dbus,
 
2432
                              socketfd=(server_settings["socket"]
 
2433
                                        or None))
 
2434
    if not foreground:
2113
2435
        pidfilename = "/var/run/mandos.pid"
 
2436
        pidfile = None
2114
2437
        try:
2115
2438
            pidfile = open(pidfilename, "w")
2116
 
        except IOError:
2117
 
            logger.error("Could not open file %r", pidfilename)
 
2439
        except IOError as e:
 
2440
            logger.error("Could not open file %r", pidfilename,
 
2441
                         exc_info=e)
2118
2442
    
2119
 
    try:
2120
 
        uid = pwd.getpwnam("_mandos").pw_uid
2121
 
        gid = pwd.getpwnam("_mandos").pw_gid
2122
 
    except KeyError:
 
2443
    for name in ("_mandos", "mandos", "nobody"):
2123
2444
        try:
2124
 
            uid = pwd.getpwnam("mandos").pw_uid
2125
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2445
            uid = pwd.getpwnam(name).pw_uid
 
2446
            gid = pwd.getpwnam(name).pw_gid
 
2447
            break
2126
2448
        except KeyError:
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
 
2449
            continue
 
2450
    else:
 
2451
        uid = 65534
 
2452
        gid = 65534
2133
2453
    try:
2134
2454
        os.setgid(gid)
2135
2455
        os.setuid(uid)
2136
2456
    except OSError as error:
2137
 
        if error[0] != errno.EPERM:
 
2457
        if error.errno != errno.EPERM:
2138
2458
            raise error
2139
2459
    
2140
2460
    if debug:
2152
2472
         .gnutls_global_set_log_function(debug_gnutls))
2153
2473
        
2154
2474
        # Redirect stdin so all checkers get /dev/null
2155
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2475
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2156
2476
        os.dup2(null, sys.stdin.fileno())
2157
2477
        if null > 2:
2158
2478
            os.close(null)
2159
 
    else:
2160
 
        # No console logging
2161
 
        logger.removeHandler(console)
2162
2479
    
2163
2480
    # Need to fork before connecting to D-Bus
2164
 
    if not debug:
 
2481
    if not foreground:
2165
2482
        # Close all input and output, do double fork, etc.
2166
2483
        daemon()
2167
2484
    
 
2485
    # multiprocessing will use threads, so before we use gobject we
 
2486
    # need to inform gobject that threads will be used.
 
2487
    gobject.threads_init()
 
2488
    
2168
2489
    global main_loop
2169
2490
    # From the Avahi example code
2170
 
    DBusGMainLoop(set_as_default=True )
 
2491
    DBusGMainLoop(set_as_default=True)
2171
2492
    main_loop = gobject.MainLoop()
2172
2493
    bus = dbus.SystemBus()
2173
2494
    # End of Avahi example code
2179
2500
                            ("se.bsnet.fukt.Mandos", bus,
2180
2501
                             do_not_queue=True))
2181
2502
        except dbus.exceptions.NameExistsException as e:
2182
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2503
            logger.error("Disabling D-Bus:", exc_info=e)
2183
2504
            use_dbus = False
2184
2505
            server_settings["use_dbus"] = False
2185
2506
            tcp_server.use_dbus = False
2197
2518
    
2198
2519
    client_class = Client
2199
2520
    if use_dbus:
2200
 
        client_class = functools.partial(ClientDBusTransitional,
2201
 
                                         bus = bus)
 
2521
        client_class = functools.partial(ClientDBus, bus = bus)
2202
2522
    
2203
2523
    client_settings = Client.config_parser(client_config)
2204
2524
    old_client_settings = {}
2212
2532
                                                     (stored_state))
2213
2533
            os.remove(stored_state_path)
2214
2534
        except IOError as e:
2215
 
            logger.warning("Could not load persistent state: {0}"
2216
 
                           .format(e))
2217
 
            if e.errno != errno.ENOENT:
 
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)
2218
2541
                raise
 
2542
        except EOFError as e:
 
2543
            logger.warning("Could not load persistent state: "
 
2544
                           "EOFError:", exc_info=e)
2219
2545
    
2220
2546
    with PGPEngine() as pgp:
2221
2547
        for client_name, client in clients_data.iteritems():
2238
2564
            
2239
2565
            # Clients who has passed its expire date can still be
2240
2566
            # enabled if its last checker was successful.  Clients
2241
 
            # whose checker failed before we stored its state is
2242
 
            # assumed to have failed all checkers during downtime.
 
2567
            # whose checker succeeded before we stored its state is
 
2568
            # assumed to have successfully run all checkers during
 
2569
            # downtime.
2243
2570
            if client["enabled"]:
2244
2571
                if datetime.datetime.utcnow() >= client["expires"]:
2245
2572
                    if not client["last_checked_ok"]:
2246
2573
                        logger.warning(
2247
2574
                            "disabling client {0} - Client never "
2248
 
                            "performed a successfull checker"
2249
 
                            .format(client["name"]))
 
2575
                            "performed a successful checker"
 
2576
                            .format(client_name))
2250
2577
                        client["enabled"] = False
2251
2578
                    elif client["last_checker_status"] != 0:
2252
2579
                        logger.warning(
2253
2580
                            "disabling client {0} - Client "
2254
2581
                            "last checker failed with error code {1}"
2255
 
                            .format(client["name"],
 
2582
                            .format(client_name,
2256
2583
                                    client["last_checker_status"]))
2257
2584
                        client["enabled"] = False
2258
2585
                    else:
2259
2586
                        client["expires"] = (datetime.datetime
2260
2587
                                             .utcnow()
2261
2588
                                             + client["timeout"])
2262
 
                    
 
2589
                        logger.debug("Last checker succeeded,"
 
2590
                                     " keeping {0} enabled"
 
2591
                                     .format(client_name))
2263
2592
            try:
2264
2593
                client["secret"] = (
2265
2594
                    pgp.decrypt(client["encrypted_secret"],
2271
2600
                             .format(client_name))
2272
2601
                client["secret"] = (
2273
2602
                    client_settings[client_name]["secret"])
2274
 
 
2275
2603
    
2276
2604
    # Add/remove clients based on new changes made to config
2277
 
    for client_name in set(old_client_settings) - set(client_settings):
 
2605
    for client_name in (set(old_client_settings)
 
2606
                        - set(client_settings)):
2278
2607
        del clients_data[client_name]
2279
 
    for client_name in set(client_settings) - set(old_client_settings):
 
2608
    for client_name in (set(client_settings)
 
2609
                        - set(old_client_settings)):
2280
2610
        clients_data[client_name] = client_settings[client_name]
2281
 
 
2282
 
    # Create clients all clients
 
2611
    
 
2612
    # Create all client objects
2283
2613
    for client_name, client in clients_data.iteritems():
2284
2614
        tcp_server.clients[client_name] = client_class(
2285
2615
            name = client_name, settings = client)
2286
2616
    
2287
2617
    if not tcp_server.clients:
2288
2618
        logger.warning("No clients defined")
2289
 
        
2290
 
    if not debug:
2291
 
        try:
2292
 
            with pidfile:
2293
 
                pid = os.getpid()
2294
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2295
 
            del pidfile
2296
 
        except IOError:
2297
 
            logger.error("Could not write to file %r with PID %d",
2298
 
                         pidfilename, pid)
2299
 
        except NameError:
2300
 
            # "pidfile" was never created
2301
 
            pass
 
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
2302
2630
        del pidfilename
2303
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2304
2631
    
2305
2632
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2306
2633
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2307
2634
    
2308
2635
    if use_dbus:
2309
 
        class MandosDBusService(dbus.service.Object):
 
2636
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2637
                                        "se.bsnet.fukt.Mandos"})
 
2638
        class MandosDBusService(DBusObjectWithProperties):
2310
2639
            """A D-Bus proxy object"""
2311
2640
            def __init__(self):
2312
2641
                dbus.service.Object.__init__(self, bus, "/")
2313
2642
            _interface = "se.recompile.Mandos"
2314
2643
            
 
2644
            @dbus_interface_annotations(_interface)
 
2645
            def _foo(self):
 
2646
                return { "org.freedesktop.DBus.Property"
 
2647
                         ".EmitsChangedSignal":
 
2648
                             "false"}
 
2649
            
2315
2650
            @dbus.service.signal(_interface, signature="o")
2316
2651
            def ClientAdded(self, objpath):
2317
2652
                "D-Bus signal"
2359
2694
            
2360
2695
            del _interface
2361
2696
        
2362
 
        class MandosDBusServiceTransitional(MandosDBusService):
2363
 
            __metaclass__ = AlternateDBusNamesMetaclass
2364
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2697
        mandos_dbus_service = MandosDBusService()
2365
2698
    
2366
2699
    def cleanup():
2367
2700
        "Cleanup function; run on exit"
2400
2733
                del client_settings[client.name]["secret"]
2401
2734
        
2402
2735
        try:
2403
 
            with os.fdopen(os.open(stored_state_path,
2404
 
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2405
 
                                   0600), "wb") as stored_state:
 
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:
2406
2740
                pickle.dump((clients, client_settings), stored_state)
 
2741
                tempname=stored_state.name
 
2742
            os.rename(tempname, stored_state_path)
2407
2743
        except (IOError, OSError) as e:
2408
 
            logger.warning("Could not save persistent state: {0}"
2409
 
                           .format(e))
2410
 
            if e.errno not in (errno.ENOENT, errno.EACCES):
2411
 
                raise
 
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
2412
2756
        
2413
2757
        # Delete all clients, and settings from config
2414
2758
        while tcp_server.clients:
2441
2785
    service.port = tcp_server.socket.getsockname()[1]
2442
2786
    if use_ipv6:
2443
2787
        logger.info("Now listening on address %r, port %d,"
2444
 
                    " flowinfo %d, scope_id %d"
2445
 
                    % tcp_server.socket.getsockname())
 
2788
                    " flowinfo %d, scope_id %d",
 
2789
                    *tcp_server.socket.getsockname())
2446
2790
    else:                       # IPv4
2447
 
        logger.info("Now listening on address %r, port %d"
2448
 
                    % tcp_server.socket.getsockname())
 
2791
        logger.info("Now listening on address %r, port %d",
 
2792
                    *tcp_server.socket.getsockname())
2449
2793
    
2450
2794
    #service.interface = tcp_server.socket.getsockname()[3]
2451
2795
    
2454
2798
        try:
2455
2799
            service.activate()
2456
2800
        except dbus.exceptions.DBusException as error:
2457
 
            logger.critical("DBusException: %s", error)
 
2801
            logger.critical("D-Bus Exception", exc_info=error)
2458
2802
            cleanup()
2459
2803
            sys.exit(1)
2460
2804
        # End of Avahi example code
2467
2811
        logger.debug("Starting main loop")
2468
2812
        main_loop.run()
2469
2813
    except AvahiError as error:
2470
 
        logger.critical("AvahiError: %s", error)
 
2814
        logger.critical("Avahi Error", exc_info=error)
2471
2815
        cleanup()
2472
2816
        sys.exit(1)
2473
2817
    except KeyboardInterrupt: