/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2012-01-01 17:38:33 UTC
  • Revision ID: teddy@recompile.se-20120101173833-ai39bif1w0ftuyyh
* Makefile (install-server): Add intro(8mandos) man page.
* network-hooks.d/bridge: Add copyright info and year.
* network-hooks.d/openvpn: - '' -
* network-hooks.d/wireless: - '' -

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.5.0"
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="/")
 
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.
 
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)
717
718
            except OSError as error:
718
 
                logger.error("Failed to start subprocess",
719
 
                             exc_info=error)
720
 
            self.checker_callback_tag = (gobject.child_watch_add
721
 
                                         (self.checker.pid,
722
 
                                          self.checker_callback,
723
 
                                          data=command))
724
 
            # The checker may have completed before the gobject
725
 
            # watch was added.  Check for this.
726
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
727
 
            if pid:
728
 
                gobject.source_remove(self.checker_callback_tag)
729
 
                self.checker_callback(pid, status, command)
 
719
                logger.error("Failed to start subprocess: %s",
 
720
                             error)
730
721
        # Re-run this periodically if run by gobject.timeout_add
731
722
        return True
732
723
    
739
730
            return
740
731
        logger.debug("Stopping checker for %(name)s", vars(self))
741
732
        try:
742
 
            self.checker.terminate()
 
733
            os.kill(self.checker.pid, signal.SIGTERM)
743
734
            #time.sleep(0.5)
744
735
            #if self.checker.poll() is None:
745
 
            #    self.checker.kill()
 
736
            #    os.kill(self.checker.pid, signal.SIGKILL)
746
737
        except OSError as error:
747
738
            if error.errno != errno.ESRCH: # No such process
748
739
                raise
765
756
    # "Set" method, so we fail early here:
766
757
    if byte_arrays and signature != "ay":
767
758
        raise ValueError("Byte arrays not supported for non-'ay'"
768
 
                         " signature {0!r}".format(signature))
 
759
                         " signature %r" % signature)
769
760
    def decorator(func):
770
761
        func._dbus_is_property = True
771
762
        func._dbus_interface = dbus_interface
779
770
    return decorator
780
771
 
781
772
 
782
 
def dbus_interface_annotations(dbus_interface):
783
 
    """Decorator for marking functions returning interface annotations
784
 
    
785
 
    Usage:
786
 
    
787
 
    @dbus_interface_annotations("org.example.Interface")
788
 
    def _foo(self):  # Function name does not matter
789
 
        return {"org.freedesktop.DBus.Deprecated": "true",
790
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
791
 
                    "false"}
792
 
    """
793
 
    def decorator(func):
794
 
        func._dbus_is_interface = True
795
 
        func._dbus_interface = dbus_interface
796
 
        func._dbus_name = dbus_interface
797
 
        return func
798
 
    return decorator
799
 
 
800
 
 
801
 
def dbus_annotations(annotations):
802
 
    """Decorator to annotate D-Bus methods, signals or properties
803
 
    Usage:
804
 
    
805
 
    @dbus_service_property("org.example.Interface", signature="b",
806
 
                           access="r")
807
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
808
 
                        "org.freedesktop.DBus.Property."
809
 
                        "EmitsChangedSignal": "false"})
810
 
    def Property_dbus_property(self):
811
 
        return dbus.Boolean(False)
812
 
    """
813
 
    def decorator(func):
814
 
        func._dbus_annotations = annotations
815
 
        return func
816
 
    return decorator
817
 
 
818
 
 
819
773
class DBusPropertyException(dbus.exceptions.DBusException):
820
774
    """A base class for D-Bus property-related exceptions
821
775
    """
844
798
    """
845
799
    
846
800
    @staticmethod
847
 
    def _is_dbus_thing(thing):
848
 
        """Returns a function testing if an attribute is a D-Bus thing
849
 
        
850
 
        If called like _is_dbus_thing("method") it returns a function
851
 
        suitable for use as predicate to inspect.getmembers().
852
 
        """
853
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
854
 
                                   False)
 
801
    def _is_dbus_property(obj):
 
802
        return getattr(obj, "_dbus_is_property", False)
855
803
    
856
 
    def _get_all_dbus_things(self, thing):
 
804
    def _get_all_dbus_properties(self):
857
805
        """Returns a generator of (name, attribute) pairs
858
806
        """
859
 
        return ((getattr(athing.__get__(self), "_dbus_name",
860
 
                         name),
861
 
                 athing.__get__(self))
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
862
808
                for cls in self.__class__.__mro__
863
 
                for name, athing in
864
 
                inspect.getmembers(cls,
865
 
                                   self._is_dbus_thing(thing)))
 
809
                for name, prop in
 
810
                inspect.getmembers(cls, self._is_dbus_property))
866
811
    
867
812
    def _get_dbus_property(self, interface_name, property_name):
868
813
        """Returns a bound method if one exists which is a D-Bus
870
815
        """
871
816
        for cls in  self.__class__.__mro__:
872
817
            for name, value in (inspect.getmembers
873
 
                                (cls,
874
 
                                 self._is_dbus_thing("property"))):
 
818
                                (cls, self._is_dbus_property)):
875
819
                if (value._dbus_name == property_name
876
820
                    and value._dbus_interface == interface_name):
877
821
                    return value.__get__(self)
919
863
        Note: Will not include properties with access="write".
920
864
        """
921
865
        properties = {}
922
 
        for name, prop in self._get_all_dbus_things("property"):
 
866
        for name, prop in self._get_all_dbus_properties():
923
867
            if (interface_name
924
868
                and interface_name != prop._dbus_interface):
925
869
                # Interface non-empty but did not match
940
884
                         path_keyword='object_path',
941
885
                         connection_keyword='connection')
942
886
    def Introspect(self, object_path, connection):
943
 
        """Overloading of standard D-Bus method.
944
 
        
945
 
        Inserts property tags and interface annotation tags.
 
887
        """Standard D-Bus method, overloaded to insert property tags.
946
888
        """
947
889
        xmlstring = dbus.service.Object.Introspect(self, object_path,
948
890
                                                   connection)
955
897
                e.setAttribute("access", prop._dbus_access)
956
898
                return e
957
899
            for if_tag in document.getElementsByTagName("interface"):
958
 
                # Add property tags
959
900
                for tag in (make_tag(document, name, prop)
960
901
                            for name, prop
961
 
                            in self._get_all_dbus_things("property")
 
902
                            in self._get_all_dbus_properties()
962
903
                            if prop._dbus_interface
963
904
                            == if_tag.getAttribute("name")):
964
905
                    if_tag.appendChild(tag)
965
 
                # Add annotation tags
966
 
                for typ in ("method", "signal", "property"):
967
 
                    for tag in if_tag.getElementsByTagName(typ):
968
 
                        annots = dict()
969
 
                        for name, prop in (self.
970
 
                                           _get_all_dbus_things(typ)):
971
 
                            if (name == tag.getAttribute("name")
972
 
                                and prop._dbus_interface
973
 
                                == if_tag.getAttribute("name")):
974
 
                                annots.update(getattr
975
 
                                              (prop,
976
 
                                               "_dbus_annotations",
977
 
                                               {}))
978
 
                        for name, value in annots.iteritems():
979
 
                            ann_tag = document.createElement(
980
 
                                "annotation")
981
 
                            ann_tag.setAttribute("name", name)
982
 
                            ann_tag.setAttribute("value", value)
983
 
                            tag.appendChild(ann_tag)
984
 
                # Add interface annotation tags
985
 
                for annotation, value in dict(
986
 
                    itertools.chain.from_iterable(
987
 
                        annotations().iteritems()
988
 
                        for name, annotations in
989
 
                        self._get_all_dbus_things("interface")
990
 
                        if name == if_tag.getAttribute("name")
991
 
                        )).iteritems():
992
 
                    ann_tag = document.createElement("annotation")
993
 
                    ann_tag.setAttribute("name", annotation)
994
 
                    ann_tag.setAttribute("value", value)
995
 
                    if_tag.appendChild(ann_tag)
996
906
                # Add the names to the return values for the
997
907
                # "org.freedesktop.DBus.Properties" methods
998
908
                if (if_tag.getAttribute("name")
1013
923
        except (AttributeError, xml.dom.DOMException,
1014
924
                xml.parsers.expat.ExpatError) as error:
1015
925
            logger.error("Failed to override Introspection method",
1016
 
                         exc_info=error)
 
926
                         error)
1017
927
        return xmlstring
1018
928
 
1019
929
 
1020
 
def datetime_to_dbus(dt, variant_level=0):
 
930
def datetime_to_dbus (dt, variant_level=0):
1021
931
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1022
932
    if dt is None:
1023
933
        return dbus.String("", variant_level = variant_level)
1025
935
                       variant_level=variant_level)
1026
936
 
1027
937
 
1028
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1029
 
    """A class decorator; applied to a subclass of
1030
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1031
 
    interface names according to the "alt_interface_names" mapping.
1032
 
    Usage:
1033
 
    
1034
 
    @alternate_dbus_interfaces({"org.example.Interface":
1035
 
                                    "net.example.AlternateInterface"})
1036
 
    class SampleDBusObject(dbus.service.Object):
1037
 
        @dbus.service.method("org.example.Interface")
1038
 
        def SampleDBusMethod():
1039
 
            pass
1040
 
    
1041
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1042
 
    reachable via two interfaces: "org.example.Interface" and
1043
 
    "net.example.AlternateInterface", the latter of which will have
1044
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1045
 
    "true", unless "deprecate" is passed with a False value.
1046
 
    
1047
 
    This works for methods and signals, and also for D-Bus properties
1048
 
    (from DBusObjectWithProperties) and interfaces (from the
1049
 
    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.
1050
942
    """
1051
 
    def wrapper(cls):
1052
 
        for orig_interface_name, alt_interface_name in (
1053
 
            alt_interface_names.iteritems()):
1054
 
            attr = {}
1055
 
            interface_names = set()
1056
 
            # Go though all attributes of the class
1057
 
            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):
1058
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
1059
951
                # with the wrong interface name
1060
952
                if (not hasattr(attribute, "_dbus_interface")
1061
953
                    or not attribute._dbus_interface
1062
 
                    .startswith(orig_interface_name)):
 
954
                    .startswith("se.recompile.Mandos")):
1063
955
                    continue
1064
956
                # Create an alternate D-Bus interface name based on
1065
957
                # the current name
1066
958
                alt_interface = (attribute._dbus_interface
1067
 
                                 .replace(orig_interface_name,
1068
 
                                          alt_interface_name))
1069
 
                interface_names.add(alt_interface)
 
959
                                 .replace("se.recompile.Mandos",
 
960
                                          "se.bsnet.fukt.Mandos"))
1070
961
                # Is this a D-Bus signal?
1071
962
                if getattr(attribute, "_dbus_is_signal", False):
1072
963
                    # Extract the original non-method function by
1087
978
                                nonmethod_func.func_name,
1088
979
                                nonmethod_func.func_defaults,
1089
980
                                nonmethod_func.func_closure)))
1090
 
                    # Copy annotations, if any
1091
 
                    try:
1092
 
                        new_function._dbus_annotations = (
1093
 
                            dict(attribute._dbus_annotations))
1094
 
                    except AttributeError:
1095
 
                        pass
1096
981
                    # Define a creator of a function to call both the
1097
 
                    # original and alternate functions, so both the
1098
 
                    # original and alternate signals gets sent when
1099
 
                    # the function is called
 
982
                    # old and new functions, so both the old and new
 
983
                    # signals gets sent when the function is called
1100
984
                    def fixscope(func1, func2):
1101
985
                        """This function is a scope container to pass
1102
986
                        func1 and func2 to the "call_both" function
1109
993
                        return call_both
1110
994
                    # Create the "call_both" function and add it to
1111
995
                    # the class
1112
 
                    attr[attrname] = fixscope(attribute, new_function)
 
996
                    attr[attrname] = fixscope(attribute,
 
997
                                              new_function)
1113
998
                # Is this a D-Bus method?
1114
999
                elif getattr(attribute, "_dbus_is_method", False):
1115
1000
                    # Create a new, but exactly alike, function
1126
1011
                                        attribute.func_name,
1127
1012
                                        attribute.func_defaults,
1128
1013
                                        attribute.func_closure)))
1129
 
                    # Copy annotations, if any
1130
 
                    try:
1131
 
                        attr[attrname]._dbus_annotations = (
1132
 
                            dict(attribute._dbus_annotations))
1133
 
                    except AttributeError:
1134
 
                        pass
1135
1014
                # Is this a D-Bus property?
1136
1015
                elif getattr(attribute, "_dbus_is_property", False):
1137
1016
                    # Create a new, but exactly alike, function
1151
1030
                                        attribute.func_name,
1152
1031
                                        attribute.func_defaults,
1153
1032
                                        attribute.func_closure)))
1154
 
                    # Copy annotations, if any
1155
 
                    try:
1156
 
                        attr[attrname]._dbus_annotations = (
1157
 
                            dict(attribute._dbus_annotations))
1158
 
                    except AttributeError:
1159
 
                        pass
1160
 
                # Is this a D-Bus interface?
1161
 
                elif getattr(attribute, "_dbus_is_interface", False):
1162
 
                    # Create a new, but exactly alike, function
1163
 
                    # object.  Decorate it to be a new D-Bus interface
1164
 
                    # with the alternate D-Bus interface name.  Add it
1165
 
                    # to the class.
1166
 
                    attr[attrname] = (dbus_interface_annotations
1167
 
                                      (alt_interface)
1168
 
                                      (types.FunctionType
1169
 
                                       (attribute.func_code,
1170
 
                                        attribute.func_globals,
1171
 
                                        attribute.func_name,
1172
 
                                        attribute.func_defaults,
1173
 
                                        attribute.func_closure)))
1174
 
            if deprecate:
1175
 
                # Deprecate all alternate interfaces
1176
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1177
 
                for interface_name in interface_names:
1178
 
                    @dbus_interface_annotations(interface_name)
1179
 
                    def func(self):
1180
 
                        return { "org.freedesktop.DBus.Deprecated":
1181
 
                                     "true" }
1182
 
                    # Find an unused name
1183
 
                    for aname in (iname.format(i)
1184
 
                                  for i in itertools.count()):
1185
 
                        if aname not in attr:
1186
 
                            attr[aname] = func
1187
 
                            break
1188
 
            if interface_names:
1189
 
                # Replace the class with a new subclass of it with
1190
 
                # methods, signals, etc. as created above.
1191
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1192
 
                           (cls,), attr)
1193
 
        return cls
1194
 
    return wrapper
1195
 
 
1196
 
 
1197
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1198
 
                                "se.bsnet.fukt.Mandos"})
 
1033
        return type.__new__(mcs, name, bases, attr)
 
1034
 
 
1035
 
1199
1036
class ClientDBus(Client, DBusObjectWithProperties):
1200
1037
    """A Client class using D-Bus
1201
1038
    
1212
1049
    def __init__(self, bus = None, *args, **kwargs):
1213
1050
        self.bus = bus
1214
1051
        Client.__init__(self, *args, **kwargs)
 
1052
        self._approvals_pending = 0
 
1053
        
 
1054
        self._approvals_pending = 0
1215
1055
        # Only now, when this client is initialized, can it show up on
1216
1056
        # the D-Bus
1217
1057
        client_object_name = unicode(self.name).translate(
1221
1061
                                 ("/clients/" + client_object_name))
1222
1062
        DBusObjectWithProperties.__init__(self, self.bus,
1223
1063
                                          self.dbus_object_path)
1224
 
    
 
1064
        
1225
1065
    def notifychangeproperty(transform_func,
1226
1066
                             dbus_name, type_func=lambda x: x,
1227
1067
                             variant_level=1):
1250
1090
        
1251
1091
        return property(lambda self: getattr(self, attrname), setter)
1252
1092
    
 
1093
    
1253
1094
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1254
1095
    approvals_pending = notifychangeproperty(dbus.Boolean,
1255
1096
                                             "ApprovalPending",
1262
1103
                                       checker is not None)
1263
1104
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1264
1105
                                           "LastCheckedOK")
1265
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1266
 
                                               "LastCheckerStatus")
1267
1106
    last_approval_request = notifychangeproperty(
1268
1107
        datetime_to_dbus, "LastApprovalRequest")
1269
1108
    approved_by_default = notifychangeproperty(dbus.Boolean,
1337
1176
        return False
1338
1177
    
1339
1178
    def approve(self, value=True):
 
1179
        self.send_changedstate()
1340
1180
        self.approved = value
1341
1181
        gobject.timeout_add(timedelta_to_milliseconds
1342
1182
                            (self.approval_duration),
1343
1183
                            self._reset_approved)
1344
 
        self.send_changedstate()
 
1184
    
1345
1185
    
1346
1186
    ## D-Bus methods, signals & properties
1347
1187
    _interface = "se.recompile.Mandos.Client"
1348
1188
    
1349
 
    ## Interfaces
1350
 
    
1351
 
    @dbus_interface_annotations(_interface)
1352
 
    def _foo(self):
1353
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1354
 
                     "false"}
1355
 
    
1356
1189
    ## Signals
1357
1190
    
1358
1191
    # CheckerCompleted - signal
1394
1227
        "D-Bus signal"
1395
1228
        return self.need_approval()
1396
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
    
1397
1238
    ## Methods
1398
1239
    
1399
1240
    # Approve - method
1509
1350
            return
1510
1351
        return datetime_to_dbus(self.last_checked_ok)
1511
1352
    
1512
 
    # LastCheckerStatus - property
1513
 
    @dbus_service_property(_interface, signature="n",
1514
 
                           access="read")
1515
 
    def LastCheckerStatus_dbus_property(self):
1516
 
        return dbus.Int16(self.last_checker_status)
1517
 
    
1518
1353
    # Expires - property
1519
1354
    @dbus_service_property(_interface, signature="s", access="read")
1520
1355
    def Expires_dbus_property(self):
1531
1366
    def Timeout_dbus_property(self, value=None):
1532
1367
        if value is None:       # get
1533
1368
            return dbus.UInt64(self.timeout_milliseconds())
1534
 
        old_timeout = self.timeout
1535
1369
        self.timeout = datetime.timedelta(0, 0, 0, value)
1536
 
        # Reschedule disabling
 
1370
        # Reschedule timeout
1537
1371
        if self.enabled:
1538
1372
            now = datetime.datetime.utcnow()
1539
 
            self.expires += self.timeout - old_timeout
1540
 
            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:
1541
1376
                # The timeout has passed
1542
1377
                self.disable()
1543
1378
            else:
 
1379
                self.expires = (now +
 
1380
                                datetime.timedelta(milliseconds =
 
1381
                                                   time_to_die))
1544
1382
                if (getattr(self, "disable_initiator_tag", None)
1545
1383
                    is None):
1546
1384
                    return
1547
1385
                gobject.source_remove(self.disable_initiator_tag)
1548
 
                self.disable_initiator_tag = (
1549
 
                    gobject.timeout_add(
1550
 
                        timedelta_to_milliseconds(self.expires - now),
1551
 
                        self.disable))
 
1386
                self.disable_initiator_tag = (gobject.timeout_add
 
1387
                                              (time_to_die,
 
1388
                                               self.disable))
1552
1389
    
1553
1390
    # ExtendedTimeout - property
1554
1391
    @dbus_service_property(_interface, signature="t",
1633
1470
        self._pipe.send(('setattr', name, value))
1634
1471
 
1635
1472
 
 
1473
class ClientDBusTransitional(ClientDBus):
 
1474
    __metaclass__ = AlternateDBusNamesMetaclass
 
1475
 
 
1476
 
1636
1477
class ClientHandler(socketserver.BaseRequestHandler, object):
1637
1478
    """A class to handle client connections.
1638
1479
    
1706
1547
                except KeyError:
1707
1548
                    return
1708
1549
                
 
1550
                if self.server.use_dbus:
 
1551
                    # Emit D-Bus signal
 
1552
                    client.NewRequest(str(self.client_address))
 
1553
                
1709
1554
                if client.approval_delay:
1710
1555
                    delay = client.approval_delay
1711
1556
                    client.approvals_pending += 1
1742
1587
                    #wait until timeout or approved
1743
1588
                    time = datetime.datetime.now()
1744
1589
                    client.changedstate.acquire()
1745
 
                    client.changedstate.wait(
1746
 
                        float(timedelta_to_milliseconds(delay)
1747
 
                              / 1000))
 
1590
                    (client.changedstate.wait
 
1591
                     (float(client.timedelta_to_milliseconds(delay)
 
1592
                            / 1000)))
1748
1593
                    client.changedstate.release()
1749
1594
                    time2 = datetime.datetime.now()
1750
1595
                    if (time2 - time) >= delay:
1766
1611
                    try:
1767
1612
                        sent = session.send(client.secret[sent_size:])
1768
1613
                    except gnutls.errors.GNUTLSError as error:
1769
 
                        logger.warning("gnutls send failed",
1770
 
                                       exc_info=error)
 
1614
                        logger.warning("gnutls send failed")
1771
1615
                        return
1772
1616
                    logger.debug("Sent: %d, remaining: %d",
1773
1617
                                 sent, len(client.secret)
1776
1620
                
1777
1621
                logger.info("Sending secret to %s", client.name)
1778
1622
                # bump the timeout using extended_timeout
1779
 
                client.bump_timeout(client.extended_timeout)
 
1623
                client.checked_ok(client.extended_timeout)
1780
1624
                if self.server.use_dbus:
1781
1625
                    # Emit D-Bus signal
1782
1626
                    client.GotSecret()
1787
1631
                try:
1788
1632
                    session.bye()
1789
1633
                except gnutls.errors.GNUTLSError as error:
1790
 
                    logger.warning("GnuTLS bye failed",
1791
 
                                   exc_info=error)
 
1634
                    logger.warning("GnuTLS bye failed")
1792
1635
    
1793
1636
    @staticmethod
1794
1637
    def peer_certificate(session):
1866
1709
    def process_request(self, request, address):
1867
1710
        """Start a new process to process the request."""
1868
1711
        proc = multiprocessing.Process(target = self.sub_process_main,
1869
 
                                       args = (request, address))
 
1712
                                       args = (request,
 
1713
                                               address))
1870
1714
        proc.start()
1871
1715
        return proc
1872
1716
 
1900
1744
        use_ipv6:       Boolean; to use IPv6 or not
1901
1745
    """
1902
1746
    def __init__(self, server_address, RequestHandlerClass,
1903
 
                 interface=None, use_ipv6=True, socketfd=None):
1904
 
        """If socketfd is set, use that file descriptor instead of
1905
 
        creating a new one with socket.socket().
1906
 
        """
 
1747
                 interface=None, use_ipv6=True):
1907
1748
        self.interface = interface
1908
1749
        if use_ipv6:
1909
1750
            self.address_family = socket.AF_INET6
1910
 
        if socketfd is not None:
1911
 
            # Save the file descriptor
1912
 
            self.socketfd = socketfd
1913
 
            # Save the original socket.socket() function
1914
 
            self.socket_socket = socket.socket
1915
 
            # To implement --socket, we monkey patch socket.socket.
1916
 
            # 
1917
 
            # (When socketserver.TCPServer is a new-style class, we
1918
 
            # could make self.socket into a property instead of monkey
1919
 
            # patching socket.socket.)
1920
 
            # 
1921
 
            # Create a one-time-only replacement for socket.socket()
1922
 
            @functools.wraps(socket.socket)
1923
 
            def socket_wrapper(*args, **kwargs):
1924
 
                # Restore original function so subsequent calls are
1925
 
                # not affected.
1926
 
                socket.socket = self.socket_socket
1927
 
                del self.socket_socket
1928
 
                # This time only, return a new socket object from the
1929
 
                # saved file descriptor.
1930
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1931
 
            # Replace socket.socket() function with wrapper
1932
 
            socket.socket = socket_wrapper
1933
 
        # The socketserver.TCPServer.__init__ will call
1934
 
        # socket.socket(), which might be our replacement,
1935
 
        # socket_wrapper(), if socketfd was set.
1936
1751
        socketserver.TCPServer.__init__(self, server_address,
1937
1752
                                        RequestHandlerClass)
1938
 
    
1939
1753
    def server_bind(self):
1940
1754
        """This overrides the normal server_bind() function
1941
1755
        to bind to an interface if one was specified, and also NOT to
1949
1763
                try:
1950
1764
                    self.socket.setsockopt(socket.SOL_SOCKET,
1951
1765
                                           SO_BINDTODEVICE,
1952
 
                                           str(self.interface + '\0'))
 
1766
                                           str(self.interface
 
1767
                                               + '\0'))
1953
1768
                except socket.error as error:
1954
 
                    if error.errno == errno.EPERM:
1955
 
                        logger.error("No permission to bind to"
1956
 
                                     " interface %s", self.interface)
1957
 
                    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:
1958
1774
                        logger.error("SO_BINDTODEVICE not available;"
1959
1775
                                     " cannot bind to interface %s",
1960
1776
                                     self.interface)
1961
 
                    elif error.errno == errno.ENODEV:
1962
 
                        logger.error("Interface %s does not exist,"
1963
 
                                     " cannot bind", self.interface)
1964
1777
                    else:
1965
1778
                        raise
1966
1779
        # Only bind(2) the socket if we really need to.
1996
1809
    """
1997
1810
    def __init__(self, server_address, RequestHandlerClass,
1998
1811
                 interface=None, use_ipv6=True, clients=None,
1999
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1812
                 gnutls_priority=None, use_dbus=True):
2000
1813
        self.enabled = False
2001
1814
        self.clients = clients
2002
1815
        if self.clients is None:
2006
1819
        IPv6_TCPServer.__init__(self, server_address,
2007
1820
                                RequestHandlerClass,
2008
1821
                                interface = interface,
2009
 
                                use_ipv6 = use_ipv6,
2010
 
                                socketfd = socketfd)
 
1822
                                use_ipv6 = use_ipv6)
2011
1823
    def server_activate(self):
2012
1824
        if self.enabled:
2013
1825
            return socketserver.TCPServer.server_activate(self)
2026
1838
    
2027
1839
    def handle_ipc(self, source, condition, parent_pipe=None,
2028
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)
2029
1855
        # error, or the other end of multiprocessing.Pipe has closed
2030
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1856
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2031
1857
            # Wait for other process to exit
2032
1858
            proc.join()
2033
1859
            return False
2091
1917
        return True
2092
1918
 
2093
1919
 
2094
 
def rfc3339_duration_to_delta(duration):
2095
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2096
 
    
2097
 
    >>> rfc3339_duration_to_delta("P7D")
2098
 
    datetime.timedelta(7)
2099
 
    >>> rfc3339_duration_to_delta("PT60S")
2100
 
    datetime.timedelta(0, 60)
2101
 
    >>> rfc3339_duration_to_delta("PT60M")
2102
 
    datetime.timedelta(0, 3600)
2103
 
    >>> rfc3339_duration_to_delta("PT24H")
2104
 
    datetime.timedelta(1)
2105
 
    >>> rfc3339_duration_to_delta("P1W")
2106
 
    datetime.timedelta(7)
2107
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2108
 
    datetime.timedelta(0, 330)
2109
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2110
 
    datetime.timedelta(1, 200)
2111
 
    """
2112
 
    
2113
 
    # Parsing an RFC 3339 duration with regular expressions is not
2114
 
    # possible - there would have to be multiple places for the same
2115
 
    # values, like seconds.  The current code, while more esoteric, is
2116
 
    # cleaner without depending on a parsing library.  If Python had a
2117
 
    # built-in library for parsing we would use it, but we'd like to
2118
 
    # avoid excessive use of external libraries.
2119
 
    
2120
 
    # New type for defining tokens, syntax, and semantics all-in-one
2121
 
    Token = collections.namedtuple("Token",
2122
 
                                   ("regexp", # To match token; if
2123
 
                                              # "value" is not None,
2124
 
                                              # must have a "group"
2125
 
                                              # containing digits
2126
 
                                    "value",  # datetime.timedelta or
2127
 
                                              # None
2128
 
                                    "followers")) # Tokens valid after
2129
 
                                                  # this token
2130
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2131
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2132
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2133
 
    token_second = Token(re.compile(r"(\d+)S"),
2134
 
                         datetime.timedelta(seconds=1),
2135
 
                         frozenset((token_end,)))
2136
 
    token_minute = Token(re.compile(r"(\d+)M"),
2137
 
                         datetime.timedelta(minutes=1),
2138
 
                         frozenset((token_second, token_end)))
2139
 
    token_hour = Token(re.compile(r"(\d+)H"),
2140
 
                       datetime.timedelta(hours=1),
2141
 
                       frozenset((token_minute, token_end)))
2142
 
    token_time = Token(re.compile(r"T"),
2143
 
                       None,
2144
 
                       frozenset((token_hour, token_minute,
2145
 
                                  token_second)))
2146
 
    token_day = Token(re.compile(r"(\d+)D"),
2147
 
                      datetime.timedelta(days=1),
2148
 
                      frozenset((token_time, token_end)))
2149
 
    token_month = Token(re.compile(r"(\d+)M"),
2150
 
                        datetime.timedelta(weeks=4),
2151
 
                        frozenset((token_day, token_end)))
2152
 
    token_year = Token(re.compile(r"(\d+)Y"),
2153
 
                       datetime.timedelta(weeks=52),
2154
 
                       frozenset((token_month, token_end)))
2155
 
    token_week = Token(re.compile(r"(\d+)W"),
2156
 
                       datetime.timedelta(weeks=1),
2157
 
                       frozenset((token_end,)))
2158
 
    token_duration = Token(re.compile(r"P"), None,
2159
 
                           frozenset((token_year, token_month,
2160
 
                                      token_day, token_time,
2161
 
                                      token_week))),
2162
 
    # Define starting values
2163
 
    value = datetime.timedelta() # Value so far
2164
 
    found_token = None
2165
 
    followers = frozenset(token_duration,) # Following valid tokens
2166
 
    s = duration                # String left to parse
2167
 
    # Loop until end token is found
2168
 
    while found_token is not token_end:
2169
 
        # Search for any currently valid tokens
2170
 
        for token in followers:
2171
 
            match = token.regexp.match(s)
2172
 
            if match is not None:
2173
 
                # Token found
2174
 
                if token.value is not None:
2175
 
                    # Value found, parse digits
2176
 
                    factor = int(match.group(1), 10)
2177
 
                    # Add to value so far
2178
 
                    value += factor * token.value
2179
 
                # Strip token from string
2180
 
                s = token.regexp.sub("", s, 1)
2181
 
                # Go to found token
2182
 
                found_token = token
2183
 
                # Set valid next tokens
2184
 
                followers = found_token.followers
2185
 
                break
2186
 
        else:
2187
 
            # No currently valid tokens were found
2188
 
            raise ValueError("Invalid RFC 3339 duration")
2189
 
    # End token found
2190
 
    return value
2191
 
 
2192
 
 
2193
1920
def string_to_delta(interval):
2194
1921
    """Parse a string and return a datetime.timedelta
2195
1922
    
2206
1933
    >>> string_to_delta('5m 30s')
2207
1934
    datetime.timedelta(0, 330)
2208
1935
    """
2209
 
    
2210
 
    try:
2211
 
        return rfc3339_duration_to_delta(interval)
2212
 
    except ValueError:
2213
 
        pass
2214
 
    
2215
1936
    timevalue = datetime.timedelta(0)
2216
1937
    for s in interval.split():
2217
1938
        try:
2228
1949
            elif suffix == "w":
2229
1950
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2230
1951
            else:
2231
 
                raise ValueError("Unknown suffix {0!r}"
2232
 
                                 .format(suffix))
 
1952
                raise ValueError("Unknown suffix %r" % suffix)
2233
1953
        except (ValueError, IndexError) as e:
2234
1954
            raise ValueError(*(e.args))
2235
1955
        timevalue += delta
2249
1969
        sys.exit()
2250
1970
    if not noclose:
2251
1971
        # Close all standard open file descriptors
2252
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1972
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2253
1973
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2254
1974
            raise OSError(errno.ENODEV,
2255
 
                          "{0} not a character device"
2256
 
                          .format(os.devnull))
 
1975
                          "%s not a character device"
 
1976
                          % os.path.devnull)
2257
1977
        os.dup2(null, sys.stdin.fileno())
2258
1978
        os.dup2(null, sys.stdout.fileno())
2259
1979
        os.dup2(null, sys.stderr.fileno())
2268
1988
    
2269
1989
    parser = argparse.ArgumentParser()
2270
1990
    parser.add_argument("-v", "--version", action="version",
2271
 
                        version = "%(prog)s {0}".format(version),
 
1991
                        version = "%%(prog)s %s" % version,
2272
1992
                        help="show version number and exit")
2273
1993
    parser.add_argument("-i", "--interface", metavar="IF",
2274
1994
                        help="Bind to interface IF")
2299
2019
    parser.add_argument("--no-restore", action="store_false",
2300
2020
                        dest="restore", help="Do not restore stored"
2301
2021
                        " state")
2302
 
    parser.add_argument("--socket", type=int,
2303
 
                        help="Specify a file descriptor to a network"
2304
 
                        " socket to use instead of creating one")
2305
2022
    parser.add_argument("--statedir", metavar="DIR",
2306
2023
                        help="Directory to save/restore state in")
2307
 
    parser.add_argument("--foreground", action="store_true",
2308
 
                        help="Run in foreground")
2309
2024
    
2310
2025
    options = parser.parse_args()
2311
2026
    
2326
2041
                        "use_ipv6": "True",
2327
2042
                        "debuglevel": "",
2328
2043
                        "restore": "True",
2329
 
                        "socket": "",
2330
 
                        "statedir": "/var/lib/mandos",
2331
 
                        "foreground": "False",
 
2044
                        "statedir": "/var/lib/mandos"
2332
2045
                        }
2333
2046
    
2334
2047
    # Parse config file for server-global settings
2339
2052
    # Convert the SafeConfigParser object to a dict
2340
2053
    server_settings = server_config.defaults()
2341
2054
    # Use the appropriate methods on the non-string config options
2342
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2055
    for option in ("debug", "use_dbus", "use_ipv6"):
2343
2056
        server_settings[option] = server_config.getboolean("DEFAULT",
2344
2057
                                                           option)
2345
2058
    if server_settings["port"]:
2346
2059
        server_settings["port"] = server_config.getint("DEFAULT",
2347
2060
                                                       "port")
2348
 
    if server_settings["socket"]:
2349
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2350
 
                                                         "socket")
2351
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2352
 
        # over with an opened os.devnull.  But we don't want this to
2353
 
        # happen with a supplied network socket.
2354
 
        if 0 <= server_settings["socket"] <= 2:
2355
 
            server_settings["socket"] = os.dup(server_settings
2356
 
                                               ["socket"])
2357
2061
    del server_config
2358
2062
    
2359
2063
    # Override the settings from the config file with command line
2361
2065
    for option in ("interface", "address", "port", "debug",
2362
2066
                   "priority", "servicename", "configdir",
2363
2067
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2364
 
                   "statedir", "socket", "foreground"):
 
2068
                   "statedir"):
2365
2069
        value = getattr(options, option)
2366
2070
        if value is not None:
2367
2071
            server_settings[option] = value
2370
2074
    for option in server_settings.keys():
2371
2075
        if type(server_settings[option]) is str:
2372
2076
            server_settings[option] = unicode(server_settings[option])
2373
 
    # Debug implies foreground
2374
 
    if server_settings["debug"]:
2375
 
        server_settings["foreground"] = True
2376
2077
    # Now we have our good server settings in "server_settings"
2377
2078
    
2378
2079
    ##################################################################
2384
2085
    use_ipv6 = server_settings["use_ipv6"]
2385
2086
    stored_state_path = os.path.join(server_settings["statedir"],
2386
2087
                                     stored_state_file)
2387
 
    foreground = server_settings["foreground"]
2388
2088
    
2389
2089
    if debug:
2390
2090
        initlogger(debug, logging.DEBUG)
2397
2097
    
2398
2098
    if server_settings["servicename"] != "Mandos":
2399
2099
        syslogger.setFormatter(logging.Formatter
2400
 
                               ('Mandos ({0}) [%(process)d]:'
2401
 
                                ' %(levelname)s: %(message)s'
2402
 
                                .format(server_settings
2403
 
                                        ["servicename"])))
 
2100
                               ('Mandos (%s) [%%(process)d]:'
 
2101
                                ' %%(levelname)s: %%(message)s'
 
2102
                                % server_settings["servicename"]))
2404
2103
    
2405
2104
    # Parse config file with clients
2406
2105
    client_config = configparser.SafeConfigParser(Client
2419
2118
                              use_ipv6=use_ipv6,
2420
2119
                              gnutls_priority=
2421
2120
                              server_settings["priority"],
2422
 
                              use_dbus=use_dbus,
2423
 
                              socketfd=(server_settings["socket"]
2424
 
                                        or None))
2425
 
    if not foreground:
 
2121
                              use_dbus=use_dbus)
 
2122
    if not debug:
2426
2123
        pidfilename = "/var/run/mandos.pid"
2427
 
        pidfile = None
2428
2124
        try:
2429
2125
            pidfile = open(pidfilename, "w")
2430
 
        except IOError as e:
2431
 
            logger.error("Could not open file %r", pidfilename,
2432
 
                         exc_info=e)
 
2126
        except IOError:
 
2127
            logger.error("Could not open file %r", pidfilename)
2433
2128
    
2434
 
    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:
2435
2133
        try:
2436
 
            uid = pwd.getpwnam(name).pw_uid
2437
 
            gid = pwd.getpwnam(name).pw_gid
2438
 
            break
 
2134
            uid = pwd.getpwnam("mandos").pw_uid
 
2135
            gid = pwd.getpwnam("mandos").pw_gid
2439
2136
        except KeyError:
2440
 
            continue
2441
 
    else:
2442
 
        uid = 65534
2443
 
        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
2444
2143
    try:
2445
2144
        os.setgid(gid)
2446
2145
        os.setuid(uid)
2447
2146
    except OSError as error:
2448
 
        if error.errno != errno.EPERM:
 
2147
        if error[0] != errno.EPERM:
2449
2148
            raise error
2450
2149
    
2451
2150
    if debug:
2463
2162
         .gnutls_global_set_log_function(debug_gnutls))
2464
2163
        
2465
2164
        # Redirect stdin so all checkers get /dev/null
2466
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2165
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2467
2166
        os.dup2(null, sys.stdin.fileno())
2468
2167
        if null > 2:
2469
2168
            os.close(null)
2470
2169
    
2471
2170
    # Need to fork before connecting to D-Bus
2472
 
    if not foreground:
 
2171
    if not debug:
2473
2172
        # Close all input and output, do double fork, etc.
2474
2173
        daemon()
2475
2174
    
2476
 
    # multiprocessing will use threads, so before we use gobject we
2477
 
    # need to inform gobject that threads will be used.
2478
2175
    gobject.threads_init()
2479
2176
    
2480
2177
    global main_loop
2481
2178
    # From the Avahi example code
2482
 
    DBusGMainLoop(set_as_default=True)
 
2179
    DBusGMainLoop(set_as_default=True )
2483
2180
    main_loop = gobject.MainLoop()
2484
2181
    bus = dbus.SystemBus()
2485
2182
    # End of Avahi example code
2491
2188
                            ("se.bsnet.fukt.Mandos", bus,
2492
2189
                             do_not_queue=True))
2493
2190
        except dbus.exceptions.NameExistsException as e:
2494
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2191
            logger.error(unicode(e) + ", disabling D-Bus")
2495
2192
            use_dbus = False
2496
2193
            server_settings["use_dbus"] = False
2497
2194
            tcp_server.use_dbus = False
2509
2206
    
2510
2207
    client_class = Client
2511
2208
    if use_dbus:
2512
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2209
        client_class = functools.partial(ClientDBusTransitional,
 
2210
                                         bus = bus)
2513
2211
    
2514
2212
    client_settings = Client.config_parser(client_config)
2515
2213
    old_client_settings = {}
2523
2221
                                                     (stored_state))
2524
2222
            os.remove(stored_state_path)
2525
2223
        except IOError as e:
2526
 
            if e.errno == errno.ENOENT:
2527
 
                logger.warning("Could not load persistent state: {0}"
2528
 
                                .format(os.strerror(e.errno)))
2529
 
            else:
2530
 
                logger.critical("Could not load persistent state:",
2531
 
                                exc_info=e)
 
2224
            logger.warning("Could not load persistent state: {0}"
 
2225
                           .format(e))
 
2226
            if e.errno != errno.ENOENT:
2532
2227
                raise
2533
2228
        except EOFError as e:
2534
2229
            logger.warning("Could not load persistent state: "
2535
 
                           "EOFError:", exc_info=e)
 
2230
                           "EOFError: {0}".format(e))
2536
2231
    
2537
2232
    with PGPEngine() as pgp:
2538
2233
        for client_name, client in clients_data.iteritems():
2555
2250
            
2556
2251
            # Clients who has passed its expire date can still be
2557
2252
            # enabled if its last checker was successful.  Clients
2558
 
            # whose checker succeeded before we stored its state is
2559
 
            # assumed to have successfully run all checkers during
2560
 
            # downtime.
 
2253
            # whose checker failed before we stored its state is
 
2254
            # assumed to have failed all checkers during downtime.
2561
2255
            if client["enabled"]:
2562
2256
                if datetime.datetime.utcnow() >= client["expires"]:
2563
2257
                    if not client["last_checked_ok"]:
2564
2258
                        logger.warning(
2565
2259
                            "disabling client {0} - Client never "
2566
 
                            "performed a successful checker"
2567
 
                            .format(client_name))
 
2260
                            "performed a successfull checker"
 
2261
                            .format(client["name"]))
2568
2262
                        client["enabled"] = False
2569
2263
                    elif client["last_checker_status"] != 0:
2570
2264
                        logger.warning(
2571
2265
                            "disabling client {0} - Client "
2572
2266
                            "last checker failed with error code {1}"
2573
 
                            .format(client_name,
 
2267
                            .format(client["name"],
2574
2268
                                    client["last_checker_status"]))
2575
2269
                        client["enabled"] = False
2576
2270
                    else:
2579
2273
                                             + client["timeout"])
2580
2274
                        logger.debug("Last checker succeeded,"
2581
2275
                                     " keeping {0} enabled"
2582
 
                                     .format(client_name))
 
2276
                                     .format(client["name"]))
2583
2277
            try:
2584
2278
                client["secret"] = (
2585
2279
                    pgp.decrypt(client["encrypted_secret"],
2591
2285
                             .format(client_name))
2592
2286
                client["secret"] = (
2593
2287
                    client_settings[client_name]["secret"])
 
2288
 
2594
2289
    
2595
2290
    # Add/remove clients based on new changes made to config
2596
2291
    for client_name in (set(old_client_settings)
2599
2294
    for client_name in (set(client_settings)
2600
2295
                        - set(old_client_settings)):
2601
2296
        clients_data[client_name] = client_settings[client_name]
2602
 
    
2603
 
    # Create all client objects
 
2297
 
 
2298
    # Create clients all clients
2604
2299
    for client_name, client in clients_data.iteritems():
2605
2300
        tcp_server.clients[client_name] = client_class(
2606
2301
            name = client_name, settings = client)
2607
2302
    
2608
2303
    if not tcp_server.clients:
2609
2304
        logger.warning("No clients defined")
2610
 
    
2611
 
    if not foreground:
2612
 
        if pidfile is not None:
2613
 
            try:
2614
 
                with pidfile:
2615
 
                    pid = os.getpid()
2616
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2617
 
            except IOError:
2618
 
                logger.error("Could not write to file %r with PID %d",
2619
 
                             pidfilename, pid)
2620
 
        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
2621
2318
        del pidfilename
 
2319
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2622
2320
    
2623
2321
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2624
2322
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2625
2323
    
2626
2324
    if use_dbus:
2627
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2628
 
                                        "se.bsnet.fukt.Mandos"})
2629
 
        class MandosDBusService(DBusObjectWithProperties):
 
2325
        class MandosDBusService(dbus.service.Object):
2630
2326
            """A D-Bus proxy object"""
2631
2327
            def __init__(self):
2632
2328
                dbus.service.Object.__init__(self, bus, "/")
2633
2329
            _interface = "se.recompile.Mandos"
2634
2330
            
2635
 
            @dbus_interface_annotations(_interface)
2636
 
            def _foo(self):
2637
 
                return { "org.freedesktop.DBus.Property"
2638
 
                         ".EmitsChangedSignal":
2639
 
                             "false"}
2640
 
            
2641
2331
            @dbus.service.signal(_interface, signature="o")
2642
2332
            def ClientAdded(self, objpath):
2643
2333
                "D-Bus signal"
2685
2375
            
2686
2376
            del _interface
2687
2377
        
2688
 
        mandos_dbus_service = MandosDBusService()
 
2378
        class MandosDBusServiceTransitional(MandosDBusService):
 
2379
            __metaclass__ = AlternateDBusNamesMetaclass
 
2380
        mandos_dbus_service = MandosDBusServiceTransitional()
2689
2381
    
2690
2382
    def cleanup():
2691
2383
        "Cleanup function; run on exit"
2724
2416
                del client_settings[client.name]["secret"]
2725
2417
        
2726
2418
        try:
2727
 
            with (tempfile.NamedTemporaryFile
2728
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2729
 
                   dir=os.path.dirname(stored_state_path),
2730
 
                   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:
2731
2424
                pickle.dump((clients, client_settings), stored_state)
2732
 
                tempname=stored_state.name
2733
2425
            os.rename(tempname, stored_state_path)
2734
2426
        except (IOError, OSError) as e:
 
2427
            logger.warning("Could not save persistent state: {0}"
 
2428
                           .format(e))
2735
2429
            if not debug:
2736
2430
                try:
2737
2431
                    os.remove(tempname)
2738
2432
                except NameError:
2739
2433
                    pass
2740
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2741
 
                logger.warning("Could not save persistent state: {0}"
2742
 
                               .format(os.strerror(e.errno)))
2743
 
            else:
2744
 
                logger.warning("Could not save persistent state:",
2745
 
                               exc_info=e)
 
2434
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2435
                                   errno.EEXIST)):
2746
2436
                raise e
2747
2437
        
2748
2438
        # Delete all clients, and settings from config
2776
2466
    service.port = tcp_server.socket.getsockname()[1]
2777
2467
    if use_ipv6:
2778
2468
        logger.info("Now listening on address %r, port %d,"
2779
 
                    " flowinfo %d, scope_id %d",
2780
 
                    *tcp_server.socket.getsockname())
 
2469
                    " flowinfo %d, scope_id %d"
 
2470
                    % tcp_server.socket.getsockname())
2781
2471
    else:                       # IPv4
2782
 
        logger.info("Now listening on address %r, port %d",
2783
 
                    *tcp_server.socket.getsockname())
 
2472
        logger.info("Now listening on address %r, port %d"
 
2473
                    % tcp_server.socket.getsockname())
2784
2474
    
2785
2475
    #service.interface = tcp_server.socket.getsockname()[3]
2786
2476
    
2789
2479
        try:
2790
2480
            service.activate()
2791
2481
        except dbus.exceptions.DBusException as error:
2792
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2482
            logger.critical("DBusException: %s", error)
2793
2483
            cleanup()
2794
2484
            sys.exit(1)
2795
2485
        # End of Avahi example code
2802
2492
        logger.debug("Starting main loop")
2803
2493
        main_loop.run()
2804
2494
    except AvahiError as error:
2805
 
        logger.critical("Avahi Error", exc_info=error)
 
2495
        logger.critical("AvahiError: %s", error)
2806
2496
        cleanup()
2807
2497
        sys.exit(1)
2808
2498
    except KeyboardInterrupt: