/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:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
 
37
from future_builtins import *
 
38
 
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
65
67
import types
66
68
import binascii
67
69
import tempfile
 
70
import itertools
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.4.1"
 
91
version = "1.5.3"
89
92
stored_state_file = "clients.pickle"
90
93
 
91
94
logger = logging.getLogger()
110
113
        return interface_index
111
114
 
112
115
 
113
 
def initlogger(level=logging.WARNING):
 
116
def initlogger(debug, level=logging.WARNING):
114
117
    """init logger and add loglevel"""
115
118
    
116
119
    syslogger.setFormatter(logging.Formatter
118
121
                            ' %(message)s'))
119
122
    logger.addHandler(syslogger)
120
123
    
121
 
    console = logging.StreamHandler()
122
 
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
123
 
                                           ' [%(process)d]:'
124
 
                                           ' %(levelname)s:'
125
 
                                           ' %(message)s'))
126
 
    logger.addHandler(console)
 
124
    if debug:
 
125
        console = logging.StreamHandler()
 
126
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
127
                                               ' [%(process)d]:'
 
128
                                               ' %(levelname)s:'
 
129
                                               ' %(message)s'))
 
130
        logger.addHandler(console)
127
131
    logger.setLevel(level)
128
132
 
129
133
 
141
145
        self.gnupg.options.meta_interactive = False
142
146
        self.gnupg.options.homedir = self.tempdir
143
147
        self.gnupg.options.extra_args.extend(['--force-mdc',
144
 
                                              '--quiet'])
 
148
                                              '--quiet',
 
149
                                              '--no-use-agent'])
145
150
    
146
151
    def __enter__(self):
147
152
        return self
173
178
    
174
179
    def encrypt(self, data, password):
175
180
        self.gnupg.passphrase = self.password_encode(password)
176
 
        with open(os.devnull) as devnull:
 
181
        with open(os.devnull, "w") as devnull:
177
182
            try:
178
183
                proc = self.gnupg.run(['--symmetric'],
179
184
                                      create_fhs=['stdin', 'stdout'],
190
195
    
191
196
    def decrypt(self, data, password):
192
197
        self.gnupg.passphrase = self.password_encode(password)
193
 
        with open(os.devnull) as devnull:
 
198
        with open(os.devnull, "w") as devnull:
194
199
            try:
195
200
                proc = self.gnupg.run(['--decrypt'],
196
201
                                      create_fhs=['stdin', 'stdout'],
197
202
                                      attach_fhs={'stderr': devnull})
198
 
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
203
                with contextlib.closing(proc.handles['stdin']) as f:
199
204
                    f.write(data)
200
205
                with contextlib.closing(proc.handles['stdout']) as f:
201
206
                    decrypted_plaintext = f.read()
206
211
        return decrypted_plaintext
207
212
 
208
213
 
209
 
 
210
214
class AvahiError(Exception):
211
215
    def __init__(self, value, *args, **kwargs):
212
216
        self.value = value
241
245
    server: D-Bus Server
242
246
    bus: dbus.SystemBus()
243
247
    """
 
248
    
244
249
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
245
250
                 servicetype = None, port = None, TXT = None,
246
251
                 domain = "", host = "", max_renames = 32768,
259
264
        self.server = None
260
265
        self.bus = bus
261
266
        self.entry_group_state_changed_match = None
 
267
    
262
268
    def rename(self):
263
269
        """Derived from the Avahi example code"""
264
270
        if self.rename_count >= self.max_renames:
274
280
        try:
275
281
            self.add()
276
282
        except dbus.exceptions.DBusException as error:
277
 
            logger.critical("DBusException: %s", error)
 
283
            logger.critical("D-Bus Exception", exc_info=error)
278
284
            self.cleanup()
279
285
            os._exit(1)
280
286
        self.rename_count += 1
 
287
    
281
288
    def remove(self):
282
289
        """Derived from the Avahi example code"""
283
290
        if self.entry_group_state_changed_match is not None:
285
292
            self.entry_group_state_changed_match = None
286
293
        if self.group is not None:
287
294
            self.group.Reset()
 
295
    
288
296
    def add(self):
289
297
        """Derived from the Avahi example code"""
290
298
        self.remove()
307
315
            dbus.UInt16(self.port),
308
316
            avahi.string_array_to_txt_array(self.TXT))
309
317
        self.group.Commit()
 
318
    
310
319
    def entry_group_state_changed(self, state, error):
311
320
        """Derived from the Avahi example code"""
312
321
        logger.debug("Avahi entry group state change: %i", state)
319
328
        elif state == avahi.ENTRY_GROUP_FAILURE:
320
329
            logger.critical("Avahi: Error in group state changed %s",
321
330
                            unicode(error))
322
 
            raise AvahiGroupError("State changed: %s"
323
 
                                  % unicode(error))
 
331
            raise AvahiGroupError("State changed: {0!s}"
 
332
                                  .format(error))
 
333
    
324
334
    def cleanup(self):
325
335
        """Derived from the Avahi example code"""
326
336
        if self.group is not None:
331
341
                pass
332
342
            self.group = None
333
343
        self.remove()
 
344
    
334
345
    def server_state_changed(self, state, error=None):
335
346
        """Derived from the Avahi example code"""
336
347
        logger.debug("Avahi server state change: %i", state)
355
366
                logger.debug("Unknown state: %r", state)
356
367
            else:
357
368
                logger.debug("Unknown state: %r: %r", state, error)
 
369
    
358
370
    def activate(self):
359
371
        """Derived from the Avahi example code"""
360
372
        if self.server is None:
372
384
        """Add the new name to the syslog messages"""
373
385
        ret = AvahiService.rename(self)
374
386
        syslogger.setFormatter(logging.Formatter
375
 
                               ('Mandos (%s) [%%(process)d]:'
376
 
                                ' %%(levelname)s: %%(message)s'
377
 
                                % self.name))
 
387
                               ('Mandos ({0}) [%(process)d]:'
 
388
                                ' %(levelname)s: %(message)s'
 
389
                                .format(self.name)))
378
390
        return ret
379
391
 
380
392
def timedelta_to_milliseconds(td):
382
394
    return ((td.days * 24 * 60 * 60 * 1000)
383
395
            + (td.seconds * 1000)
384
396
            + (td.microseconds // 1000))
385
 
        
 
397
 
386
398
class Client(object):
387
399
    """A representation of a client host served by this server.
388
400
    
413
425
    last_checked_ok: datetime.datetime(); (UTC) or None
414
426
    last_checker_status: integer between 0 and 255 reflecting exit
415
427
                         status of last checker. -1 reflects crashed
416
 
                         checker, or None.
 
428
                         checker, -2 means no checker completed yet.
417
429
    last_enabled: datetime.datetime(); (UTC) or None
418
430
    name:       string; from the config file, used in log messages and
419
431
                        D-Bus identifiers
420
432
    secret:     bytestring; sent verbatim (over TLS) to client
421
433
    timeout:    datetime.timedelta(); How long from last_checked_ok
422
434
                                      until this client is disabled
423
 
    extended_timeout:   extra long timeout when password has been sent
 
435
    extended_timeout:   extra long timeout when secret has been sent
424
436
    runtime_expansions: Allowed attributes for runtime expansion.
425
437
    expires:    datetime.datetime(); time (UTC) when a client will be
426
438
                disabled, or None
455
467
    
456
468
    def approval_delay_milliseconds(self):
457
469
        return timedelta_to_milliseconds(self.approval_delay)
458
 
 
 
470
    
459
471
    @staticmethod
460
472
    def config_parser(config):
461
 
        """ Construct a new dict of client settings of this form:
 
473
        """Construct a new dict of client settings of this form:
462
474
        { client_name: {setting_name: value, ...}, ...}
463
 
        with exceptions for any special settings as defined above"""
 
475
        with exceptions for any special settings as defined above.
 
476
        NOTE: Must be a pure function. Must return the same result
 
477
        value given the same arguments.
 
478
        """
464
479
        settings = {}
465
480
        for client_name in config.sections():
466
481
            section = dict(config.items(client_name))
470
485
            # Reformat values from string types to Python types
471
486
            client["approved_by_default"] = config.getboolean(
472
487
                client_name, "approved_by_default")
473
 
            client["enabled"] = config.getboolean(client_name, "enabled")
 
488
            client["enabled"] = config.getboolean(client_name,
 
489
                                                  "enabled")
474
490
            
475
491
            client["fingerprint"] = (section["fingerprint"].upper()
476
492
                                     .replace(" ", ""))
482
498
                          "rb") as secfile:
483
499
                    client["secret"] = secfile.read()
484
500
            else:
485
 
                raise TypeError("No secret or secfile for section %s"
486
 
                                % section)
 
501
                raise TypeError("No secret or secfile for section {0}"
 
502
                                .format(section))
487
503
            client["timeout"] = string_to_delta(section["timeout"])
488
504
            client["extended_timeout"] = string_to_delta(
489
505
                section["extended_timeout"])
495
511
            client["checker_command"] = section["checker"]
496
512
            client["last_approval_request"] = None
497
513
            client["last_checked_ok"] = None
498
 
            client["last_checker_status"] = None
499
 
            if client["enabled"]:
500
 
                client["last_enabled"] = datetime.datetime.utcnow()
501
 
                client["expires"] = (datetime.datetime.utcnow()
502
 
                                     + client["timeout"])
503
 
            else:
504
 
                client["last_enabled"] = None
505
 
                client["expires"] = None
506
 
 
 
514
            client["last_checker_status"] = -2
 
515
        
507
516
        return settings
508
 
        
509
 
        
 
517
    
510
518
    def __init__(self, settings, name = None):
511
 
        """Note: the 'checker' key in 'config' sets the
512
 
        'checker_command' attribute and *not* the 'checker'
513
 
        attribute."""
514
519
        self.name = name
515
520
        # adding all client settings
516
521
        for setting, value in settings.iteritems():
517
522
            setattr(self, setting, value)
518
523
        
 
524
        if self.enabled:
 
525
            if not hasattr(self, "last_enabled"):
 
526
                self.last_enabled = datetime.datetime.utcnow()
 
527
            if not hasattr(self, "expires"):
 
528
                self.expires = (datetime.datetime.utcnow()
 
529
                                + self.timeout)
 
530
        else:
 
531
            self.last_enabled = None
 
532
            self.expires = None
 
533
        
519
534
        logger.debug("Creating client %r", self.name)
520
535
        # Uppercase and remove spaces from fingerprint for later
521
536
        # comparison purposes with return value from the fingerprint()
522
537
        # function
523
538
        logger.debug("  Fingerprint: %s", self.fingerprint)
524
 
        self.created = settings.get("created", datetime.datetime.utcnow())
525
 
 
 
539
        self.created = settings.get("created",
 
540
                                    datetime.datetime.utcnow())
 
541
        
526
542
        # attributes specific for this server instance
527
543
        self.checker = None
528
544
        self.checker_initiator_tag = None
616
632
            logger.warning("Checker for %(name)s crashed?",
617
633
                           vars(self))
618
634
    
619
 
    def checked_ok(self, timeout=None):
620
 
        """Bump up the timeout for this client.
621
 
        
622
 
        This should only be called when the client has been seen,
623
 
        alive and well.
624
 
        """
 
635
    def checked_ok(self):
 
636
        """Assert that the client has been seen, alive and well."""
 
637
        self.last_checked_ok = datetime.datetime.utcnow()
 
638
        self.last_checker_status = 0
 
639
        self.bump_timeout()
 
640
    
 
641
    def bump_timeout(self, timeout=None):
 
642
        """Bump up the timeout for this client."""
625
643
        if timeout is None:
626
644
            timeout = self.timeout
627
 
        self.last_checked_ok = datetime.datetime.utcnow()
628
645
        if self.disable_initiator_tag is not None:
629
646
            gobject.source_remove(self.disable_initiator_tag)
630
647
        if getattr(self, "enabled", False):
642
659
        If a checker already exists, leave it running and do
643
660
        nothing."""
644
661
        # The reason for not killing a running checker is that if we
645
 
        # did that, then if a checker (for some reason) started
646
 
        # running slowly and taking more than 'interval' time, the
647
 
        # client would inevitably timeout, since no checker would get
648
 
        # a chance to run to completion.  If we instead leave running
 
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
649
666
        # checkers alone, the checker would have to take more time
650
667
        # than 'timeout' for the client to be disabled, which is as it
651
668
        # should be.
681
698
                try:
682
699
                    command = self.checker_command % escaped_attrs
683
700
                except TypeError as error:
684
 
                    logger.error('Could not format string "%s":'
685
 
                                 ' %s', self.checker_command, error)
 
701
                    logger.error('Could not format string "%s"',
 
702
                                 self.checker_command, exc_info=error)
686
703
                    return True # Try again later
687
704
            self.current_checker_command = command
688
705
            try:
706
723
                    gobject.source_remove(self.checker_callback_tag)
707
724
                    self.checker_callback(pid, status, command)
708
725
            except OSError as error:
709
 
                logger.error("Failed to start subprocess: %s",
710
 
                             error)
 
726
                logger.error("Failed to start subprocess",
 
727
                             exc_info=error)
711
728
        # Re-run this periodically if run by gobject.timeout_add
712
729
        return True
713
730
    
720
737
            return
721
738
        logger.debug("Stopping checker for %(name)s", vars(self))
722
739
        try:
723
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
740
            self.checker.terminate()
724
741
            #time.sleep(0.5)
725
742
            #if self.checker.poll() is None:
726
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
743
            #    self.checker.kill()
727
744
        except OSError as error:
728
745
            if error.errno != errno.ESRCH: # No such process
729
746
                raise
746
763
    # "Set" method, so we fail early here:
747
764
    if byte_arrays and signature != "ay":
748
765
        raise ValueError("Byte arrays not supported for non-'ay'"
749
 
                         " signature %r" % signature)
 
766
                         " signature {0!r}".format(signature))
750
767
    def decorator(func):
751
768
        func._dbus_is_property = True
752
769
        func._dbus_interface = dbus_interface
760
777
    return decorator
761
778
 
762
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
 
763
817
class DBusPropertyException(dbus.exceptions.DBusException):
764
818
    """A base class for D-Bus property-related exceptions
765
819
    """
788
842
    """
789
843
    
790
844
    @staticmethod
791
 
    def _is_dbus_property(obj):
792
 
        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)
793
853
    
794
 
    def _get_all_dbus_properties(self):
 
854
    def _get_all_dbus_things(self, thing):
795
855
        """Returns a generator of (name, attribute) pairs
796
856
        """
797
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
857
        return ((getattr(athing.__get__(self), "_dbus_name",
 
858
                         name),
 
859
                 athing.__get__(self))
798
860
                for cls in self.__class__.__mro__
799
 
                for name, prop in
800
 
                inspect.getmembers(cls, self._is_dbus_property))
 
861
                for name, athing in
 
862
                inspect.getmembers(cls,
 
863
                                   self._is_dbus_thing(thing)))
801
864
    
802
865
    def _get_dbus_property(self, interface_name, property_name):
803
866
        """Returns a bound method if one exists which is a D-Bus
805
868
        """
806
869
        for cls in  self.__class__.__mro__:
807
870
            for name, value in (inspect.getmembers
808
 
                                (cls, self._is_dbus_property)):
 
871
                                (cls,
 
872
                                 self._is_dbus_thing("property"))):
809
873
                if (value._dbus_name == property_name
810
874
                    and value._dbus_interface == interface_name):
811
875
                    return value.__get__(self)
840
904
            # signatures other than "ay".
841
905
            if prop._dbus_signature != "ay":
842
906
                raise ValueError
843
 
            value = dbus.ByteArray(''.join(unichr(byte)
844
 
                                           for byte in value))
 
907
            value = dbus.ByteArray(b''.join(chr(byte)
 
908
                                            for byte in value))
845
909
        prop(value)
846
910
    
847
911
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
853
917
        Note: Will not include properties with access="write".
854
918
        """
855
919
        properties = {}
856
 
        for name, prop in self._get_all_dbus_properties():
 
920
        for name, prop in self._get_all_dbus_things("property"):
857
921
            if (interface_name
858
922
                and interface_name != prop._dbus_interface):
859
923
                # Interface non-empty but did not match
874
938
                         path_keyword='object_path',
875
939
                         connection_keyword='connection')
876
940
    def Introspect(self, object_path, connection):
877
 
        """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.
878
944
        """
879
945
        xmlstring = dbus.service.Object.Introspect(self, object_path,
880
946
                                                   connection)
887
953
                e.setAttribute("access", prop._dbus_access)
888
954
                return e
889
955
            for if_tag in document.getElementsByTagName("interface"):
 
956
                # Add property tags
890
957
                for tag in (make_tag(document, name, prop)
891
958
                            for name, prop
892
 
                            in self._get_all_dbus_properties()
 
959
                            in self._get_all_dbus_things("property")
893
960
                            if prop._dbus_interface
894
961
                            == if_tag.getAttribute("name")):
895
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)
896
994
                # Add the names to the return values for the
897
995
                # "org.freedesktop.DBus.Properties" methods
898
996
                if (if_tag.getAttribute("name")
913
1011
        except (AttributeError, xml.dom.DOMException,
914
1012
                xml.parsers.expat.ExpatError) as error:
915
1013
            logger.error("Failed to override Introspection method",
916
 
                         error)
 
1014
                         exc_info=error)
917
1015
        return xmlstring
918
1016
 
919
1017
 
925
1023
                       variant_level=variant_level)
926
1024
 
927
1025
 
928
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
929
 
                                  .__metaclass__):
930
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
931
 
    will add additional D-Bus attributes matching a certain pattern.
 
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).
932
1048
    """
933
 
    def __new__(mcs, name, bases, attr):
934
 
        # Go through all the base classes which could have D-Bus
935
 
        # methods, signals, or properties in them
936
 
        for base in (b for b in bases
937
 
                     if issubclass(b, dbus.service.Object)):
938
 
            # Go though all attributes of the base class
939
 
            for attrname, attribute in inspect.getmembers(base):
 
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):
940
1056
                # Ignore non-D-Bus attributes, and D-Bus attributes
941
1057
                # with the wrong interface name
942
1058
                if (not hasattr(attribute, "_dbus_interface")
943
1059
                    or not attribute._dbus_interface
944
 
                    .startswith("se.recompile.Mandos")):
 
1060
                    .startswith(orig_interface_name)):
945
1061
                    continue
946
1062
                # Create an alternate D-Bus interface name based on
947
1063
                # the current name
948
1064
                alt_interface = (attribute._dbus_interface
949
 
                                 .replace("se.recompile.Mandos",
950
 
                                          "se.bsnet.fukt.Mandos"))
 
1065
                                 .replace(orig_interface_name,
 
1066
                                          alt_interface_name))
 
1067
                interface_names.add(alt_interface)
951
1068
                # Is this a D-Bus signal?
952
1069
                if getattr(attribute, "_dbus_is_signal", False):
953
1070
                    # Extract the original non-method function by
968
1085
                                nonmethod_func.func_name,
969
1086
                                nonmethod_func.func_defaults,
970
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
971
1094
                    # Define a creator of a function to call both the
972
 
                    # old and new functions, so both the old and new
973
 
                    # signals gets sent when the function is called
 
1095
                    # original and alternate functions, so both the
 
1096
                    # original and alternate signals gets sent when
 
1097
                    # the function is called
974
1098
                    def fixscope(func1, func2):
975
1099
                        """This function is a scope container to pass
976
1100
                        func1 and func2 to the "call_both" function
983
1107
                        return call_both
984
1108
                    # Create the "call_both" function and add it to
985
1109
                    # the class
986
 
                    attr[attrname] = fixscope(attribute,
987
 
                                              new_function)
 
1110
                    attr[attrname] = fixscope(attribute, new_function)
988
1111
                # Is this a D-Bus method?
989
1112
                elif getattr(attribute, "_dbus_is_method", False):
990
1113
                    # Create a new, but exactly alike, function
1001
1124
                                        attribute.func_name,
1002
1125
                                        attribute.func_defaults,
1003
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
1004
1133
                # Is this a D-Bus property?
1005
1134
                elif getattr(attribute, "_dbus_is_property", False):
1006
1135
                    # Create a new, but exactly alike, function
1020
1149
                                        attribute.func_name,
1021
1150
                                        attribute.func_defaults,
1022
1151
                                        attribute.func_closure)))
1023
 
        return type.__new__(mcs, name, bases, attr)
1024
 
 
1025
 
 
 
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"})
1026
1197
class ClientDBus(Client, DBusObjectWithProperties):
1027
1198
    """A Client class using D-Bus
1028
1199
    
1039
1210
    def __init__(self, bus = None, *args, **kwargs):
1040
1211
        self.bus = bus
1041
1212
        Client.__init__(self, *args, **kwargs)
1042
 
        self._approvals_pending = 0
1043
 
        
1044
 
        self._approvals_pending = 0
1045
1213
        # Only now, when this client is initialized, can it show up on
1046
1214
        # the D-Bus
1047
1215
        client_object_name = unicode(self.name).translate(
1051
1219
                                 ("/clients/" + client_object_name))
1052
1220
        DBusObjectWithProperties.__init__(self, self.bus,
1053
1221
                                          self.dbus_object_path)
1054
 
        
 
1222
    
1055
1223
    def notifychangeproperty(transform_func,
1056
1224
                             dbus_name, type_func=lambda x: x,
1057
1225
                             variant_level=1):
1080
1248
        
1081
1249
        return property(lambda self: getattr(self, attrname), setter)
1082
1250
    
1083
 
    
1084
1251
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1085
1252
    approvals_pending = notifychangeproperty(dbus.Boolean,
1086
1253
                                             "ApprovalPending",
1093
1260
                                       checker is not None)
1094
1261
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1095
1262
                                           "LastCheckedOK")
 
1263
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1264
                                               "LastCheckerStatus")
1096
1265
    last_approval_request = notifychangeproperty(
1097
1266
        datetime_to_dbus, "LastApprovalRequest")
1098
1267
    approved_by_default = notifychangeproperty(dbus.Boolean,
1172
1341
                            (self.approval_duration),
1173
1342
                            self._reset_approved)
1174
1343
    
1175
 
    
1176
1344
    ## D-Bus methods, signals & properties
1177
1345
    _interface = "se.recompile.Mandos.Client"
1178
1346
    
 
1347
    ## Interfaces
 
1348
    
 
1349
    @dbus_interface_annotations(_interface)
 
1350
    def _foo(self):
 
1351
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1352
                     "false"}
 
1353
    
1179
1354
    ## Signals
1180
1355
    
1181
1356
    # CheckerCompleted - signal
1217
1392
        "D-Bus signal"
1218
1393
        return self.need_approval()
1219
1394
    
1220
 
    # NeRwequest - signal
1221
 
    @dbus.service.signal(_interface, signature="s")
1222
 
    def NewRequest(self, ip):
1223
 
        """D-Bus signal
1224
 
        Is sent after a client request a password.
1225
 
        """
1226
 
        pass
1227
 
    
1228
1395
    ## Methods
1229
1396
    
1230
1397
    # Approve - method
1340
1507
            return
1341
1508
        return datetime_to_dbus(self.last_checked_ok)
1342
1509
    
 
1510
    # LastCheckerStatus - property
 
1511
    @dbus_service_property(_interface, signature="n",
 
1512
                           access="read")
 
1513
    def LastCheckerStatus_dbus_property(self):
 
1514
        return dbus.Int16(self.last_checker_status)
 
1515
    
1343
1516
    # Expires - property
1344
1517
    @dbus_service_property(_interface, signature="s", access="read")
1345
1518
    def Expires_dbus_property(self):
1357
1530
        if value is None:       # get
1358
1531
            return dbus.UInt64(self.timeout_milliseconds())
1359
1532
        self.timeout = datetime.timedelta(0, 0, 0, value)
1360
 
        if getattr(self, "disable_initiator_tag", None) is None:
1361
 
            return
1362
1533
        # Reschedule timeout
1363
 
        gobject.source_remove(self.disable_initiator_tag)
1364
 
        self.disable_initiator_tag = None
1365
 
        self.expires = None
1366
 
        time_to_die = timedelta_to_milliseconds((self
1367
 
                                                 .last_checked_ok
1368
 
                                                 + self.timeout)
1369
 
                                                - datetime.datetime
1370
 
                                                .utcnow())
1371
 
        if time_to_die <= 0:
1372
 
            # The timeout has passed
1373
 
            self.disable()
1374
 
        else:
1375
 
            self.expires = (datetime.datetime.utcnow()
1376
 
                            + datetime.timedelta(milliseconds =
1377
 
                                                 time_to_die))
1378
 
            self.disable_initiator_tag = (gobject.timeout_add
1379
 
                                          (time_to_die, self.disable))
 
1534
        if self.enabled:
 
1535
            now = datetime.datetime.utcnow()
 
1536
            time_to_die = timedelta_to_milliseconds(
 
1537
                (self.last_checked_ok + self.timeout) - now)
 
1538
            if time_to_die <= 0:
 
1539
                # The timeout has passed
 
1540
                self.disable()
 
1541
            else:
 
1542
                self.expires = (now +
 
1543
                                datetime.timedelta(milliseconds =
 
1544
                                                   time_to_die))
 
1545
                if (getattr(self, "disable_initiator_tag", None)
 
1546
                    is None):
 
1547
                    return
 
1548
                gobject.source_remove(self.disable_initiator_tag)
 
1549
                self.disable_initiator_tag = (gobject.timeout_add
 
1550
                                              (time_to_die,
 
1551
                                               self.disable))
1380
1552
    
1381
1553
    # ExtendedTimeout - property
1382
1554
    @dbus_service_property(_interface, signature="t",
1461
1633
        self._pipe.send(('setattr', name, value))
1462
1634
 
1463
1635
 
1464
 
class ClientDBusTransitional(ClientDBus):
1465
 
    __metaclass__ = AlternateDBusNamesMetaclass
1466
 
 
1467
 
 
1468
1636
class ClientHandler(socketserver.BaseRequestHandler, object):
1469
1637
    """A class to handle client connections.
1470
1638
    
1538
1706
                except KeyError:
1539
1707
                    return
1540
1708
                
1541
 
                if self.server.use_dbus:
1542
 
                    # Emit D-Bus signal
1543
 
                    client.NewRequest(str(self.client_address))
1544
 
                
1545
1709
                if client.approval_delay:
1546
1710
                    delay = client.approval_delay
1547
1711
                    client.approvals_pending += 1
1602
1766
                    try:
1603
1767
                        sent = session.send(client.secret[sent_size:])
1604
1768
                    except gnutls.errors.GNUTLSError as error:
1605
 
                        logger.warning("gnutls send failed")
 
1769
                        logger.warning("gnutls send failed",
 
1770
                                       exc_info=error)
1606
1771
                        return
1607
1772
                    logger.debug("Sent: %d, remaining: %d",
1608
1773
                                 sent, len(client.secret)
1611
1776
                
1612
1777
                logger.info("Sending secret to %s", client.name)
1613
1778
                # bump the timeout using extended_timeout
1614
 
                client.checked_ok(client.extended_timeout)
 
1779
                client.bump_timeout(client.extended_timeout)
1615
1780
                if self.server.use_dbus:
1616
1781
                    # Emit D-Bus signal
1617
1782
                    client.GotSecret()
1622
1787
                try:
1623
1788
                    session.bye()
1624
1789
                except gnutls.errors.GNUTLSError as error:
1625
 
                    logger.warning("GnuTLS bye failed")
 
1790
                    logger.warning("GnuTLS bye failed",
 
1791
                                   exc_info=error)
1626
1792
    
1627
1793
    @staticmethod
1628
1794
    def peer_certificate(session):
1700
1866
    def process_request(self, request, address):
1701
1867
        """Start a new process to process the request."""
1702
1868
        proc = multiprocessing.Process(target = self.sub_process_main,
1703
 
                                       args = (request,
1704
 
                                               address))
 
1869
                                       args = (request, address))
1705
1870
        proc.start()
1706
1871
        return proc
1707
1872
 
1829
1994
    
1830
1995
    def handle_ipc(self, source, condition, parent_pipe=None,
1831
1996
                   proc = None, client_object=None):
1832
 
        condition_names = {
1833
 
            gobject.IO_IN: "IN",   # There is data to read.
1834
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1835
 
                                    # blocking).
1836
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1837
 
            gobject.IO_ERR: "ERR", # Error condition.
1838
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1839
 
                                    # broken, usually for pipes and
1840
 
                                    # sockets).
1841
 
            }
1842
 
        conditions_string = ' | '.join(name
1843
 
                                       for cond, name in
1844
 
                                       condition_names.iteritems()
1845
 
                                       if cond & condition)
1846
1997
        # error, or the other end of multiprocessing.Pipe has closed
1847
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1998
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1848
1999
            # Wait for other process to exit
1849
2000
            proc.join()
1850
2001
            return False
1940
2091
            elif suffix == "w":
1941
2092
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1942
2093
            else:
1943
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2094
                raise ValueError("Unknown suffix {0!r}"
 
2095
                                 .format(suffix))
1944
2096
        except (ValueError, IndexError) as e:
1945
2097
            raise ValueError(*(e.args))
1946
2098
        timevalue += delta
1960
2112
        sys.exit()
1961
2113
    if not noclose:
1962
2114
        # Close all standard open file descriptors
1963
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2115
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1964
2116
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1965
2117
            raise OSError(errno.ENODEV,
1966
 
                          "%s not a character device"
1967
 
                          % os.path.devnull)
 
2118
                          "{0} not a character device"
 
2119
                          .format(os.devnull))
1968
2120
        os.dup2(null, sys.stdin.fileno())
1969
2121
        os.dup2(null, sys.stdout.fileno())
1970
2122
        os.dup2(null, sys.stderr.fileno())
1979
2131
    
1980
2132
    parser = argparse.ArgumentParser()
1981
2133
    parser.add_argument("-v", "--version", action="version",
1982
 
                        version = "%%(prog)s %s" % version,
 
2134
                        version = "%(prog)s {0}".format(version),
1983
2135
                        help="show version number and exit")
1984
2136
    parser.add_argument("-i", "--interface", metavar="IF",
1985
2137
                        help="Bind to interface IF")
2078
2230
                                     stored_state_file)
2079
2231
    
2080
2232
    if debug:
2081
 
        initlogger(logging.DEBUG)
 
2233
        initlogger(debug, logging.DEBUG)
2082
2234
    else:
2083
2235
        if not debuglevel:
2084
 
            initlogger()
 
2236
            initlogger(debug)
2085
2237
        else:
2086
2238
            level = getattr(logging, debuglevel.upper())
2087
 
            initlogger(level)
 
2239
            initlogger(debug, level)
2088
2240
    
2089
2241
    if server_settings["servicename"] != "Mandos":
2090
2242
        syslogger.setFormatter(logging.Formatter
2091
 
                               ('Mandos (%s) [%%(process)d]:'
2092
 
                                ' %%(levelname)s: %%(message)s'
2093
 
                                % server_settings["servicename"]))
 
2243
                               ('Mandos ({0}) [%(process)d]:'
 
2244
                                ' %(levelname)s: %(message)s'
 
2245
                                .format(server_settings
 
2246
                                        ["servicename"])))
2094
2247
    
2095
2248
    # Parse config file with clients
2096
 
    client_config = configparser.SafeConfigParser(Client.client_defaults)
 
2249
    client_config = configparser.SafeConfigParser(Client
 
2250
                                                  .client_defaults)
2097
2251
    client_config.read(os.path.join(server_settings["configdir"],
2098
2252
                                    "clients.conf"))
2099
2253
    
2113
2267
        pidfilename = "/var/run/mandos.pid"
2114
2268
        try:
2115
2269
            pidfile = open(pidfilename, "w")
2116
 
        except IOError:
2117
 
            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)
2118
2273
    
2119
 
    try:
2120
 
        uid = pwd.getpwnam("_mandos").pw_uid
2121
 
        gid = pwd.getpwnam("_mandos").pw_gid
2122
 
    except KeyError:
 
2274
    for name in ("_mandos", "mandos", "nobody"):
2123
2275
        try:
2124
 
            uid = pwd.getpwnam("mandos").pw_uid
2125
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2276
            uid = pwd.getpwnam(name).pw_uid
 
2277
            gid = pwd.getpwnam(name).pw_gid
 
2278
            break
2126
2279
        except KeyError:
2127
 
            try:
2128
 
                uid = pwd.getpwnam("nobody").pw_uid
2129
 
                gid = pwd.getpwnam("nobody").pw_gid
2130
 
            except KeyError:
2131
 
                uid = 65534
2132
 
                gid = 65534
 
2280
            continue
 
2281
    else:
 
2282
        uid = 65534
 
2283
        gid = 65534
2133
2284
    try:
2134
2285
        os.setgid(gid)
2135
2286
        os.setuid(uid)
2152
2303
         .gnutls_global_set_log_function(debug_gnutls))
2153
2304
        
2154
2305
        # Redirect stdin so all checkers get /dev/null
2155
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2306
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2156
2307
        os.dup2(null, sys.stdin.fileno())
2157
2308
        if null > 2:
2158
2309
            os.close(null)
2159
 
    else:
2160
 
        # No console logging
2161
 
        logger.removeHandler(console)
2162
2310
    
2163
2311
    # Need to fork before connecting to D-Bus
2164
2312
    if not debug:
2165
2313
        # Close all input and output, do double fork, etc.
2166
2314
        daemon()
2167
2315
    
 
2316
    gobject.threads_init()
 
2317
    
2168
2318
    global main_loop
2169
2319
    # From the Avahi example code
2170
 
    DBusGMainLoop(set_as_default=True )
 
2320
    DBusGMainLoop(set_as_default=True)
2171
2321
    main_loop = gobject.MainLoop()
2172
2322
    bus = dbus.SystemBus()
2173
2323
    # End of Avahi example code
2179
2329
                            ("se.bsnet.fukt.Mandos", bus,
2180
2330
                             do_not_queue=True))
2181
2331
        except dbus.exceptions.NameExistsException as e:
2182
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2332
            logger.error("Disabling D-Bus:", exc_info=e)
2183
2333
            use_dbus = False
2184
2334
            server_settings["use_dbus"] = False
2185
2335
            tcp_server.use_dbus = False
2197
2347
    
2198
2348
    client_class = Client
2199
2349
    if use_dbus:
2200
 
        client_class = functools.partial(ClientDBusTransitional,
2201
 
                                         bus = bus)
 
2350
        client_class = functools.partial(ClientDBus, bus = bus)
2202
2351
    
2203
2352
    client_settings = Client.config_parser(client_config)
2204
2353
    old_client_settings = {}
2212
2361
                                                     (stored_state))
2213
2362
            os.remove(stored_state_path)
2214
2363
        except IOError as e:
2215
 
            logger.warning("Could not load persistent state: {0}"
2216
 
                           .format(e))
2217
 
            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)
2218
2370
                raise
 
2371
        except EOFError as e:
 
2372
            logger.warning("Could not load persistent state: "
 
2373
                           "EOFError:", exc_info=e)
2219
2374
    
2220
2375
    with PGPEngine() as pgp:
2221
2376
        for client_name, client in clients_data.iteritems():
2238
2393
            
2239
2394
            # Clients who has passed its expire date can still be
2240
2395
            # enabled if its last checker was successful.  Clients
2241
 
            # whose checker failed before we stored its state is
2242
 
            # assumed to have failed all checkers during downtime.
 
2396
            # whose checker succeeded before we stored its state is
 
2397
            # assumed to have successfully run all checkers during
 
2398
            # downtime.
2243
2399
            if client["enabled"]:
2244
2400
                if datetime.datetime.utcnow() >= client["expires"]:
2245
2401
                    if not client["last_checked_ok"]:
2246
2402
                        logger.warning(
2247
2403
                            "disabling client {0} - Client never "
2248
 
                            "performed a successfull checker"
2249
 
                            .format(client["name"]))
 
2404
                            "performed a successful checker"
 
2405
                            .format(client_name))
2250
2406
                        client["enabled"] = False
2251
2407
                    elif client["last_checker_status"] != 0:
2252
2408
                        logger.warning(
2253
2409
                            "disabling client {0} - Client "
2254
2410
                            "last checker failed with error code {1}"
2255
 
                            .format(client["name"],
 
2411
                            .format(client_name,
2256
2412
                                    client["last_checker_status"]))
2257
2413
                        client["enabled"] = False
2258
2414
                    else:
2259
2415
                        client["expires"] = (datetime.datetime
2260
2416
                                             .utcnow()
2261
2417
                                             + client["timeout"])
2262
 
                    
 
2418
                        logger.debug("Last checker succeeded,"
 
2419
                                     " keeping {0} enabled"
 
2420
                                     .format(client_name))
2263
2421
            try:
2264
2422
                client["secret"] = (
2265
2423
                    pgp.decrypt(client["encrypted_secret"],
2271
2429
                             .format(client_name))
2272
2430
                client["secret"] = (
2273
2431
                    client_settings[client_name]["secret"])
2274
 
 
2275
2432
    
2276
2433
    # Add/remove clients based on new changes made to config
2277
 
    for client_name in set(old_client_settings) - set(client_settings):
 
2434
    for client_name in (set(old_client_settings)
 
2435
                        - set(client_settings)):
2278
2436
        del clients_data[client_name]
2279
 
    for client_name in set(client_settings) - set(old_client_settings):
 
2437
    for client_name in (set(client_settings)
 
2438
                        - set(old_client_settings)):
2280
2439
        clients_data[client_name] = client_settings[client_name]
2281
 
 
2282
 
    # Create clients all clients
 
2440
    
 
2441
    # Create all client objects
2283
2442
    for client_name, client in clients_data.iteritems():
2284
2443
        tcp_server.clients[client_name] = client_class(
2285
2444
            name = client_name, settings = client)
2286
2445
    
2287
2446
    if not tcp_server.clients:
2288
2447
        logger.warning("No clients defined")
2289
 
        
 
2448
    
2290
2449
    if not debug:
2291
2450
        try:
2292
2451
            with pidfile:
2306
2465
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2307
2466
    
2308
2467
    if use_dbus:
2309
 
        class MandosDBusService(dbus.service.Object):
 
2468
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2469
                                        "se.bsnet.fukt.Mandos"})
 
2470
        class MandosDBusService(DBusObjectWithProperties):
2310
2471
            """A D-Bus proxy object"""
2311
2472
            def __init__(self):
2312
2473
                dbus.service.Object.__init__(self, bus, "/")
2313
2474
            _interface = "se.recompile.Mandos"
2314
2475
            
 
2476
            @dbus_interface_annotations(_interface)
 
2477
            def _foo(self):
 
2478
                return { "org.freedesktop.DBus.Property"
 
2479
                         ".EmitsChangedSignal":
 
2480
                             "false"}
 
2481
            
2315
2482
            @dbus.service.signal(_interface, signature="o")
2316
2483
            def ClientAdded(self, objpath):
2317
2484
                "D-Bus signal"
2359
2526
            
2360
2527
            del _interface
2361
2528
        
2362
 
        class MandosDBusServiceTransitional(MandosDBusService):
2363
 
            __metaclass__ = AlternateDBusNamesMetaclass
2364
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2529
        mandos_dbus_service = MandosDBusService()
2365
2530
    
2366
2531
    def cleanup():
2367
2532
        "Cleanup function; run on exit"
2400
2565
                del client_settings[client.name]["secret"]
2401
2566
        
2402
2567
        try:
2403
 
            with os.fdopen(os.open(stored_state_path,
2404
 
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2405
 
                                   0600), "wb") as stored_state:
 
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:
2406
2572
                pickle.dump((clients, client_settings), stored_state)
 
2573
                tempname=stored_state.name
 
2574
            os.rename(tempname, stored_state_path)
2407
2575
        except (IOError, OSError) as e:
2408
 
            logger.warning("Could not save persistent state: {0}"
2409
 
                           .format(e))
2410
 
            if e.errno not in (errno.ENOENT, errno.EACCES):
2411
 
                raise
 
2576
            if not debug:
 
2577
                try:
 
2578
                    os.remove(tempname)
 
2579
                except NameError:
 
2580
                    pass
 
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)
 
2587
                raise e
2412
2588
        
2413
2589
        # Delete all clients, and settings from config
2414
2590
        while tcp_server.clients:
2441
2617
    service.port = tcp_server.socket.getsockname()[1]
2442
2618
    if use_ipv6:
2443
2619
        logger.info("Now listening on address %r, port %d,"
2444
 
                    " flowinfo %d, scope_id %d"
2445
 
                    % tcp_server.socket.getsockname())
 
2620
                    " flowinfo %d, scope_id %d",
 
2621
                    *tcp_server.socket.getsockname())
2446
2622
    else:                       # IPv4
2447
 
        logger.info("Now listening on address %r, port %d"
2448
 
                    % tcp_server.socket.getsockname())
 
2623
        logger.info("Now listening on address %r, port %d",
 
2624
                    *tcp_server.socket.getsockname())
2449
2625
    
2450
2626
    #service.interface = tcp_server.socket.getsockname()[3]
2451
2627
    
2454
2630
        try:
2455
2631
            service.activate()
2456
2632
        except dbus.exceptions.DBusException as error:
2457
 
            logger.critical("DBusException: %s", error)
 
2633
            logger.critical("D-Bus Exception", exc_info=error)
2458
2634
            cleanup()
2459
2635
            sys.exit(1)
2460
2636
        # End of Avahi example code
2467
2643
        logger.debug("Starting main loop")
2468
2644
        main_loop.run()
2469
2645
    except AvahiError as error:
2470
 
        logger.critical("AvahiError: %s", error)
 
2646
        logger.critical("Avahi Error", exc_info=error)
2471
2647
        cleanup()
2472
2648
        sys.exit(1)
2473
2649
    except KeyboardInterrupt: