/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

* mandos-ctl (main): Bug fix: Make --secret actually work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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()
152
148
    def __enter__(self):
153
149
        return self
154
150
    
155
 
    def __exit__(self, exc_type, exc_value, traceback):
 
151
    def __exit__ (self, exc_type, exc_value, traceback):
156
152
        self._cleanup()
157
153
        return False
158
154
    
179
175
    
180
176
    def encrypt(self, data, password):
181
177
        self.gnupg.passphrase = self.password_encode(password)
182
 
        with open(os.devnull, "w") as devnull:
 
178
        with open(os.devnull) as devnull:
183
179
            try:
184
180
                proc = self.gnupg.run(['--symmetric'],
185
181
                                      create_fhs=['stdin', 'stdout'],
196
192
    
197
193
    def decrypt(self, data, password):
198
194
        self.gnupg.passphrase = self.password_encode(password)
199
 
        with open(os.devnull, "w") as devnull:
 
195
        with open(os.devnull) as devnull:
200
196
            try:
201
197
                proc = self.gnupg.run(['--decrypt'],
202
198
                                      create_fhs=['stdin', 'stdout'],
203
199
                                      attach_fhs={'stderr': devnull})
204
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
200
                with contextlib.closing(proc.handles['stdin'] ) as f:
205
201
                    f.write(data)
206
202
                with contextlib.closing(proc.handles['stdout']) as f:
207
203
                    decrypted_plaintext = f.read()
212
208
        return decrypted_plaintext
213
209
 
214
210
 
 
211
 
215
212
class AvahiError(Exception):
216
213
    def __init__(self, value, *args, **kwargs):
217
214
        self.value = value
246
243
    server: D-Bus Server
247
244
    bus: dbus.SystemBus()
248
245
    """
249
 
    
250
246
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
247
                 servicetype = None, port = None, TXT = None,
252
248
                 domain = "", host = "", max_renames = 32768,
265
261
        self.server = None
266
262
        self.bus = bus
267
263
        self.entry_group_state_changed_match = None
268
 
    
269
264
    def rename(self):
270
265
        """Derived from the Avahi example code"""
271
266
        if self.rename_count >= self.max_renames:
281
276
        try:
282
277
            self.add()
283
278
        except dbus.exceptions.DBusException as error:
284
 
            logger.critical("D-Bus Exception", exc_info=error)
 
279
            logger.critical("DBusException: %s", error)
285
280
            self.cleanup()
286
281
            os._exit(1)
287
282
        self.rename_count += 1
288
 
    
289
283
    def remove(self):
290
284
        """Derived from the Avahi example code"""
291
285
        if self.entry_group_state_changed_match is not None:
293
287
            self.entry_group_state_changed_match = None
294
288
        if self.group is not None:
295
289
            self.group.Reset()
296
 
    
297
290
    def add(self):
298
291
        """Derived from the Avahi example code"""
299
292
        self.remove()
316
309
            dbus.UInt16(self.port),
317
310
            avahi.string_array_to_txt_array(self.TXT))
318
311
        self.group.Commit()
319
 
    
320
312
    def entry_group_state_changed(self, state, error):
321
313
        """Derived from the Avahi example code"""
322
314
        logger.debug("Avahi entry group state change: %i", state)
329
321
        elif state == avahi.ENTRY_GROUP_FAILURE:
330
322
            logger.critical("Avahi: Error in group state changed %s",
331
323
                            unicode(error))
332
 
            raise AvahiGroupError("State changed: {0!s}"
333
 
                                  .format(error))
334
 
    
 
324
            raise AvahiGroupError("State changed: %s"
 
325
                                  % unicode(error))
335
326
    def cleanup(self):
336
327
        """Derived from the Avahi example code"""
337
328
        if self.group is not None:
342
333
                pass
343
334
            self.group = None
344
335
        self.remove()
345
 
    
346
336
    def server_state_changed(self, state, error=None):
347
337
        """Derived from the Avahi example code"""
348
338
        logger.debug("Avahi server state change: %i", state)
367
357
                logger.debug("Unknown state: %r", state)
368
358
            else:
369
359
                logger.debug("Unknown state: %r: %r", state, error)
370
 
    
371
360
    def activate(self):
372
361
        """Derived from the Avahi example code"""
373
362
        if self.server is None:
380
369
                                 self.server_state_changed)
381
370
        self.server_state_changed(self.server.GetState())
382
371
 
383
 
 
384
372
class AvahiServiceToSyslog(AvahiService):
385
373
    def rename(self):
386
374
        """Add the new name to the syslog messages"""
387
375
        ret = AvahiService.rename(self)
388
376
        syslogger.setFormatter(logging.Formatter
389
 
                               ('Mandos ({0}) [%(process)d]:'
390
 
                                ' %(levelname)s: %(message)s'
391
 
                                .format(self.name)))
 
377
                               ('Mandos (%s) [%%(process)d]:'
 
378
                                ' %%(levelname)s: %%(message)s'
 
379
                                % self.name))
392
380
        return ret
393
381
 
394
 
 
395
382
def timedelta_to_milliseconds(td):
396
383
    "Convert a datetime.timedelta() to milliseconds"
397
384
    return ((td.days * 24 * 60 * 60 * 1000)
398
385
            + (td.seconds * 1000)
399
386
            + (td.microseconds // 1000))
400
 
 
401
 
 
 
387
        
402
388
class Client(object):
403
389
    """A representation of a client host served by this server.
404
390
    
429
415
    last_checked_ok: datetime.datetime(); (UTC) or None
430
416
    last_checker_status: integer between 0 and 255 reflecting exit
431
417
                         status of last checker. -1 reflects crashed
432
 
                         checker, -2 means no checker completed yet.
 
418
                         checker, or None.
433
419
    last_enabled: datetime.datetime(); (UTC) or None
434
420
    name:       string; from the config file, used in log messages and
435
421
                        D-Bus identifiers
436
422
    secret:     bytestring; sent verbatim (over TLS) to client
437
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
438
424
                                      until this client is disabled
439
 
    extended_timeout:   extra long timeout when secret has been sent
 
425
    extended_timeout:   extra long timeout when password has been sent
440
426
    runtime_expansions: Allowed attributes for runtime expansion.
441
427
    expires:    datetime.datetime(); time (UTC) when a client will be
442
428
                disabled, or None
443
429
    """
444
430
    
445
431
    runtime_expansions = ("approval_delay", "approval_duration",
446
 
                          "created", "enabled", "expires",
447
 
                          "fingerprint", "host", "interval",
448
 
                          "last_approval_request", "last_checked_ok",
 
432
                          "created", "enabled", "fingerprint",
 
433
                          "host", "interval", "last_checked_ok",
449
434
                          "last_enabled", "name", "timeout")
450
 
    client_defaults = { "timeout": "PT5M",
451
 
                        "extended_timeout": "PT15M",
452
 
                        "interval": "PT2M",
 
435
    client_defaults = { "timeout": "5m",
 
436
                        "extended_timeout": "15m",
 
437
                        "interval": "2m",
453
438
                        "checker": "fping -q -- %%(host)s",
454
439
                        "host": "",
455
 
                        "approval_delay": "PT0S",
456
 
                        "approval_duration": "PT1S",
 
440
                        "approval_delay": "0s",
 
441
                        "approval_duration": "1s",
457
442
                        "approved_by_default": "True",
458
443
                        "enabled": "True",
459
444
                        }
472
457
    
473
458
    def approval_delay_milliseconds(self):
474
459
        return timedelta_to_milliseconds(self.approval_delay)
475
 
    
 
460
 
476
461
    @staticmethod
477
462
    def config_parser(config):
478
463
        """Construct a new dict of client settings of this form:
503
488
                          "rb") as secfile:
504
489
                    client["secret"] = secfile.read()
505
490
            else:
506
 
                raise TypeError("No secret or secfile for section {0}"
507
 
                                .format(section))
 
491
                raise TypeError("No secret or secfile for section %s"
 
492
                                % section)
508
493
            client["timeout"] = string_to_delta(section["timeout"])
509
494
            client["extended_timeout"] = string_to_delta(
510
495
                section["extended_timeout"])
516
501
            client["checker_command"] = section["checker"]
517
502
            client["last_approval_request"] = None
518
503
            client["last_checked_ok"] = None
519
 
            client["last_checker_status"] = -2
 
504
            client["last_checker_status"] = None
520
505
        
521
506
        return settings
522
 
    
 
507
        
 
508
        
523
509
    def __init__(self, settings, name = None):
 
510
        """Note: the 'checker' key in 'config' sets the
 
511
        'checker_command' attribute and *not* the 'checker'
 
512
        attribute."""
524
513
        self.name = name
525
514
        # adding all client settings
526
515
        for setting, value in settings.iteritems():
535
524
        else:
536
525
            self.last_enabled = None
537
526
            self.expires = None
538
 
        
 
527
       
539
528
        logger.debug("Creating client %r", self.name)
540
529
        # Uppercase and remove spaces from fingerprint for later
541
530
        # comparison purposes with return value from the fingerprint()
543
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
544
533
        self.created = settings.get("created",
545
534
                                    datetime.datetime.utcnow())
546
 
        
 
535
 
547
536
        # attributes specific for this server instance
548
537
        self.checker = None
549
538
        self.checker_initiator_tag = None
577
566
        if getattr(self, "enabled", False):
578
567
            # Already enabled
579
568
            return
 
569
        self.send_changedstate()
580
570
        self.expires = datetime.datetime.utcnow() + self.timeout
581
571
        self.enabled = True
582
572
        self.last_enabled = datetime.datetime.utcnow()
583
573
        self.init_checker()
584
 
        self.send_changedstate()
585
574
    
586
575
    def disable(self, quiet=True):
587
576
        """Disable this client."""
588
577
        if not getattr(self, "enabled", False):
589
578
            return False
590
579
        if not quiet:
 
580
            self.send_changedstate()
 
581
        if not quiet:
591
582
            logger.info("Disabling client %s", self.name)
592
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
583
        if getattr(self, "disable_initiator_tag", False):
593
584
            gobject.source_remove(self.disable_initiator_tag)
594
585
            self.disable_initiator_tag = None
595
586
        self.expires = None
596
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
587
        if getattr(self, "checker_initiator_tag", False):
597
588
            gobject.source_remove(self.checker_initiator_tag)
598
589
            self.checker_initiator_tag = None
599
590
        self.stop_checker()
600
591
        self.enabled = False
601
 
        if not quiet:
602
 
            self.send_changedstate()
603
592
        # Do not run this again if called by a gobject.timeout_add
604
593
        return False
605
594
    
609
598
    def init_checker(self):
610
599
        # Schedule a new checker to be started an 'interval' from now,
611
600
        # and every interval from then on.
612
 
        if self.checker_initiator_tag is not None:
613
 
            gobject.source_remove(self.checker_initiator_tag)
614
601
        self.checker_initiator_tag = (gobject.timeout_add
615
602
                                      (self.interval_milliseconds(),
616
603
                                       self.start_checker))
617
604
        # 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
605
        self.disable_initiator_tag = (gobject.timeout_add
621
606
                                   (self.timeout_milliseconds(),
622
607
                                    self.disable))
641
626
            logger.warning("Checker for %(name)s crashed?",
642
627
                           vars(self))
643
628
    
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."""
 
629
    def checked_ok(self, timeout=None):
 
630
        """Bump up the timeout for this client.
 
631
        
 
632
        This should only be called when the client has been seen,
 
633
        alive and well.
 
634
        """
652
635
        if timeout is None:
653
636
            timeout = self.timeout
 
637
        self.last_checked_ok = datetime.datetime.utcnow()
654
638
        if self.disable_initiator_tag is not None:
655
639
            gobject.source_remove(self.disable_initiator_tag)
656
 
            self.disable_initiator_tag = None
657
640
        if getattr(self, "enabled", False):
658
641
            self.disable_initiator_tag = (gobject.timeout_add
659
642
                                          (timedelta_to_milliseconds
669
652
        If a checker already exists, leave it running and do
670
653
        nothing."""
671
654
        # 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
 
655
        # did that, then if a checker (for some reason) started
 
656
        # running slowly and taking more than 'interval' time, the
 
657
        # client would inevitably timeout, since no checker would get
 
658
        # a chance to run to completion.  If we instead leave running
676
659
        # checkers alone, the checker would have to take more time
677
660
        # than 'timeout' for the client to be disabled, which is as it
678
661
        # should be.
692
675
                                      self.current_checker_command)
693
676
        # Start a new checker if needed
694
677
        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
678
            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
 
679
                # In case checker_command has exactly one % operator
 
680
                command = self.checker_command % self.host
 
681
            except TypeError:
 
682
                # Escape attributes for the shell
 
683
                escaped_attrs = dict(
 
684
                    (attr,
 
685
                     re.escape(unicode(str(getattr(self, attr, "")),
 
686
                                       errors=
 
687
                                       'replace')))
 
688
                    for attr in
 
689
                    self.runtime_expansions)
 
690
                
 
691
                try:
 
692
                    command = self.checker_command % escaped_attrs
 
693
                except TypeError as error:
 
694
                    logger.error('Could not format string "%s":'
 
695
                                 ' %s', self.checker_command, error)
 
696
                    return True # Try again later
706
697
            self.current_checker_command = command
707
698
            try:
708
699
                logger.info("Starting checker %r for %s",
714
705
                self.checker = subprocess.Popen(command,
715
706
                                                close_fds=True,
716
707
                                                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:
 
708
                self.checker_callback_tag = (gobject.child_watch_add
 
709
                                             (self.checker.pid,
 
710
                                              self.checker_callback,
 
711
                                              data=command))
 
712
                # The checker may have completed before the gobject
 
713
                # watch was added.  Check for this.
728
714
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
715
                if pid:
 
716
                    gobject.source_remove(self.checker_callback_tag)
 
717
                    self.checker_callback(pid, status, command)
729
718
            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)
 
719
                logger.error("Failed to start subprocess: %s",
 
720
                             error)
739
721
        # Re-run this periodically if run by gobject.timeout_add
740
722
        return True
741
723
    
748
730
            return
749
731
        logger.debug("Stopping checker for %(name)s", vars(self))
750
732
        try:
751
 
            self.checker.terminate()
 
733
            os.kill(self.checker.pid, signal.SIGTERM)
752
734
            #time.sleep(0.5)
753
735
            #if self.checker.poll() is None:
754
 
            #    self.checker.kill()
 
736
            #    os.kill(self.checker.pid, signal.SIGKILL)
755
737
        except OSError as error:
756
738
            if error.errno != errno.ESRCH: # No such process
757
739
                raise
774
756
    # "Set" method, so we fail early here:
775
757
    if byte_arrays and signature != "ay":
776
758
        raise ValueError("Byte arrays not supported for non-'ay'"
777
 
                         " signature {0!r}".format(signature))
 
759
                         " signature %r" % signature)
778
760
    def decorator(func):
779
761
        func._dbus_is_property = True
780
762
        func._dbus_interface = dbus_interface
788
770
    return decorator
789
771
 
790
772
 
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
773
class DBusPropertyException(dbus.exceptions.DBusException):
829
774
    """A base class for D-Bus property-related exceptions
830
775
    """
853
798
    """
854
799
    
855
800
    @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)
 
801
    def _is_dbus_property(obj):
 
802
        return getattr(obj, "_dbus_is_property", False)
864
803
    
865
 
    def _get_all_dbus_things(self, thing):
 
804
    def _get_all_dbus_properties(self):
866
805
        """Returns a generator of (name, attribute) pairs
867
806
        """
868
 
        return ((getattr(athing.__get__(self), "_dbus_name",
869
 
                         name),
870
 
                 athing.__get__(self))
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
871
808
                for cls in self.__class__.__mro__
872
 
                for name, athing in
873
 
                inspect.getmembers(cls,
874
 
                                   self._is_dbus_thing(thing)))
 
809
                for name, prop in
 
810
                inspect.getmembers(cls, self._is_dbus_property))
875
811
    
876
812
    def _get_dbus_property(self, interface_name, property_name):
877
813
        """Returns a bound method if one exists which is a D-Bus
879
815
        """
880
816
        for cls in  self.__class__.__mro__:
881
817
            for name, value in (inspect.getmembers
882
 
                                (cls,
883
 
                                 self._is_dbus_thing("property"))):
 
818
                                (cls, self._is_dbus_property)):
884
819
                if (value._dbus_name == property_name
885
820
                    and value._dbus_interface == interface_name):
886
821
                    return value.__get__(self)
915
850
            # signatures other than "ay".
916
851
            if prop._dbus_signature != "ay":
917
852
                raise ValueError
918
 
            value = dbus.ByteArray(b''.join(chr(byte)
919
 
                                            for byte in value))
 
853
            value = dbus.ByteArray(''.join(unichr(byte)
 
854
                                           for byte in value))
920
855
        prop(value)
921
856
    
922
857
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
928
863
        Note: Will not include properties with access="write".
929
864
        """
930
865
        properties = {}
931
 
        for name, prop in self._get_all_dbus_things("property"):
 
866
        for name, prop in self._get_all_dbus_properties():
932
867
            if (interface_name
933
868
                and interface_name != prop._dbus_interface):
934
869
                # Interface non-empty but did not match
949
884
                         path_keyword='object_path',
950
885
                         connection_keyword='connection')
951
886
    def Introspect(self, object_path, connection):
952
 
        """Overloading of standard D-Bus method.
953
 
        
954
 
        Inserts property tags and interface annotation tags.
 
887
        """Standard D-Bus method, overloaded to insert property tags.
955
888
        """
956
889
        xmlstring = dbus.service.Object.Introspect(self, object_path,
957
890
                                                   connection)
964
897
                e.setAttribute("access", prop._dbus_access)
965
898
                return e
966
899
            for if_tag in document.getElementsByTagName("interface"):
967
 
                # Add property tags
968
900
                for tag in (make_tag(document, name, prop)
969
901
                            for name, prop
970
 
                            in self._get_all_dbus_things("property")
 
902
                            in self._get_all_dbus_properties()
971
903
                            if prop._dbus_interface
972
904
                            == if_tag.getAttribute("name")):
973
905
                    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
906
                # Add the names to the return values for the
1006
907
                # "org.freedesktop.DBus.Properties" methods
1007
908
                if (if_tag.getAttribute("name")
1022
923
        except (AttributeError, xml.dom.DOMException,
1023
924
                xml.parsers.expat.ExpatError) as error:
1024
925
            logger.error("Failed to override Introspection method",
1025
 
                         exc_info=error)
 
926
                         error)
1026
927
        return xmlstring
1027
928
 
1028
929
 
1029
 
def datetime_to_dbus(dt, variant_level=0):
 
930
def datetime_to_dbus (dt, variant_level=0):
1030
931
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1031
932
    if dt is None:
1032
933
        return dbus.String("", variant_level = variant_level)
1034
935
                       variant_level=variant_level)
1035
936
 
1036
937
 
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).
 
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
939
                                  .__metaclass__):
 
940
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
941
    will add additional D-Bus attributes matching a certain pattern.
1059
942
    """
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):
 
943
    def __new__(mcs, name, bases, attr):
 
944
        # Go through all the base classes which could have D-Bus
 
945
        # methods, signals, or properties in them
 
946
        for base in (b for b in bases
 
947
                     if issubclass(b, dbus.service.Object)):
 
948
            # Go though all attributes of the base class
 
949
            for attrname, attribute in inspect.getmembers(base):
1067
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
1068
951
                # with the wrong interface name
1069
952
                if (not hasattr(attribute, "_dbus_interface")
1070
953
                    or not attribute._dbus_interface
1071
 
                    .startswith(orig_interface_name)):
 
954
                    .startswith("se.recompile.Mandos")):
1072
955
                    continue
1073
956
                # Create an alternate D-Bus interface name based on
1074
957
                # the current name
1075
958
                alt_interface = (attribute._dbus_interface
1076
 
                                 .replace(orig_interface_name,
1077
 
                                          alt_interface_name))
1078
 
                interface_names.add(alt_interface)
 
959
                                 .replace("se.recompile.Mandos",
 
960
                                          "se.bsnet.fukt.Mandos"))
1079
961
                # Is this a D-Bus signal?
1080
962
                if getattr(attribute, "_dbus_is_signal", False):
1081
963
                    # Extract the original non-method function by
1096
978
                                nonmethod_func.func_name,
1097
979
                                nonmethod_func.func_defaults,
1098
980
                                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
981
                    # 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
 
982
                    # old and new functions, so both the old and new
 
983
                    # signals gets sent when the function is called
1109
984
                    def fixscope(func1, func2):
1110
985
                        """This function is a scope container to pass
1111
986
                        func1 and func2 to the "call_both" function
1118
993
                        return call_both
1119
994
                    # Create the "call_both" function and add it to
1120
995
                    # the class
1121
 
                    attr[attrname] = fixscope(attribute, new_function)
 
996
                    attr[attrname] = fixscope(attribute,
 
997
                                              new_function)
1122
998
                # Is this a D-Bus method?
1123
999
                elif getattr(attribute, "_dbus_is_method", False):
1124
1000
                    # Create a new, but exactly alike, function
1135
1011
                                        attribute.func_name,
1136
1012
                                        attribute.func_defaults,
1137
1013
                                        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
1014
                # Is this a D-Bus property?
1145
1015
                elif getattr(attribute, "_dbus_is_property", False):
1146
1016
                    # Create a new, but exactly alike, function
1160
1030
                                        attribute.func_name,
1161
1031
                                        attribute.func_defaults,
1162
1032
                                        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"})
 
1033
        return type.__new__(mcs, name, bases, attr)
 
1034
 
 
1035
 
1208
1036
class ClientDBus(Client, DBusObjectWithProperties):
1209
1037
    """A Client class using D-Bus
1210
1038
    
1221
1049
    def __init__(self, bus = None, *args, **kwargs):
1222
1050
        self.bus = bus
1223
1051
        Client.__init__(self, *args, **kwargs)
 
1052
        self._approvals_pending = 0
 
1053
        
 
1054
        self._approvals_pending = 0
1224
1055
        # Only now, when this client is initialized, can it show up on
1225
1056
        # the D-Bus
1226
1057
        client_object_name = unicode(self.name).translate(
1230
1061
                                 ("/clients/" + client_object_name))
1231
1062
        DBusObjectWithProperties.__init__(self, self.bus,
1232
1063
                                          self.dbus_object_path)
1233
 
    
 
1064
        
1234
1065
    def notifychangeproperty(transform_func,
1235
1066
                             dbus_name, type_func=lambda x: x,
1236
1067
                             variant_level=1):
1259
1090
        
1260
1091
        return property(lambda self: getattr(self, attrname), setter)
1261
1092
    
 
1093
    
1262
1094
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1263
1095
    approvals_pending = notifychangeproperty(dbus.Boolean,
1264
1096
                                             "ApprovalPending",
1271
1103
                                       checker is not None)
1272
1104
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1273
1105
                                           "LastCheckedOK")
1274
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1275
 
                                               "LastCheckerStatus")
1276
1106
    last_approval_request = notifychangeproperty(
1277
1107
        datetime_to_dbus, "LastApprovalRequest")
1278
1108
    approved_by_default = notifychangeproperty(dbus.Boolean,
1346
1176
        return False
1347
1177
    
1348
1178
    def approve(self, value=True):
 
1179
        self.send_changedstate()
1349
1180
        self.approved = value
1350
1181
        gobject.timeout_add(timedelta_to_milliseconds
1351
1182
                            (self.approval_duration),
1352
1183
                            self._reset_approved)
1353
 
        self.send_changedstate()
 
1184
    
1354
1185
    
1355
1186
    ## D-Bus methods, signals & properties
1356
1187
    _interface = "se.recompile.Mandos.Client"
1357
1188
    
1358
 
    ## Interfaces
1359
 
    
1360
 
    @dbus_interface_annotations(_interface)
1361
 
    def _foo(self):
1362
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1363
 
                     "false"}
1364
 
    
1365
1189
    ## Signals
1366
1190
    
1367
1191
    # CheckerCompleted - signal
1403
1227
        "D-Bus signal"
1404
1228
        return self.need_approval()
1405
1229
    
 
1230
    # NeRwequest - signal
 
1231
    @dbus.service.signal(_interface, signature="s")
 
1232
    def NewRequest(self, ip):
 
1233
        """D-Bus signal
 
1234
        Is sent after a client request a password.
 
1235
        """
 
1236
        pass
 
1237
    
1406
1238
    ## Methods
1407
1239
    
1408
1240
    # Approve - method
1518
1350
            return
1519
1351
        return datetime_to_dbus(self.last_checked_ok)
1520
1352
    
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
1353
    # Expires - property
1528
1354
    @dbus_service_property(_interface, signature="s", access="read")
1529
1355
    def Expires_dbus_property(self):
1540
1366
    def Timeout_dbus_property(self, value=None):
1541
1367
        if value is None:       # get
1542
1368
            return dbus.UInt64(self.timeout_milliseconds())
1543
 
        old_timeout = self.timeout
1544
1369
        self.timeout = datetime.timedelta(0, 0, 0, value)
1545
 
        # Reschedule disabling
 
1370
        # Reschedule timeout
1546
1371
        if self.enabled:
1547
1372
            now = datetime.datetime.utcnow()
1548
 
            self.expires += self.timeout - old_timeout
1549
 
            if self.expires <= now:
 
1373
            time_to_die = timedelta_to_milliseconds(
 
1374
                (self.last_checked_ok + self.timeout) - now)
 
1375
            if time_to_die <= 0:
1550
1376
                # The timeout has passed
1551
1377
                self.disable()
1552
1378
            else:
 
1379
                self.expires = (now +
 
1380
                                datetime.timedelta(milliseconds =
 
1381
                                                   time_to_die))
1553
1382
                if (getattr(self, "disable_initiator_tag", None)
1554
1383
                    is None):
1555
1384
                    return
1556
1385
                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))
 
1386
                self.disable_initiator_tag = (gobject.timeout_add
 
1387
                                              (time_to_die,
 
1388
                                               self.disable))
1561
1389
    
1562
1390
    # ExtendedTimeout - property
1563
1391
    @dbus_service_property(_interface, signature="t",
1642
1470
        self._pipe.send(('setattr', name, value))
1643
1471
 
1644
1472
 
 
1473
class ClientDBusTransitional(ClientDBus):
 
1474
    __metaclass__ = AlternateDBusNamesMetaclass
 
1475
 
 
1476
 
1645
1477
class ClientHandler(socketserver.BaseRequestHandler, object):
1646
1478
    """A class to handle client connections.
1647
1479
    
1715
1547
                except KeyError:
1716
1548
                    return
1717
1549
                
 
1550
                if self.server.use_dbus:
 
1551
                    # Emit D-Bus signal
 
1552
                    client.NewRequest(str(self.client_address))
 
1553
                
1718
1554
                if client.approval_delay:
1719
1555
                    delay = client.approval_delay
1720
1556
                    client.approvals_pending += 1
1751
1587
                    #wait until timeout or approved
1752
1588
                    time = datetime.datetime.now()
1753
1589
                    client.changedstate.acquire()
1754
 
                    client.changedstate.wait(
1755
 
                        float(timedelta_to_milliseconds(delay)
1756
 
                              / 1000))
 
1590
                    (client.changedstate.wait
 
1591
                     (float(client.timedelta_to_milliseconds(delay)
 
1592
                            / 1000)))
1757
1593
                    client.changedstate.release()
1758
1594
                    time2 = datetime.datetime.now()
1759
1595
                    if (time2 - time) >= delay:
1775
1611
                    try:
1776
1612
                        sent = session.send(client.secret[sent_size:])
1777
1613
                    except gnutls.errors.GNUTLSError as error:
1778
 
                        logger.warning("gnutls send failed",
1779
 
                                       exc_info=error)
 
1614
                        logger.warning("gnutls send failed")
1780
1615
                        return
1781
1616
                    logger.debug("Sent: %d, remaining: %d",
1782
1617
                                 sent, len(client.secret)
1785
1620
                
1786
1621
                logger.info("Sending secret to %s", client.name)
1787
1622
                # bump the timeout using extended_timeout
1788
 
                client.bump_timeout(client.extended_timeout)
 
1623
                client.checked_ok(client.extended_timeout)
1789
1624
                if self.server.use_dbus:
1790
1625
                    # Emit D-Bus signal
1791
1626
                    client.GotSecret()
1796
1631
                try:
1797
1632
                    session.bye()
1798
1633
                except gnutls.errors.GNUTLSError as error:
1799
 
                    logger.warning("GnuTLS bye failed",
1800
 
                                   exc_info=error)
 
1634
                    logger.warning("GnuTLS bye failed")
1801
1635
    
1802
1636
    @staticmethod
1803
1637
    def peer_certificate(session):
1875
1709
    def process_request(self, request, address):
1876
1710
        """Start a new process to process the request."""
1877
1711
        proc = multiprocessing.Process(target = self.sub_process_main,
1878
 
                                       args = (request, address))
 
1712
                                       args = (request,
 
1713
                                               address))
1879
1714
        proc.start()
1880
1715
        return proc
1881
1716
 
1909
1744
        use_ipv6:       Boolean; to use IPv6 or not
1910
1745
    """
1911
1746
    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
 
        """
 
1747
                 interface=None, use_ipv6=True):
1916
1748
        self.interface = interface
1917
1749
        if use_ipv6:
1918
1750
            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
1751
        socketserver.TCPServer.__init__(self, server_address,
1946
1752
                                        RequestHandlerClass)
1947
 
    
1948
1753
    def server_bind(self):
1949
1754
        """This overrides the normal server_bind() function
1950
1755
        to bind to an interface if one was specified, and also NOT to
1958
1763
                try:
1959
1764
                    self.socket.setsockopt(socket.SOL_SOCKET,
1960
1765
                                           SO_BINDTODEVICE,
1961
 
                                           str(self.interface + '\0'))
 
1766
                                           str(self.interface
 
1767
                                               + '\0'))
1962
1768
                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:
 
1769
                    if error[0] == errno.EPERM:
 
1770
                        logger.error("No permission to"
 
1771
                                     " bind to interface %s",
 
1772
                                     self.interface)
 
1773
                    elif error[0] == errno.ENOPROTOOPT:
1967
1774
                        logger.error("SO_BINDTODEVICE not available;"
1968
1775
                                     " cannot bind to interface %s",
1969
1776
                                     self.interface)
1970
 
                    elif error.errno == errno.ENODEV:
1971
 
                        logger.error("Interface %s does not exist,"
1972
 
                                     " cannot bind", self.interface)
1973
1777
                    else:
1974
1778
                        raise
1975
1779
        # Only bind(2) the socket if we really need to.
2005
1809
    """
2006
1810
    def __init__(self, server_address, RequestHandlerClass,
2007
1811
                 interface=None, use_ipv6=True, clients=None,
2008
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1812
                 gnutls_priority=None, use_dbus=True):
2009
1813
        self.enabled = False
2010
1814
        self.clients = clients
2011
1815
        if self.clients is None:
2015
1819
        IPv6_TCPServer.__init__(self, server_address,
2016
1820
                                RequestHandlerClass,
2017
1821
                                interface = interface,
2018
 
                                use_ipv6 = use_ipv6,
2019
 
                                socketfd = socketfd)
 
1822
                                use_ipv6 = use_ipv6)
2020
1823
    def server_activate(self):
2021
1824
        if self.enabled:
2022
1825
            return socketserver.TCPServer.server_activate(self)
2035
1838
    
2036
1839
    def handle_ipc(self, source, condition, parent_pipe=None,
2037
1840
                   proc = None, client_object=None):
 
1841
        condition_names = {
 
1842
            gobject.IO_IN: "IN",   # There is data to read.
 
1843
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1844
                                    # blocking).
 
1845
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1846
            gobject.IO_ERR: "ERR", # Error condition.
 
1847
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1848
                                    # broken, usually for pipes and
 
1849
                                    # sockets).
 
1850
            }
 
1851
        conditions_string = ' | '.join(name
 
1852
                                       for cond, name in
 
1853
                                       condition_names.iteritems()
 
1854
                                       if cond & condition)
2038
1855
        # error, or the other end of multiprocessing.Pipe has closed
2039
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1856
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2040
1857
            # Wait for other process to exit
2041
1858
            proc.join()
2042
1859
            return False
2100
1917
        return True
2101
1918
 
2102
1919
 
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
1920
def string_to_delta(interval):
2203
1921
    """Parse a string and return a datetime.timedelta
2204
1922
    
2215
1933
    >>> string_to_delta('5m 30s')
2216
1934
    datetime.timedelta(0, 330)
2217
1935
    """
2218
 
    
2219
 
    try:
2220
 
        return rfc3339_duration_to_delta(interval)
2221
 
    except ValueError:
2222
 
        pass
2223
 
    
2224
1936
    timevalue = datetime.timedelta(0)
2225
1937
    for s in interval.split():
2226
1938
        try:
2237
1949
            elif suffix == "w":
2238
1950
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2239
1951
            else:
2240
 
                raise ValueError("Unknown suffix {0!r}"
2241
 
                                 .format(suffix))
 
1952
                raise ValueError("Unknown suffix %r" % suffix)
2242
1953
        except (ValueError, IndexError) as e:
2243
1954
            raise ValueError(*(e.args))
2244
1955
        timevalue += delta
2258
1969
        sys.exit()
2259
1970
    if not noclose:
2260
1971
        # Close all standard open file descriptors
2261
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1972
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2262
1973
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2263
1974
            raise OSError(errno.ENODEV,
2264
 
                          "{0} not a character device"
2265
 
                          .format(os.devnull))
 
1975
                          "%s not a character device"
 
1976
                          % os.path.devnull)
2266
1977
        os.dup2(null, sys.stdin.fileno())
2267
1978
        os.dup2(null, sys.stdout.fileno())
2268
1979
        os.dup2(null, sys.stderr.fileno())
2277
1988
    
2278
1989
    parser = argparse.ArgumentParser()
2279
1990
    parser.add_argument("-v", "--version", action="version",
2280
 
                        version = "%(prog)s {0}".format(version),
 
1991
                        version = "%%(prog)s %s" % version,
2281
1992
                        help="show version number and exit")
2282
1993
    parser.add_argument("-i", "--interface", metavar="IF",
2283
1994
                        help="Bind to interface IF")
2308
2019
    parser.add_argument("--no-restore", action="store_false",
2309
2020
                        dest="restore", help="Do not restore stored"
2310
2021
                        " 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
2022
    parser.add_argument("--statedir", metavar="DIR",
2315
2023
                        help="Directory to save/restore state in")
2316
 
    parser.add_argument("--foreground", action="store_true",
2317
 
                        help="Run in foreground")
2318
2024
    
2319
2025
    options = parser.parse_args()
2320
2026
    
2335
2041
                        "use_ipv6": "True",
2336
2042
                        "debuglevel": "",
2337
2043
                        "restore": "True",
2338
 
                        "socket": "",
2339
 
                        "statedir": "/var/lib/mandos",
2340
 
                        "foreground": "False",
 
2044
                        "statedir": "/var/lib/mandos"
2341
2045
                        }
2342
2046
    
2343
2047
    # Parse config file for server-global settings
2348
2052
    # Convert the SafeConfigParser object to a dict
2349
2053
    server_settings = server_config.defaults()
2350
2054
    # Use the appropriate methods on the non-string config options
2351
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2055
    for option in ("debug", "use_dbus", "use_ipv6"):
2352
2056
        server_settings[option] = server_config.getboolean("DEFAULT",
2353
2057
                                                           option)
2354
2058
    if server_settings["port"]:
2355
2059
        server_settings["port"] = server_config.getint("DEFAULT",
2356
2060
                                                       "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
2061
    del server_config
2367
2062
    
2368
2063
    # Override the settings from the config file with command line
2370
2065
    for option in ("interface", "address", "port", "debug",
2371
2066
                   "priority", "servicename", "configdir",
2372
2067
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2373
 
                   "statedir", "socket", "foreground"):
 
2068
                   "statedir"):
2374
2069
        value = getattr(options, option)
2375
2070
        if value is not None:
2376
2071
            server_settings[option] = value
2379
2074
    for option in server_settings.keys():
2380
2075
        if type(server_settings[option]) is str:
2381
2076
            server_settings[option] = unicode(server_settings[option])
2382
 
    # Debug implies foreground
2383
 
    if server_settings["debug"]:
2384
 
        server_settings["foreground"] = True
2385
2077
    # Now we have our good server settings in "server_settings"
2386
2078
    
2387
2079
    ##################################################################
2393
2085
    use_ipv6 = server_settings["use_ipv6"]
2394
2086
    stored_state_path = os.path.join(server_settings["statedir"],
2395
2087
                                     stored_state_file)
2396
 
    foreground = server_settings["foreground"]
2397
2088
    
2398
2089
    if debug:
2399
2090
        initlogger(debug, logging.DEBUG)
2406
2097
    
2407
2098
    if server_settings["servicename"] != "Mandos":
2408
2099
        syslogger.setFormatter(logging.Formatter
2409
 
                               ('Mandos ({0}) [%(process)d]:'
2410
 
                                ' %(levelname)s: %(message)s'
2411
 
                                .format(server_settings
2412
 
                                        ["servicename"])))
 
2100
                               ('Mandos (%s) [%%(process)d]:'
 
2101
                                ' %%(levelname)s: %%(message)s'
 
2102
                                % server_settings["servicename"]))
2413
2103
    
2414
2104
    # Parse config file with clients
2415
2105
    client_config = configparser.SafeConfigParser(Client
2428
2118
                              use_ipv6=use_ipv6,
2429
2119
                              gnutls_priority=
2430
2120
                              server_settings["priority"],
2431
 
                              use_dbus=use_dbus,
2432
 
                              socketfd=(server_settings["socket"]
2433
 
                                        or None))
2434
 
    if not foreground:
 
2121
                              use_dbus=use_dbus)
 
2122
    if not debug:
2435
2123
        pidfilename = "/var/run/mandos.pid"
2436
 
        pidfile = None
2437
2124
        try:
2438
2125
            pidfile = open(pidfilename, "w")
2439
 
        except IOError as e:
2440
 
            logger.error("Could not open file %r", pidfilename,
2441
 
                         exc_info=e)
 
2126
        except IOError:
 
2127
            logger.error("Could not open file %r", pidfilename)
2442
2128
    
2443
 
    for name in ("_mandos", "mandos", "nobody"):
 
2129
    try:
 
2130
        uid = pwd.getpwnam("_mandos").pw_uid
 
2131
        gid = pwd.getpwnam("_mandos").pw_gid
 
2132
    except KeyError:
2444
2133
        try:
2445
 
            uid = pwd.getpwnam(name).pw_uid
2446
 
            gid = pwd.getpwnam(name).pw_gid
2447
 
            break
 
2134
            uid = pwd.getpwnam("mandos").pw_uid
 
2135
            gid = pwd.getpwnam("mandos").pw_gid
2448
2136
        except KeyError:
2449
 
            continue
2450
 
    else:
2451
 
        uid = 65534
2452
 
        gid = 65534
 
2137
            try:
 
2138
                uid = pwd.getpwnam("nobody").pw_uid
 
2139
                gid = pwd.getpwnam("nobody").pw_gid
 
2140
            except KeyError:
 
2141
                uid = 65534
 
2142
                gid = 65534
2453
2143
    try:
2454
2144
        os.setgid(gid)
2455
2145
        os.setuid(uid)
2456
2146
    except OSError as error:
2457
 
        if error.errno != errno.EPERM:
 
2147
        if error[0] != errno.EPERM:
2458
2148
            raise error
2459
2149
    
2460
2150
    if debug:
2472
2162
         .gnutls_global_set_log_function(debug_gnutls))
2473
2163
        
2474
2164
        # Redirect stdin so all checkers get /dev/null
2475
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2165
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2476
2166
        os.dup2(null, sys.stdin.fileno())
2477
2167
        if null > 2:
2478
2168
            os.close(null)
2479
2169
    
2480
2170
    # Need to fork before connecting to D-Bus
2481
 
    if not foreground:
 
2171
    if not debug:
2482
2172
        # Close all input and output, do double fork, etc.
2483
2173
        daemon()
2484
2174
    
2485
 
    # multiprocessing will use threads, so before we use gobject we
2486
 
    # need to inform gobject that threads will be used.
2487
2175
    gobject.threads_init()
2488
2176
    
2489
2177
    global main_loop
2490
2178
    # From the Avahi example code
2491
 
    DBusGMainLoop(set_as_default=True)
 
2179
    DBusGMainLoop(set_as_default=True )
2492
2180
    main_loop = gobject.MainLoop()
2493
2181
    bus = dbus.SystemBus()
2494
2182
    # End of Avahi example code
2500
2188
                            ("se.bsnet.fukt.Mandos", bus,
2501
2189
                             do_not_queue=True))
2502
2190
        except dbus.exceptions.NameExistsException as e:
2503
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2191
            logger.error(unicode(e) + ", disabling D-Bus")
2504
2192
            use_dbus = False
2505
2193
            server_settings["use_dbus"] = False
2506
2194
            tcp_server.use_dbus = False
2518
2206
    
2519
2207
    client_class = Client
2520
2208
    if use_dbus:
2521
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2209
        client_class = functools.partial(ClientDBusTransitional,
 
2210
                                         bus = bus)
2522
2211
    
2523
2212
    client_settings = Client.config_parser(client_config)
2524
2213
    old_client_settings = {}
2532
2221
                                                     (stored_state))
2533
2222
            os.remove(stored_state_path)
2534
2223
        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)
 
2224
            logger.warning("Could not load persistent state: {0}"
 
2225
                           .format(e))
 
2226
            if e.errno != errno.ENOENT:
2541
2227
                raise
2542
2228
        except EOFError as e:
2543
2229
            logger.warning("Could not load persistent state: "
2544
 
                           "EOFError:", exc_info=e)
 
2230
                           "EOFError: {0}".format(e))
2545
2231
    
2546
2232
    with PGPEngine() as pgp:
2547
2233
        for client_name, client in clients_data.iteritems():
2564
2250
            
2565
2251
            # Clients who has passed its expire date can still be
2566
2252
            # 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.
 
2253
            # whose checker failed before we stored its state is
 
2254
            # assumed to have failed all checkers during downtime.
2570
2255
            if client["enabled"]:
2571
2256
                if datetime.datetime.utcnow() >= client["expires"]:
2572
2257
                    if not client["last_checked_ok"]:
2573
2258
                        logger.warning(
2574
2259
                            "disabling client {0} - Client never "
2575
 
                            "performed a successful checker"
2576
 
                            .format(client_name))
 
2260
                            "performed a successfull checker"
 
2261
                            .format(client["name"]))
2577
2262
                        client["enabled"] = False
2578
2263
                    elif client["last_checker_status"] != 0:
2579
2264
                        logger.warning(
2580
2265
                            "disabling client {0} - Client "
2581
2266
                            "last checker failed with error code {1}"
2582
 
                            .format(client_name,
 
2267
                            .format(client["name"],
2583
2268
                                    client["last_checker_status"]))
2584
2269
                        client["enabled"] = False
2585
2270
                    else:
2588
2273
                                             + client["timeout"])
2589
2274
                        logger.debug("Last checker succeeded,"
2590
2275
                                     " keeping {0} enabled"
2591
 
                                     .format(client_name))
 
2276
                                     .format(client["name"]))
2592
2277
            try:
2593
2278
                client["secret"] = (
2594
2279
                    pgp.decrypt(client["encrypted_secret"],
2600
2285
                             .format(client_name))
2601
2286
                client["secret"] = (
2602
2287
                    client_settings[client_name]["secret"])
 
2288
 
2603
2289
    
2604
2290
    # Add/remove clients based on new changes made to config
2605
2291
    for client_name in (set(old_client_settings)
2608
2294
    for client_name in (set(client_settings)
2609
2295
                        - set(old_client_settings)):
2610
2296
        clients_data[client_name] = client_settings[client_name]
2611
 
    
2612
 
    # Create all client objects
 
2297
 
 
2298
    # Create clients all clients
2613
2299
    for client_name, client in clients_data.iteritems():
2614
2300
        tcp_server.clients[client_name] = client_class(
2615
2301
            name = client_name, settings = client)
2616
2302
    
2617
2303
    if not tcp_server.clients:
2618
2304
        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
 
2305
        
 
2306
    if not debug:
 
2307
        try:
 
2308
            with pidfile:
 
2309
                pid = os.getpid()
 
2310
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2311
            del pidfile
 
2312
        except IOError:
 
2313
            logger.error("Could not write to file %r with PID %d",
 
2314
                         pidfilename, pid)
 
2315
        except NameError:
 
2316
            # "pidfile" was never created
 
2317
            pass
2630
2318
        del pidfilename
 
2319
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2631
2320
    
2632
2321
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2633
2322
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2634
2323
    
2635
2324
    if use_dbus:
2636
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2637
 
                                        "se.bsnet.fukt.Mandos"})
2638
 
        class MandosDBusService(DBusObjectWithProperties):
 
2325
        class MandosDBusService(dbus.service.Object):
2639
2326
            """A D-Bus proxy object"""
2640
2327
            def __init__(self):
2641
2328
                dbus.service.Object.__init__(self, bus, "/")
2642
2329
            _interface = "se.recompile.Mandos"
2643
2330
            
2644
 
            @dbus_interface_annotations(_interface)
2645
 
            def _foo(self):
2646
 
                return { "org.freedesktop.DBus.Property"
2647
 
                         ".EmitsChangedSignal":
2648
 
                             "false"}
2649
 
            
2650
2331
            @dbus.service.signal(_interface, signature="o")
2651
2332
            def ClientAdded(self, objpath):
2652
2333
                "D-Bus signal"
2694
2375
            
2695
2376
            del _interface
2696
2377
        
2697
 
        mandos_dbus_service = MandosDBusService()
 
2378
        class MandosDBusServiceTransitional(MandosDBusService):
 
2379
            __metaclass__ = AlternateDBusNamesMetaclass
 
2380
        mandos_dbus_service = MandosDBusServiceTransitional()
2698
2381
    
2699
2382
    def cleanup():
2700
2383
        "Cleanup function; run on exit"
2733
2416
                del client_settings[client.name]["secret"]
2734
2417
        
2735
2418
        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:
 
2419
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2420
                                                prefix="clients-",
 
2421
                                                dir=os.path.dirname
 
2422
                                                (stored_state_path))
 
2423
            with os.fdopen(tempfd, "wb") as stored_state:
2740
2424
                pickle.dump((clients, client_settings), stored_state)
2741
 
                tempname=stored_state.name
2742
2425
            os.rename(tempname, stored_state_path)
2743
2426
        except (IOError, OSError) as e:
 
2427
            logger.warning("Could not save persistent state: {0}"
 
2428
                           .format(e))
2744
2429
            if not debug:
2745
2430
                try:
2746
2431
                    os.remove(tempname)
2747
2432
                except NameError:
2748
2433
                    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)
 
2434
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2435
                                   errno.EEXIST)):
2755
2436
                raise e
2756
2437
        
2757
2438
        # Delete all clients, and settings from config
2785
2466
    service.port = tcp_server.socket.getsockname()[1]
2786
2467
    if use_ipv6:
2787
2468
        logger.info("Now listening on address %r, port %d,"
2788
 
                    " flowinfo %d, scope_id %d",
2789
 
                    *tcp_server.socket.getsockname())
 
2469
                    " flowinfo %d, scope_id %d"
 
2470
                    % tcp_server.socket.getsockname())
2790
2471
    else:                       # IPv4
2791
 
        logger.info("Now listening on address %r, port %d",
2792
 
                    *tcp_server.socket.getsockname())
 
2472
        logger.info("Now listening on address %r, port %d"
 
2473
                    % tcp_server.socket.getsockname())
2793
2474
    
2794
2475
    #service.interface = tcp_server.socket.getsockname()[3]
2795
2476
    
2798
2479
        try:
2799
2480
            service.activate()
2800
2481
        except dbus.exceptions.DBusException as error:
2801
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2482
            logger.critical("DBusException: %s", error)
2802
2483
            cleanup()
2803
2484
            sys.exit(1)
2804
2485
        # End of Avahi example code
2811
2492
        logger.debug("Starting main loop")
2812
2493
        main_loop.run()
2813
2494
    except AvahiError as error:
2814
 
        logger.critical("Avahi Error", exc_info=error)
 
2495
        logger.critical("AvahiError: %s", error)
2815
2496
        cleanup()
2816
2497
        sys.exit(1)
2817
2498
    except KeyboardInterrupt: