/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

  • Committer: Teddy Hogeborn
  • Date: 2012-01-01 20:47:06 UTC
  • mfrom: (237.7.98 trunk)
  • Revision ID: teddy@recompile.se-20120101204706-0lhdhlrhkrkwjekv
MergeĀ fromĀ trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
67
65
import types
68
66
import binascii
69
67
import tempfile
70
 
import itertools
71
68
 
72
69
import dbus
73
70
import dbus.service
88
85
    except ImportError:
89
86
        SO_BINDTODEVICE = None
90
87
 
91
 
version = "1.5.3"
 
88
version = "1.5.0"
92
89
stored_state_file = "clients.pickle"
93
90
 
94
91
logger = logging.getLogger()
178
175
    
179
176
    def encrypt(self, data, password):
180
177
        self.gnupg.passphrase = self.password_encode(password)
181
 
        with open(os.devnull, "w") as devnull:
 
178
        with open(os.devnull) as devnull:
182
179
            try:
183
180
                proc = self.gnupg.run(['--symmetric'],
184
181
                                      create_fhs=['stdin', 'stdout'],
195
192
    
196
193
    def decrypt(self, data, password):
197
194
        self.gnupg.passphrase = self.password_encode(password)
198
 
        with open(os.devnull, "w") as devnull:
 
195
        with open(os.devnull) as devnull:
199
196
            try:
200
197
                proc = self.gnupg.run(['--decrypt'],
201
198
                                      create_fhs=['stdin', 'stdout'],
202
199
                                      attach_fhs={'stderr': devnull})
203
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
200
                with contextlib.closing(proc.handles['stdin'] ) as f:
204
201
                    f.write(data)
205
202
                with contextlib.closing(proc.handles['stdout']) as f:
206
203
                    decrypted_plaintext = f.read()
211
208
        return decrypted_plaintext
212
209
 
213
210
 
 
211
 
214
212
class AvahiError(Exception):
215
213
    def __init__(self, value, *args, **kwargs):
216
214
        self.value = value
245
243
    server: D-Bus Server
246
244
    bus: dbus.SystemBus()
247
245
    """
248
 
    
249
246
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
250
247
                 servicetype = None, port = None, TXT = None,
251
248
                 domain = "", host = "", max_renames = 32768,
264
261
        self.server = None
265
262
        self.bus = bus
266
263
        self.entry_group_state_changed_match = None
267
 
    
268
264
    def rename(self):
269
265
        """Derived from the Avahi example code"""
270
266
        if self.rename_count >= self.max_renames:
280
276
        try:
281
277
            self.add()
282
278
        except dbus.exceptions.DBusException as error:
283
 
            logger.critical("D-Bus Exception", exc_info=error)
 
279
            logger.critical("DBusException: %s", error)
284
280
            self.cleanup()
285
281
            os._exit(1)
286
282
        self.rename_count += 1
287
 
    
288
283
    def remove(self):
289
284
        """Derived from the Avahi example code"""
290
285
        if self.entry_group_state_changed_match is not None:
292
287
            self.entry_group_state_changed_match = None
293
288
        if self.group is not None:
294
289
            self.group.Reset()
295
 
    
296
290
    def add(self):
297
291
        """Derived from the Avahi example code"""
298
292
        self.remove()
315
309
            dbus.UInt16(self.port),
316
310
            avahi.string_array_to_txt_array(self.TXT))
317
311
        self.group.Commit()
318
 
    
319
312
    def entry_group_state_changed(self, state, error):
320
313
        """Derived from the Avahi example code"""
321
314
        logger.debug("Avahi entry group state change: %i", state)
328
321
        elif state == avahi.ENTRY_GROUP_FAILURE:
329
322
            logger.critical("Avahi: Error in group state changed %s",
330
323
                            unicode(error))
331
 
            raise AvahiGroupError("State changed: {0!s}"
332
 
                                  .format(error))
333
 
    
 
324
            raise AvahiGroupError("State changed: %s"
 
325
                                  % unicode(error))
334
326
    def cleanup(self):
335
327
        """Derived from the Avahi example code"""
336
328
        if self.group is not None:
341
333
                pass
342
334
            self.group = None
343
335
        self.remove()
344
 
    
345
336
    def server_state_changed(self, state, error=None):
346
337
        """Derived from the Avahi example code"""
347
338
        logger.debug("Avahi server state change: %i", state)
366
357
                logger.debug("Unknown state: %r", state)
367
358
            else:
368
359
                logger.debug("Unknown state: %r: %r", state, error)
369
 
    
370
360
    def activate(self):
371
361
        """Derived from the Avahi example code"""
372
362
        if self.server is None:
379
369
                                 self.server_state_changed)
380
370
        self.server_state_changed(self.server.GetState())
381
371
 
382
 
 
383
372
class AvahiServiceToSyslog(AvahiService):
384
373
    def rename(self):
385
374
        """Add the new name to the syslog messages"""
386
375
        ret = AvahiService.rename(self)
387
376
        syslogger.setFormatter(logging.Formatter
388
 
                               ('Mandos ({0}) [%(process)d]:'
389
 
                                ' %(levelname)s: %(message)s'
390
 
                                .format(self.name)))
 
377
                               ('Mandos (%s) [%%(process)d]:'
 
378
                                ' %%(levelname)s: %%(message)s'
 
379
                                % self.name))
391
380
        return ret
392
381
 
393
 
 
394
382
def timedelta_to_milliseconds(td):
395
383
    "Convert a datetime.timedelta() to milliseconds"
396
384
    return ((td.days * 24 * 60 * 60 * 1000)
397
385
            + (td.seconds * 1000)
398
386
            + (td.microseconds // 1000))
399
 
 
400
 
 
 
387
        
401
388
class Client(object):
402
389
    """A representation of a client host served by this server.
403
390
    
428
415
    last_checked_ok: datetime.datetime(); (UTC) or None
429
416
    last_checker_status: integer between 0 and 255 reflecting exit
430
417
                         status of last checker. -1 reflects crashed
431
 
                         checker, -2 means no checker completed yet.
 
418
                         checker, or None.
432
419
    last_enabled: datetime.datetime(); (UTC) or None
433
420
    name:       string; from the config file, used in log messages and
434
421
                        D-Bus identifiers
435
422
    secret:     bytestring; sent verbatim (over TLS) to client
436
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
437
424
                                      until this client is disabled
438
 
    extended_timeout:   extra long timeout when secret has been sent
 
425
    extended_timeout:   extra long timeout when password has been sent
439
426
    runtime_expansions: Allowed attributes for runtime expansion.
440
427
    expires:    datetime.datetime(); time (UTC) when a client will be
441
428
                disabled, or None
470
457
    
471
458
    def approval_delay_milliseconds(self):
472
459
        return timedelta_to_milliseconds(self.approval_delay)
473
 
    
 
460
 
474
461
    @staticmethod
475
462
    def config_parser(config):
476
463
        """Construct a new dict of client settings of this form:
501
488
                          "rb") as secfile:
502
489
                    client["secret"] = secfile.read()
503
490
            else:
504
 
                raise TypeError("No secret or secfile for section {0}"
505
 
                                .format(section))
 
491
                raise TypeError("No secret or secfile for section %s"
 
492
                                % section)
506
493
            client["timeout"] = string_to_delta(section["timeout"])
507
494
            client["extended_timeout"] = string_to_delta(
508
495
                section["extended_timeout"])
514
501
            client["checker_command"] = section["checker"]
515
502
            client["last_approval_request"] = None
516
503
            client["last_checked_ok"] = None
517
 
            client["last_checker_status"] = -2
 
504
            client["last_checker_status"] = None
518
505
        
519
506
        return settings
520
 
    
 
507
        
 
508
        
521
509
    def __init__(self, settings, name = None):
 
510
        """Note: the 'checker' key in 'config' sets the
 
511
        'checker_command' attribute and *not* the 'checker'
 
512
        attribute."""
522
513
        self.name = name
523
514
        # adding all client settings
524
515
        for setting, value in settings.iteritems():
533
524
        else:
534
525
            self.last_enabled = None
535
526
            self.expires = None
536
 
        
 
527
       
537
528
        logger.debug("Creating client %r", self.name)
538
529
        # Uppercase and remove spaces from fingerprint for later
539
530
        # comparison purposes with return value from the fingerprint()
541
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
542
533
        self.created = settings.get("created",
543
534
                                    datetime.datetime.utcnow())
544
 
        
 
535
 
545
536
        # attributes specific for this server instance
546
537
        self.checker = None
547
538
        self.checker_initiator_tag = None
575
566
        if getattr(self, "enabled", False):
576
567
            # Already enabled
577
568
            return
 
569
        self.send_changedstate()
578
570
        self.expires = datetime.datetime.utcnow() + self.timeout
579
571
        self.enabled = True
580
572
        self.last_enabled = datetime.datetime.utcnow()
581
573
        self.init_checker()
582
 
        self.send_changedstate()
583
574
    
584
575
    def disable(self, quiet=True):
585
576
        """Disable this client."""
586
577
        if not getattr(self, "enabled", False):
587
578
            return False
588
579
        if not quiet:
 
580
            self.send_changedstate()
 
581
        if not quiet:
589
582
            logger.info("Disabling client %s", self.name)
590
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
583
        if getattr(self, "disable_initiator_tag", False):
591
584
            gobject.source_remove(self.disable_initiator_tag)
592
585
            self.disable_initiator_tag = None
593
586
        self.expires = None
594
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
587
        if getattr(self, "checker_initiator_tag", False):
595
588
            gobject.source_remove(self.checker_initiator_tag)
596
589
            self.checker_initiator_tag = None
597
590
        self.stop_checker()
598
591
        self.enabled = False
599
 
        if not quiet:
600
 
            self.send_changedstate()
601
592
        # Do not run this again if called by a gobject.timeout_add
602
593
        return False
603
594
    
607
598
    def init_checker(self):
608
599
        # Schedule a new checker to be started an 'interval' from now,
609
600
        # and every interval from then on.
610
 
        if self.checker_initiator_tag is not None:
611
 
            gobject.source_remove(self.checker_initiator_tag)
612
601
        self.checker_initiator_tag = (gobject.timeout_add
613
602
                                      (self.interval_milliseconds(),
614
603
                                       self.start_checker))
615
604
        # Schedule a disable() when 'timeout' has passed
616
 
        if self.disable_initiator_tag is not None:
617
 
            gobject.source_remove(self.disable_initiator_tag)
618
605
        self.disable_initiator_tag = (gobject.timeout_add
619
606
                                   (self.timeout_milliseconds(),
620
607
                                    self.disable))
639
626
            logger.warning("Checker for %(name)s crashed?",
640
627
                           vars(self))
641
628
    
642
 
    def checked_ok(self):
643
 
        """Assert that the client has been seen, alive and well."""
644
 
        self.last_checked_ok = datetime.datetime.utcnow()
645
 
        self.last_checker_status = 0
646
 
        self.bump_timeout()
647
 
    
648
 
    def bump_timeout(self, timeout=None):
649
 
        """Bump up the timeout for this client."""
 
629
    def checked_ok(self, timeout=None):
 
630
        """Bump up the timeout for this client.
 
631
        
 
632
        This should only be called when the client has been seen,
 
633
        alive and well.
 
634
        """
650
635
        if timeout is None:
651
636
            timeout = self.timeout
 
637
        self.last_checked_ok = datetime.datetime.utcnow()
652
638
        if self.disable_initiator_tag is not None:
653
639
            gobject.source_remove(self.disable_initiator_tag)
654
 
            self.disable_initiator_tag = None
655
640
        if getattr(self, "enabled", False):
656
641
            self.disable_initiator_tag = (gobject.timeout_add
657
642
                                          (timedelta_to_milliseconds
667
652
        If a checker already exists, leave it running and do
668
653
        nothing."""
669
654
        # The reason for not killing a running checker is that if we
670
 
        # did that, and if a checker (for some reason) started running
671
 
        # slowly and taking more than 'interval' time, then the client
672
 
        # would inevitably timeout, since no checker would get a
673
 
        # chance to run to completion.  If we instead leave running
 
655
        # did that, then if a checker (for some reason) started
 
656
        # running slowly and taking more than 'interval' time, the
 
657
        # client would inevitably timeout, since no checker would get
 
658
        # a chance to run to completion.  If we instead leave running
674
659
        # checkers alone, the checker would have to take more time
675
660
        # than 'timeout' for the client to be disabled, which is as it
676
661
        # should be.
690
675
                                      self.current_checker_command)
691
676
        # Start a new checker if needed
692
677
        if self.checker is None:
693
 
            # Escape attributes for the shell
694
 
            escaped_attrs = dict(
695
 
                (attr, re.escape(unicode(getattr(self, attr))))
696
 
                for attr in
697
 
                self.runtime_expansions)
698
678
            try:
699
 
                command = self.checker_command % escaped_attrs
700
 
            except TypeError as error:
701
 
                logger.error('Could not format string "%s"',
702
 
                             self.checker_command, exc_info=error)
703
 
                return True # Try again later
 
679
                # In case checker_command has exactly one % operator
 
680
                command = self.checker_command % self.host
 
681
            except TypeError:
 
682
                # Escape attributes for the shell
 
683
                escaped_attrs = dict(
 
684
                    (attr,
 
685
                     re.escape(unicode(str(getattr(self, attr, "")),
 
686
                                       errors=
 
687
                                       'replace')))
 
688
                    for attr in
 
689
                    self.runtime_expansions)
 
690
                
 
691
                try:
 
692
                    command = self.checker_command % escaped_attrs
 
693
                except TypeError as error:
 
694
                    logger.error('Could not format string "%s":'
 
695
                                 ' %s', self.checker_command, error)
 
696
                    return True # Try again later
704
697
            self.current_checker_command = command
705
698
            try:
706
699
                logger.info("Starting checker %r for %s",
712
705
                self.checker = subprocess.Popen(command,
713
706
                                                close_fds=True,
714
707
                                                shell=True, cwd="/")
 
708
                self.checker_callback_tag = (gobject.child_watch_add
 
709
                                             (self.checker.pid,
 
710
                                              self.checker_callback,
 
711
                                              data=command))
 
712
                # The checker may have completed before the gobject
 
713
                # watch was added.  Check for this.
 
714
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
715
                if pid:
 
716
                    gobject.source_remove(self.checker_callback_tag)
 
717
                    self.checker_callback(pid, status, command)
715
718
            except OSError as error:
716
 
                logger.error("Failed to start subprocess",
717
 
                             exc_info=error)
718
 
            self.checker_callback_tag = (gobject.child_watch_add
719
 
                                         (self.checker.pid,
720
 
                                          self.checker_callback,
721
 
                                          data=command))
722
 
            # The checker may have completed before the gobject
723
 
            # watch was added.  Check for this.
724
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
725
 
            if pid:
726
 
                gobject.source_remove(self.checker_callback_tag)
727
 
                self.checker_callback(pid, status, command)
 
719
                logger.error("Failed to start subprocess: %s",
 
720
                             error)
728
721
        # Re-run this periodically if run by gobject.timeout_add
729
722
        return True
730
723
    
737
730
            return
738
731
        logger.debug("Stopping checker for %(name)s", vars(self))
739
732
        try:
740
 
            self.checker.terminate()
 
733
            os.kill(self.checker.pid, signal.SIGTERM)
741
734
            #time.sleep(0.5)
742
735
            #if self.checker.poll() is None:
743
 
            #    self.checker.kill()
 
736
            #    os.kill(self.checker.pid, signal.SIGKILL)
744
737
        except OSError as error:
745
738
            if error.errno != errno.ESRCH: # No such process
746
739
                raise
763
756
    # "Set" method, so we fail early here:
764
757
    if byte_arrays and signature != "ay":
765
758
        raise ValueError("Byte arrays not supported for non-'ay'"
766
 
                         " signature {0!r}".format(signature))
 
759
                         " signature %r" % signature)
767
760
    def decorator(func):
768
761
        func._dbus_is_property = True
769
762
        func._dbus_interface = dbus_interface
777
770
    return decorator
778
771
 
779
772
 
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
 
 
817
773
class DBusPropertyException(dbus.exceptions.DBusException):
818
774
    """A base class for D-Bus property-related exceptions
819
775
    """
842
798
    """
843
799
    
844
800
    @staticmethod
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)
 
801
    def _is_dbus_property(obj):
 
802
        return getattr(obj, "_dbus_is_property", False)
853
803
    
854
 
    def _get_all_dbus_things(self, thing):
 
804
    def _get_all_dbus_properties(self):
855
805
        """Returns a generator of (name, attribute) pairs
856
806
        """
857
 
        return ((getattr(athing.__get__(self), "_dbus_name",
858
 
                         name),
859
 
                 athing.__get__(self))
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
860
808
                for cls in self.__class__.__mro__
861
 
                for name, athing in
862
 
                inspect.getmembers(cls,
863
 
                                   self._is_dbus_thing(thing)))
 
809
                for name, prop in
 
810
                inspect.getmembers(cls, self._is_dbus_property))
864
811
    
865
812
    def _get_dbus_property(self, interface_name, property_name):
866
813
        """Returns a bound method if one exists which is a D-Bus
868
815
        """
869
816
        for cls in  self.__class__.__mro__:
870
817
            for name, value in (inspect.getmembers
871
 
                                (cls,
872
 
                                 self._is_dbus_thing("property"))):
 
818
                                (cls, self._is_dbus_property)):
873
819
                if (value._dbus_name == property_name
874
820
                    and value._dbus_interface == interface_name):
875
821
                    return value.__get__(self)
917
863
        Note: Will not include properties with access="write".
918
864
        """
919
865
        properties = {}
920
 
        for name, prop in self._get_all_dbus_things("property"):
 
866
        for name, prop in self._get_all_dbus_properties():
921
867
            if (interface_name
922
868
                and interface_name != prop._dbus_interface):
923
869
                # Interface non-empty but did not match
938
884
                         path_keyword='object_path',
939
885
                         connection_keyword='connection')
940
886
    def Introspect(self, object_path, connection):
941
 
        """Overloading of standard D-Bus method.
942
 
        
943
 
        Inserts property tags and interface annotation tags.
 
887
        """Standard D-Bus method, overloaded to insert property tags.
944
888
        """
945
889
        xmlstring = dbus.service.Object.Introspect(self, object_path,
946
890
                                                   connection)
953
897
                e.setAttribute("access", prop._dbus_access)
954
898
                return e
955
899
            for if_tag in document.getElementsByTagName("interface"):
956
 
                # Add property tags
957
900
                for tag in (make_tag(document, name, prop)
958
901
                            for name, prop
959
 
                            in self._get_all_dbus_things("property")
 
902
                            in self._get_all_dbus_properties()
960
903
                            if prop._dbus_interface
961
904
                            == if_tag.getAttribute("name")):
962
905
                    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)
994
906
                # Add the names to the return values for the
995
907
                # "org.freedesktop.DBus.Properties" methods
996
908
                if (if_tag.getAttribute("name")
1011
923
        except (AttributeError, xml.dom.DOMException,
1012
924
                xml.parsers.expat.ExpatError) as error:
1013
925
            logger.error("Failed to override Introspection method",
1014
 
                         exc_info=error)
 
926
                         error)
1015
927
        return xmlstring
1016
928
 
1017
929
 
1023
935
                       variant_level=variant_level)
1024
936
 
1025
937
 
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).
 
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
939
                                  .__metaclass__):
 
940
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
941
    will add additional D-Bus attributes matching a certain pattern.
1048
942
    """
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):
 
943
    def __new__(mcs, name, bases, attr):
 
944
        # Go through all the base classes which could have D-Bus
 
945
        # methods, signals, or properties in them
 
946
        for base in (b for b in bases
 
947
                     if issubclass(b, dbus.service.Object)):
 
948
            # Go though all attributes of the base class
 
949
            for attrname, attribute in inspect.getmembers(base):
1056
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
1057
951
                # with the wrong interface name
1058
952
                if (not hasattr(attribute, "_dbus_interface")
1059
953
                    or not attribute._dbus_interface
1060
 
                    .startswith(orig_interface_name)):
 
954
                    .startswith("se.recompile.Mandos")):
1061
955
                    continue
1062
956
                # Create an alternate D-Bus interface name based on
1063
957
                # the current name
1064
958
                alt_interface = (attribute._dbus_interface
1065
 
                                 .replace(orig_interface_name,
1066
 
                                          alt_interface_name))
1067
 
                interface_names.add(alt_interface)
 
959
                                 .replace("se.recompile.Mandos",
 
960
                                          "se.bsnet.fukt.Mandos"))
1068
961
                # Is this a D-Bus signal?
1069
962
                if getattr(attribute, "_dbus_is_signal", False):
1070
963
                    # Extract the original non-method function by
1085
978
                                nonmethod_func.func_name,
1086
979
                                nonmethod_func.func_defaults,
1087
980
                                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
1094
981
                    # Define a creator of a function to call both the
1095
 
                    # original and alternate functions, so both the
1096
 
                    # original and alternate signals gets sent when
1097
 
                    # the function is called
 
982
                    # old and new functions, so both the old and new
 
983
                    # signals gets sent when the function is called
1098
984
                    def fixscope(func1, func2):
1099
985
                        """This function is a scope container to pass
1100
986
                        func1 and func2 to the "call_both" function
1107
993
                        return call_both
1108
994
                    # Create the "call_both" function and add it to
1109
995
                    # the class
1110
 
                    attr[attrname] = fixscope(attribute, new_function)
 
996
                    attr[attrname] = fixscope(attribute,
 
997
                                              new_function)
1111
998
                # Is this a D-Bus method?
1112
999
                elif getattr(attribute, "_dbus_is_method", False):
1113
1000
                    # Create a new, but exactly alike, function
1124
1011
                                        attribute.func_name,
1125
1012
                                        attribute.func_defaults,
1126
1013
                                        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
1133
1014
                # Is this a D-Bus property?
1134
1015
                elif getattr(attribute, "_dbus_is_property", False):
1135
1016
                    # Create a new, but exactly alike, function
1149
1030
                                        attribute.func_name,
1150
1031
                                        attribute.func_defaults,
1151
1032
                                        attribute.func_closure)))
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"})
 
1033
        return type.__new__(mcs, name, bases, attr)
 
1034
 
 
1035
 
1197
1036
class ClientDBus(Client, DBusObjectWithProperties):
1198
1037
    """A Client class using D-Bus
1199
1038
    
1210
1049
    def __init__(self, bus = None, *args, **kwargs):
1211
1050
        self.bus = bus
1212
1051
        Client.__init__(self, *args, **kwargs)
 
1052
        self._approvals_pending = 0
 
1053
        
 
1054
        self._approvals_pending = 0
1213
1055
        # Only now, when this client is initialized, can it show up on
1214
1056
        # the D-Bus
1215
1057
        client_object_name = unicode(self.name).translate(
1219
1061
                                 ("/clients/" + client_object_name))
1220
1062
        DBusObjectWithProperties.__init__(self, self.bus,
1221
1063
                                          self.dbus_object_path)
1222
 
    
 
1064
        
1223
1065
    def notifychangeproperty(transform_func,
1224
1066
                             dbus_name, type_func=lambda x: x,
1225
1067
                             variant_level=1):
1248
1090
        
1249
1091
        return property(lambda self: getattr(self, attrname), setter)
1250
1092
    
 
1093
    
1251
1094
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1252
1095
    approvals_pending = notifychangeproperty(dbus.Boolean,
1253
1096
                                             "ApprovalPending",
1260
1103
                                       checker is not None)
1261
1104
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1262
1105
                                           "LastCheckedOK")
1263
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1264
 
                                               "LastCheckerStatus")
1265
1106
    last_approval_request = notifychangeproperty(
1266
1107
        datetime_to_dbus, "LastApprovalRequest")
1267
1108
    approved_by_default = notifychangeproperty(dbus.Boolean,
1335
1176
        return False
1336
1177
    
1337
1178
    def approve(self, value=True):
 
1179
        self.send_changedstate()
1338
1180
        self.approved = value
1339
1181
        gobject.timeout_add(timedelta_to_milliseconds
1340
1182
                            (self.approval_duration),
1341
1183
                            self._reset_approved)
1342
 
        self.send_changedstate()
 
1184
    
1343
1185
    
1344
1186
    ## D-Bus methods, signals & properties
1345
1187
    _interface = "se.recompile.Mandos.Client"
1346
1188
    
1347
 
    ## Interfaces
1348
 
    
1349
 
    @dbus_interface_annotations(_interface)
1350
 
    def _foo(self):
1351
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1352
 
                     "false"}
1353
 
    
1354
1189
    ## Signals
1355
1190
    
1356
1191
    # CheckerCompleted - signal
1392
1227
        "D-Bus signal"
1393
1228
        return self.need_approval()
1394
1229
    
 
1230
    # NeRwequest - signal
 
1231
    @dbus.service.signal(_interface, signature="s")
 
1232
    def NewRequest(self, ip):
 
1233
        """D-Bus signal
 
1234
        Is sent after a client request a password.
 
1235
        """
 
1236
        pass
 
1237
    
1395
1238
    ## Methods
1396
1239
    
1397
1240
    # Approve - method
1507
1350
            return
1508
1351
        return datetime_to_dbus(self.last_checked_ok)
1509
1352
    
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
 
    
1516
1353
    # Expires - property
1517
1354
    @dbus_service_property(_interface, signature="s", access="read")
1518
1355
    def Expires_dbus_property(self):
1529
1366
    def Timeout_dbus_property(self, value=None):
1530
1367
        if value is None:       # get
1531
1368
            return dbus.UInt64(self.timeout_milliseconds())
1532
 
        old_timeout = self.timeout
1533
1369
        self.timeout = datetime.timedelta(0, 0, 0, value)
1534
 
        # Reschedule disabling
 
1370
        # Reschedule timeout
1535
1371
        if self.enabled:
1536
1372
            now = datetime.datetime.utcnow()
1537
 
            self.expires += self.timeout - old_timeout
1538
 
            if self.expires <= now:
 
1373
            time_to_die = timedelta_to_milliseconds(
 
1374
                (self.last_checked_ok + self.timeout) - now)
 
1375
            if time_to_die <= 0:
1539
1376
                # The timeout has passed
1540
1377
                self.disable()
1541
1378
            else:
 
1379
                self.expires = (now +
 
1380
                                datetime.timedelta(milliseconds =
 
1381
                                                   time_to_die))
1542
1382
                if (getattr(self, "disable_initiator_tag", None)
1543
1383
                    is None):
1544
1384
                    return
1545
1385
                gobject.source_remove(self.disable_initiator_tag)
1546
 
                self.disable_initiator_tag = (
1547
 
                    gobject.timeout_add(
1548
 
                        timedelta_to_milliseconds(self.expires - now),
1549
 
                        self.disable))
 
1386
                self.disable_initiator_tag = (gobject.timeout_add
 
1387
                                              (time_to_die,
 
1388
                                               self.disable))
1550
1389
    
1551
1390
    # ExtendedTimeout - property
1552
1391
    @dbus_service_property(_interface, signature="t",
1631
1470
        self._pipe.send(('setattr', name, value))
1632
1471
 
1633
1472
 
 
1473
class ClientDBusTransitional(ClientDBus):
 
1474
    __metaclass__ = AlternateDBusNamesMetaclass
 
1475
 
 
1476
 
1634
1477
class ClientHandler(socketserver.BaseRequestHandler, object):
1635
1478
    """A class to handle client connections.
1636
1479
    
1704
1547
                except KeyError:
1705
1548
                    return
1706
1549
                
 
1550
                if self.server.use_dbus:
 
1551
                    # Emit D-Bus signal
 
1552
                    client.NewRequest(str(self.client_address))
 
1553
                
1707
1554
                if client.approval_delay:
1708
1555
                    delay = client.approval_delay
1709
1556
                    client.approvals_pending += 1
1740
1587
                    #wait until timeout or approved
1741
1588
                    time = datetime.datetime.now()
1742
1589
                    client.changedstate.acquire()
1743
 
                    client.changedstate.wait(
1744
 
                        float(timedelta_to_milliseconds(delay)
1745
 
                              / 1000))
 
1590
                    (client.changedstate.wait
 
1591
                     (float(client.timedelta_to_milliseconds(delay)
 
1592
                            / 1000)))
1746
1593
                    client.changedstate.release()
1747
1594
                    time2 = datetime.datetime.now()
1748
1595
                    if (time2 - time) >= delay:
1764
1611
                    try:
1765
1612
                        sent = session.send(client.secret[sent_size:])
1766
1613
                    except gnutls.errors.GNUTLSError as error:
1767
 
                        logger.warning("gnutls send failed",
1768
 
                                       exc_info=error)
 
1614
                        logger.warning("gnutls send failed")
1769
1615
                        return
1770
1616
                    logger.debug("Sent: %d, remaining: %d",
1771
1617
                                 sent, len(client.secret)
1774
1620
                
1775
1621
                logger.info("Sending secret to %s", client.name)
1776
1622
                # bump the timeout using extended_timeout
1777
 
                client.bump_timeout(client.extended_timeout)
 
1623
                client.checked_ok(client.extended_timeout)
1778
1624
                if self.server.use_dbus:
1779
1625
                    # Emit D-Bus signal
1780
1626
                    client.GotSecret()
1785
1631
                try:
1786
1632
                    session.bye()
1787
1633
                except gnutls.errors.GNUTLSError as error:
1788
 
                    logger.warning("GnuTLS bye failed",
1789
 
                                   exc_info=error)
 
1634
                    logger.warning("GnuTLS bye failed")
1790
1635
    
1791
1636
    @staticmethod
1792
1637
    def peer_certificate(session):
1864
1709
    def process_request(self, request, address):
1865
1710
        """Start a new process to process the request."""
1866
1711
        proc = multiprocessing.Process(target = self.sub_process_main,
1867
 
                                       args = (request, address))
 
1712
                                       args = (request,
 
1713
                                               address))
1868
1714
        proc.start()
1869
1715
        return proc
1870
1716
 
1920
1766
                                           str(self.interface
1921
1767
                                               + '\0'))
1922
1768
                except socket.error as error:
1923
 
                    if error.errno == errno.EPERM:
 
1769
                    if error[0] == errno.EPERM:
1924
1770
                        logger.error("No permission to"
1925
1771
                                     " bind to interface %s",
1926
1772
                                     self.interface)
1927
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1773
                    elif error[0] == errno.ENOPROTOOPT:
1928
1774
                        logger.error("SO_BINDTODEVICE not available;"
1929
1775
                                     " cannot bind to interface %s",
1930
1776
                                     self.interface)
1931
 
                    elif error.errno == errno.ENODEV:
1932
 
                        logger.error("Interface %s does not"
1933
 
                                     " exist, cannot bind",
1934
 
                                     self.interface)
1935
1777
                    else:
1936
1778
                        raise
1937
1779
        # Only bind(2) the socket if we really need to.
1996
1838
    
1997
1839
    def handle_ipc(self, source, condition, parent_pipe=None,
1998
1840
                   proc = None, client_object=None):
 
1841
        condition_names = {
 
1842
            gobject.IO_IN: "IN",   # There is data to read.
 
1843
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1844
                                    # blocking).
 
1845
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1846
            gobject.IO_ERR: "ERR", # Error condition.
 
1847
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1848
                                    # broken, usually for pipes and
 
1849
                                    # sockets).
 
1850
            }
 
1851
        conditions_string = ' | '.join(name
 
1852
                                       for cond, name in
 
1853
                                       condition_names.iteritems()
 
1854
                                       if cond & condition)
1999
1855
        # error, or the other end of multiprocessing.Pipe has closed
2000
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1856
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2001
1857
            # Wait for other process to exit
2002
1858
            proc.join()
2003
1859
            return False
2093
1949
            elif suffix == "w":
2094
1950
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2095
1951
            else:
2096
 
                raise ValueError("Unknown suffix {0!r}"
2097
 
                                 .format(suffix))
 
1952
                raise ValueError("Unknown suffix %r" % suffix)
2098
1953
        except (ValueError, IndexError) as e:
2099
1954
            raise ValueError(*(e.args))
2100
1955
        timevalue += delta
2114
1969
        sys.exit()
2115
1970
    if not noclose:
2116
1971
        # Close all standard open file descriptors
2117
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1972
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2118
1973
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2119
1974
            raise OSError(errno.ENODEV,
2120
 
                          "{0} not a character device"
2121
 
                          .format(os.devnull))
 
1975
                          "%s not a character device"
 
1976
                          % os.path.devnull)
2122
1977
        os.dup2(null, sys.stdin.fileno())
2123
1978
        os.dup2(null, sys.stdout.fileno())
2124
1979
        os.dup2(null, sys.stderr.fileno())
2133
1988
    
2134
1989
    parser = argparse.ArgumentParser()
2135
1990
    parser.add_argument("-v", "--version", action="version",
2136
 
                        version = "%(prog)s {0}".format(version),
 
1991
                        version = "%%(prog)s %s" % version,
2137
1992
                        help="show version number and exit")
2138
1993
    parser.add_argument("-i", "--interface", metavar="IF",
2139
1994
                        help="Bind to interface IF")
2242
2097
    
2243
2098
    if server_settings["servicename"] != "Mandos":
2244
2099
        syslogger.setFormatter(logging.Formatter
2245
 
                               ('Mandos ({0}) [%(process)d]:'
2246
 
                                ' %(levelname)s: %(message)s'
2247
 
                                .format(server_settings
2248
 
                                        ["servicename"])))
 
2100
                               ('Mandos (%s) [%%(process)d]:'
 
2101
                                ' %%(levelname)s: %%(message)s'
 
2102
                                % server_settings["servicename"]))
2249
2103
    
2250
2104
    # Parse config file with clients
2251
2105
    client_config = configparser.SafeConfigParser(Client
2269
2123
        pidfilename = "/var/run/mandos.pid"
2270
2124
        try:
2271
2125
            pidfile = open(pidfilename, "w")
2272
 
        except IOError as e:
2273
 
            logger.error("Could not open file %r", pidfilename,
2274
 
                         exc_info=e)
 
2126
        except IOError:
 
2127
            logger.error("Could not open file %r", pidfilename)
2275
2128
    
2276
 
    for name in ("_mandos", "mandos", "nobody"):
 
2129
    try:
 
2130
        uid = pwd.getpwnam("_mandos").pw_uid
 
2131
        gid = pwd.getpwnam("_mandos").pw_gid
 
2132
    except KeyError:
2277
2133
        try:
2278
 
            uid = pwd.getpwnam(name).pw_uid
2279
 
            gid = pwd.getpwnam(name).pw_gid
2280
 
            break
 
2134
            uid = pwd.getpwnam("mandos").pw_uid
 
2135
            gid = pwd.getpwnam("mandos").pw_gid
2281
2136
        except KeyError:
2282
 
            continue
2283
 
    else:
2284
 
        uid = 65534
2285
 
        gid = 65534
 
2137
            try:
 
2138
                uid = pwd.getpwnam("nobody").pw_uid
 
2139
                gid = pwd.getpwnam("nobody").pw_gid
 
2140
            except KeyError:
 
2141
                uid = 65534
 
2142
                gid = 65534
2286
2143
    try:
2287
2144
        os.setgid(gid)
2288
2145
        os.setuid(uid)
2289
2146
    except OSError as error:
2290
 
        if error.errno != errno.EPERM:
 
2147
        if error[0] != errno.EPERM:
2291
2148
            raise error
2292
2149
    
2293
2150
    if debug:
2305
2162
         .gnutls_global_set_log_function(debug_gnutls))
2306
2163
        
2307
2164
        # Redirect stdin so all checkers get /dev/null
2308
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2165
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2309
2166
        os.dup2(null, sys.stdin.fileno())
2310
2167
        if null > 2:
2311
2168
            os.close(null)
2319
2176
    
2320
2177
    global main_loop
2321
2178
    # From the Avahi example code
2322
 
    DBusGMainLoop(set_as_default=True)
 
2179
    DBusGMainLoop(set_as_default=True )
2323
2180
    main_loop = gobject.MainLoop()
2324
2181
    bus = dbus.SystemBus()
2325
2182
    # End of Avahi example code
2331
2188
                            ("se.bsnet.fukt.Mandos", bus,
2332
2189
                             do_not_queue=True))
2333
2190
        except dbus.exceptions.NameExistsException as e:
2334
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2191
            logger.error(unicode(e) + ", disabling D-Bus")
2335
2192
            use_dbus = False
2336
2193
            server_settings["use_dbus"] = False
2337
2194
            tcp_server.use_dbus = False
2349
2206
    
2350
2207
    client_class = Client
2351
2208
    if use_dbus:
2352
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2209
        client_class = functools.partial(ClientDBusTransitional,
 
2210
                                         bus = bus)
2353
2211
    
2354
2212
    client_settings = Client.config_parser(client_config)
2355
2213
    old_client_settings = {}
2363
2221
                                                     (stored_state))
2364
2222
            os.remove(stored_state_path)
2365
2223
        except IOError as e:
2366
 
            if e.errno == errno.ENOENT:
2367
 
                logger.warning("Could not load persistent state: {0}"
2368
 
                                .format(os.strerror(e.errno)))
2369
 
            else:
2370
 
                logger.critical("Could not load persistent state:",
2371
 
                                exc_info=e)
 
2224
            logger.warning("Could not load persistent state: {0}"
 
2225
                           .format(e))
 
2226
            if e.errno != errno.ENOENT:
2372
2227
                raise
2373
2228
        except EOFError as e:
2374
2229
            logger.warning("Could not load persistent state: "
2375
 
                           "EOFError:", exc_info=e)
 
2230
                           "EOFError: {0}".format(e))
2376
2231
    
2377
2232
    with PGPEngine() as pgp:
2378
2233
        for client_name, client in clients_data.iteritems():
2395
2250
            
2396
2251
            # Clients who has passed its expire date can still be
2397
2252
            # enabled if its last checker was successful.  Clients
2398
 
            # whose checker succeeded before we stored its state is
2399
 
            # assumed to have successfully run all checkers during
2400
 
            # downtime.
 
2253
            # whose checker failed before we stored its state is
 
2254
            # assumed to have failed all checkers during downtime.
2401
2255
            if client["enabled"]:
2402
2256
                if datetime.datetime.utcnow() >= client["expires"]:
2403
2257
                    if not client["last_checked_ok"]:
2404
2258
                        logger.warning(
2405
2259
                            "disabling client {0} - Client never "
2406
 
                            "performed a successful checker"
2407
 
                            .format(client_name))
 
2260
                            "performed a successfull checker"
 
2261
                            .format(client["name"]))
2408
2262
                        client["enabled"] = False
2409
2263
                    elif client["last_checker_status"] != 0:
2410
2264
                        logger.warning(
2411
2265
                            "disabling client {0} - Client "
2412
2266
                            "last checker failed with error code {1}"
2413
 
                            .format(client_name,
 
2267
                            .format(client["name"],
2414
2268
                                    client["last_checker_status"]))
2415
2269
                        client["enabled"] = False
2416
2270
                    else:
2419
2273
                                             + client["timeout"])
2420
2274
                        logger.debug("Last checker succeeded,"
2421
2275
                                     " keeping {0} enabled"
2422
 
                                     .format(client_name))
 
2276
                                     .format(client["name"]))
2423
2277
            try:
2424
2278
                client["secret"] = (
2425
2279
                    pgp.decrypt(client["encrypted_secret"],
2431
2285
                             .format(client_name))
2432
2286
                client["secret"] = (
2433
2287
                    client_settings[client_name]["secret"])
 
2288
 
2434
2289
    
2435
2290
    # Add/remove clients based on new changes made to config
2436
2291
    for client_name in (set(old_client_settings)
2439
2294
    for client_name in (set(client_settings)
2440
2295
                        - set(old_client_settings)):
2441
2296
        clients_data[client_name] = client_settings[client_name]
2442
 
    
2443
 
    # Create all client objects
 
2297
 
 
2298
    # Create clients all clients
2444
2299
    for client_name, client in clients_data.iteritems():
2445
2300
        tcp_server.clients[client_name] = client_class(
2446
2301
            name = client_name, settings = client)
2447
2302
    
2448
2303
    if not tcp_server.clients:
2449
2304
        logger.warning("No clients defined")
2450
 
    
 
2305
        
2451
2306
    if not debug:
2452
2307
        try:
2453
2308
            with pidfile:
2467
2322
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2468
2323
    
2469
2324
    if use_dbus:
2470
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2471
 
                                        "se.bsnet.fukt.Mandos"})
2472
 
        class MandosDBusService(DBusObjectWithProperties):
 
2325
        class MandosDBusService(dbus.service.Object):
2473
2326
            """A D-Bus proxy object"""
2474
2327
            def __init__(self):
2475
2328
                dbus.service.Object.__init__(self, bus, "/")
2476
2329
            _interface = "se.recompile.Mandos"
2477
2330
            
2478
 
            @dbus_interface_annotations(_interface)
2479
 
            def _foo(self):
2480
 
                return { "org.freedesktop.DBus.Property"
2481
 
                         ".EmitsChangedSignal":
2482
 
                             "false"}
2483
 
            
2484
2331
            @dbus.service.signal(_interface, signature="o")
2485
2332
            def ClientAdded(self, objpath):
2486
2333
                "D-Bus signal"
2528
2375
            
2529
2376
            del _interface
2530
2377
        
2531
 
        mandos_dbus_service = MandosDBusService()
 
2378
        class MandosDBusServiceTransitional(MandosDBusService):
 
2379
            __metaclass__ = AlternateDBusNamesMetaclass
 
2380
        mandos_dbus_service = MandosDBusServiceTransitional()
2532
2381
    
2533
2382
    def cleanup():
2534
2383
        "Cleanup function; run on exit"
2567
2416
                del client_settings[client.name]["secret"]
2568
2417
        
2569
2418
        try:
2570
 
            with (tempfile.NamedTemporaryFile
2571
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2572
 
                   dir=os.path.dirname(stored_state_path),
2573
 
                   delete=False)) as stored_state:
 
2419
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2420
                                                prefix="clients-",
 
2421
                                                dir=os.path.dirname
 
2422
                                                (stored_state_path))
 
2423
            with os.fdopen(tempfd, "wb") as stored_state:
2574
2424
                pickle.dump((clients, client_settings), stored_state)
2575
 
                tempname=stored_state.name
2576
2425
            os.rename(tempname, stored_state_path)
2577
2426
        except (IOError, OSError) as e:
 
2427
            logger.warning("Could not save persistent state: {0}"
 
2428
                           .format(e))
2578
2429
            if not debug:
2579
2430
                try:
2580
2431
                    os.remove(tempname)
2581
2432
                except NameError:
2582
2433
                    pass
2583
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2584
 
                logger.warning("Could not save persistent state: {0}"
2585
 
                               .format(os.strerror(e.errno)))
2586
 
            else:
2587
 
                logger.warning("Could not save persistent state:",
2588
 
                               exc_info=e)
 
2434
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2435
                                   errno.EEXIST)):
2589
2436
                raise e
2590
2437
        
2591
2438
        # Delete all clients, and settings from config
2619
2466
    service.port = tcp_server.socket.getsockname()[1]
2620
2467
    if use_ipv6:
2621
2468
        logger.info("Now listening on address %r, port %d,"
2622
 
                    " flowinfo %d, scope_id %d",
2623
 
                    *tcp_server.socket.getsockname())
 
2469
                    " flowinfo %d, scope_id %d"
 
2470
                    % tcp_server.socket.getsockname())
2624
2471
    else:                       # IPv4
2625
 
        logger.info("Now listening on address %r, port %d",
2626
 
                    *tcp_server.socket.getsockname())
 
2472
        logger.info("Now listening on address %r, port %d"
 
2473
                    % tcp_server.socket.getsockname())
2627
2474
    
2628
2475
    #service.interface = tcp_server.socket.getsockname()[3]
2629
2476
    
2632
2479
        try:
2633
2480
            service.activate()
2634
2481
        except dbus.exceptions.DBusException as error:
2635
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2482
            logger.critical("DBusException: %s", error)
2636
2483
            cleanup()
2637
2484
            sys.exit(1)
2638
2485
        # End of Avahi example code
2645
2492
        logger.debug("Starting main loop")
2646
2493
        main_loop.run()
2647
2494
    except AvahiError as error:
2648
 
        logger.critical("Avahi Error", exc_info=error)
 
2495
        logger.critical("AvahiError: %s", error)
2649
2496
        cleanup()
2650
2497
        sys.exit(1)
2651
2498
    except KeyboardInterrupt: