/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-06-06 14:12:50 UTC
  • Revision ID: teddy@recompile.se-20120606141250-5zxn3syowzb4t437
* Makefile (DOCBOOKTOMAN): Don't show errors from "locale".

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
 
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
65
67
import types
66
68
import binascii
67
69
import tempfile
 
70
import itertools
68
71
 
69
72
import dbus
70
73
import dbus.service
85
88
    except ImportError:
86
89
        SO_BINDTODEVICE = None
87
90
 
88
 
version = "1.5.1"
 
91
version = "1.5.5"
89
92
stored_state_file = "clients.pickle"
90
93
 
91
94
logger = logging.getLogger()
148
151
    def __enter__(self):
149
152
        return self
150
153
    
151
 
    def __exit__ (self, exc_type, exc_value, traceback):
 
154
    def __exit__(self, exc_type, exc_value, traceback):
152
155
        self._cleanup()
153
156
        return False
154
157
    
175
178
    
176
179
    def encrypt(self, data, password):
177
180
        self.gnupg.passphrase = self.password_encode(password)
178
 
        with open(os.devnull) as devnull:
 
181
        with open(os.devnull, "w") as devnull:
179
182
            try:
180
183
                proc = self.gnupg.run(['--symmetric'],
181
184
                                      create_fhs=['stdin', 'stdout'],
192
195
    
193
196
    def decrypt(self, data, password):
194
197
        self.gnupg.passphrase = self.password_encode(password)
195
 
        with open(os.devnull) as devnull:
 
198
        with open(os.devnull, "w") as devnull:
196
199
            try:
197
200
                proc = self.gnupg.run(['--decrypt'],
198
201
                                      create_fhs=['stdin', 'stdout'],
199
202
                                      attach_fhs={'stderr': devnull})
200
 
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
203
                with contextlib.closing(proc.handles['stdin']) as f:
201
204
                    f.write(data)
202
205
                with contextlib.closing(proc.handles['stdout']) as f:
203
206
                    decrypted_plaintext = f.read()
208
211
        return decrypted_plaintext
209
212
 
210
213
 
211
 
 
212
214
class AvahiError(Exception):
213
215
    def __init__(self, value, *args, **kwargs):
214
216
        self.value = value
243
245
    server: D-Bus Server
244
246
    bus: dbus.SystemBus()
245
247
    """
 
248
    
246
249
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
247
250
                 servicetype = None, port = None, TXT = None,
248
251
                 domain = "", host = "", max_renames = 32768,
261
264
        self.server = None
262
265
        self.bus = bus
263
266
        self.entry_group_state_changed_match = None
 
267
    
264
268
    def rename(self):
265
269
        """Derived from the Avahi example code"""
266
270
        if self.rename_count >= self.max_renames:
276
280
        try:
277
281
            self.add()
278
282
        except dbus.exceptions.DBusException as error:
279
 
            logger.critical("DBusException: %s", error)
 
283
            logger.critical("D-Bus Exception", exc_info=error)
280
284
            self.cleanup()
281
285
            os._exit(1)
282
286
        self.rename_count += 1
 
287
    
283
288
    def remove(self):
284
289
        """Derived from the Avahi example code"""
285
290
        if self.entry_group_state_changed_match is not None:
287
292
            self.entry_group_state_changed_match = None
288
293
        if self.group is not None:
289
294
            self.group.Reset()
 
295
    
290
296
    def add(self):
291
297
        """Derived from the Avahi example code"""
292
298
        self.remove()
309
315
            dbus.UInt16(self.port),
310
316
            avahi.string_array_to_txt_array(self.TXT))
311
317
        self.group.Commit()
 
318
    
312
319
    def entry_group_state_changed(self, state, error):
313
320
        """Derived from the Avahi example code"""
314
321
        logger.debug("Avahi entry group state change: %i", state)
321
328
        elif state == avahi.ENTRY_GROUP_FAILURE:
322
329
            logger.critical("Avahi: Error in group state changed %s",
323
330
                            unicode(error))
324
 
            raise AvahiGroupError("State changed: %s"
325
 
                                  % unicode(error))
 
331
            raise AvahiGroupError("State changed: {0!s}"
 
332
                                  .format(error))
 
333
    
326
334
    def cleanup(self):
327
335
        """Derived from the Avahi example code"""
328
336
        if self.group is not None:
333
341
                pass
334
342
            self.group = None
335
343
        self.remove()
 
344
    
336
345
    def server_state_changed(self, state, error=None):
337
346
        """Derived from the Avahi example code"""
338
347
        logger.debug("Avahi server state change: %i", state)
357
366
                logger.debug("Unknown state: %r", state)
358
367
            else:
359
368
                logger.debug("Unknown state: %r: %r", state, error)
 
369
    
360
370
    def activate(self):
361
371
        """Derived from the Avahi example code"""
362
372
        if self.server is None:
369
379
                                 self.server_state_changed)
370
380
        self.server_state_changed(self.server.GetState())
371
381
 
 
382
 
372
383
class AvahiServiceToSyslog(AvahiService):
373
384
    def rename(self):
374
385
        """Add the new name to the syslog messages"""
375
386
        ret = AvahiService.rename(self)
376
387
        syslogger.setFormatter(logging.Formatter
377
 
                               ('Mandos (%s) [%%(process)d]:'
378
 
                                ' %%(levelname)s: %%(message)s'
379
 
                                % self.name))
 
388
                               ('Mandos ({0}) [%(process)d]:'
 
389
                                ' %(levelname)s: %(message)s'
 
390
                                .format(self.name)))
380
391
        return ret
381
392
 
 
393
 
382
394
def timedelta_to_milliseconds(td):
383
395
    "Convert a datetime.timedelta() to milliseconds"
384
396
    return ((td.days * 24 * 60 * 60 * 1000)
385
397
            + (td.seconds * 1000)
386
398
            + (td.microseconds // 1000))
387
 
        
 
399
 
 
400
 
388
401
class Client(object):
389
402
    """A representation of a client host served by this server.
390
403
    
415
428
    last_checked_ok: datetime.datetime(); (UTC) or None
416
429
    last_checker_status: integer between 0 and 255 reflecting exit
417
430
                         status of last checker. -1 reflects crashed
418
 
                         checker, or None.
 
431
                         checker, -2 means no checker completed yet.
419
432
    last_enabled: datetime.datetime(); (UTC) or None
420
433
    name:       string; from the config file, used in log messages and
421
434
                        D-Bus identifiers
429
442
    """
430
443
    
431
444
    runtime_expansions = ("approval_delay", "approval_duration",
432
 
                          "created", "enabled", "fingerprint",
433
 
                          "host", "interval", "last_checked_ok",
 
445
                          "created", "enabled", "expires",
 
446
                          "fingerprint", "host", "interval",
 
447
                          "last_approval_request", "last_checked_ok",
434
448
                          "last_enabled", "name", "timeout")
435
449
    client_defaults = { "timeout": "5m",
436
450
                        "extended_timeout": "15m",
457
471
    
458
472
    def approval_delay_milliseconds(self):
459
473
        return timedelta_to_milliseconds(self.approval_delay)
460
 
 
 
474
    
461
475
    @staticmethod
462
476
    def config_parser(config):
463
477
        """Construct a new dict of client settings of this form:
488
502
                          "rb") as secfile:
489
503
                    client["secret"] = secfile.read()
490
504
            else:
491
 
                raise TypeError("No secret or secfile for section %s"
492
 
                                % section)
 
505
                raise TypeError("No secret or secfile for section {0}"
 
506
                                .format(section))
493
507
            client["timeout"] = string_to_delta(section["timeout"])
494
508
            client["extended_timeout"] = string_to_delta(
495
509
                section["extended_timeout"])
501
515
            client["checker_command"] = section["checker"]
502
516
            client["last_approval_request"] = None
503
517
            client["last_checked_ok"] = None
504
 
            client["last_checker_status"] = None
 
518
            client["last_checker_status"] = -2
505
519
        
506
520
        return settings
507
 
        
508
 
        
 
521
    
509
522
    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."""
513
523
        self.name = name
514
524
        # adding all client settings
515
525
        for setting, value in settings.iteritems():
524
534
        else:
525
535
            self.last_enabled = None
526
536
            self.expires = None
527
 
       
 
537
        
528
538
        logger.debug("Creating client %r", self.name)
529
539
        # Uppercase and remove spaces from fingerprint for later
530
540
        # comparison purposes with return value from the fingerprint()
532
542
        logger.debug("  Fingerprint: %s", self.fingerprint)
533
543
        self.created = settings.get("created",
534
544
                                    datetime.datetime.utcnow())
535
 
 
 
545
        
536
546
        # attributes specific for this server instance
537
547
        self.checker = None
538
548
        self.checker_initiator_tag = None
566
576
        if getattr(self, "enabled", False):
567
577
            # Already enabled
568
578
            return
569
 
        self.send_changedstate()
570
579
        self.expires = datetime.datetime.utcnow() + self.timeout
571
580
        self.enabled = True
572
581
        self.last_enabled = datetime.datetime.utcnow()
573
582
        self.init_checker()
 
583
        self.send_changedstate()
574
584
    
575
585
    def disable(self, quiet=True):
576
586
        """Disable this client."""
577
587
        if not getattr(self, "enabled", False):
578
588
            return False
579
589
        if not quiet:
580
 
            self.send_changedstate()
581
 
        if not quiet:
582
590
            logger.info("Disabling client %s", self.name)
583
 
        if getattr(self, "disable_initiator_tag", False):
 
591
        if getattr(self, "disable_initiator_tag", None) is not None:
584
592
            gobject.source_remove(self.disable_initiator_tag)
585
593
            self.disable_initiator_tag = None
586
594
        self.expires = None
587
 
        if getattr(self, "checker_initiator_tag", False):
 
595
        if getattr(self, "checker_initiator_tag", None) is not None:
588
596
            gobject.source_remove(self.checker_initiator_tag)
589
597
            self.checker_initiator_tag = None
590
598
        self.stop_checker()
591
599
        self.enabled = False
 
600
        if not quiet:
 
601
            self.send_changedstate()
592
602
        # Do not run this again if called by a gobject.timeout_add
593
603
        return False
594
604
    
598
608
    def init_checker(self):
599
609
        # Schedule a new checker to be started an 'interval' from now,
600
610
        # and every interval from then on.
 
611
        if self.checker_initiator_tag is not None:
 
612
            gobject.source_remove(self.checker_initiator_tag)
601
613
        self.checker_initiator_tag = (gobject.timeout_add
602
614
                                      (self.interval_milliseconds(),
603
615
                                       self.start_checker))
604
616
        # Schedule a disable() when 'timeout' has passed
 
617
        if self.disable_initiator_tag is not None:
 
618
            gobject.source_remove(self.disable_initiator_tag)
605
619
        self.disable_initiator_tag = (gobject.timeout_add
606
620
                                   (self.timeout_milliseconds(),
607
621
                                    self.disable))
626
640
            logger.warning("Checker for %(name)s crashed?",
627
641
                           vars(self))
628
642
    
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
 
        """
 
643
    def checked_ok(self):
 
644
        """Assert that the client has been seen, alive and well."""
 
645
        self.last_checked_ok = datetime.datetime.utcnow()
 
646
        self.last_checker_status = 0
 
647
        self.bump_timeout()
 
648
    
 
649
    def bump_timeout(self, timeout=None):
 
650
        """Bump up the timeout for this client."""
635
651
        if timeout is None:
636
652
            timeout = self.timeout
637
 
        self.last_checked_ok = datetime.datetime.utcnow()
638
653
        if self.disable_initiator_tag is not None:
639
654
            gobject.source_remove(self.disable_initiator_tag)
 
655
            self.disable_initiator_tag = None
640
656
        if getattr(self, "enabled", False):
641
657
            self.disable_initiator_tag = (gobject.timeout_add
642
658
                                          (timedelta_to_milliseconds
652
668
        If a checker already exists, leave it running and do
653
669
        nothing."""
654
670
        # The reason for not killing a running checker is that if we
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
 
671
        # did that, and if a checker (for some reason) started running
 
672
        # slowly and taking more than 'interval' time, then the client
 
673
        # would inevitably timeout, since no checker would get a
 
674
        # chance to run to completion.  If we instead leave running
659
675
        # checkers alone, the checker would have to take more time
660
676
        # than 'timeout' for the client to be disabled, which is as it
661
677
        # should be.
675
691
                                      self.current_checker_command)
676
692
        # Start a new checker if needed
677
693
        if self.checker is None:
 
694
            # Escape attributes for the shell
 
695
            escaped_attrs = dict(
 
696
                (attr, re.escape(unicode(getattr(self, attr))))
 
697
                for attr in
 
698
                self.runtime_expansions)
678
699
            try:
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
 
700
                command = self.checker_command % escaped_attrs
 
701
            except TypeError as error:
 
702
                logger.error('Could not format string "%s"',
 
703
                             self.checker_command, exc_info=error)
 
704
                return True # Try again later
697
705
            self.current_checker_command = command
698
706
            try:
699
707
                logger.info("Starting checker %r for %s",
705
713
                self.checker = subprocess.Popen(command,
706
714
                                                close_fds=True,
707
715
                                                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)
718
716
            except OSError as error:
719
 
                logger.error("Failed to start subprocess: %s",
720
 
                             error)
 
717
                logger.error("Failed to start subprocess",
 
718
                             exc_info=error)
 
719
            self.checker_callback_tag = (gobject.child_watch_add
 
720
                                         (self.checker.pid,
 
721
                                          self.checker_callback,
 
722
                                          data=command))
 
723
            # The checker may have completed before the gobject
 
724
            # watch was added.  Check for this.
 
725
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
726
            if pid:
 
727
                gobject.source_remove(self.checker_callback_tag)
 
728
                self.checker_callback(pid, status, command)
721
729
        # Re-run this periodically if run by gobject.timeout_add
722
730
        return True
723
731
    
730
738
            return
731
739
        logger.debug("Stopping checker for %(name)s", vars(self))
732
740
        try:
733
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
741
            self.checker.terminate()
734
742
            #time.sleep(0.5)
735
743
            #if self.checker.poll() is None:
736
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
744
            #    self.checker.kill()
737
745
        except OSError as error:
738
746
            if error.errno != errno.ESRCH: # No such process
739
747
                raise
756
764
    # "Set" method, so we fail early here:
757
765
    if byte_arrays and signature != "ay":
758
766
        raise ValueError("Byte arrays not supported for non-'ay'"
759
 
                         " signature %r" % signature)
 
767
                         " signature {0!r}".format(signature))
760
768
    def decorator(func):
761
769
        func._dbus_is_property = True
762
770
        func._dbus_interface = dbus_interface
770
778
    return decorator
771
779
 
772
780
 
 
781
def dbus_interface_annotations(dbus_interface):
 
782
    """Decorator for marking functions returning interface annotations
 
783
    
 
784
    Usage:
 
785
    
 
786
    @dbus_interface_annotations("org.example.Interface")
 
787
    def _foo(self):  # Function name does not matter
 
788
        return {"org.freedesktop.DBus.Deprecated": "true",
 
789
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
790
                    "false"}
 
791
    """
 
792
    def decorator(func):
 
793
        func._dbus_is_interface = True
 
794
        func._dbus_interface = dbus_interface
 
795
        func._dbus_name = dbus_interface
 
796
        return func
 
797
    return decorator
 
798
 
 
799
 
 
800
def dbus_annotations(annotations):
 
801
    """Decorator to annotate D-Bus methods, signals or properties
 
802
    Usage:
 
803
    
 
804
    @dbus_service_property("org.example.Interface", signature="b",
 
805
                           access="r")
 
806
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
807
                        "org.freedesktop.DBus.Property."
 
808
                        "EmitsChangedSignal": "false"})
 
809
    def Property_dbus_property(self):
 
810
        return dbus.Boolean(False)
 
811
    """
 
812
    def decorator(func):
 
813
        func._dbus_annotations = annotations
 
814
        return func
 
815
    return decorator
 
816
 
 
817
 
773
818
class DBusPropertyException(dbus.exceptions.DBusException):
774
819
    """A base class for D-Bus property-related exceptions
775
820
    """
798
843
    """
799
844
    
800
845
    @staticmethod
801
 
    def _is_dbus_property(obj):
802
 
        return getattr(obj, "_dbus_is_property", False)
 
846
    def _is_dbus_thing(thing):
 
847
        """Returns a function testing if an attribute is a D-Bus thing
 
848
        
 
849
        If called like _is_dbus_thing("method") it returns a function
 
850
        suitable for use as predicate to inspect.getmembers().
 
851
        """
 
852
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
853
                                   False)
803
854
    
804
 
    def _get_all_dbus_properties(self):
 
855
    def _get_all_dbus_things(self, thing):
805
856
        """Returns a generator of (name, attribute) pairs
806
857
        """
807
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
858
        return ((getattr(athing.__get__(self), "_dbus_name",
 
859
                         name),
 
860
                 athing.__get__(self))
808
861
                for cls in self.__class__.__mro__
809
 
                for name, prop in
810
 
                inspect.getmembers(cls, self._is_dbus_property))
 
862
                for name, athing in
 
863
                inspect.getmembers(cls,
 
864
                                   self._is_dbus_thing(thing)))
811
865
    
812
866
    def _get_dbus_property(self, interface_name, property_name):
813
867
        """Returns a bound method if one exists which is a D-Bus
815
869
        """
816
870
        for cls in  self.__class__.__mro__:
817
871
            for name, value in (inspect.getmembers
818
 
                                (cls, self._is_dbus_property)):
 
872
                                (cls,
 
873
                                 self._is_dbus_thing("property"))):
819
874
                if (value._dbus_name == property_name
820
875
                    and value._dbus_interface == interface_name):
821
876
                    return value.__get__(self)
863
918
        Note: Will not include properties with access="write".
864
919
        """
865
920
        properties = {}
866
 
        for name, prop in self._get_all_dbus_properties():
 
921
        for name, prop in self._get_all_dbus_things("property"):
867
922
            if (interface_name
868
923
                and interface_name != prop._dbus_interface):
869
924
                # Interface non-empty but did not match
884
939
                         path_keyword='object_path',
885
940
                         connection_keyword='connection')
886
941
    def Introspect(self, object_path, connection):
887
 
        """Standard D-Bus method, overloaded to insert property tags.
 
942
        """Overloading of standard D-Bus method.
 
943
        
 
944
        Inserts property tags and interface annotation tags.
888
945
        """
889
946
        xmlstring = dbus.service.Object.Introspect(self, object_path,
890
947
                                                   connection)
897
954
                e.setAttribute("access", prop._dbus_access)
898
955
                return e
899
956
            for if_tag in document.getElementsByTagName("interface"):
 
957
                # Add property tags
900
958
                for tag in (make_tag(document, name, prop)
901
959
                            for name, prop
902
 
                            in self._get_all_dbus_properties()
 
960
                            in self._get_all_dbus_things("property")
903
961
                            if prop._dbus_interface
904
962
                            == if_tag.getAttribute("name")):
905
963
                    if_tag.appendChild(tag)
 
964
                # Add annotation tags
 
965
                for typ in ("method", "signal", "property"):
 
966
                    for tag in if_tag.getElementsByTagName(typ):
 
967
                        annots = dict()
 
968
                        for name, prop in (self.
 
969
                                           _get_all_dbus_things(typ)):
 
970
                            if (name == tag.getAttribute("name")
 
971
                                and prop._dbus_interface
 
972
                                == if_tag.getAttribute("name")):
 
973
                                annots.update(getattr
 
974
                                              (prop,
 
975
                                               "_dbus_annotations",
 
976
                                               {}))
 
977
                        for name, value in annots.iteritems():
 
978
                            ann_tag = document.createElement(
 
979
                                "annotation")
 
980
                            ann_tag.setAttribute("name", name)
 
981
                            ann_tag.setAttribute("value", value)
 
982
                            tag.appendChild(ann_tag)
 
983
                # Add interface annotation tags
 
984
                for annotation, value in dict(
 
985
                    itertools.chain.from_iterable(
 
986
                        annotations().iteritems()
 
987
                        for name, annotations in
 
988
                        self._get_all_dbus_things("interface")
 
989
                        if name == if_tag.getAttribute("name")
 
990
                        )).iteritems():
 
991
                    ann_tag = document.createElement("annotation")
 
992
                    ann_tag.setAttribute("name", annotation)
 
993
                    ann_tag.setAttribute("value", value)
 
994
                    if_tag.appendChild(ann_tag)
906
995
                # Add the names to the return values for the
907
996
                # "org.freedesktop.DBus.Properties" methods
908
997
                if (if_tag.getAttribute("name")
923
1012
        except (AttributeError, xml.dom.DOMException,
924
1013
                xml.parsers.expat.ExpatError) as error:
925
1014
            logger.error("Failed to override Introspection method",
926
 
                         error)
 
1015
                         exc_info=error)
927
1016
        return xmlstring
928
1017
 
929
1018
 
930
 
def datetime_to_dbus (dt, variant_level=0):
 
1019
def datetime_to_dbus(dt, variant_level=0):
931
1020
    """Convert a UTC datetime.datetime() to a D-Bus type."""
932
1021
    if dt is None:
933
1022
        return dbus.String("", variant_level = variant_level)
935
1024
                       variant_level=variant_level)
936
1025
 
937
1026
 
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.
 
1027
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1028
    """A class decorator; applied to a subclass of
 
1029
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1030
    interface names according to the "alt_interface_names" mapping.
 
1031
    Usage:
 
1032
    
 
1033
    @alternate_dbus_interfaces({"org.example.Interface":
 
1034
                                    "net.example.AlternateInterface"})
 
1035
    class SampleDBusObject(dbus.service.Object):
 
1036
        @dbus.service.method("org.example.Interface")
 
1037
        def SampleDBusMethod():
 
1038
            pass
 
1039
    
 
1040
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1041
    reachable via two interfaces: "org.example.Interface" and
 
1042
    "net.example.AlternateInterface", the latter of which will have
 
1043
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1044
    "true", unless "deprecate" is passed with a False value.
 
1045
    
 
1046
    This works for methods and signals, and also for D-Bus properties
 
1047
    (from DBusObjectWithProperties) and interfaces (from the
 
1048
    dbus_interface_annotations decorator).
942
1049
    """
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):
 
1050
    def wrapper(cls):
 
1051
        for orig_interface_name, alt_interface_name in (
 
1052
            alt_interface_names.iteritems()):
 
1053
            attr = {}
 
1054
            interface_names = set()
 
1055
            # Go though all attributes of the class
 
1056
            for attrname, attribute in inspect.getmembers(cls):
950
1057
                # Ignore non-D-Bus attributes, and D-Bus attributes
951
1058
                # with the wrong interface name
952
1059
                if (not hasattr(attribute, "_dbus_interface")
953
1060
                    or not attribute._dbus_interface
954
 
                    .startswith("se.recompile.Mandos")):
 
1061
                    .startswith(orig_interface_name)):
955
1062
                    continue
956
1063
                # Create an alternate D-Bus interface name based on
957
1064
                # the current name
958
1065
                alt_interface = (attribute._dbus_interface
959
 
                                 .replace("se.recompile.Mandos",
960
 
                                          "se.bsnet.fukt.Mandos"))
 
1066
                                 .replace(orig_interface_name,
 
1067
                                          alt_interface_name))
 
1068
                interface_names.add(alt_interface)
961
1069
                # Is this a D-Bus signal?
962
1070
                if getattr(attribute, "_dbus_is_signal", False):
963
1071
                    # Extract the original non-method function by
978
1086
                                nonmethod_func.func_name,
979
1087
                                nonmethod_func.func_defaults,
980
1088
                                nonmethod_func.func_closure)))
 
1089
                    # Copy annotations, if any
 
1090
                    try:
 
1091
                        new_function._dbus_annotations = (
 
1092
                            dict(attribute._dbus_annotations))
 
1093
                    except AttributeError:
 
1094
                        pass
981
1095
                    # Define a creator of a function to call both the
982
 
                    # old and new functions, so both the old and new
983
 
                    # signals gets sent when the function is called
 
1096
                    # original and alternate functions, so both the
 
1097
                    # original and alternate signals gets sent when
 
1098
                    # the function is called
984
1099
                    def fixscope(func1, func2):
985
1100
                        """This function is a scope container to pass
986
1101
                        func1 and func2 to the "call_both" function
993
1108
                        return call_both
994
1109
                    # Create the "call_both" function and add it to
995
1110
                    # the class
996
 
                    attr[attrname] = fixscope(attribute,
997
 
                                              new_function)
 
1111
                    attr[attrname] = fixscope(attribute, new_function)
998
1112
                # Is this a D-Bus method?
999
1113
                elif getattr(attribute, "_dbus_is_method", False):
1000
1114
                    # Create a new, but exactly alike, function
1011
1125
                                        attribute.func_name,
1012
1126
                                        attribute.func_defaults,
1013
1127
                                        attribute.func_closure)))
 
1128
                    # Copy annotations, if any
 
1129
                    try:
 
1130
                        attr[attrname]._dbus_annotations = (
 
1131
                            dict(attribute._dbus_annotations))
 
1132
                    except AttributeError:
 
1133
                        pass
1014
1134
                # Is this a D-Bus property?
1015
1135
                elif getattr(attribute, "_dbus_is_property", False):
1016
1136
                    # Create a new, but exactly alike, function
1030
1150
                                        attribute.func_name,
1031
1151
                                        attribute.func_defaults,
1032
1152
                                        attribute.func_closure)))
1033
 
        return type.__new__(mcs, name, bases, attr)
1034
 
 
1035
 
 
 
1153
                    # Copy annotations, if any
 
1154
                    try:
 
1155
                        attr[attrname]._dbus_annotations = (
 
1156
                            dict(attribute._dbus_annotations))
 
1157
                    except AttributeError:
 
1158
                        pass
 
1159
                # Is this a D-Bus interface?
 
1160
                elif getattr(attribute, "_dbus_is_interface", False):
 
1161
                    # Create a new, but exactly alike, function
 
1162
                    # object.  Decorate it to be a new D-Bus interface
 
1163
                    # with the alternate D-Bus interface name.  Add it
 
1164
                    # to the class.
 
1165
                    attr[attrname] = (dbus_interface_annotations
 
1166
                                      (alt_interface)
 
1167
                                      (types.FunctionType
 
1168
                                       (attribute.func_code,
 
1169
                                        attribute.func_globals,
 
1170
                                        attribute.func_name,
 
1171
                                        attribute.func_defaults,
 
1172
                                        attribute.func_closure)))
 
1173
            if deprecate:
 
1174
                # Deprecate all alternate interfaces
 
1175
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1176
                for interface_name in interface_names:
 
1177
                    @dbus_interface_annotations(interface_name)
 
1178
                    def func(self):
 
1179
                        return { "org.freedesktop.DBus.Deprecated":
 
1180
                                     "true" }
 
1181
                    # Find an unused name
 
1182
                    for aname in (iname.format(i)
 
1183
                                  for i in itertools.count()):
 
1184
                        if aname not in attr:
 
1185
                            attr[aname] = func
 
1186
                            break
 
1187
            if interface_names:
 
1188
                # Replace the class with a new subclass of it with
 
1189
                # methods, signals, etc. as created above.
 
1190
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1191
                           (cls,), attr)
 
1192
        return cls
 
1193
    return wrapper
 
1194
 
 
1195
 
 
1196
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1197
                                "se.bsnet.fukt.Mandos"})
1036
1198
class ClientDBus(Client, DBusObjectWithProperties):
1037
1199
    """A Client class using D-Bus
1038
1200
    
1058
1220
                                 ("/clients/" + client_object_name))
1059
1221
        DBusObjectWithProperties.__init__(self, self.bus,
1060
1222
                                          self.dbus_object_path)
1061
 
        
 
1223
    
1062
1224
    def notifychangeproperty(transform_func,
1063
1225
                             dbus_name, type_func=lambda x: x,
1064
1226
                             variant_level=1):
1087
1249
        
1088
1250
        return property(lambda self: getattr(self, attrname), setter)
1089
1251
    
1090
 
    
1091
1252
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1092
1253
    approvals_pending = notifychangeproperty(dbus.Boolean,
1093
1254
                                             "ApprovalPending",
1100
1261
                                       checker is not None)
1101
1262
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1102
1263
                                           "LastCheckedOK")
 
1264
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1265
                                               "LastCheckerStatus")
1103
1266
    last_approval_request = notifychangeproperty(
1104
1267
        datetime_to_dbus, "LastApprovalRequest")
1105
1268
    approved_by_default = notifychangeproperty(dbus.Boolean,
1173
1336
        return False
1174
1337
    
1175
1338
    def approve(self, value=True):
1176
 
        self.send_changedstate()
1177
1339
        self.approved = value
1178
1340
        gobject.timeout_add(timedelta_to_milliseconds
1179
1341
                            (self.approval_duration),
1180
1342
                            self._reset_approved)
1181
 
    
 
1343
        self.send_changedstate()
1182
1344
    
1183
1345
    ## D-Bus methods, signals & properties
1184
1346
    _interface = "se.recompile.Mandos.Client"
1185
1347
    
 
1348
    ## Interfaces
 
1349
    
 
1350
    @dbus_interface_annotations(_interface)
 
1351
    def _foo(self):
 
1352
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1353
                     "false"}
 
1354
    
1186
1355
    ## Signals
1187
1356
    
1188
1357
    # CheckerCompleted - signal
1339
1508
            return
1340
1509
        return datetime_to_dbus(self.last_checked_ok)
1341
1510
    
 
1511
    # LastCheckerStatus - property
 
1512
    @dbus_service_property(_interface, signature="n",
 
1513
                           access="read")
 
1514
    def LastCheckerStatus_dbus_property(self):
 
1515
        return dbus.Int16(self.last_checker_status)
 
1516
    
1342
1517
    # Expires - property
1343
1518
    @dbus_service_property(_interface, signature="s", access="read")
1344
1519
    def Expires_dbus_property(self):
1355
1530
    def Timeout_dbus_property(self, value=None):
1356
1531
        if value is None:       # get
1357
1532
            return dbus.UInt64(self.timeout_milliseconds())
 
1533
        old_timeout = self.timeout
1358
1534
        self.timeout = datetime.timedelta(0, 0, 0, value)
1359
 
        # Reschedule timeout
 
1535
        # Reschedule disabling
1360
1536
        if self.enabled:
1361
1537
            now = datetime.datetime.utcnow()
1362
 
            time_to_die = timedelta_to_milliseconds(
1363
 
                (self.last_checked_ok + self.timeout) - now)
1364
 
            if time_to_die <= 0:
 
1538
            self.expires += self.timeout - old_timeout
 
1539
            if self.expires <= now:
1365
1540
                # The timeout has passed
1366
1541
                self.disable()
1367
1542
            else:
1368
 
                self.expires = (now +
1369
 
                                datetime.timedelta(milliseconds =
1370
 
                                                   time_to_die))
1371
1543
                if (getattr(self, "disable_initiator_tag", None)
1372
1544
                    is None):
1373
1545
                    return
1374
1546
                gobject.source_remove(self.disable_initiator_tag)
1375
 
                self.disable_initiator_tag = (gobject.timeout_add
1376
 
                                              (time_to_die,
1377
 
                                               self.disable))
 
1547
                self.disable_initiator_tag = (
 
1548
                    gobject.timeout_add(
 
1549
                        timedelta_to_milliseconds(self.expires - now),
 
1550
                        self.disable))
1378
1551
    
1379
1552
    # ExtendedTimeout - property
1380
1553
    @dbus_service_property(_interface, signature="t",
1459
1632
        self._pipe.send(('setattr', name, value))
1460
1633
 
1461
1634
 
1462
 
class ClientDBusTransitional(ClientDBus):
1463
 
    __metaclass__ = AlternateDBusNamesMetaclass
1464
 
 
1465
 
 
1466
1635
class ClientHandler(socketserver.BaseRequestHandler, object):
1467
1636
    """A class to handle client connections.
1468
1637
    
1572
1741
                    #wait until timeout or approved
1573
1742
                    time = datetime.datetime.now()
1574
1743
                    client.changedstate.acquire()
1575
 
                    (client.changedstate.wait
1576
 
                     (float(client.timedelta_to_milliseconds(delay)
1577
 
                            / 1000)))
 
1744
                    client.changedstate.wait(
 
1745
                        float(timedelta_to_milliseconds(delay)
 
1746
                              / 1000))
1578
1747
                    client.changedstate.release()
1579
1748
                    time2 = datetime.datetime.now()
1580
1749
                    if (time2 - time) >= delay:
1596
1765
                    try:
1597
1766
                        sent = session.send(client.secret[sent_size:])
1598
1767
                    except gnutls.errors.GNUTLSError as error:
1599
 
                        logger.warning("gnutls send failed")
 
1768
                        logger.warning("gnutls send failed",
 
1769
                                       exc_info=error)
1600
1770
                        return
1601
1771
                    logger.debug("Sent: %d, remaining: %d",
1602
1772
                                 sent, len(client.secret)
1605
1775
                
1606
1776
                logger.info("Sending secret to %s", client.name)
1607
1777
                # bump the timeout using extended_timeout
1608
 
                client.checked_ok(client.extended_timeout)
 
1778
                client.bump_timeout(client.extended_timeout)
1609
1779
                if self.server.use_dbus:
1610
1780
                    # Emit D-Bus signal
1611
1781
                    client.GotSecret()
1616
1786
                try:
1617
1787
                    session.bye()
1618
1788
                except gnutls.errors.GNUTLSError as error:
1619
 
                    logger.warning("GnuTLS bye failed")
 
1789
                    logger.warning("GnuTLS bye failed",
 
1790
                                   exc_info=error)
1620
1791
    
1621
1792
    @staticmethod
1622
1793
    def peer_certificate(session):
1694
1865
    def process_request(self, request, address):
1695
1866
        """Start a new process to process the request."""
1696
1867
        proc = multiprocessing.Process(target = self.sub_process_main,
1697
 
                                       args = (request,
1698
 
                                               address))
 
1868
                                       args = (request, address))
1699
1869
        proc.start()
1700
1870
        return proc
1701
1871
 
1729
1899
        use_ipv6:       Boolean; to use IPv6 or not
1730
1900
    """
1731
1901
    def __init__(self, server_address, RequestHandlerClass,
1732
 
                 interface=None, use_ipv6=True):
 
1902
                 interface=None, use_ipv6=True, socketfd=None):
 
1903
        """If socketfd is set, use that file descriptor instead of
 
1904
        creating a new one with socket.socket().
 
1905
        """
1733
1906
        self.interface = interface
1734
1907
        if use_ipv6:
1735
1908
            self.address_family = socket.AF_INET6
 
1909
        if socketfd is not None:
 
1910
            # Save the file descriptor
 
1911
            self.socketfd = socketfd
 
1912
            # Save the original socket.socket() function
 
1913
            self.socket_socket = socket.socket
 
1914
            # To implement --socket, we monkey patch socket.socket.
 
1915
            # 
 
1916
            # (When socketserver.TCPServer is a new-style class, we
 
1917
            # could make self.socket into a property instead of monkey
 
1918
            # patching socket.socket.)
 
1919
            # 
 
1920
            # Create a one-time-only replacement for socket.socket()
 
1921
            @functools.wraps(socket.socket)
 
1922
            def socket_wrapper(*args, **kwargs):
 
1923
                # Restore original function so subsequent calls are
 
1924
                # not affected.
 
1925
                socket.socket = self.socket_socket
 
1926
                del self.socket_socket
 
1927
                # This time only, return a new socket object from the
 
1928
                # saved file descriptor.
 
1929
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1930
            # Replace socket.socket() function with wrapper
 
1931
            socket.socket = socket_wrapper
 
1932
        # The socketserver.TCPServer.__init__ will call
 
1933
        # socket.socket(), which might be our replacement,
 
1934
        # socket_wrapper(), if socketfd was set.
1736
1935
        socketserver.TCPServer.__init__(self, server_address,
1737
1936
                                        RequestHandlerClass)
 
1937
    
1738
1938
    def server_bind(self):
1739
1939
        """This overrides the normal server_bind() function
1740
1940
        to bind to an interface if one was specified, and also NOT to
1751
1951
                                           str(self.interface
1752
1952
                                               + '\0'))
1753
1953
                except socket.error as error:
1754
 
                    if error[0] == errno.EPERM:
 
1954
                    if error.errno == errno.EPERM:
1755
1955
                        logger.error("No permission to"
1756
1956
                                     " bind to interface %s",
1757
1957
                                     self.interface)
1758
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1958
                    elif error.errno == errno.ENOPROTOOPT:
1759
1959
                        logger.error("SO_BINDTODEVICE not available;"
1760
1960
                                     " cannot bind to interface %s",
1761
1961
                                     self.interface)
 
1962
                    elif error.errno == errno.ENODEV:
 
1963
                        logger.error("Interface %s does not"
 
1964
                                     " exist, cannot bind",
 
1965
                                     self.interface)
1762
1966
                    else:
1763
1967
                        raise
1764
1968
        # Only bind(2) the socket if we really need to.
1794
1998
    """
1795
1999
    def __init__(self, server_address, RequestHandlerClass,
1796
2000
                 interface=None, use_ipv6=True, clients=None,
1797
 
                 gnutls_priority=None, use_dbus=True):
 
2001
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1798
2002
        self.enabled = False
1799
2003
        self.clients = clients
1800
2004
        if self.clients is None:
1804
2008
        IPv6_TCPServer.__init__(self, server_address,
1805
2009
                                RequestHandlerClass,
1806
2010
                                interface = interface,
1807
 
                                use_ipv6 = use_ipv6)
 
2011
                                use_ipv6 = use_ipv6,
 
2012
                                socketfd = socketfd)
1808
2013
    def server_activate(self):
1809
2014
        if self.enabled:
1810
2015
            return socketserver.TCPServer.server_activate(self)
1823
2028
    
1824
2029
    def handle_ipc(self, source, condition, parent_pipe=None,
1825
2030
                   proc = None, client_object=None):
1826
 
        condition_names = {
1827
 
            gobject.IO_IN: "IN",   # There is data to read.
1828
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1829
 
                                    # blocking).
1830
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1831
 
            gobject.IO_ERR: "ERR", # Error condition.
1832
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1833
 
                                    # broken, usually for pipes and
1834
 
                                    # sockets).
1835
 
            }
1836
 
        conditions_string = ' | '.join(name
1837
 
                                       for cond, name in
1838
 
                                       condition_names.iteritems()
1839
 
                                       if cond & condition)
1840
2031
        # error, or the other end of multiprocessing.Pipe has closed
1841
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2032
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1842
2033
            # Wait for other process to exit
1843
2034
            proc.join()
1844
2035
            return False
1934
2125
            elif suffix == "w":
1935
2126
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1936
2127
            else:
1937
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2128
                raise ValueError("Unknown suffix {0!r}"
 
2129
                                 .format(suffix))
1938
2130
        except (ValueError, IndexError) as e:
1939
2131
            raise ValueError(*(e.args))
1940
2132
        timevalue += delta
1954
2146
        sys.exit()
1955
2147
    if not noclose:
1956
2148
        # Close all standard open file descriptors
1957
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2149
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1958
2150
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1959
2151
            raise OSError(errno.ENODEV,
1960
 
                          "%s not a character device"
1961
 
                          % os.path.devnull)
 
2152
                          "{0} not a character device"
 
2153
                          .format(os.devnull))
1962
2154
        os.dup2(null, sys.stdin.fileno())
1963
2155
        os.dup2(null, sys.stdout.fileno())
1964
2156
        os.dup2(null, sys.stderr.fileno())
1973
2165
    
1974
2166
    parser = argparse.ArgumentParser()
1975
2167
    parser.add_argument("-v", "--version", action="version",
1976
 
                        version = "%%(prog)s %s" % version,
 
2168
                        version = "%(prog)s {0}".format(version),
1977
2169
                        help="show version number and exit")
1978
2170
    parser.add_argument("-i", "--interface", metavar="IF",
1979
2171
                        help="Bind to interface IF")
2004
2196
    parser.add_argument("--no-restore", action="store_false",
2005
2197
                        dest="restore", help="Do not restore stored"
2006
2198
                        " state")
 
2199
    parser.add_argument("--socket", type=int,
 
2200
                        help="Specify a file descriptor to a network"
 
2201
                        " socket to use instead of creating one")
2007
2202
    parser.add_argument("--statedir", metavar="DIR",
2008
2203
                        help="Directory to save/restore state in")
2009
2204
    
2026
2221
                        "use_ipv6": "True",
2027
2222
                        "debuglevel": "",
2028
2223
                        "restore": "True",
 
2224
                        "socket": "",
2029
2225
                        "statedir": "/var/lib/mandos"
2030
2226
                        }
2031
2227
    
2043
2239
    if server_settings["port"]:
2044
2240
        server_settings["port"] = server_config.getint("DEFAULT",
2045
2241
                                                       "port")
 
2242
    if server_settings["socket"]:
 
2243
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2244
                                                         "socket")
 
2245
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2246
        # over with an opened os.devnull.  But we don't want this to
 
2247
        # happen with a supplied network socket.
 
2248
        if 0 <= server_settings["socket"] <= 2:
 
2249
            server_settings["socket"] = os.dup(server_settings
 
2250
                                               ["socket"])
2046
2251
    del server_config
2047
2252
    
2048
2253
    # Override the settings from the config file with command line
2050
2255
    for option in ("interface", "address", "port", "debug",
2051
2256
                   "priority", "servicename", "configdir",
2052
2257
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2053
 
                   "statedir"):
 
2258
                   "statedir", "socket"):
2054
2259
        value = getattr(options, option)
2055
2260
        if value is not None:
2056
2261
            server_settings[option] = value
2082
2287
    
2083
2288
    if server_settings["servicename"] != "Mandos":
2084
2289
        syslogger.setFormatter(logging.Formatter
2085
 
                               ('Mandos (%s) [%%(process)d]:'
2086
 
                                ' %%(levelname)s: %%(message)s'
2087
 
                                % server_settings["servicename"]))
 
2290
                               ('Mandos ({0}) [%(process)d]:'
 
2291
                                ' %(levelname)s: %(message)s'
 
2292
                                .format(server_settings
 
2293
                                        ["servicename"])))
2088
2294
    
2089
2295
    # Parse config file with clients
2090
2296
    client_config = configparser.SafeConfigParser(Client
2103
2309
                              use_ipv6=use_ipv6,
2104
2310
                              gnutls_priority=
2105
2311
                              server_settings["priority"],
2106
 
                              use_dbus=use_dbus)
 
2312
                              use_dbus=use_dbus,
 
2313
                              socketfd=(server_settings["socket"]
 
2314
                                        or None))
2107
2315
    if not debug:
2108
2316
        pidfilename = "/var/run/mandos.pid"
2109
2317
        try:
2110
2318
            pidfile = open(pidfilename, "w")
2111
 
        except IOError:
2112
 
            logger.error("Could not open file %r", pidfilename)
 
2319
        except IOError as e:
 
2320
            logger.error("Could not open file %r", pidfilename,
 
2321
                         exc_info=e)
2113
2322
    
2114
 
    try:
2115
 
        uid = pwd.getpwnam("_mandos").pw_uid
2116
 
        gid = pwd.getpwnam("_mandos").pw_gid
2117
 
    except KeyError:
 
2323
    for name in ("_mandos", "mandos", "nobody"):
2118
2324
        try:
2119
 
            uid = pwd.getpwnam("mandos").pw_uid
2120
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2325
            uid = pwd.getpwnam(name).pw_uid
 
2326
            gid = pwd.getpwnam(name).pw_gid
 
2327
            break
2121
2328
        except KeyError:
2122
 
            try:
2123
 
                uid = pwd.getpwnam("nobody").pw_uid
2124
 
                gid = pwd.getpwnam("nobody").pw_gid
2125
 
            except KeyError:
2126
 
                uid = 65534
2127
 
                gid = 65534
 
2329
            continue
 
2330
    else:
 
2331
        uid = 65534
 
2332
        gid = 65534
2128
2333
    try:
2129
2334
        os.setgid(gid)
2130
2335
        os.setuid(uid)
2131
2336
    except OSError as error:
2132
 
        if error[0] != errno.EPERM:
 
2337
        if error.errno != errno.EPERM:
2133
2338
            raise error
2134
2339
    
2135
2340
    if debug:
2147
2352
         .gnutls_global_set_log_function(debug_gnutls))
2148
2353
        
2149
2354
        # Redirect stdin so all checkers get /dev/null
2150
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2355
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2151
2356
        os.dup2(null, sys.stdin.fileno())
2152
2357
        if null > 2:
2153
2358
            os.close(null)
2157
2362
        # Close all input and output, do double fork, etc.
2158
2363
        daemon()
2159
2364
    
 
2365
    # multiprocessing will use threads, so before we use gobject we
 
2366
    # need to inform gobject that threads will be used.
2160
2367
    gobject.threads_init()
2161
2368
    
2162
2369
    global main_loop
2163
2370
    # From the Avahi example code
2164
 
    DBusGMainLoop(set_as_default=True )
 
2371
    DBusGMainLoop(set_as_default=True)
2165
2372
    main_loop = gobject.MainLoop()
2166
2373
    bus = dbus.SystemBus()
2167
2374
    # End of Avahi example code
2173
2380
                            ("se.bsnet.fukt.Mandos", bus,
2174
2381
                             do_not_queue=True))
2175
2382
        except dbus.exceptions.NameExistsException as e:
2176
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2383
            logger.error("Disabling D-Bus:", exc_info=e)
2177
2384
            use_dbus = False
2178
2385
            server_settings["use_dbus"] = False
2179
2386
            tcp_server.use_dbus = False
2191
2398
    
2192
2399
    client_class = Client
2193
2400
    if use_dbus:
2194
 
        client_class = functools.partial(ClientDBusTransitional,
2195
 
                                         bus = bus)
 
2401
        client_class = functools.partial(ClientDBus, bus = bus)
2196
2402
    
2197
2403
    client_settings = Client.config_parser(client_config)
2198
2404
    old_client_settings = {}
2206
2412
                                                     (stored_state))
2207
2413
            os.remove(stored_state_path)
2208
2414
        except IOError as e:
2209
 
            logger.warning("Could not load persistent state: {0}"
2210
 
                           .format(e))
2211
 
            if e.errno != errno.ENOENT:
 
2415
            if e.errno == errno.ENOENT:
 
2416
                logger.warning("Could not load persistent state: {0}"
 
2417
                                .format(os.strerror(e.errno)))
 
2418
            else:
 
2419
                logger.critical("Could not load persistent state:",
 
2420
                                exc_info=e)
2212
2421
                raise
2213
2422
        except EOFError as e:
2214
2423
            logger.warning("Could not load persistent state: "
2215
 
                           "EOFError: {0}".format(e))
 
2424
                           "EOFError:", exc_info=e)
2216
2425
    
2217
2426
    with PGPEngine() as pgp:
2218
2427
        for client_name, client in clients_data.iteritems():
2271
2480
                             .format(client_name))
2272
2481
                client["secret"] = (
2273
2482
                    client_settings[client_name]["secret"])
2274
 
 
2275
2483
    
2276
2484
    # Add/remove clients based on new changes made to config
2277
2485
    for client_name in (set(old_client_settings)
2280
2488
    for client_name in (set(client_settings)
2281
2489
                        - set(old_client_settings)):
2282
2490
        clients_data[client_name] = client_settings[client_name]
2283
 
 
 
2491
    
2284
2492
    # Create all client objects
2285
2493
    for client_name, client in clients_data.iteritems():
2286
2494
        tcp_server.clients[client_name] = client_class(
2288
2496
    
2289
2497
    if not tcp_server.clients:
2290
2498
        logger.warning("No clients defined")
2291
 
        
 
2499
    
2292
2500
    if not debug:
2293
2501
        try:
2294
2502
            with pidfile:
2302
2510
            # "pidfile" was never created
2303
2511
            pass
2304
2512
        del pidfilename
2305
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2306
2513
    
2307
2514
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2308
2515
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2309
2516
    
2310
2517
    if use_dbus:
2311
 
        class MandosDBusService(dbus.service.Object):
 
2518
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2519
                                        "se.bsnet.fukt.Mandos"})
 
2520
        class MandosDBusService(DBusObjectWithProperties):
2312
2521
            """A D-Bus proxy object"""
2313
2522
            def __init__(self):
2314
2523
                dbus.service.Object.__init__(self, bus, "/")
2315
2524
            _interface = "se.recompile.Mandos"
2316
2525
            
 
2526
            @dbus_interface_annotations(_interface)
 
2527
            def _foo(self):
 
2528
                return { "org.freedesktop.DBus.Property"
 
2529
                         ".EmitsChangedSignal":
 
2530
                             "false"}
 
2531
            
2317
2532
            @dbus.service.signal(_interface, signature="o")
2318
2533
            def ClientAdded(self, objpath):
2319
2534
                "D-Bus signal"
2361
2576
            
2362
2577
            del _interface
2363
2578
        
2364
 
        class MandosDBusServiceTransitional(MandosDBusService):
2365
 
            __metaclass__ = AlternateDBusNamesMetaclass
2366
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2579
        mandos_dbus_service = MandosDBusService()
2367
2580
    
2368
2581
    def cleanup():
2369
2582
        "Cleanup function; run on exit"
2402
2615
                del client_settings[client.name]["secret"]
2403
2616
        
2404
2617
        try:
2405
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2406
 
                                                prefix="clients-",
2407
 
                                                dir=os.path.dirname
2408
 
                                                (stored_state_path))
2409
 
            with os.fdopen(tempfd, "wb") as stored_state:
 
2618
            with (tempfile.NamedTemporaryFile
 
2619
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2620
                   dir=os.path.dirname(stored_state_path),
 
2621
                   delete=False)) as stored_state:
2410
2622
                pickle.dump((clients, client_settings), stored_state)
 
2623
                tempname=stored_state.name
2411
2624
            os.rename(tempname, stored_state_path)
2412
2625
        except (IOError, OSError) as e:
2413
 
            logger.warning("Could not save persistent state: {0}"
2414
 
                           .format(e))
2415
2626
            if not debug:
2416
2627
                try:
2417
2628
                    os.remove(tempname)
2418
2629
                except NameError:
2419
2630
                    pass
2420
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2421
 
                                   errno.EEXIST)):
 
2631
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2632
                logger.warning("Could not save persistent state: {0}"
 
2633
                               .format(os.strerror(e.errno)))
 
2634
            else:
 
2635
                logger.warning("Could not save persistent state:",
 
2636
                               exc_info=e)
2422
2637
                raise e
2423
2638
        
2424
2639
        # Delete all clients, and settings from config
2452
2667
    service.port = tcp_server.socket.getsockname()[1]
2453
2668
    if use_ipv6:
2454
2669
        logger.info("Now listening on address %r, port %d,"
2455
 
                    " flowinfo %d, scope_id %d"
2456
 
                    % tcp_server.socket.getsockname())
 
2670
                    " flowinfo %d, scope_id %d",
 
2671
                    *tcp_server.socket.getsockname())
2457
2672
    else:                       # IPv4
2458
 
        logger.info("Now listening on address %r, port %d"
2459
 
                    % tcp_server.socket.getsockname())
 
2673
        logger.info("Now listening on address %r, port %d",
 
2674
                    *tcp_server.socket.getsockname())
2460
2675
    
2461
2676
    #service.interface = tcp_server.socket.getsockname()[3]
2462
2677
    
2465
2680
        try:
2466
2681
            service.activate()
2467
2682
        except dbus.exceptions.DBusException as error:
2468
 
            logger.critical("DBusException: %s", error)
 
2683
            logger.critical("D-Bus Exception", exc_info=error)
2469
2684
            cleanup()
2470
2685
            sys.exit(1)
2471
2686
        # End of Avahi example code
2478
2693
        logger.debug("Starting main loop")
2479
2694
        main_loop.run()
2480
2695
    except AvahiError as error:
2481
 
        logger.critical("AvahiError: %s", error)
 
2696
        logger.critical("Avahi Error", exc_info=error)
2482
2697
        cleanup()
2483
2698
        sys.exit(1)
2484
2699
    except KeyboardInterrupt: