/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

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.2"
 
91
version = "1.5.3"
89
92
stored_state_file = "clients.pickle"
90
93
 
91
94
logger = logging.getLogger()
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:
374
384
        """Add the new name to the syslog messages"""
375
385
        ret = AvahiService.rename(self)
376
386
        syslogger.setFormatter(logging.Formatter
377
 
                               ('Mandos (%s) [%%(process)d]:'
378
 
                                ' %%(levelname)s: %%(message)s'
379
 
                                % self.name))
 
387
                               ('Mandos ({0}) [%(process)d]:'
 
388
                                ' %(levelname)s: %(message)s'
 
389
                                .format(self.name)))
380
390
        return ret
381
391
 
382
392
def timedelta_to_milliseconds(td):
384
394
    return ((td.days * 24 * 60 * 60 * 1000)
385
395
            + (td.seconds * 1000)
386
396
            + (td.microseconds // 1000))
387
 
        
 
397
 
388
398
class Client(object):
389
399
    """A representation of a client host served by this server.
390
400
    
457
467
    
458
468
    def approval_delay_milliseconds(self):
459
469
        return timedelta_to_milliseconds(self.approval_delay)
460
 
 
 
470
    
461
471
    @staticmethod
462
472
    def config_parser(config):
463
473
        """Construct a new dict of client settings of this form:
488
498
                          "rb") as secfile:
489
499
                    client["secret"] = secfile.read()
490
500
            else:
491
 
                raise TypeError("No secret or secfile for section %s"
492
 
                                % section)
 
501
                raise TypeError("No secret or secfile for section {0}"
 
502
                                .format(section))
493
503
            client["timeout"] = string_to_delta(section["timeout"])
494
504
            client["extended_timeout"] = string_to_delta(
495
505
                section["extended_timeout"])
504
514
            client["last_checker_status"] = -2
505
515
        
506
516
        return settings
507
 
        
508
 
        
 
517
    
509
518
    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
519
        self.name = name
514
520
        # adding all client settings
515
521
        for setting, value in settings.iteritems():
524
530
        else:
525
531
            self.last_enabled = None
526
532
            self.expires = None
527
 
       
 
533
        
528
534
        logger.debug("Creating client %r", self.name)
529
535
        # Uppercase and remove spaces from fingerprint for later
530
536
        # comparison purposes with return value from the fingerprint()
532
538
        logger.debug("  Fingerprint: %s", self.fingerprint)
533
539
        self.created = settings.get("created",
534
540
                                    datetime.datetime.utcnow())
535
 
 
 
541
        
536
542
        # attributes specific for this server instance
537
543
        self.checker = None
538
544
        self.checker_initiator_tag = None
653
659
        If a checker already exists, leave it running and do
654
660
        nothing."""
655
661
        # The reason for not killing a running checker is that if we
656
 
        # did that, then if a checker (for some reason) started
657
 
        # running slowly and taking more than 'interval' time, the
658
 
        # client would inevitably timeout, since no checker would get
659
 
        # a chance to run to completion.  If we instead leave running
 
662
        # did that, and if a checker (for some reason) started running
 
663
        # slowly and taking more than 'interval' time, then the client
 
664
        # would inevitably timeout, since no checker would get a
 
665
        # chance to run to completion.  If we instead leave running
660
666
        # checkers alone, the checker would have to take more time
661
667
        # than 'timeout' for the client to be disabled, which is as it
662
668
        # should be.
692
698
                try:
693
699
                    command = self.checker_command % escaped_attrs
694
700
                except TypeError as error:
695
 
                    logger.error('Could not format string "%s":'
696
 
                                 ' %s', self.checker_command, error)
 
701
                    logger.error('Could not format string "%s"',
 
702
                                 self.checker_command, exc_info=error)
697
703
                    return True # Try again later
698
704
            self.current_checker_command = command
699
705
            try:
717
723
                    gobject.source_remove(self.checker_callback_tag)
718
724
                    self.checker_callback(pid, status, command)
719
725
            except OSError as error:
720
 
                logger.error("Failed to start subprocess: %s",
721
 
                             error)
 
726
                logger.error("Failed to start subprocess",
 
727
                             exc_info=error)
722
728
        # Re-run this periodically if run by gobject.timeout_add
723
729
        return True
724
730
    
731
737
            return
732
738
        logger.debug("Stopping checker for %(name)s", vars(self))
733
739
        try:
734
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
740
            self.checker.terminate()
735
741
            #time.sleep(0.5)
736
742
            #if self.checker.poll() is None:
737
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
743
            #    self.checker.kill()
738
744
        except OSError as error:
739
745
            if error.errno != errno.ESRCH: # No such process
740
746
                raise
757
763
    # "Set" method, so we fail early here:
758
764
    if byte_arrays and signature != "ay":
759
765
        raise ValueError("Byte arrays not supported for non-'ay'"
760
 
                         " signature %r" % signature)
 
766
                         " signature {0!r}".format(signature))
761
767
    def decorator(func):
762
768
        func._dbus_is_property = True
763
769
        func._dbus_interface = dbus_interface
771
777
    return decorator
772
778
 
773
779
 
 
780
def dbus_interface_annotations(dbus_interface):
 
781
    """Decorator for marking functions returning interface annotations
 
782
    
 
783
    Usage:
 
784
    
 
785
    @dbus_interface_annotations("org.example.Interface")
 
786
    def _foo(self):  # Function name does not matter
 
787
        return {"org.freedesktop.DBus.Deprecated": "true",
 
788
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
789
                    "false"}
 
790
    """
 
791
    def decorator(func):
 
792
        func._dbus_is_interface = True
 
793
        func._dbus_interface = dbus_interface
 
794
        func._dbus_name = dbus_interface
 
795
        return func
 
796
    return decorator
 
797
 
 
798
 
 
799
def dbus_annotations(annotations):
 
800
    """Decorator to annotate D-Bus methods, signals or properties
 
801
    Usage:
 
802
    
 
803
    @dbus_service_property("org.example.Interface", signature="b",
 
804
                           access="r")
 
805
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
806
                        "org.freedesktop.DBus.Property."
 
807
                        "EmitsChangedSignal": "false"})
 
808
    def Property_dbus_property(self):
 
809
        return dbus.Boolean(False)
 
810
    """
 
811
    def decorator(func):
 
812
        func._dbus_annotations = annotations
 
813
        return func
 
814
    return decorator
 
815
 
 
816
 
774
817
class DBusPropertyException(dbus.exceptions.DBusException):
775
818
    """A base class for D-Bus property-related exceptions
776
819
    """
799
842
    """
800
843
    
801
844
    @staticmethod
802
 
    def _is_dbus_property(obj):
803
 
        return getattr(obj, "_dbus_is_property", False)
 
845
    def _is_dbus_thing(thing):
 
846
        """Returns a function testing if an attribute is a D-Bus thing
 
847
        
 
848
        If called like _is_dbus_thing("method") it returns a function
 
849
        suitable for use as predicate to inspect.getmembers().
 
850
        """
 
851
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
852
                                   False)
804
853
    
805
 
    def _get_all_dbus_properties(self):
 
854
    def _get_all_dbus_things(self, thing):
806
855
        """Returns a generator of (name, attribute) pairs
807
856
        """
808
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
857
        return ((getattr(athing.__get__(self), "_dbus_name",
 
858
                         name),
 
859
                 athing.__get__(self))
809
860
                for cls in self.__class__.__mro__
810
 
                for name, prop in
811
 
                inspect.getmembers(cls, self._is_dbus_property))
 
861
                for name, athing in
 
862
                inspect.getmembers(cls,
 
863
                                   self._is_dbus_thing(thing)))
812
864
    
813
865
    def _get_dbus_property(self, interface_name, property_name):
814
866
        """Returns a bound method if one exists which is a D-Bus
816
868
        """
817
869
        for cls in  self.__class__.__mro__:
818
870
            for name, value in (inspect.getmembers
819
 
                                (cls, self._is_dbus_property)):
 
871
                                (cls,
 
872
                                 self._is_dbus_thing("property"))):
820
873
                if (value._dbus_name == property_name
821
874
                    and value._dbus_interface == interface_name):
822
875
                    return value.__get__(self)
864
917
        Note: Will not include properties with access="write".
865
918
        """
866
919
        properties = {}
867
 
        for name, prop in self._get_all_dbus_properties():
 
920
        for name, prop in self._get_all_dbus_things("property"):
868
921
            if (interface_name
869
922
                and interface_name != prop._dbus_interface):
870
923
                # Interface non-empty but did not match
885
938
                         path_keyword='object_path',
886
939
                         connection_keyword='connection')
887
940
    def Introspect(self, object_path, connection):
888
 
        """Standard D-Bus method, overloaded to insert property tags.
 
941
        """Overloading of standard D-Bus method.
 
942
        
 
943
        Inserts property tags and interface annotation tags.
889
944
        """
890
945
        xmlstring = dbus.service.Object.Introspect(self, object_path,
891
946
                                                   connection)
898
953
                e.setAttribute("access", prop._dbus_access)
899
954
                return e
900
955
            for if_tag in document.getElementsByTagName("interface"):
 
956
                # Add property tags
901
957
                for tag in (make_tag(document, name, prop)
902
958
                            for name, prop
903
 
                            in self._get_all_dbus_properties()
 
959
                            in self._get_all_dbus_things("property")
904
960
                            if prop._dbus_interface
905
961
                            == if_tag.getAttribute("name")):
906
962
                    if_tag.appendChild(tag)
 
963
                # Add annotation tags
 
964
                for typ in ("method", "signal", "property"):
 
965
                    for tag in if_tag.getElementsByTagName(typ):
 
966
                        annots = dict()
 
967
                        for name, prop in (self.
 
968
                                           _get_all_dbus_things(typ)):
 
969
                            if (name == tag.getAttribute("name")
 
970
                                and prop._dbus_interface
 
971
                                == if_tag.getAttribute("name")):
 
972
                                annots.update(getattr
 
973
                                              (prop,
 
974
                                               "_dbus_annotations",
 
975
                                               {}))
 
976
                        for name, value in annots.iteritems():
 
977
                            ann_tag = document.createElement(
 
978
                                "annotation")
 
979
                            ann_tag.setAttribute("name", name)
 
980
                            ann_tag.setAttribute("value", value)
 
981
                            tag.appendChild(ann_tag)
 
982
                # Add interface annotation tags
 
983
                for annotation, value in dict(
 
984
                    itertools.chain.from_iterable(
 
985
                        annotations().iteritems()
 
986
                        for name, annotations in
 
987
                        self._get_all_dbus_things("interface")
 
988
                        if name == if_tag.getAttribute("name")
 
989
                        )).iteritems():
 
990
                    ann_tag = document.createElement("annotation")
 
991
                    ann_tag.setAttribute("name", annotation)
 
992
                    ann_tag.setAttribute("value", value)
 
993
                    if_tag.appendChild(ann_tag)
907
994
                # Add the names to the return values for the
908
995
                # "org.freedesktop.DBus.Properties" methods
909
996
                if (if_tag.getAttribute("name")
924
1011
        except (AttributeError, xml.dom.DOMException,
925
1012
                xml.parsers.expat.ExpatError) as error:
926
1013
            logger.error("Failed to override Introspection method",
927
 
                         error)
 
1014
                         exc_info=error)
928
1015
        return xmlstring
929
1016
 
930
1017
 
936
1023
                       variant_level=variant_level)
937
1024
 
938
1025
 
939
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
940
 
                                  .__metaclass__):
941
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
942
 
    will add additional D-Bus attributes matching a certain pattern.
 
1026
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1027
    """A class decorator; applied to a subclass of
 
1028
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1029
    interface names according to the "alt_interface_names" mapping.
 
1030
    Usage:
 
1031
    
 
1032
    @alternate_dbus_names({"org.example.Interface":
 
1033
                               "net.example.AlternateInterface"})
 
1034
    class SampleDBusObject(dbus.service.Object):
 
1035
        @dbus.service.method("org.example.Interface")
 
1036
        def SampleDBusMethod():
 
1037
            pass
 
1038
    
 
1039
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1040
    reachable via two interfaces: "org.example.Interface" and
 
1041
    "net.example.AlternateInterface", the latter of which will have
 
1042
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1043
    "true", unless "deprecate" is passed with a False value.
 
1044
    
 
1045
    This works for methods and signals, and also for D-Bus properties
 
1046
    (from DBusObjectWithProperties) and interfaces (from the
 
1047
    dbus_interface_annotations decorator).
943
1048
    """
944
 
    def __new__(mcs, name, bases, attr):
945
 
        # Go through all the base classes which could have D-Bus
946
 
        # methods, signals, or properties in them
947
 
        for base in (b for b in bases
948
 
                     if issubclass(b, dbus.service.Object)):
949
 
            # Go though all attributes of the base class
950
 
            for attrname, attribute in inspect.getmembers(base):
 
1049
    def wrapper(cls):
 
1050
        for orig_interface_name, alt_interface_name in (
 
1051
            alt_interface_names.iteritems()):
 
1052
            attr = {}
 
1053
            interface_names = set()
 
1054
            # Go though all attributes of the class
 
1055
            for attrname, attribute in inspect.getmembers(cls):
951
1056
                # Ignore non-D-Bus attributes, and D-Bus attributes
952
1057
                # with the wrong interface name
953
1058
                if (not hasattr(attribute, "_dbus_interface")
954
1059
                    or not attribute._dbus_interface
955
 
                    .startswith("se.recompile.Mandos")):
 
1060
                    .startswith(orig_interface_name)):
956
1061
                    continue
957
1062
                # Create an alternate D-Bus interface name based on
958
1063
                # the current name
959
1064
                alt_interface = (attribute._dbus_interface
960
 
                                 .replace("se.recompile.Mandos",
961
 
                                          "se.bsnet.fukt.Mandos"))
 
1065
                                 .replace(orig_interface_name,
 
1066
                                          alt_interface_name))
 
1067
                interface_names.add(alt_interface)
962
1068
                # Is this a D-Bus signal?
963
1069
                if getattr(attribute, "_dbus_is_signal", False):
964
1070
                    # Extract the original non-method function by
979
1085
                                nonmethod_func.func_name,
980
1086
                                nonmethod_func.func_defaults,
981
1087
                                nonmethod_func.func_closure)))
 
1088
                    # Copy annotations, if any
 
1089
                    try:
 
1090
                        new_function._dbus_annotations = (
 
1091
                            dict(attribute._dbus_annotations))
 
1092
                    except AttributeError:
 
1093
                        pass
982
1094
                    # Define a creator of a function to call both the
983
 
                    # old and new functions, so both the old and new
984
 
                    # signals gets sent when the function is called
 
1095
                    # original and alternate functions, so both the
 
1096
                    # original and alternate signals gets sent when
 
1097
                    # the function is called
985
1098
                    def fixscope(func1, func2):
986
1099
                        """This function is a scope container to pass
987
1100
                        func1 and func2 to the "call_both" function
994
1107
                        return call_both
995
1108
                    # Create the "call_both" function and add it to
996
1109
                    # the class
997
 
                    attr[attrname] = fixscope(attribute,
998
 
                                              new_function)
 
1110
                    attr[attrname] = fixscope(attribute, new_function)
999
1111
                # Is this a D-Bus method?
1000
1112
                elif getattr(attribute, "_dbus_is_method", False):
1001
1113
                    # Create a new, but exactly alike, function
1012
1124
                                        attribute.func_name,
1013
1125
                                        attribute.func_defaults,
1014
1126
                                        attribute.func_closure)))
 
1127
                    # Copy annotations, if any
 
1128
                    try:
 
1129
                        attr[attrname]._dbus_annotations = (
 
1130
                            dict(attribute._dbus_annotations))
 
1131
                    except AttributeError:
 
1132
                        pass
1015
1133
                # Is this a D-Bus property?
1016
1134
                elif getattr(attribute, "_dbus_is_property", False):
1017
1135
                    # Create a new, but exactly alike, function
1031
1149
                                        attribute.func_name,
1032
1150
                                        attribute.func_defaults,
1033
1151
                                        attribute.func_closure)))
1034
 
        return type.__new__(mcs, name, bases, attr)
1035
 
 
1036
 
 
 
1152
                    # Copy annotations, if any
 
1153
                    try:
 
1154
                        attr[attrname]._dbus_annotations = (
 
1155
                            dict(attribute._dbus_annotations))
 
1156
                    except AttributeError:
 
1157
                        pass
 
1158
                # Is this a D-Bus interface?
 
1159
                elif getattr(attribute, "_dbus_is_interface", False):
 
1160
                    # Create a new, but exactly alike, function
 
1161
                    # object.  Decorate it to be a new D-Bus interface
 
1162
                    # with the alternate D-Bus interface name.  Add it
 
1163
                    # to the class.
 
1164
                    attr[attrname] = (dbus_interface_annotations
 
1165
                                      (alt_interface)
 
1166
                                      (types.FunctionType
 
1167
                                       (attribute.func_code,
 
1168
                                        attribute.func_globals,
 
1169
                                        attribute.func_name,
 
1170
                                        attribute.func_defaults,
 
1171
                                        attribute.func_closure)))
 
1172
            if deprecate:
 
1173
                # Deprecate all alternate interfaces
 
1174
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1175
                for interface_name in interface_names:
 
1176
                    @dbus_interface_annotations(interface_name)
 
1177
                    def func(self):
 
1178
                        return { "org.freedesktop.DBus.Deprecated":
 
1179
                                     "true" }
 
1180
                    # Find an unused name
 
1181
                    for aname in (iname.format(i)
 
1182
                                  for i in itertools.count()):
 
1183
                        if aname not in attr:
 
1184
                            attr[aname] = func
 
1185
                            break
 
1186
            if interface_names:
 
1187
                # Replace the class with a new subclass of it with
 
1188
                # methods, signals, etc. as created above.
 
1189
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1190
                           (cls,), attr)
 
1191
        return cls
 
1192
    return wrapper
 
1193
 
 
1194
 
 
1195
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1196
                                "se.bsnet.fukt.Mandos"})
1037
1197
class ClientDBus(Client, DBusObjectWithProperties):
1038
1198
    """A Client class using D-Bus
1039
1199
    
1059
1219
                                 ("/clients/" + client_object_name))
1060
1220
        DBusObjectWithProperties.__init__(self, self.bus,
1061
1221
                                          self.dbus_object_path)
1062
 
        
 
1222
    
1063
1223
    def notifychangeproperty(transform_func,
1064
1224
                             dbus_name, type_func=lambda x: x,
1065
1225
                             variant_level=1):
1088
1248
        
1089
1249
        return property(lambda self: getattr(self, attrname), setter)
1090
1250
    
1091
 
    
1092
1251
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1093
1252
    approvals_pending = notifychangeproperty(dbus.Boolean,
1094
1253
                                             "ApprovalPending",
1182
1341
                            (self.approval_duration),
1183
1342
                            self._reset_approved)
1184
1343
    
1185
 
    
1186
1344
    ## D-Bus methods, signals & properties
1187
1345
    _interface = "se.recompile.Mandos.Client"
1188
1346
    
 
1347
    ## Interfaces
 
1348
    
 
1349
    @dbus_interface_annotations(_interface)
 
1350
    def _foo(self):
 
1351
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1352
                     "false"}
 
1353
    
1189
1354
    ## Signals
1190
1355
    
1191
1356
    # CheckerCompleted - signal
1468
1633
        self._pipe.send(('setattr', name, value))
1469
1634
 
1470
1635
 
1471
 
class ClientDBusTransitional(ClientDBus):
1472
 
    __metaclass__ = AlternateDBusNamesMetaclass
1473
 
 
1474
 
 
1475
1636
class ClientHandler(socketserver.BaseRequestHandler, object):
1476
1637
    """A class to handle client connections.
1477
1638
    
1605
1766
                    try:
1606
1767
                        sent = session.send(client.secret[sent_size:])
1607
1768
                    except gnutls.errors.GNUTLSError as error:
1608
 
                        logger.warning("gnutls send failed")
 
1769
                        logger.warning("gnutls send failed",
 
1770
                                       exc_info=error)
1609
1771
                        return
1610
1772
                    logger.debug("Sent: %d, remaining: %d",
1611
1773
                                 sent, len(client.secret)
1625
1787
                try:
1626
1788
                    session.bye()
1627
1789
                except gnutls.errors.GNUTLSError as error:
1628
 
                    logger.warning("GnuTLS bye failed")
 
1790
                    logger.warning("GnuTLS bye failed",
 
1791
                                   exc_info=error)
1629
1792
    
1630
1793
    @staticmethod
1631
1794
    def peer_certificate(session):
1703
1866
    def process_request(self, request, address):
1704
1867
        """Start a new process to process the request."""
1705
1868
        proc = multiprocessing.Process(target = self.sub_process_main,
1706
 
                                       args = (request,
1707
 
                                               address))
 
1869
                                       args = (request, address))
1708
1870
        proc.start()
1709
1871
        return proc
1710
1872
 
1832
1994
    
1833
1995
    def handle_ipc(self, source, condition, parent_pipe=None,
1834
1996
                   proc = None, client_object=None):
1835
 
        condition_names = {
1836
 
            gobject.IO_IN: "IN",   # There is data to read.
1837
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1838
 
                                    # blocking).
1839
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1840
 
            gobject.IO_ERR: "ERR", # Error condition.
1841
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1842
 
                                    # broken, usually for pipes and
1843
 
                                    # sockets).
1844
 
            }
1845
 
        conditions_string = ' | '.join(name
1846
 
                                       for cond, name in
1847
 
                                       condition_names.iteritems()
1848
 
                                       if cond & condition)
1849
1997
        # error, or the other end of multiprocessing.Pipe has closed
1850
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1998
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1851
1999
            # Wait for other process to exit
1852
2000
            proc.join()
1853
2001
            return False
1943
2091
            elif suffix == "w":
1944
2092
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1945
2093
            else:
1946
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2094
                raise ValueError("Unknown suffix {0!r}"
 
2095
                                 .format(suffix))
1947
2096
        except (ValueError, IndexError) as e:
1948
2097
            raise ValueError(*(e.args))
1949
2098
        timevalue += delta
1963
2112
        sys.exit()
1964
2113
    if not noclose:
1965
2114
        # Close all standard open file descriptors
1966
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2115
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1967
2116
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1968
2117
            raise OSError(errno.ENODEV,
1969
 
                          "%s not a character device"
1970
 
                          % os.path.devnull)
 
2118
                          "{0} not a character device"
 
2119
                          .format(os.devnull))
1971
2120
        os.dup2(null, sys.stdin.fileno())
1972
2121
        os.dup2(null, sys.stdout.fileno())
1973
2122
        os.dup2(null, sys.stderr.fileno())
1982
2131
    
1983
2132
    parser = argparse.ArgumentParser()
1984
2133
    parser.add_argument("-v", "--version", action="version",
1985
 
                        version = "%%(prog)s %s" % version,
 
2134
                        version = "%(prog)s {0}".format(version),
1986
2135
                        help="show version number and exit")
1987
2136
    parser.add_argument("-i", "--interface", metavar="IF",
1988
2137
                        help="Bind to interface IF")
2091
2240
    
2092
2241
    if server_settings["servicename"] != "Mandos":
2093
2242
        syslogger.setFormatter(logging.Formatter
2094
 
                               ('Mandos (%s) [%%(process)d]:'
2095
 
                                ' %%(levelname)s: %%(message)s'
2096
 
                                % server_settings["servicename"]))
 
2243
                               ('Mandos ({0}) [%(process)d]:'
 
2244
                                ' %(levelname)s: %(message)s'
 
2245
                                .format(server_settings
 
2246
                                        ["servicename"])))
2097
2247
    
2098
2248
    # Parse config file with clients
2099
2249
    client_config = configparser.SafeConfigParser(Client
2117
2267
        pidfilename = "/var/run/mandos.pid"
2118
2268
        try:
2119
2269
            pidfile = open(pidfilename, "w")
2120
 
        except IOError:
2121
 
            logger.error("Could not open file %r", pidfilename)
 
2270
        except IOError as e:
 
2271
            logger.error("Could not open file %r", pidfilename,
 
2272
                         exc_info=e)
2122
2273
    
2123
 
    try:
2124
 
        uid = pwd.getpwnam("_mandos").pw_uid
2125
 
        gid = pwd.getpwnam("_mandos").pw_gid
2126
 
    except KeyError:
 
2274
    for name in ("_mandos", "mandos", "nobody"):
2127
2275
        try:
2128
 
            uid = pwd.getpwnam("mandos").pw_uid
2129
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2276
            uid = pwd.getpwnam(name).pw_uid
 
2277
            gid = pwd.getpwnam(name).pw_gid
 
2278
            break
2130
2279
        except KeyError:
2131
 
            try:
2132
 
                uid = pwd.getpwnam("nobody").pw_uid
2133
 
                gid = pwd.getpwnam("nobody").pw_gid
2134
 
            except KeyError:
2135
 
                uid = 65534
2136
 
                gid = 65534
 
2280
            continue
 
2281
    else:
 
2282
        uid = 65534
 
2283
        gid = 65534
2137
2284
    try:
2138
2285
        os.setgid(gid)
2139
2286
        os.setuid(uid)
2156
2303
         .gnutls_global_set_log_function(debug_gnutls))
2157
2304
        
2158
2305
        # Redirect stdin so all checkers get /dev/null
2159
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2306
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2160
2307
        os.dup2(null, sys.stdin.fileno())
2161
2308
        if null > 2:
2162
2309
            os.close(null)
2170
2317
    
2171
2318
    global main_loop
2172
2319
    # From the Avahi example code
2173
 
    DBusGMainLoop(set_as_default=True )
 
2320
    DBusGMainLoop(set_as_default=True)
2174
2321
    main_loop = gobject.MainLoop()
2175
2322
    bus = dbus.SystemBus()
2176
2323
    # End of Avahi example code
2182
2329
                            ("se.bsnet.fukt.Mandos", bus,
2183
2330
                             do_not_queue=True))
2184
2331
        except dbus.exceptions.NameExistsException as e:
2185
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2332
            logger.error("Disabling D-Bus:", exc_info=e)
2186
2333
            use_dbus = False
2187
2334
            server_settings["use_dbus"] = False
2188
2335
            tcp_server.use_dbus = False
2200
2347
    
2201
2348
    client_class = Client
2202
2349
    if use_dbus:
2203
 
        client_class = functools.partial(ClientDBusTransitional,
2204
 
                                         bus = bus)
 
2350
        client_class = functools.partial(ClientDBus, bus = bus)
2205
2351
    
2206
2352
    client_settings = Client.config_parser(client_config)
2207
2353
    old_client_settings = {}
2215
2361
                                                     (stored_state))
2216
2362
            os.remove(stored_state_path)
2217
2363
        except IOError as e:
2218
 
            logger.warning("Could not load persistent state: {0}"
2219
 
                           .format(e))
2220
 
            if e.errno != errno.ENOENT:
 
2364
            if e.errno == errno.ENOENT:
 
2365
                logger.warning("Could not load persistent state: {0}"
 
2366
                                .format(os.strerror(e.errno)))
 
2367
            else:
 
2368
                logger.critical("Could not load persistent state:",
 
2369
                                exc_info=e)
2221
2370
                raise
2222
2371
        except EOFError as e:
2223
2372
            logger.warning("Could not load persistent state: "
2224
 
                           "EOFError: {0}".format(e))
 
2373
                           "EOFError:", exc_info=e)
2225
2374
    
2226
2375
    with PGPEngine() as pgp:
2227
2376
        for client_name, client in clients_data.iteritems():
2280
2429
                             .format(client_name))
2281
2430
                client["secret"] = (
2282
2431
                    client_settings[client_name]["secret"])
2283
 
 
2284
2432
    
2285
2433
    # Add/remove clients based on new changes made to config
2286
2434
    for client_name in (set(old_client_settings)
2289
2437
    for client_name in (set(client_settings)
2290
2438
                        - set(old_client_settings)):
2291
2439
        clients_data[client_name] = client_settings[client_name]
2292
 
 
 
2440
    
2293
2441
    # Create all client objects
2294
2442
    for client_name, client in clients_data.iteritems():
2295
2443
        tcp_server.clients[client_name] = client_class(
2297
2445
    
2298
2446
    if not tcp_server.clients:
2299
2447
        logger.warning("No clients defined")
2300
 
        
 
2448
    
2301
2449
    if not debug:
2302
2450
        try:
2303
2451
            with pidfile:
2317
2465
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2318
2466
    
2319
2467
    if use_dbus:
2320
 
        class MandosDBusService(dbus.service.Object):
 
2468
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2469
                                        "se.bsnet.fukt.Mandos"})
 
2470
        class MandosDBusService(DBusObjectWithProperties):
2321
2471
            """A D-Bus proxy object"""
2322
2472
            def __init__(self):
2323
2473
                dbus.service.Object.__init__(self, bus, "/")
2324
2474
            _interface = "se.recompile.Mandos"
2325
2475
            
 
2476
            @dbus_interface_annotations(_interface)
 
2477
            def _foo(self):
 
2478
                return { "org.freedesktop.DBus.Property"
 
2479
                         ".EmitsChangedSignal":
 
2480
                             "false"}
 
2481
            
2326
2482
            @dbus.service.signal(_interface, signature="o")
2327
2483
            def ClientAdded(self, objpath):
2328
2484
                "D-Bus signal"
2370
2526
            
2371
2527
            del _interface
2372
2528
        
2373
 
        class MandosDBusServiceTransitional(MandosDBusService):
2374
 
            __metaclass__ = AlternateDBusNamesMetaclass
2375
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2529
        mandos_dbus_service = MandosDBusService()
2376
2530
    
2377
2531
    def cleanup():
2378
2532
        "Cleanup function; run on exit"
2411
2565
                del client_settings[client.name]["secret"]
2412
2566
        
2413
2567
        try:
2414
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2415
 
                                                prefix="clients-",
2416
 
                                                dir=os.path.dirname
2417
 
                                                (stored_state_path))
2418
 
            with os.fdopen(tempfd, "wb") as stored_state:
 
2568
            with (tempfile.NamedTemporaryFile
 
2569
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2570
                   dir=os.path.dirname(stored_state_path),
 
2571
                   delete=False)) as stored_state:
2419
2572
                pickle.dump((clients, client_settings), stored_state)
 
2573
                tempname=stored_state.name
2420
2574
            os.rename(tempname, stored_state_path)
2421
2575
        except (IOError, OSError) as e:
2422
 
            logger.warning("Could not save persistent state: {0}"
2423
 
                           .format(e))
2424
2576
            if not debug:
2425
2577
                try:
2426
2578
                    os.remove(tempname)
2427
2579
                except NameError:
2428
2580
                    pass
2429
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2430
 
                                   errno.EEXIST)):
 
2581
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2582
                logger.warning("Could not save persistent state: {0}"
 
2583
                               .format(os.strerror(e.errno)))
 
2584
            else:
 
2585
                logger.warning("Could not save persistent state:",
 
2586
                               exc_info=e)
2431
2587
                raise e
2432
2588
        
2433
2589
        # Delete all clients, and settings from config
2461
2617
    service.port = tcp_server.socket.getsockname()[1]
2462
2618
    if use_ipv6:
2463
2619
        logger.info("Now listening on address %r, port %d,"
2464
 
                    " flowinfo %d, scope_id %d"
2465
 
                    % tcp_server.socket.getsockname())
 
2620
                    " flowinfo %d, scope_id %d",
 
2621
                    *tcp_server.socket.getsockname())
2466
2622
    else:                       # IPv4
2467
 
        logger.info("Now listening on address %r, port %d"
2468
 
                    % tcp_server.socket.getsockname())
 
2623
        logger.info("Now listening on address %r, port %d",
 
2624
                    *tcp_server.socket.getsockname())
2469
2625
    
2470
2626
    #service.interface = tcp_server.socket.getsockname()[3]
2471
2627
    
2474
2630
        try:
2475
2631
            service.activate()
2476
2632
        except dbus.exceptions.DBusException as error:
2477
 
            logger.critical("DBusException: %s", error)
 
2633
            logger.critical("D-Bus Exception", exc_info=error)
2478
2634
            cleanup()
2479
2635
            sys.exit(1)
2480
2636
        # End of Avahi example code
2487
2643
        logger.debug("Starting main loop")
2488
2644
        main_loop.run()
2489
2645
    except AvahiError as error:
2490
 
        logger.critical("AvahiError: %s", error)
 
2646
        logger.critical("Avahi Error", exc_info=error)
2491
2647
        cleanup()
2492
2648
        sys.exit(1)
2493
2649
    except KeyboardInterrupt: