/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-05-31 15:56:58 UTC
  • Revision ID: teddy@recompile.se-20150531155658-l7znu7zlqr2dmuwd
mandos: Generate better messages in exceptions.

mandos (ProxyClient.__init__): Include fingerprint in KeyError().
(rfc3339_duration_to_delta): Include duration in ValueError().

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-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 Björn Påhlsson
 
14
# Copyright © 2008-2015 Teddy Hogeborn
 
15
# Copyright © 2008-2015 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
36
36
 
37
37
from future_builtins import *
38
38
 
39
 
import SocketServer as socketserver
 
39
try:
 
40
    import SocketServer as socketserver
 
41
except ImportError:
 
42
    import socketserver
40
43
import socket
41
44
import argparse
42
45
import datetime
47
50
import gnutls.library.functions
48
51
import gnutls.library.constants
49
52
import gnutls.library.types
50
 
import ConfigParser as configparser
 
53
try:
 
54
    import ConfigParser as configparser
 
55
except ImportError:
 
56
    import configparser
51
57
import sys
52
58
import re
53
59
import os
62
68
import struct
63
69
import fcntl
64
70
import functools
65
 
import cPickle as pickle
 
71
try:
 
72
    import cPickle as pickle
 
73
except ImportError:
 
74
    import pickle
66
75
import multiprocessing
67
76
import types
68
77
import binascii
69
78
import tempfile
70
79
import itertools
71
80
import collections
 
81
import codecs
72
82
 
73
83
import dbus
74
84
import dbus.service
75
 
import gobject
 
85
try:
 
86
    import gobject
 
87
except ImportError:
 
88
    from gi.repository import GObject as gobject
76
89
import avahi
77
90
from dbus.mainloop.glib import DBusGMainLoop
78
91
import ctypes
98
111
syslogger = None
99
112
 
100
113
try:
101
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
102
 
                      (ctypes.util.find_library("c"))
103
 
                      .if_nametoindex)
 
114
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
115
        ctypes.util.find_library("c")).if_nametoindex
104
116
except (OSError, AttributeError):
 
117
    
105
118
    def if_nametoindex(interface):
106
119
        "Get an interface index the hard way, i.e. using fcntl()"
107
120
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
116
129
    """init logger and add loglevel"""
117
130
    
118
131
    global syslogger
119
 
    syslogger = (logging.handlers.SysLogHandler
120
 
                 (facility =
121
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
122
 
                  address = "/dev/log"))
 
132
    syslogger = (logging.handlers.SysLogHandler(
 
133
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
134
        address = "/dev/log"))
123
135
    syslogger.setFormatter(logging.Formatter
124
136
                           ('Mandos [%(process)d]: %(levelname)s:'
125
137
                            ' %(message)s'))
142
154
 
143
155
class PGPEngine(object):
144
156
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
157
    
145
158
    def __init__(self):
146
159
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
147
160
        self.gnupgargs = ['--batch',
186
199
    
187
200
    def encrypt(self, data, password):
188
201
        passphrase = self.password_encode(password)
189
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
190
 
                                         ) as passfile:
 
202
        with tempfile.NamedTemporaryFile(
 
203
                dir=self.tempdir) as passfile:
191
204
            passfile.write(passphrase)
192
205
            passfile.flush()
193
206
            proc = subprocess.Popen(['gpg', '--symmetric',
204
217
    
205
218
    def decrypt(self, data, password):
206
219
        passphrase = self.password_encode(password)
207
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
208
 
                                         ) as passfile:
 
220
        with tempfile.NamedTemporaryFile(
 
221
                dir = self.tempdir) as passfile:
209
222
            passfile.write(passphrase)
210
223
            passfile.flush()
211
224
            proc = subprocess.Popen(['gpg', '--decrypt',
215
228
                                    stdin = subprocess.PIPE,
216
229
                                    stdout = subprocess.PIPE,
217
230
                                    stderr = subprocess.PIPE)
218
 
            decrypted_plaintext, err = proc.communicate(input
219
 
                                                        = data)
 
231
            decrypted_plaintext, err = proc.communicate(input = data)
220
232
        if proc.returncode != 0:
221
233
            raise PGPError(err)
222
234
        return decrypted_plaintext
228
240
        return super(AvahiError, self).__init__(value, *args,
229
241
                                                **kwargs)
230
242
 
 
243
 
231
244
class AvahiServiceError(AvahiError):
232
245
    pass
233
246
 
 
247
 
234
248
class AvahiGroupError(AvahiError):
235
249
    pass
236
250
 
256
270
    bus: dbus.SystemBus()
257
271
    """
258
272
    
259
 
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
260
 
                 servicetype = None, port = None, TXT = None,
261
 
                 domain = "", host = "", max_renames = 32768,
262
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
273
    def __init__(self,
 
274
                 interface = avahi.IF_UNSPEC,
 
275
                 name = None,
 
276
                 servicetype = None,
 
277
                 port = None,
 
278
                 TXT = None,
 
279
                 domain = "",
 
280
                 host = "",
 
281
                 max_renames = 32768,
 
282
                 protocol = avahi.PROTO_UNSPEC,
 
283
                 bus = None):
263
284
        self.interface = interface
264
285
        self.name = name
265
286
        self.type = servicetype
282
303
                            " after %i retries, exiting.",
283
304
                            self.rename_count)
284
305
            raise AvahiServiceError("Too many renames")
285
 
        self.name = str(self.server
286
 
                        .GetAlternativeServiceName(self.name))
 
306
        self.name = str(
 
307
            self.server.GetAlternativeServiceName(self.name))
287
308
        self.rename_count += 1
288
309
        logger.info("Changing Zeroconf service name to %r ...",
289
310
                    self.name)
344
365
        elif state == avahi.ENTRY_GROUP_FAILURE:
345
366
            logger.critical("Avahi: Error in group state changed %s",
346
367
                            str(error))
347
 
            raise AvahiGroupError("State changed: {!s}"
348
 
                                  .format(error))
 
368
            raise AvahiGroupError("State changed: {!s}".format(error))
349
369
    
350
370
    def cleanup(self):
351
371
        """Derived from the Avahi example code"""
361
381
    def server_state_changed(self, state, error=None):
362
382
        """Derived from the Avahi example code"""
363
383
        logger.debug("Avahi server state change: %i", state)
364
 
        bad_states = { avahi.SERVER_INVALID:
365
 
                           "Zeroconf server invalid",
366
 
                       avahi.SERVER_REGISTERING: None,
367
 
                       avahi.SERVER_COLLISION:
368
 
                           "Zeroconf server name collision",
369
 
                       avahi.SERVER_FAILURE:
370
 
                           "Zeroconf server failure" }
 
384
        bad_states = {
 
385
            avahi.SERVER_INVALID: "Zeroconf server invalid",
 
386
            avahi.SERVER_REGISTERING: None,
 
387
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
 
388
            avahi.SERVER_FAILURE: "Zeroconf server failure",
 
389
        }
371
390
        if state in bad_states:
372
391
            if bad_states[state] is not None:
373
392
                if error is None:
392
411
                                    follow_name_owner_changes=True),
393
412
                avahi.DBUS_INTERFACE_SERVER)
394
413
        self.server.connect_to_signal("StateChanged",
395
 
                                 self.server_state_changed)
 
414
                                      self.server_state_changed)
396
415
        self.server_state_changed(self.server.GetState())
397
416
 
398
417
 
400
419
    def rename(self, *args, **kwargs):
401
420
        """Add the new name to the syslog messages"""
402
421
        ret = AvahiService.rename(self, *args, **kwargs)
403
 
        syslogger.setFormatter(logging.Formatter
404
 
                               ('Mandos ({}) [%(process)d]:'
405
 
                                ' %(levelname)s: %(message)s'
406
 
                                .format(self.name)))
 
422
        syslogger.setFormatter(logging.Formatter(
 
423
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
424
            .format(self.name)))
407
425
        return ret
408
426
 
409
427
 
456
474
                          "fingerprint", "host", "interval",
457
475
                          "last_approval_request", "last_checked_ok",
458
476
                          "last_enabled", "name", "timeout")
459
 
    client_defaults = { "timeout": "PT5M",
460
 
                        "extended_timeout": "PT15M",
461
 
                        "interval": "PT2M",
462
 
                        "checker": "fping -q -- %%(host)s",
463
 
                        "host": "",
464
 
                        "approval_delay": "PT0S",
465
 
                        "approval_duration": "PT1S",
466
 
                        "approved_by_default": "True",
467
 
                        "enabled": "True",
468
 
                        }
 
477
    client_defaults = {
 
478
        "timeout": "PT5M",
 
479
        "extended_timeout": "PT15M",
 
480
        "interval": "PT2M",
 
481
        "checker": "fping -q -- %%(host)s",
 
482
        "host": "",
 
483
        "approval_delay": "PT0S",
 
484
        "approval_duration": "PT1S",
 
485
        "approved_by_default": "True",
 
486
        "enabled": "True",
 
487
    }
469
488
    
470
489
    @staticmethod
471
490
    def config_parser(config):
549
568
        self.current_checker_command = None
550
569
        self.approved = None
551
570
        self.approvals_pending = 0
552
 
        self.changedstate = (multiprocessing_manager
553
 
                             .Condition(multiprocessing_manager
554
 
                                        .Lock()))
555
 
        self.client_structure = [attr for attr in
556
 
                                 self.__dict__.iterkeys()
 
571
        self.changedstate = multiprocessing_manager.Condition(
 
572
            multiprocessing_manager.Lock())
 
573
        self.client_structure = [attr
 
574
                                 for attr in self.__dict__.iterkeys()
557
575
                                 if not attr.startswith("_")]
558
576
        self.client_structure.append("client_structure")
559
577
        
560
 
        for name, t in inspect.getmembers(type(self),
561
 
                                          lambda obj:
562
 
                                              isinstance(obj,
563
 
                                                         property)):
 
578
        for name, t in inspect.getmembers(
 
579
                type(self), lambda obj: isinstance(obj, property)):
564
580
            if not name.startswith("_"):
565
581
                self.client_structure.append(name)
566
582
    
608
624
        # and every interval from then on.
609
625
        if self.checker_initiator_tag is not None:
610
626
            gobject.source_remove(self.checker_initiator_tag)
611
 
        self.checker_initiator_tag = (gobject.timeout_add
612
 
                                      (int(self.interval
613
 
                                           .total_seconds() * 1000),
614
 
                                       self.start_checker))
 
627
        self.checker_initiator_tag = gobject.timeout_add(
 
628
            int(self.interval.total_seconds() * 1000),
 
629
            self.start_checker)
615
630
        # Schedule a disable() when 'timeout' has passed
616
631
        if self.disable_initiator_tag is not None:
617
632
            gobject.source_remove(self.disable_initiator_tag)
618
 
        self.disable_initiator_tag = (gobject.timeout_add
619
 
                                      (int(self.timeout
620
 
                                           .total_seconds() * 1000),
621
 
                                       self.disable))
 
633
        self.disable_initiator_tag = gobject.timeout_add(
 
634
            int(self.timeout.total_seconds() * 1000), self.disable)
622
635
        # Also start a new checker *right now*.
623
636
        self.start_checker()
624
637
    
633
646
                            vars(self))
634
647
                self.checked_ok()
635
648
            else:
636
 
                logger.info("Checker for %(name)s failed",
637
 
                            vars(self))
 
649
                logger.info("Checker for %(name)s failed", vars(self))
638
650
        else:
639
651
            self.last_checker_status = -1
640
652
            logger.warning("Checker for %(name)s crashed?",
654
666
            gobject.source_remove(self.disable_initiator_tag)
655
667
            self.disable_initiator_tag = None
656
668
        if getattr(self, "enabled", False):
657
 
            self.disable_initiator_tag = (gobject.timeout_add
658
 
                                          (int(timeout.total_seconds()
659
 
                                               * 1000), self.disable))
 
669
            self.disable_initiator_tag = gobject.timeout_add(
 
670
                int(timeout.total_seconds() * 1000), self.disable)
660
671
            self.expires = datetime.datetime.utcnow() + timeout
661
672
    
662
673
    def need_approval(self):
693
704
        # Start a new checker if needed
694
705
        if self.checker is None:
695
706
            # Escape attributes for the shell
696
 
            escaped_attrs = { attr:
697
 
                                  re.escape(str(getattr(self, attr)))
698
 
                              for attr in self.runtime_expansions }
 
707
            escaped_attrs = {
 
708
                attr: re.escape(str(getattr(self, attr)))
 
709
                for attr in self.runtime_expansions }
699
710
            try:
700
711
                command = self.checker_command % escaped_attrs
701
712
            except TypeError as error:
702
713
                logger.error('Could not format string "%s"',
703
 
                             self.checker_command, exc_info=error)
704
 
                return True # Try again later
 
714
                             self.checker_command,
 
715
                             exc_info=error)
 
716
                return True     # Try again later
705
717
            self.current_checker_command = command
706
718
            try:
707
 
                logger.info("Starting checker %r for %s",
708
 
                            command, self.name)
 
719
                logger.info("Starting checker %r for %s", command,
 
720
                            self.name)
709
721
                # We don't need to redirect stdout and stderr, since
710
722
                # in normal mode, that is already done by daemon(),
711
723
                # and in debug mode we don't want to.  (Stdin is
720
732
                                       "stderr": wnull })
721
733
                self.checker = subprocess.Popen(command,
722
734
                                                close_fds=True,
723
 
                                                shell=True, cwd="/",
 
735
                                                shell=True,
 
736
                                                cwd="/",
724
737
                                                **popen_args)
725
738
            except OSError as error:
726
739
                logger.error("Failed to start subprocess",
727
740
                             exc_info=error)
728
741
                return True
729
 
            self.checker_callback_tag = (gobject.child_watch_add
730
 
                                         (self.checker.pid,
731
 
                                          self.checker_callback,
732
 
                                          data=command))
 
742
            self.checker_callback_tag = gobject.child_watch_add(
 
743
                self.checker.pid, self.checker_callback, data=command)
733
744
            # The checker may have completed before the gobject
734
745
            # watch was added.  Check for this.
735
746
            try:
766
777
        self.checker = None
767
778
 
768
779
 
769
 
def dbus_service_property(dbus_interface, signature="v",
770
 
                          access="readwrite", byte_arrays=False):
 
780
def dbus_service_property(dbus_interface,
 
781
                          signature="v",
 
782
                          access="readwrite",
 
783
                          byte_arrays=False):
771
784
    """Decorators for marking methods of a DBusObjectWithProperties to
772
785
    become properties on the D-Bus.
773
786
    
783
796
    if byte_arrays and signature != "ay":
784
797
        raise ValueError("Byte arrays not supported for non-'ay'"
785
798
                         " signature {!r}".format(signature))
 
799
    
786
800
    def decorator(func):
787
801
        func._dbus_is_property = True
788
802
        func._dbus_interface = dbus_interface
793
807
            func._dbus_name = func._dbus_name[:-14]
794
808
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
795
809
        return func
 
810
    
796
811
    return decorator
797
812
 
798
813
 
807
822
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
808
823
                    "false"}
809
824
    """
 
825
    
810
826
    def decorator(func):
811
827
        func._dbus_is_interface = True
812
828
        func._dbus_interface = dbus_interface
813
829
        func._dbus_name = dbus_interface
814
830
        return func
 
831
    
815
832
    return decorator
816
833
 
817
834
 
827
844
    def Property_dbus_property(self):
828
845
        return dbus.Boolean(False)
829
846
    """
 
847
    
830
848
    def decorator(func):
831
849
        func._dbus_annotations = annotations
832
850
        return func
 
851
    
833
852
    return decorator
834
853
 
835
854
 
838
857
    """
839
858
    pass
840
859
 
 
860
 
841
861
class DBusPropertyAccessException(DBusPropertyException):
842
862
    """A property's access permissions disallows an operation.
843
863
    """
871
891
    def _get_all_dbus_things(self, thing):
872
892
        """Returns a generator of (name, attribute) pairs
873
893
        """
874
 
        return ((getattr(athing.__get__(self), "_dbus_name",
875
 
                         name),
 
894
        return ((getattr(athing.__get__(self), "_dbus_name", name),
876
895
                 athing.__get__(self))
877
896
                for cls in self.__class__.__mro__
878
897
                for name, athing in
879
 
                inspect.getmembers(cls,
880
 
                                   self._is_dbus_thing(thing)))
 
898
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
881
899
    
882
900
    def _get_dbus_property(self, interface_name, property_name):
883
901
        """Returns a bound method if one exists which is a D-Bus
884
902
        property with the specified name and interface.
885
903
        """
886
 
        for cls in  self.__class__.__mro__:
887
 
            for name, value in (inspect.getmembers
888
 
                                (cls,
889
 
                                 self._is_dbus_thing("property"))):
 
904
        for cls in self.__class__.__mro__:
 
905
            for name, value in inspect.getmembers(
 
906
                    cls, self._is_dbus_thing("property")):
890
907
                if (value._dbus_name == property_name
891
908
                    and value._dbus_interface == interface_name):
892
909
                    return value.__get__(self)
893
910
        
894
911
        # No such property
895
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
896
 
                                   + interface_name + "."
897
 
                                   + property_name)
 
912
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
913
            self.dbus_object_path, interface_name, property_name))
898
914
    
899
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
915
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
916
                         in_signature="ss",
900
917
                         out_signature="v")
901
918
    def Get(self, interface_name, property_name):
902
919
        """Standard D-Bus property Get() method, see D-Bus standard.
927
944
                                            for byte in value))
928
945
        prop(value)
929
946
    
930
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
947
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
948
                         in_signature="s",
931
949
                         out_signature="a{sv}")
932
950
    def GetAll(self, interface_name):
933
951
        """Standard D-Bus property GetAll() method, see D-Bus
948
966
            if not hasattr(value, "variant_level"):
949
967
                properties[name] = value
950
968
                continue
951
 
            properties[name] = type(value)(value, variant_level=
952
 
                                           value.variant_level+1)
 
969
            properties[name] = type(value)(
 
970
                value, variant_level = value.variant_level + 1)
953
971
        return dbus.Dictionary(properties, signature="sv")
954
972
    
955
973
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
973
991
                                                   connection)
974
992
        try:
975
993
            document = xml.dom.minidom.parseString(xmlstring)
 
994
            
976
995
            def make_tag(document, name, prop):
977
996
                e = document.createElement("property")
978
997
                e.setAttribute("name", name)
979
998
                e.setAttribute("type", prop._dbus_signature)
980
999
                e.setAttribute("access", prop._dbus_access)
981
1000
                return e
 
1001
            
982
1002
            for if_tag in document.getElementsByTagName("interface"):
983
1003
                # Add property tags
984
1004
                for tag in (make_tag(document, name, prop)
996
1016
                            if (name == tag.getAttribute("name")
997
1017
                                and prop._dbus_interface
998
1018
                                == if_tag.getAttribute("name")):
999
 
                                annots.update(getattr
1000
 
                                              (prop,
1001
 
                                               "_dbus_annotations",
1002
 
                                               {}))
 
1019
                                annots.update(getattr(
 
1020
                                    prop, "_dbus_annotations", {}))
1003
1021
                        for name, value in annots.items():
1004
1022
                            ann_tag = document.createElement(
1005
1023
                                "annotation")
1010
1028
                for annotation, value in dict(
1011
1029
                    itertools.chain.from_iterable(
1012
1030
                        annotations().items()
1013
 
                        for name, annotations in
1014
 
                        self._get_all_dbus_things("interface")
 
1031
                        for name, annotations
 
1032
                        in self._get_all_dbus_things("interface")
1015
1033
                        if name == if_tag.getAttribute("name")
1016
1034
                        )).items():
1017
1035
                    ann_tag = document.createElement("annotation")
1046
1064
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1047
1065
    if dt is None:
1048
1066
        return dbus.String("", variant_level = variant_level)
1049
 
    return dbus.String(dt.isoformat(),
1050
 
                       variant_level=variant_level)
 
1067
    return dbus.String(dt.isoformat(), variant_level=variant_level)
1051
1068
 
1052
1069
 
1053
1070
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1073
1090
    (from DBusObjectWithProperties) and interfaces (from the
1074
1091
    dbus_interface_annotations decorator).
1075
1092
    """
 
1093
    
1076
1094
    def wrapper(cls):
1077
1095
        for orig_interface_name, alt_interface_name in (
1078
 
            alt_interface_names.items()):
 
1096
                alt_interface_names.items()):
1079
1097
            attr = {}
1080
1098
            interface_names = set()
1081
1099
            # Go though all attributes of the class
1083
1101
                # Ignore non-D-Bus attributes, and D-Bus attributes
1084
1102
                # with the wrong interface name
1085
1103
                if (not hasattr(attribute, "_dbus_interface")
1086
 
                    or not attribute._dbus_interface
1087
 
                    .startswith(orig_interface_name)):
 
1104
                    or not attribute._dbus_interface.startswith(
 
1105
                        orig_interface_name)):
1088
1106
                    continue
1089
1107
                # Create an alternate D-Bus interface name based on
1090
1108
                # the current name
1091
 
                alt_interface = (attribute._dbus_interface
1092
 
                                 .replace(orig_interface_name,
1093
 
                                          alt_interface_name))
 
1109
                alt_interface = attribute._dbus_interface.replace(
 
1110
                    orig_interface_name, alt_interface_name)
1094
1111
                interface_names.add(alt_interface)
1095
1112
                # Is this a D-Bus signal?
1096
1113
                if getattr(attribute, "_dbus_is_signal", False):
1097
1114
                    # Extract the original non-method undecorated
1098
1115
                    # function by black magic
1099
1116
                    nonmethod_func = (dict(
1100
 
                            zip(attribute.func_code.co_freevars,
1101
 
                                attribute.__closure__))["func"]
1102
 
                                      .cell_contents)
 
1117
                        zip(attribute.func_code.co_freevars,
 
1118
                            attribute.__closure__))
 
1119
                                      ["func"].cell_contents)
1103
1120
                    # Create a new, but exactly alike, function
1104
1121
                    # object, and decorate it to be a new D-Bus signal
1105
1122
                    # with the alternate D-Bus interface name
1106
 
                    new_function = (dbus.service.signal
1107
 
                                    (alt_interface,
1108
 
                                     attribute._dbus_signature)
 
1123
                    new_function = (dbus.service.signal(
 
1124
                        alt_interface, attribute._dbus_signature)
1109
1125
                                    (types.FunctionType(
1110
 
                                nonmethod_func.func_code,
1111
 
                                nonmethod_func.func_globals,
1112
 
                                nonmethod_func.func_name,
1113
 
                                nonmethod_func.func_defaults,
1114
 
                                nonmethod_func.func_closure)))
 
1126
                                        nonmethod_func.func_code,
 
1127
                                        nonmethod_func.func_globals,
 
1128
                                        nonmethod_func.func_name,
 
1129
                                        nonmethod_func.func_defaults,
 
1130
                                        nonmethod_func.func_closure)))
1115
1131
                    # Copy annotations, if any
1116
1132
                    try:
1117
 
                        new_function._dbus_annotations = (
1118
 
                            dict(attribute._dbus_annotations))
 
1133
                        new_function._dbus_annotations = dict(
 
1134
                            attribute._dbus_annotations)
1119
1135
                    except AttributeError:
1120
1136
                        pass
1121
1137
                    # Define a creator of a function to call both the
1126
1142
                        """This function is a scope container to pass
1127
1143
                        func1 and func2 to the "call_both" function
1128
1144
                        outside of its arguments"""
 
1145
                        
1129
1146
                        def call_both(*args, **kwargs):
1130
1147
                            """This function will emit two D-Bus
1131
1148
                            signals by calling func1 and func2"""
1132
1149
                            func1(*args, **kwargs)
1133
1150
                            func2(*args, **kwargs)
 
1151
                        
1134
1152
                        return call_both
1135
1153
                    # Create the "call_both" function and add it to
1136
1154
                    # the class
1141
1159
                    # object.  Decorate it to be a new D-Bus method
1142
1160
                    # with the alternate D-Bus interface name.  Add it
1143
1161
                    # to the class.
1144
 
                    attr[attrname] = (dbus.service.method
1145
 
                                      (alt_interface,
1146
 
                                       attribute._dbus_in_signature,
1147
 
                                       attribute._dbus_out_signature)
1148
 
                                      (types.FunctionType
1149
 
                                       (attribute.func_code,
1150
 
                                        attribute.func_globals,
1151
 
                                        attribute.func_name,
1152
 
                                        attribute.func_defaults,
1153
 
                                        attribute.func_closure)))
 
1162
                    attr[attrname] = (
 
1163
                        dbus.service.method(
 
1164
                            alt_interface,
 
1165
                            attribute._dbus_in_signature,
 
1166
                            attribute._dbus_out_signature)
 
1167
                        (types.FunctionType(attribute.func_code,
 
1168
                                            attribute.func_globals,
 
1169
                                            attribute.func_name,
 
1170
                                            attribute.func_defaults,
 
1171
                                            attribute.func_closure)))
1154
1172
                    # Copy annotations, if any
1155
1173
                    try:
1156
 
                        attr[attrname]._dbus_annotations = (
1157
 
                            dict(attribute._dbus_annotations))
 
1174
                        attr[attrname]._dbus_annotations = dict(
 
1175
                            attribute._dbus_annotations)
1158
1176
                    except AttributeError:
1159
1177
                        pass
1160
1178
                # Is this a D-Bus property?
1163
1181
                    # object, and decorate it to be a new D-Bus
1164
1182
                    # property with the alternate D-Bus interface
1165
1183
                    # name.  Add it to the class.
1166
 
                    attr[attrname] = (dbus_service_property
1167
 
                                      (alt_interface,
1168
 
                                       attribute._dbus_signature,
1169
 
                                       attribute._dbus_access,
1170
 
                                       attribute
1171
 
                                       ._dbus_get_args_options
1172
 
                                       ["byte_arrays"])
1173
 
                                      (types.FunctionType
1174
 
                                       (attribute.func_code,
1175
 
                                        attribute.func_globals,
1176
 
                                        attribute.func_name,
1177
 
                                        attribute.func_defaults,
1178
 
                                        attribute.func_closure)))
 
1184
                    attr[attrname] = (dbus_service_property(
 
1185
                        alt_interface, attribute._dbus_signature,
 
1186
                        attribute._dbus_access,
 
1187
                        attribute._dbus_get_args_options
 
1188
                        ["byte_arrays"])
 
1189
                                      (types.FunctionType(
 
1190
                                          attribute.func_code,
 
1191
                                          attribute.func_globals,
 
1192
                                          attribute.func_name,
 
1193
                                          attribute.func_defaults,
 
1194
                                          attribute.func_closure)))
1179
1195
                    # Copy annotations, if any
1180
1196
                    try:
1181
 
                        attr[attrname]._dbus_annotations = (
1182
 
                            dict(attribute._dbus_annotations))
 
1197
                        attr[attrname]._dbus_annotations = dict(
 
1198
                            attribute._dbus_annotations)
1183
1199
                    except AttributeError:
1184
1200
                        pass
1185
1201
                # Is this a D-Bus interface?
1188
1204
                    # object.  Decorate it to be a new D-Bus interface
1189
1205
                    # with the alternate D-Bus interface name.  Add it
1190
1206
                    # to the class.
1191
 
                    attr[attrname] = (dbus_interface_annotations
1192
 
                                      (alt_interface)
1193
 
                                      (types.FunctionType
1194
 
                                       (attribute.func_code,
1195
 
                                        attribute.func_globals,
1196
 
                                        attribute.func_name,
1197
 
                                        attribute.func_defaults,
1198
 
                                        attribute.func_closure)))
 
1207
                    attr[attrname] = (
 
1208
                        dbus_interface_annotations(alt_interface)
 
1209
                        (types.FunctionType(attribute.func_code,
 
1210
                                            attribute.func_globals,
 
1211
                                            attribute.func_name,
 
1212
                                            attribute.func_defaults,
 
1213
                                            attribute.func_closure)))
1199
1214
            if deprecate:
1200
1215
                # Deprecate all alternate interfaces
1201
1216
                iname="_AlternateDBusNames_interface_annotation{}"
1202
1217
                for interface_name in interface_names:
 
1218
                    
1203
1219
                    @dbus_interface_annotations(interface_name)
1204
1220
                    def func(self):
1205
1221
                        return { "org.freedesktop.DBus.Deprecated":
1206
 
                                     "true" }
 
1222
                                 "true" }
1207
1223
                    # Find an unused name
1208
1224
                    for aname in (iname.format(i)
1209
1225
                                  for i in itertools.count()):
1214
1230
                # Replace the class with a new subclass of it with
1215
1231
                # methods, signals, etc. as created above.
1216
1232
                cls = type(b"{}Alternate".format(cls.__name__),
1217
 
                           (cls,), attr)
 
1233
                           (cls, ), attr)
1218
1234
        return cls
 
1235
    
1219
1236
    return wrapper
1220
1237
 
1221
1238
 
1222
1239
@alternate_dbus_interfaces({"se.recompile.Mandos":
1223
 
                                "se.bsnet.fukt.Mandos"})
 
1240
                            "se.bsnet.fukt.Mandos"})
1224
1241
class ClientDBus(Client, DBusObjectWithProperties):
1225
1242
    """A Client class using D-Bus
1226
1243
    
1230
1247
    """
1231
1248
    
1232
1249
    runtime_expansions = (Client.runtime_expansions
1233
 
                          + ("dbus_object_path",))
 
1250
                          + ("dbus_object_path", ))
1234
1251
    
1235
1252
    _interface = "se.recompile.Mandos.Client"
1236
1253
    
1244
1261
        client_object_name = str(self.name).translate(
1245
1262
            {ord("."): ord("_"),
1246
1263
             ord("-"): ord("_")})
1247
 
        self.dbus_object_path = (dbus.ObjectPath
1248
 
                                 ("/clients/" + client_object_name))
 
1264
        self.dbus_object_path = dbus.ObjectPath(
 
1265
            "/clients/" + client_object_name)
1249
1266
        DBusObjectWithProperties.__init__(self, self.bus,
1250
1267
                                          self.dbus_object_path)
1251
1268
    
1252
 
    def notifychangeproperty(transform_func,
1253
 
                             dbus_name, type_func=lambda x: x,
1254
 
                             variant_level=1, invalidate_only=False,
 
1269
    def notifychangeproperty(transform_func, dbus_name,
 
1270
                             type_func=lambda x: x,
 
1271
                             variant_level=1,
 
1272
                             invalidate_only=False,
1255
1273
                             _interface=_interface):
1256
1274
        """ Modify a variable so that it's a property which announces
1257
1275
        its changes to DBus.
1264
1282
        variant_level: D-Bus variant level.  Default: 1
1265
1283
        """
1266
1284
        attrname = "_{}".format(dbus_name)
 
1285
        
1267
1286
        def setter(self, value):
1268
1287
            if hasattr(self, "dbus_object_path"):
1269
1288
                if (not hasattr(self, attrname) or
1270
1289
                    type_func(getattr(self, attrname, None))
1271
1290
                    != type_func(value)):
1272
1291
                    if invalidate_only:
1273
 
                        self.PropertiesChanged(_interface,
1274
 
                                               dbus.Dictionary(),
1275
 
                                               dbus.Array
1276
 
                                               ((dbus_name,)))
 
1292
                        self.PropertiesChanged(
 
1293
                            _interface, dbus.Dictionary(),
 
1294
                            dbus.Array((dbus_name, )))
1277
1295
                    else:
1278
 
                        dbus_value = transform_func(type_func(value),
1279
 
                                                    variant_level
1280
 
                                                    =variant_level)
 
1296
                        dbus_value = transform_func(
 
1297
                            type_func(value),
 
1298
                            variant_level = variant_level)
1281
1299
                        self.PropertyChanged(dbus.String(dbus_name),
1282
1300
                                             dbus_value)
1283
 
                        self.PropertiesChanged(_interface,
1284
 
                                               dbus.Dictionary({
1285
 
                                    dbus.String(dbus_name):
1286
 
                                        dbus_value }), dbus.Array())
 
1301
                        self.PropertiesChanged(
 
1302
                            _interface,
 
1303
                            dbus.Dictionary({ dbus.String(dbus_name):
 
1304
                                              dbus_value }),
 
1305
                            dbus.Array())
1287
1306
            setattr(self, attrname, value)
1288
1307
        
1289
1308
        return property(lambda self: getattr(self, attrname), setter)
1295
1314
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1296
1315
    last_enabled = notifychangeproperty(datetime_to_dbus,
1297
1316
                                        "LastEnabled")
1298
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1299
 
                                   type_func = lambda checker:
1300
 
                                       checker is not None)
 
1317
    checker = notifychangeproperty(
 
1318
        dbus.Boolean, "CheckerRunning",
 
1319
        type_func = lambda checker: checker is not None)
1301
1320
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1302
1321
                                           "LastCheckedOK")
1303
1322
    last_checker_status = notifychangeproperty(dbus.Int16,
1306
1325
        datetime_to_dbus, "LastApprovalRequest")
1307
1326
    approved_by_default = notifychangeproperty(dbus.Boolean,
1308
1327
                                               "ApprovedByDefault")
1309
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1310
 
                                          "ApprovalDelay",
1311
 
                                          type_func =
1312
 
                                          lambda td: td.total_seconds()
1313
 
                                          * 1000)
 
1328
    approval_delay = notifychangeproperty(
 
1329
        dbus.UInt64, "ApprovalDelay",
 
1330
        type_func = lambda td: td.total_seconds() * 1000)
1314
1331
    approval_duration = notifychangeproperty(
1315
1332
        dbus.UInt64, "ApprovalDuration",
1316
1333
        type_func = lambda td: td.total_seconds() * 1000)
1317
1334
    host = notifychangeproperty(dbus.String, "Host")
1318
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1319
 
                                   type_func = lambda td:
1320
 
                                       td.total_seconds() * 1000)
 
1335
    timeout = notifychangeproperty(
 
1336
        dbus.UInt64, "Timeout",
 
1337
        type_func = lambda td: td.total_seconds() * 1000)
1321
1338
    extended_timeout = notifychangeproperty(
1322
1339
        dbus.UInt64, "ExtendedTimeout",
1323
1340
        type_func = lambda td: td.total_seconds() * 1000)
1324
 
    interval = notifychangeproperty(dbus.UInt64,
1325
 
                                    "Interval",
1326
 
                                    type_func =
1327
 
                                    lambda td: td.total_seconds()
1328
 
                                    * 1000)
 
1341
    interval = notifychangeproperty(
 
1342
        dbus.UInt64, "Interval",
 
1343
        type_func = lambda td: td.total_seconds() * 1000)
1329
1344
    checker_command = notifychangeproperty(dbus.String, "Checker")
1330
1345
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1331
1346
                                  invalidate_only=True)
1469
1484
        return dbus.Boolean(bool(self.approvals_pending))
1470
1485
    
1471
1486
    # ApprovedByDefault - property
1472
 
    @dbus_service_property(_interface, signature="b",
 
1487
    @dbus_service_property(_interface,
 
1488
                           signature="b",
1473
1489
                           access="readwrite")
1474
1490
    def ApprovedByDefault_dbus_property(self, value=None):
1475
1491
        if value is None:       # get
1477
1493
        self.approved_by_default = bool(value)
1478
1494
    
1479
1495
    # ApprovalDelay - property
1480
 
    @dbus_service_property(_interface, signature="t",
 
1496
    @dbus_service_property(_interface,
 
1497
                           signature="t",
1481
1498
                           access="readwrite")
1482
1499
    def ApprovalDelay_dbus_property(self, value=None):
1483
1500
        if value is None:       # get
1486
1503
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1487
1504
    
1488
1505
    # ApprovalDuration - property
1489
 
    @dbus_service_property(_interface, signature="t",
 
1506
    @dbus_service_property(_interface,
 
1507
                           signature="t",
1490
1508
                           access="readwrite")
1491
1509
    def ApprovalDuration_dbus_property(self, value=None):
1492
1510
        if value is None:       # get
1505
1523
        return dbus.String(self.fingerprint)
1506
1524
    
1507
1525
    # Host - property
1508
 
    @dbus_service_property(_interface, signature="s",
 
1526
    @dbus_service_property(_interface,
 
1527
                           signature="s",
1509
1528
                           access="readwrite")
1510
1529
    def Host_dbus_property(self, value=None):
1511
1530
        if value is None:       # get
1523
1542
        return datetime_to_dbus(self.last_enabled)
1524
1543
    
1525
1544
    # Enabled - property
1526
 
    @dbus_service_property(_interface, signature="b",
 
1545
    @dbus_service_property(_interface,
 
1546
                           signature="b",
1527
1547
                           access="readwrite")
1528
1548
    def Enabled_dbus_property(self, value=None):
1529
1549
        if value is None:       # get
1534
1554
            self.disable()
1535
1555
    
1536
1556
    # LastCheckedOK - property
1537
 
    @dbus_service_property(_interface, signature="s",
 
1557
    @dbus_service_property(_interface,
 
1558
                           signature="s",
1538
1559
                           access="readwrite")
1539
1560
    def LastCheckedOK_dbus_property(self, value=None):
1540
1561
        if value is not None:
1543
1564
        return datetime_to_dbus(self.last_checked_ok)
1544
1565
    
1545
1566
    # LastCheckerStatus - property
1546
 
    @dbus_service_property(_interface, signature="n",
1547
 
                           access="read")
 
1567
    @dbus_service_property(_interface, signature="n", access="read")
1548
1568
    def LastCheckerStatus_dbus_property(self):
1549
1569
        return dbus.Int16(self.last_checker_status)
1550
1570
    
1559
1579
        return datetime_to_dbus(self.last_approval_request)
1560
1580
    
1561
1581
    # Timeout - property
1562
 
    @dbus_service_property(_interface, signature="t",
 
1582
    @dbus_service_property(_interface,
 
1583
                           signature="t",
1563
1584
                           access="readwrite")
1564
1585
    def Timeout_dbus_property(self, value=None):
1565
1586
        if value is None:       # get
1578
1599
                    is None):
1579
1600
                    return
1580
1601
                gobject.source_remove(self.disable_initiator_tag)
1581
 
                self.disable_initiator_tag = (
1582
 
                    gobject.timeout_add(
1583
 
                        int((self.expires - now).total_seconds()
1584
 
                            * 1000), self.disable))
 
1602
                self.disable_initiator_tag = gobject.timeout_add(
 
1603
                    int((self.expires - now).total_seconds() * 1000),
 
1604
                    self.disable)
1585
1605
    
1586
1606
    # ExtendedTimeout - property
1587
 
    @dbus_service_property(_interface, signature="t",
 
1607
    @dbus_service_property(_interface,
 
1608
                           signature="t",
1588
1609
                           access="readwrite")
1589
1610
    def ExtendedTimeout_dbus_property(self, value=None):
1590
1611
        if value is None:       # get
1593
1614
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1594
1615
    
1595
1616
    # Interval - property
1596
 
    @dbus_service_property(_interface, signature="t",
 
1617
    @dbus_service_property(_interface,
 
1618
                           signature="t",
1597
1619
                           access="readwrite")
1598
1620
    def Interval_dbus_property(self, value=None):
1599
1621
        if value is None:       # get
1604
1626
        if self.enabled:
1605
1627
            # Reschedule checker run
1606
1628
            gobject.source_remove(self.checker_initiator_tag)
1607
 
            self.checker_initiator_tag = (gobject.timeout_add
1608
 
                                          (value, self.start_checker))
1609
 
            self.start_checker()    # Start one now, too
 
1629
            self.checker_initiator_tag = gobject.timeout_add(
 
1630
                value, self.start_checker)
 
1631
            self.start_checker() # Start one now, too
1610
1632
    
1611
1633
    # Checker - property
1612
 
    @dbus_service_property(_interface, signature="s",
 
1634
    @dbus_service_property(_interface,
 
1635
                           signature="s",
1613
1636
                           access="readwrite")
1614
1637
    def Checker_dbus_property(self, value=None):
1615
1638
        if value is None:       # get
1617
1640
        self.checker_command = str(value)
1618
1641
    
1619
1642
    # CheckerRunning - property
1620
 
    @dbus_service_property(_interface, signature="b",
 
1643
    @dbus_service_property(_interface,
 
1644
                           signature="b",
1621
1645
                           access="readwrite")
1622
1646
    def CheckerRunning_dbus_property(self, value=None):
1623
1647
        if value is None:       # get
1633
1657
        return self.dbus_object_path # is already a dbus.ObjectPath
1634
1658
    
1635
1659
    # Secret = property
1636
 
    @dbus_service_property(_interface, signature="ay",
1637
 
                           access="write", byte_arrays=True)
 
1660
    @dbus_service_property(_interface,
 
1661
                           signature="ay",
 
1662
                           access="write",
 
1663
                           byte_arrays=True)
1638
1664
    def Secret_dbus_property(self, value):
1639
1665
        self.secret = bytes(value)
1640
1666
    
1646
1672
        self._pipe = child_pipe
1647
1673
        self._pipe.send(('init', fpr, address))
1648
1674
        if not self._pipe.recv():
1649
 
            raise KeyError()
 
1675
            raise KeyError(fpr)
1650
1676
    
1651
1677
    def __getattribute__(self, name):
1652
1678
        if name == '_pipe':
1656
1682
        if data[0] == 'data':
1657
1683
            return data[1]
1658
1684
        if data[0] == 'function':
 
1685
            
1659
1686
            def func(*args, **kwargs):
1660
1687
                self._pipe.send(('funcall', name, args, kwargs))
1661
1688
                return self._pipe.recv()[1]
 
1689
            
1662
1690
            return func
1663
1691
    
1664
1692
    def __setattr__(self, name, value):
1680
1708
            logger.debug("Pipe FD: %d",
1681
1709
                         self.server.child_pipe.fileno())
1682
1710
            
1683
 
            session = (gnutls.connection
1684
 
                       .ClientSession(self.request,
1685
 
                                      gnutls.connection
1686
 
                                      .X509Credentials()))
 
1711
            session = gnutls.connection.ClientSession(
 
1712
                self.request, gnutls.connection .X509Credentials())
1687
1713
            
1688
1714
            # Note: gnutls.connection.X509Credentials is really a
1689
1715
            # generic GnuTLS certificate credentials object so long as
1698
1724
            priority = self.server.gnutls_priority
1699
1725
            if priority is None:
1700
1726
                priority = "NORMAL"
1701
 
            (gnutls.library.functions
1702
 
             .gnutls_priority_set_direct(session._c_object,
1703
 
                                         priority, None))
 
1727
            gnutls.library.functions.gnutls_priority_set_direct(
 
1728
                session._c_object, priority, None)
1704
1729
            
1705
1730
            # Start communication using the Mandos protocol
1706
1731
            # Get protocol number
1726
1751
            approval_required = False
1727
1752
            try:
1728
1753
                try:
1729
 
                    fpr = self.fingerprint(self.peer_certificate
1730
 
                                           (session))
 
1754
                    fpr = self.fingerprint(
 
1755
                        self.peer_certificate(session))
1731
1756
                except (TypeError,
1732
1757
                        gnutls.errors.GNUTLSError) as error:
1733
1758
                    logger.warning("Bad certificate: %s", error)
1748
1773
                while True:
1749
1774
                    if not client.enabled:
1750
1775
                        logger.info("Client %s is disabled",
1751
 
                                       client.name)
 
1776
                                    client.name)
1752
1777
                        if self.server.use_dbus:
1753
1778
                            # Emit D-Bus signal
1754
1779
                            client.Rejected("Disabled")
1801
1826
                        logger.warning("gnutls send failed",
1802
1827
                                       exc_info=error)
1803
1828
                        return
1804
 
                    logger.debug("Sent: %d, remaining: %d",
1805
 
                                 sent, len(client.secret)
1806
 
                                 - (sent_size + sent))
 
1829
                    logger.debug("Sent: %d, remaining: %d", sent,
 
1830
                                 len(client.secret) - (sent_size
 
1831
                                                       + sent))
1807
1832
                    sent_size += sent
1808
1833
                
1809
1834
                logger.info("Sending secret to %s", client.name)
1826
1851
    def peer_certificate(session):
1827
1852
        "Return the peer's OpenPGP certificate as a bytestring"
1828
1853
        # If not an OpenPGP certificate...
1829
 
        if (gnutls.library.functions
1830
 
            .gnutls_certificate_type_get(session._c_object)
 
1854
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
1855
                session._c_object)
1831
1856
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1832
1857
            # ...do the normal thing
1833
1858
            return session.peer_certificate
1847
1872
    def fingerprint(openpgp):
1848
1873
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1849
1874
        # New GnuTLS "datum" with the OpenPGP public key
1850
 
        datum = (gnutls.library.types
1851
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1852
 
                                             ctypes.POINTER
1853
 
                                             (ctypes.c_ubyte)),
1854
 
                                 ctypes.c_uint(len(openpgp))))
 
1875
        datum = gnutls.library.types.gnutls_datum_t(
 
1876
            ctypes.cast(ctypes.c_char_p(openpgp),
 
1877
                        ctypes.POINTER(ctypes.c_ubyte)),
 
1878
            ctypes.c_uint(len(openpgp)))
1855
1879
        # New empty GnuTLS certificate
1856
1880
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1857
 
        (gnutls.library.functions
1858
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
1881
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
1882
            ctypes.byref(crt))
1859
1883
        # Import the OpenPGP public key into the certificate
1860
 
        (gnutls.library.functions
1861
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1862
 
                                    gnutls.library.constants
1863
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
1884
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
1885
            crt, ctypes.byref(datum),
 
1886
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1864
1887
        # Verify the self signature in the key
1865
1888
        crtverify = ctypes.c_uint()
1866
 
        (gnutls.library.functions
1867
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
1868
 
                                         ctypes.byref(crtverify)))
 
1889
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
1890
            crt, 0, ctypes.byref(crtverify))
1869
1891
        if crtverify.value != 0:
1870
1892
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1871
 
            raise (gnutls.errors.CertificateSecurityError
1872
 
                   ("Verify failed"))
 
1893
            raise gnutls.errors.CertificateSecurityError(
 
1894
                "Verify failed")
1873
1895
        # New buffer for the fingerprint
1874
1896
        buf = ctypes.create_string_buffer(20)
1875
1897
        buf_len = ctypes.c_size_t()
1876
1898
        # Get the fingerprint from the certificate into the buffer
1877
 
        (gnutls.library.functions
1878
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1879
 
                                             ctypes.byref(buf_len)))
 
1899
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
1900
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
1880
1901
        # Deinit the certificate
1881
1902
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1882
1903
        # Convert the buffer to a Python bytestring
1888
1909
 
1889
1910
class MultiprocessingMixIn(object):
1890
1911
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1912
    
1891
1913
    def sub_process_main(self, request, address):
1892
1914
        try:
1893
1915
            self.finish_request(request, address)
1905
1927
 
1906
1928
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1907
1929
    """ adds a pipe to the MixIn """
 
1930
    
1908
1931
    def process_request(self, request, client_address):
1909
1932
        """Overrides and wraps the original process_request().
1910
1933
        
1931
1954
        interface:      None or a network interface name (string)
1932
1955
        use_ipv6:       Boolean; to use IPv6 or not
1933
1956
    """
 
1957
    
1934
1958
    def __init__(self, server_address, RequestHandlerClass,
1935
 
                 interface=None, use_ipv6=True, socketfd=None):
 
1959
                 interface=None,
 
1960
                 use_ipv6=True,
 
1961
                 socketfd=None):
1936
1962
        """If socketfd is set, use that file descriptor instead of
1937
1963
        creating a new one with socket.socket().
1938
1964
        """
1979
2005
                             self.interface)
1980
2006
            else:
1981
2007
                try:
1982
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1983
 
                                           SO_BINDTODEVICE,
1984
 
                                           (self.interface + "\0")
1985
 
                                           .encode("utf-8"))
 
2008
                    self.socket.setsockopt(
 
2009
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2010
                        (self.interface + "\0").encode("utf-8"))
1986
2011
                except socket.error as error:
1987
2012
                    if error.errno == errno.EPERM:
1988
2013
                        logger.error("No permission to bind to"
2006
2031
                self.server_address = (any_address,
2007
2032
                                       self.server_address[1])
2008
2033
            elif not self.server_address[1]:
2009
 
                self.server_address = (self.server_address[0],
2010
 
                                       0)
 
2034
                self.server_address = (self.server_address[0], 0)
2011
2035
#                 if self.interface:
2012
2036
#                     self.server_address = (self.server_address[0],
2013
2037
#                                            0, # port
2027
2051
    
2028
2052
    Assumes a gobject.MainLoop event loop.
2029
2053
    """
 
2054
    
2030
2055
    def __init__(self, server_address, RequestHandlerClass,
2031
 
                 interface=None, use_ipv6=True, clients=None,
2032
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
2056
                 interface=None,
 
2057
                 use_ipv6=True,
 
2058
                 clients=None,
 
2059
                 gnutls_priority=None,
 
2060
                 use_dbus=True,
 
2061
                 socketfd=None):
2033
2062
        self.enabled = False
2034
2063
        self.clients = clients
2035
2064
        if self.clients is None:
2041
2070
                                interface = interface,
2042
2071
                                use_ipv6 = use_ipv6,
2043
2072
                                socketfd = socketfd)
 
2073
    
2044
2074
    def server_activate(self):
2045
2075
        if self.enabled:
2046
2076
            return socketserver.TCPServer.server_activate(self)
2050
2080
    
2051
2081
    def add_pipe(self, parent_pipe, proc):
2052
2082
        # Call "handle_ipc" for both data and EOF events
2053
 
        gobject.io_add_watch(parent_pipe.fileno(),
2054
 
                             gobject.IO_IN | gobject.IO_HUP,
2055
 
                             functools.partial(self.handle_ipc,
2056
 
                                               parent_pipe =
2057
 
                                               parent_pipe,
2058
 
                                               proc = proc))
 
2083
        gobject.io_add_watch(
 
2084
            parent_pipe.fileno(),
 
2085
            gobject.IO_IN | gobject.IO_HUP,
 
2086
            functools.partial(self.handle_ipc,
 
2087
                              parent_pipe = parent_pipe,
 
2088
                              proc = proc))
2059
2089
    
2060
 
    def handle_ipc(self, source, condition, parent_pipe=None,
2061
 
                   proc = None, client_object=None):
 
2090
    def handle_ipc(self, source, condition,
 
2091
                   parent_pipe=None,
 
2092
                   proc = None,
 
2093
                   client_object=None):
2062
2094
        # error, or the other end of multiprocessing.Pipe has closed
2063
2095
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2064
2096
            # Wait for other process to exit
2087
2119
                parent_pipe.send(False)
2088
2120
                return False
2089
2121
            
2090
 
            gobject.io_add_watch(parent_pipe.fileno(),
2091
 
                                 gobject.IO_IN | gobject.IO_HUP,
2092
 
                                 functools.partial(self.handle_ipc,
2093
 
                                                   parent_pipe =
2094
 
                                                   parent_pipe,
2095
 
                                                   proc = proc,
2096
 
                                                   client_object =
2097
 
                                                   client))
 
2122
            gobject.io_add_watch(
 
2123
                parent_pipe.fileno(),
 
2124
                gobject.IO_IN | gobject.IO_HUP,
 
2125
                functools.partial(self.handle_ipc,
 
2126
                                  parent_pipe = parent_pipe,
 
2127
                                  proc = proc,
 
2128
                                  client_object = client))
2098
2129
            parent_pipe.send(True)
2099
2130
            # remove the old hook in favor of the new above hook on
2100
2131
            # same fileno
2106
2137
            
2107
2138
            parent_pipe.send(('data', getattr(client_object,
2108
2139
                                              funcname)(*args,
2109
 
                                                         **kwargs)))
 
2140
                                                        **kwargs)))
2110
2141
        
2111
2142
        if command == 'getattr':
2112
2143
            attrname = request[1]
2113
2144
            if callable(client_object.__getattribute__(attrname)):
2114
 
                parent_pipe.send(('function',))
 
2145
                parent_pipe.send(('function', ))
2115
2146
            else:
2116
 
                parent_pipe.send(('data', client_object
2117
 
                                  .__getattribute__(attrname)))
 
2147
                parent_pipe.send((
 
2148
                    'data', client_object.__getattribute__(attrname)))
2118
2149
        
2119
2150
        if command == 'setattr':
2120
2151
            attrname = request[1]
2160
2191
                                              # None
2161
2192
                                    "followers")) # Tokens valid after
2162
2193
                                                  # this token
 
2194
    Token = collections.namedtuple("Token", (
 
2195
        "regexp",  # To match token; if "value" is not None, must have
 
2196
                   # a "group" containing digits
 
2197
        "value",   # datetime.timedelta or None
 
2198
        "followers"))           # Tokens valid after this token
2163
2199
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2164
2200
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2165
2201
    token_end = Token(re.compile(r"$"), None, frozenset())
2166
2202
    token_second = Token(re.compile(r"(\d+)S"),
2167
2203
                         datetime.timedelta(seconds=1),
2168
 
                         frozenset((token_end,)))
 
2204
                         frozenset((token_end, )))
2169
2205
    token_minute = Token(re.compile(r"(\d+)M"),
2170
2206
                         datetime.timedelta(minutes=1),
2171
2207
                         frozenset((token_second, token_end)))
2187
2223
                       frozenset((token_month, token_end)))
2188
2224
    token_week = Token(re.compile(r"(\d+)W"),
2189
2225
                       datetime.timedelta(weeks=1),
2190
 
                       frozenset((token_end,)))
 
2226
                       frozenset((token_end, )))
2191
2227
    token_duration = Token(re.compile(r"P"), None,
2192
2228
                           frozenset((token_year, token_month,
2193
2229
                                      token_day, token_time,
2218
2254
                break
2219
2255
        else:
2220
2256
            # No currently valid tokens were found
2221
 
            raise ValueError("Invalid RFC 3339 duration")
 
2257
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2258
                             .format(duration))
2222
2259
    # End token found
2223
2260
    return value
2224
2261
 
2261
2298
            elif suffix == "w":
2262
2299
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2263
2300
            else:
2264
 
                raise ValueError("Unknown suffix {!r}"
2265
 
                                 .format(suffix))
 
2301
                raise ValueError("Unknown suffix {!r}".format(suffix))
2266
2302
        except IndexError as e:
2267
2303
            raise ValueError(*(e.args))
2268
2304
        timevalue += delta
2284
2320
        # Close all standard open file descriptors
2285
2321
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2286
2322
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2287
 
            raise OSError(errno.ENODEV, "{} not a character device"
 
2323
            raise OSError(errno.ENODEV,
 
2324
                          "{} not a character device"
2288
2325
                          .format(os.devnull))
2289
2326
        os.dup2(null, sys.stdin.fileno())
2290
2327
        os.dup2(null, sys.stdout.fileno())
2356
2393
                        "port": "",
2357
2394
                        "debug": "False",
2358
2395
                        "priority":
2359
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2396
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2397
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2360
2398
                        "servicename": "Mandos",
2361
2399
                        "use_dbus": "True",
2362
2400
                        "use_ipv6": "True",
2366
2404
                        "statedir": "/var/lib/mandos",
2367
2405
                        "foreground": "False",
2368
2406
                        "zeroconf": "True",
2369
 
                        }
 
2407
                    }
2370
2408
    
2371
2409
    # Parse config file for server-global settings
2372
2410
    server_config = configparser.SafeConfigParser(server_defaults)
2373
2411
    del server_defaults
2374
 
    server_config.read(os.path.join(options.configdir,
2375
 
                                    "mandos.conf"))
 
2412
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
2376
2413
    # Convert the SafeConfigParser object to a dict
2377
2414
    server_settings = server_config.defaults()
2378
2415
    # Use the appropriate methods on the non-string config options
2396
2433
    # Override the settings from the config file with command line
2397
2434
    # options, if set.
2398
2435
    for option in ("interface", "address", "port", "debug",
2399
 
                   "priority", "servicename", "configdir",
2400
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2401
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2436
                   "priority", "servicename", "configdir", "use_dbus",
 
2437
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2438
                   "socket", "foreground", "zeroconf"):
2402
2439
        value = getattr(options, option)
2403
2440
        if value is not None:
2404
2441
            server_settings[option] = value
2419
2456
    
2420
2457
    ##################################################################
2421
2458
    
2422
 
    if (not server_settings["zeroconf"] and
2423
 
        not (server_settings["port"]
2424
 
             or server_settings["socket"] != "")):
2425
 
            parser.error("Needs port or socket to work without"
2426
 
                         " Zeroconf")
 
2459
    if (not server_settings["zeroconf"]
 
2460
        and not (server_settings["port"]
 
2461
                 or server_settings["socket"] != "")):
 
2462
        parser.error("Needs port or socket to work without Zeroconf")
2427
2463
    
2428
2464
    # For convenience
2429
2465
    debug = server_settings["debug"]
2445
2481
            initlogger(debug, level)
2446
2482
    
2447
2483
    if server_settings["servicename"] != "Mandos":
2448
 
        syslogger.setFormatter(logging.Formatter
2449
 
                               ('Mandos ({}) [%(process)d]:'
2450
 
                                ' %(levelname)s: %(message)s'
2451
 
                                .format(server_settings
2452
 
                                        ["servicename"])))
 
2484
        syslogger.setFormatter(
 
2485
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2486
                              ' %(levelname)s: %(message)s'.format(
 
2487
                                  server_settings["servicename"])))
2453
2488
    
2454
2489
    # Parse config file with clients
2455
2490
    client_config = configparser.SafeConfigParser(Client
2463
2498
    socketfd = None
2464
2499
    if server_settings["socket"] != "":
2465
2500
        socketfd = server_settings["socket"]
2466
 
    tcp_server = MandosServer((server_settings["address"],
2467
 
                               server_settings["port"]),
2468
 
                              ClientHandler,
2469
 
                              interface=(server_settings["interface"]
2470
 
                                         or None),
2471
 
                              use_ipv6=use_ipv6,
2472
 
                              gnutls_priority=
2473
 
                              server_settings["priority"],
2474
 
                              use_dbus=use_dbus,
2475
 
                              socketfd=socketfd)
 
2501
    tcp_server = MandosServer(
 
2502
        (server_settings["address"], server_settings["port"]),
 
2503
        ClientHandler,
 
2504
        interface=(server_settings["interface"] or None),
 
2505
        use_ipv6=use_ipv6,
 
2506
        gnutls_priority=server_settings["priority"],
 
2507
        use_dbus=use_dbus,
 
2508
        socketfd=socketfd)
2476
2509
    if not foreground:
2477
2510
        pidfilename = "/run/mandos.pid"
2478
2511
        if not os.path.isdir("/run/."):
2479
2512
            pidfilename = "/var/run/mandos.pid"
2480
2513
        pidfile = None
2481
2514
        try:
2482
 
            pidfile = open(pidfilename, "w")
 
2515
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2483
2516
        except IOError as e:
2484
2517
            logger.error("Could not open file %r", pidfilename,
2485
2518
                         exc_info=e)
2512
2545
        def debug_gnutls(level, string):
2513
2546
            logger.debug("GnuTLS: %s", string[:-1])
2514
2547
        
2515
 
        (gnutls.library.functions
2516
 
         .gnutls_global_set_log_function(debug_gnutls))
 
2548
        gnutls.library.functions.gnutls_global_set_log_function(
 
2549
            debug_gnutls)
2517
2550
        
2518
2551
        # Redirect stdin so all checkers get /dev/null
2519
2552
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2539
2572
    if use_dbus:
2540
2573
        try:
2541
2574
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2542
 
                                            bus, do_not_queue=True)
2543
 
            old_bus_name = (dbus.service.BusName
2544
 
                            ("se.bsnet.fukt.Mandos", bus,
2545
 
                             do_not_queue=True))
2546
 
        except dbus.exceptions.NameExistsException as e:
 
2575
                                            bus,
 
2576
                                            do_not_queue=True)
 
2577
            old_bus_name = dbus.service.BusName(
 
2578
                "se.bsnet.fukt.Mandos", bus,
 
2579
                do_not_queue=True)
 
2580
        except dbus.exceptions.DBusException as e:
2547
2581
            logger.error("Disabling D-Bus:", exc_info=e)
2548
2582
            use_dbus = False
2549
2583
            server_settings["use_dbus"] = False
2550
2584
            tcp_server.use_dbus = False
2551
2585
    if zeroconf:
2552
2586
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2553
 
        service = AvahiServiceToSyslog(name =
2554
 
                                       server_settings["servicename"],
2555
 
                                       servicetype = "_mandos._tcp",
2556
 
                                       protocol = protocol, bus = bus)
 
2587
        service = AvahiServiceToSyslog(
 
2588
            name = server_settings["servicename"],
 
2589
            servicetype = "_mandos._tcp",
 
2590
            protocol = protocol,
 
2591
            bus = bus)
2557
2592
        if server_settings["interface"]:
2558
 
            service.interface = (if_nametoindex
2559
 
                                 (server_settings["interface"]
2560
 
                                  .encode("utf-8")))
 
2593
            service.interface = if_nametoindex(
 
2594
                server_settings["interface"].encode("utf-8"))
2561
2595
    
2562
2596
    global multiprocessing_manager
2563
2597
    multiprocessing_manager = multiprocessing.Manager()
2582
2616
    if server_settings["restore"]:
2583
2617
        try:
2584
2618
            with open(stored_state_path, "rb") as stored_state:
2585
 
                clients_data, old_client_settings = (pickle.load
2586
 
                                                     (stored_state))
 
2619
                clients_data, old_client_settings = pickle.load(
 
2620
                    stored_state)
2587
2621
            os.remove(stored_state_path)
2588
2622
        except IOError as e:
2589
2623
            if e.errno == errno.ENOENT:
2590
 
                logger.warning("Could not load persistent state: {}"
2591
 
                                .format(os.strerror(e.errno)))
 
2624
                logger.warning("Could not load persistent state:"
 
2625
                               " {}".format(os.strerror(e.errno)))
2592
2626
            else:
2593
2627
                logger.critical("Could not load persistent state:",
2594
2628
                                exc_info=e)
2595
2629
                raise
2596
2630
        except EOFError as e:
2597
2631
            logger.warning("Could not load persistent state: "
2598
 
                           "EOFError:", exc_info=e)
 
2632
                           "EOFError:",
 
2633
                           exc_info=e)
2599
2634
    
2600
2635
    with PGPEngine() as pgp:
2601
2636
        for client_name, client in clients_data.items():
2613
2648
                    # For each value in new config, check if it
2614
2649
                    # differs from the old config value (Except for
2615
2650
                    # the "secret" attribute)
2616
 
                    if (name != "secret" and
2617
 
                        value != old_client_settings[client_name]
2618
 
                        [name]):
 
2651
                    if (name != "secret"
 
2652
                        and (value !=
 
2653
                             old_client_settings[client_name][name])):
2619
2654
                        client[name] = value
2620
2655
                except KeyError:
2621
2656
                    pass
2630
2665
                    if not client["last_checked_ok"]:
2631
2666
                        logger.warning(
2632
2667
                            "disabling client {} - Client never "
2633
 
                            "performed a successful checker"
2634
 
                            .format(client_name))
 
2668
                            "performed a successful checker".format(
 
2669
                                client_name))
2635
2670
                        client["enabled"] = False
2636
2671
                    elif client["last_checker_status"] != 0:
2637
2672
                        logger.warning(
2638
2673
                            "disabling client {} - Client last"
2639
 
                            " checker failed with error code {}"
2640
 
                            .format(client_name,
2641
 
                                    client["last_checker_status"]))
 
2674
                            " checker failed with error code"
 
2675
                            " {}".format(
 
2676
                                client_name,
 
2677
                                client["last_checker_status"]))
2642
2678
                        client["enabled"] = False
2643
2679
                    else:
2644
 
                        client["expires"] = (datetime.datetime
2645
 
                                             .utcnow()
2646
 
                                             + client["timeout"])
 
2680
                        client["expires"] = (
 
2681
                            datetime.datetime.utcnow()
 
2682
                            + client["timeout"])
2647
2683
                        logger.debug("Last checker succeeded,"
2648
 
                                     " keeping {} enabled"
2649
 
                                     .format(client_name))
 
2684
                                     " keeping {} enabled".format(
 
2685
                                         client_name))
2650
2686
            try:
2651
 
                client["secret"] = (
2652
 
                    pgp.decrypt(client["encrypted_secret"],
2653
 
                                client_settings[client_name]
2654
 
                                ["secret"]))
 
2687
                client["secret"] = pgp.decrypt(
 
2688
                    client["encrypted_secret"],
 
2689
                    client_settings[client_name]["secret"])
2655
2690
            except PGPError:
2656
2691
                # If decryption fails, we use secret from new settings
2657
 
                logger.debug("Failed to decrypt {} old secret"
2658
 
                             .format(client_name))
2659
 
                client["secret"] = (
2660
 
                    client_settings[client_name]["secret"])
 
2692
                logger.debug("Failed to decrypt {} old secret".format(
 
2693
                    client_name))
 
2694
                client["secret"] = (client_settings[client_name]
 
2695
                                    ["secret"])
2661
2696
    
2662
2697
    # Add/remove clients based on new changes made to config
2663
2698
    for client_name in (set(old_client_settings)
2670
2705
    # Create all client objects
2671
2706
    for client_name, client in clients_data.items():
2672
2707
        tcp_server.clients[client_name] = client_class(
2673
 
            name = client_name, settings = client,
 
2708
            name = client_name,
 
2709
            settings = client,
2674
2710
            server_settings = server_settings)
2675
2711
    
2676
2712
    if not tcp_server.clients:
2678
2714
    
2679
2715
    if not foreground:
2680
2716
        if pidfile is not None:
 
2717
            pid = os.getpid()
2681
2718
            try:
2682
2719
                with pidfile:
2683
 
                    pid = os.getpid()
2684
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
2720
                    print(pid, file=pidfile)
2685
2721
            except IOError:
2686
2722
                logger.error("Could not write to file %r with PID %d",
2687
2723
                             pidfilename, pid)
2692
2728
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2693
2729
    
2694
2730
    if use_dbus:
2695
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2696
 
                                        "se.bsnet.fukt.Mandos"})
 
2731
        
 
2732
        @alternate_dbus_interfaces(
 
2733
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2697
2734
        class MandosDBusService(DBusObjectWithProperties):
2698
2735
            """A D-Bus proxy object"""
 
2736
            
2699
2737
            def __init__(self):
2700
2738
                dbus.service.Object.__init__(self, bus, "/")
 
2739
            
2701
2740
            _interface = "se.recompile.Mandos"
2702
2741
            
2703
2742
            @dbus_interface_annotations(_interface)
2704
2743
            def _foo(self):
2705
 
                return { "org.freedesktop.DBus.Property"
2706
 
                         ".EmitsChangedSignal":
2707
 
                             "false"}
 
2744
                return {
 
2745
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2746
                    "false" }
2708
2747
            
2709
2748
            @dbus.service.signal(_interface, signature="o")
2710
2749
            def ClientAdded(self, objpath):
2724
2763
            @dbus.service.method(_interface, out_signature="ao")
2725
2764
            def GetAllClients(self):
2726
2765
                "D-Bus method"
2727
 
                return dbus.Array(c.dbus_object_path
2728
 
                                  for c in
 
2766
                return dbus.Array(c.dbus_object_path for c in
2729
2767
                                  tcp_server.clients.itervalues())
2730
2768
            
2731
2769
            @dbus.service.method(_interface,
2780
2818
                # + secret.
2781
2819
                exclude = { "bus", "changedstate", "secret",
2782
2820
                            "checker", "server_settings" }
2783
 
                for name, typ in (inspect.getmembers
2784
 
                                  (dbus.service.Object)):
 
2821
                for name, typ in inspect.getmembers(dbus.service
 
2822
                                                    .Object):
2785
2823
                    exclude.add(name)
2786
2824
                
2787
2825
                client_dict["encrypted_secret"] = (client
2794
2832
                del client_settings[client.name]["secret"]
2795
2833
        
2796
2834
        try:
2797
 
            with (tempfile.NamedTemporaryFile
2798
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2799
 
                   dir=os.path.dirname(stored_state_path),
2800
 
                   delete=False)) as stored_state:
 
2835
            with tempfile.NamedTemporaryFile(
 
2836
                    mode='wb',
 
2837
                    suffix=".pickle",
 
2838
                    prefix='clients-',
 
2839
                    dir=os.path.dirname(stored_state_path),
 
2840
                    delete=False) as stored_state:
2801
2841
                pickle.dump((clients, client_settings), stored_state)
2802
 
                tempname=stored_state.name
 
2842
                tempname = stored_state.name
2803
2843
            os.rename(tempname, stored_state_path)
2804
2844
        except (IOError, OSError) as e:
2805
2845
            if not debug:
2824
2864
            client.disable(quiet=True)
2825
2865
            if use_dbus:
2826
2866
                # Emit D-Bus signal
2827
 
                mandos_dbus_service.ClientRemoved(client
2828
 
                                                  .dbus_object_path,
2829
 
                                                  client.name)
 
2867
                mandos_dbus_service.ClientRemoved(
 
2868
                    client.dbus_object_path, client.name)
2830
2869
        client_settings.clear()
2831
2870
    
2832
2871
    atexit.register(cleanup)
2885
2924
    # Must run before the D-Bus bus name gets deregistered
2886
2925
    cleanup()
2887
2926
 
 
2927
 
2888
2928
if __name__ == '__main__':
2889
2929
    main()