63
 
import cPickle as pickle
 
 
70
    import cPickle as pickle
 
64
73
import multiprocessing
 
70
83
import dbus.service
 
 
85
from gi.repository import GLib
 
73
86
from dbus.mainloop.glib import DBusGMainLoop
 
76
89
import xml.dom.minidom
 
 
92
if sys.version_info.major == 2:
 
 
95
# Show warnings by default
 
 
96
if not sys.warnoptions:
 
 
98
    warnings.simplefilter("default")
 
 
100
# Try to find the value of SO_BINDTODEVICE:
 
 
102
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
 
 
103
    # newer, and it is also the most natural place for it:
 
81
104
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
 
82
105
except AttributeError:
 
 
107
        # This is where SO_BINDTODEVICE was up to and including Python
 
84
109
        from IN import SO_BINDTODEVICE
 
85
110
    except ImportError:
 
86
 
        SO_BINDTODEVICE = None
 
 
111
        # In Python 2.7 it seems to have been removed entirely.
 
 
112
        # Try running the C preprocessor:
 
 
114
            cc = subprocess.Popen(["cc", "--language=c", "-E",
 
 
116
                                  stdin=subprocess.PIPE,
 
 
117
                                  stdout=subprocess.PIPE)
 
 
118
            stdout = cc.communicate(
 
 
119
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
 
 
120
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
 
 
121
        except (OSError, ValueError, IndexError):
 
 
123
            SO_BINDTODEVICE = None
 
 
125
if sys.version_info.major == 2:
 
 
128
if sys.version_info < (3, 2):
 
 
129
    configparser.Configparser = configparser.SafeConfigParser
 
89
132
stored_state_file = "clients.pickle"
 
91
134
logger = logging.getLogger()
 
92
 
syslogger = (logging.handlers.SysLogHandler
 
93
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
94
 
              address = str("/dev/log")))
 
 
135
logging.captureWarnings(True)   # Show warnings via the logging system
 
97
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
98
 
                      (ctypes.util.find_library("c"))
 
 
139
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
 
140
        ctypes.util.find_library("c")).if_nametoindex
 
100
141
except (OSError, AttributeError):
 
101
143
    def if_nametoindex(interface):
 
102
144
        "Get an interface index the hard way, i.e. using fcntl()"
 
103
145
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
104
146
        with contextlib.closing(socket.socket()) as s:
 
105
147
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
106
 
                                struct.pack(str("16s16x"),
 
108
 
        interface_index = struct.unpack(str("I"),
 
 
148
                                struct.pack(b"16s16x", interface))
 
 
149
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
110
150
        return interface_index
 
 
153
def copy_function(func):
 
 
154
    """Make a copy of a function"""
 
 
155
    if sys.version_info.major == 2:
 
 
156
        return types.FunctionType(func.func_code,
 
 
162
        return types.FunctionType(func.__code__,
 
113
169
def initlogger(debug, level=logging.WARNING):
 
114
170
    """init logger and add loglevel"""
 
 
173
    syslogger = (logging.handlers.SysLogHandler(
 
 
174
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
 
116
176
    syslogger.setFormatter(logging.Formatter
 
117
177
                           ('Mandos [%(process)d]: %(levelname)s:'
 
119
179
    logger.addHandler(syslogger)
 
122
182
        console = logging.StreamHandler()
 
123
183
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
 
168
240
            os.rmdir(self.tempdir)
 
169
241
            self.tempdir = None
 
171
243
    def password_encode(self, password):
 
172
244
        # Passphrase can not be empty and can not contain newlines or
 
173
245
        # NUL bytes.  So we prefix it and hex encode it.
 
174
 
        return b"mandos" + binascii.hexlify(password)
 
 
246
        encoded = b"mandos" + binascii.hexlify(password)
 
 
247
        if len(encoded) > 2048:
 
 
248
            # GnuPG can't handle long passwords, so encode differently
 
 
249
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
 
250
                       .replace(b"\n", b"\\n")
 
 
251
                       .replace(b"\0", b"\\x00"))
 
176
254
    def encrypt(self, data, password):
 
177
 
        self.gnupg.passphrase = self.password_encode(password)
 
178
 
        with open(os.devnull) as devnull:
 
180
 
                proc = self.gnupg.run(['--symmetric'],
 
181
 
                                      create_fhs=['stdin', 'stdout'],
 
182
 
                                      attach_fhs={'stderr': devnull})
 
183
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
185
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
186
 
                    ciphertext = f.read()
 
190
 
        self.gnupg.passphrase = None
 
 
255
        passphrase = self.password_encode(password)
 
 
256
        with tempfile.NamedTemporaryFile(
 
 
257
                dir=self.tempdir) as passfile:
 
 
258
            passfile.write(passphrase)
 
 
260
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
 
264
                                    stdin=subprocess.PIPE,
 
 
265
                                    stdout=subprocess.PIPE,
 
 
266
                                    stderr=subprocess.PIPE)
 
 
267
            ciphertext, err = proc.communicate(input=data)
 
 
268
        if proc.returncode != 0:
 
191
270
        return ciphertext
 
193
272
    def decrypt(self, data, password):
 
194
 
        self.gnupg.passphrase = self.password_encode(password)
 
195
 
        with open(os.devnull) as devnull:
 
197
 
                proc = self.gnupg.run(['--decrypt'],
 
198
 
                                      create_fhs=['stdin', 'stdout'],
 
199
 
                                      attach_fhs={'stderr': devnull})
 
200
 
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
202
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
203
 
                    decrypted_plaintext = f.read()
 
207
 
        self.gnupg.passphrase = None
 
 
273
        passphrase = self.password_encode(password)
 
 
274
        with tempfile.NamedTemporaryFile(
 
 
275
                dir=self.tempdir) as passfile:
 
 
276
            passfile.write(passphrase)
 
 
278
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
 
282
                                    stdin=subprocess.PIPE,
 
 
283
                                    stdout=subprocess.PIPE,
 
 
284
                                    stderr=subprocess.PIPE)
 
 
285
            decrypted_plaintext, err = proc.communicate(input=data)
 
 
286
        if proc.returncode != 0:
 
208
288
        return decrypted_plaintext
 
 
291
# Pretend that we have an Avahi module
 
 
293
    """This isn't so much a class as it is a module-like namespace."""
 
 
294
    IF_UNSPEC = -1               # avahi-common/address.h
 
 
295
    PROTO_UNSPEC = -1            # avahi-common/address.h
 
 
296
    PROTO_INET = 0               # avahi-common/address.h
 
 
297
    PROTO_INET6 = 1              # avahi-common/address.h
 
 
298
    DBUS_NAME = "org.freedesktop.Avahi"
 
 
299
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
 
 
300
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
 
 
301
    DBUS_PATH_SERVER = "/"
 
 
304
    def string_array_to_txt_array(t):
 
 
305
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
 
 
306
                           for s in t), signature="ay")
 
 
307
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
 
 
308
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
 
 
309
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
 
 
310
    SERVER_INVALID = 0           # avahi-common/defs.h
 
 
311
    SERVER_REGISTERING = 1       # avahi-common/defs.h
 
 
312
    SERVER_RUNNING = 2           # avahi-common/defs.h
 
 
313
    SERVER_COLLISION = 3         # avahi-common/defs.h
 
 
314
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
212
317
class AvahiError(Exception):
 
213
318
    def __init__(self, value, *args, **kwargs):
 
214
319
        self.value = value
 
215
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
216
 
    def __unicode__(self):
 
217
 
        return unicode(repr(self.value))
 
 
320
        return super(AvahiError, self).__init__(value, *args,
 
219
324
class AvahiServiceError(AvahiError):
 
222
328
class AvahiGroupError(AvahiError):
 
226
 
class AvahiService(object):
 
227
333
    """An Avahi (Zeroconf) service.
 
230
336
    interface: integer; avahi.IF_UNSPEC or an interface index.
 
231
337
               Used to optionally bind to the specified interface.
 
232
338
    name: string; Example: 'Mandos'
 
233
339
    type: string; Example: '_mandos._tcp'.
 
234
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
 
340
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
235
341
    port: integer; what port to announce
 
236
342
    TXT: list of strings; TXT record for the service
 
237
343
    domain: string; Domain to publish on, default to .local if empty.
 
 
366
502
                                    follow_name_owner_changes=True),
 
367
503
                avahi.DBUS_INTERFACE_SERVER)
 
368
504
        self.server.connect_to_signal("StateChanged",
 
369
 
                                 self.server_state_changed)
 
 
505
                                      self.server_state_changed)
 
370
506
        self.server_state_changed(self.server.GetState())
 
372
509
class AvahiServiceToSyslog(AvahiService):
 
 
510
    def rename(self, *args, **kwargs):
 
374
511
        """Add the new name to the syslog messages"""
 
375
 
        ret = AvahiService.rename(self)
 
376
 
        syslogger.setFormatter(logging.Formatter
 
377
 
                               ('Mandos (%s) [%%(process)d]:'
 
378
 
                                ' %%(levelname)s: %%(message)s'
 
 
512
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
 
513
        syslogger.setFormatter(logging.Formatter(
 
 
514
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
382
 
def timedelta_to_milliseconds(td):
 
383
 
    "Convert a datetime.timedelta() to milliseconds"
 
384
 
    return ((td.days * 24 * 60 * 60 * 1000)
 
385
 
            + (td.seconds * 1000)
 
386
 
            + (td.microseconds // 1000))
 
388
 
class Client(object):
 
 
519
# Pretend that we have a GnuTLS module
 
 
521
    """This isn't so much a class as it is a module-like namespace."""
 
 
523
    library = ctypes.util.find_library("gnutls")
 
 
525
        library = ctypes.util.find_library("gnutls-deb0")
 
 
526
    _library = ctypes.cdll.LoadLibrary(library)
 
 
529
    # Unless otherwise indicated, the constants and types below are
 
 
530
    # all from the gnutls/gnutls.h C header file.
 
 
541
    E_NO_CERTIFICATE_FOUND = -49
 
 
546
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
 
 
547
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
 
 
550
    class session_int(ctypes.Structure):
 
 
552
    session_t = ctypes.POINTER(session_int)
 
 
554
    class certificate_credentials_st(ctypes.Structure):
 
 
556
    certificate_credentials_t = ctypes.POINTER(
 
 
557
        certificate_credentials_st)
 
 
558
    certificate_type_t = ctypes.c_int
 
 
560
    class datum_t(ctypes.Structure):
 
 
561
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
 
562
                    ('size', ctypes.c_uint)]
 
 
564
    class openpgp_crt_int(ctypes.Structure):
 
 
566
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
 
567
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
 
 
568
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
 
 
569
    credentials_type_t = ctypes.c_int
 
 
570
    transport_ptr_t = ctypes.c_void_p
 
 
571
    close_request_t = ctypes.c_int
 
 
574
    class Error(Exception):
 
 
575
        def __init__(self, message=None, code=None, args=()):
 
 
576
            # Default usage is by a message string, but if a return
 
 
577
            # code is passed, convert it to a string with
 
 
580
            if message is None and code is not None:
 
 
581
                message = gnutls.strerror(code)
 
 
582
            return super(gnutls.Error, self).__init__(
 
 
585
    class CertificateSecurityError(Error):
 
 
591
            self._c_object = gnutls.certificate_credentials_t()
 
 
592
            gnutls.certificate_allocate_credentials(
 
 
593
                ctypes.byref(self._c_object))
 
 
594
            self.type = gnutls.CRD_CERTIFICATE
 
 
597
            gnutls.certificate_free_credentials(self._c_object)
 
 
600
        def __init__(self, socket, credentials=None):
 
 
601
            self._c_object = gnutls.session_t()
 
 
602
            gnutls_flags = gnutls.CLIENT
 
 
603
            if gnutls.check_version(b"3.5.6"):
 
 
604
                gnutls_flags |= gnutls.NO_TICKETS
 
 
606
                gnutls_flags |= gnutls.ENABLE_RAWPK
 
 
607
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
 
609
            gnutls.set_default_priority(self._c_object)
 
 
610
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
 
611
            gnutls.handshake_set_private_extensions(self._c_object,
 
 
614
            if credentials is None:
 
 
615
                credentials = gnutls.Credentials()
 
 
616
            gnutls.credentials_set(self._c_object, credentials.type,
 
 
617
                                   ctypes.cast(credentials._c_object,
 
 
619
            self.credentials = credentials
 
 
622
            gnutls.deinit(self._c_object)
 
 
625
            return gnutls.handshake(self._c_object)
 
 
627
        def send(self, data):
 
 
631
                data_len -= gnutls.record_send(self._c_object,
 
 
636
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
 
638
    # Error handling functions
 
 
639
    def _error_code(result):
 
 
640
        """A function to raise exceptions on errors, suitable
 
 
641
        for the 'restype' attribute on ctypes functions"""
 
 
644
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
 
 
645
            raise gnutls.CertificateSecurityError(code=result)
 
 
646
        raise gnutls.Error(code=result)
 
 
648
    def _retry_on_error(result, func, arguments):
 
 
649
        """A function to retry on some errors, suitable
 
 
650
        for the 'errcheck' attribute on ctypes functions"""
 
 
652
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
 
 
653
                return _error_code(result)
 
 
654
            result = func(*arguments)
 
 
657
    # Unless otherwise indicated, the function declarations below are
 
 
658
    # all from the gnutls/gnutls.h C header file.
 
 
661
    priority_set_direct = _library.gnutls_priority_set_direct
 
 
662
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
 
663
                                    ctypes.POINTER(ctypes.c_char_p)]
 
 
664
    priority_set_direct.restype = _error_code
 
 
666
    init = _library.gnutls_init
 
 
667
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
 
668
    init.restype = _error_code
 
 
670
    set_default_priority = _library.gnutls_set_default_priority
 
 
671
    set_default_priority.argtypes = [session_t]
 
 
672
    set_default_priority.restype = _error_code
 
 
674
    record_send = _library.gnutls_record_send
 
 
675
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
 
677
    record_send.restype = ctypes.c_ssize_t
 
 
678
    record_send.errcheck = _retry_on_error
 
 
680
    certificate_allocate_credentials = (
 
 
681
        _library.gnutls_certificate_allocate_credentials)
 
 
682
    certificate_allocate_credentials.argtypes = [
 
 
683
        ctypes.POINTER(certificate_credentials_t)]
 
 
684
    certificate_allocate_credentials.restype = _error_code
 
 
686
    certificate_free_credentials = (
 
 
687
        _library.gnutls_certificate_free_credentials)
 
 
688
    certificate_free_credentials.argtypes = [
 
 
689
        certificate_credentials_t]
 
 
690
    certificate_free_credentials.restype = None
 
 
692
    handshake_set_private_extensions = (
 
 
693
        _library.gnutls_handshake_set_private_extensions)
 
 
694
    handshake_set_private_extensions.argtypes = [session_t,
 
 
696
    handshake_set_private_extensions.restype = None
 
 
698
    credentials_set = _library.gnutls_credentials_set
 
 
699
    credentials_set.argtypes = [session_t, credentials_type_t,
 
 
701
    credentials_set.restype = _error_code
 
 
703
    strerror = _library.gnutls_strerror
 
 
704
    strerror.argtypes = [ctypes.c_int]
 
 
705
    strerror.restype = ctypes.c_char_p
 
 
707
    certificate_type_get = _library.gnutls_certificate_type_get
 
 
708
    certificate_type_get.argtypes = [session_t]
 
 
709
    certificate_type_get.restype = _error_code
 
 
711
    certificate_get_peers = _library.gnutls_certificate_get_peers
 
 
712
    certificate_get_peers.argtypes = [session_t,
 
 
713
                                      ctypes.POINTER(ctypes.c_uint)]
 
 
714
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
 
 
716
    global_set_log_level = _library.gnutls_global_set_log_level
 
 
717
    global_set_log_level.argtypes = [ctypes.c_int]
 
 
718
    global_set_log_level.restype = None
 
 
720
    global_set_log_function = _library.gnutls_global_set_log_function
 
 
721
    global_set_log_function.argtypes = [log_func]
 
 
722
    global_set_log_function.restype = None
 
 
724
    deinit = _library.gnutls_deinit
 
 
725
    deinit.argtypes = [session_t]
 
 
726
    deinit.restype = None
 
 
728
    handshake = _library.gnutls_handshake
 
 
729
    handshake.argtypes = [session_t]
 
 
730
    handshake.restype = _error_code
 
 
731
    handshake.errcheck = _retry_on_error
 
 
733
    transport_set_ptr = _library.gnutls_transport_set_ptr
 
 
734
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
 
735
    transport_set_ptr.restype = None
 
 
737
    bye = _library.gnutls_bye
 
 
738
    bye.argtypes = [session_t, close_request_t]
 
 
739
    bye.restype = _error_code
 
 
740
    bye.errcheck = _retry_on_error
 
 
742
    check_version = _library.gnutls_check_version
 
 
743
    check_version.argtypes = [ctypes.c_char_p]
 
 
744
    check_version.restype = ctypes.c_char_p
 
 
746
    _need_version = b"3.3.0"
 
 
747
    if check_version(_need_version) is None:
 
 
748
        raise self.Error("Needs GnuTLS {} or later"
 
 
749
                         .format(_need_version))
 
 
751
    _tls_rawpk_version = b"3.6.6"
 
 
752
    has_rawpk = bool(check_version(_tls_rawpk_version))
 
 
756
        class pubkey_st(ctypes.Structure):
 
 
758
        pubkey_t = ctypes.POINTER(pubkey_st)
 
 
760
        x509_crt_fmt_t = ctypes.c_int
 
 
762
        # All the function declarations below are from gnutls/abstract.h
 
 
763
        pubkey_init = _library.gnutls_pubkey_init
 
 
764
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
 
 
765
        pubkey_init.restype = _error_code
 
 
767
        pubkey_import = _library.gnutls_pubkey_import
 
 
768
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
 
 
770
        pubkey_import.restype = _error_code
 
 
772
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
 
 
773
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
 
 
774
                                      ctypes.POINTER(ctypes.c_ubyte),
 
 
775
                                      ctypes.POINTER(ctypes.c_size_t)]
 
 
776
        pubkey_get_key_id.restype = _error_code
 
 
778
        pubkey_deinit = _library.gnutls_pubkey_deinit
 
 
779
        pubkey_deinit.argtypes = [pubkey_t]
 
 
780
        pubkey_deinit.restype = None
 
 
782
        # All the function declarations below are from gnutls/openpgp.h
 
 
784
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
 
 
785
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
 
 
786
        openpgp_crt_init.restype = _error_code
 
 
788
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
 
 
789
        openpgp_crt_import.argtypes = [openpgp_crt_t,
 
 
790
                                       ctypes.POINTER(datum_t),
 
 
792
        openpgp_crt_import.restype = _error_code
 
 
794
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
 
795
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
 
796
                                            ctypes.POINTER(ctypes.c_uint)]
 
 
797
        openpgp_crt_verify_self.restype = _error_code
 
 
799
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
 
 
800
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
 
 
801
        openpgp_crt_deinit.restype = None
 
 
803
        openpgp_crt_get_fingerprint = (
 
 
804
            _library.gnutls_openpgp_crt_get_fingerprint)
 
 
805
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
 
 
809
        openpgp_crt_get_fingerprint.restype = _error_code
 
 
811
    if check_version(b"3.6.4"):
 
 
812
        certificate_type_get2 = _library.gnutls_certificate_type_get2
 
 
813
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
 
814
        certificate_type_get2.restype = _error_code
 
 
816
    # Remove non-public functions
 
 
817
    del _error_code, _retry_on_error
 
 
820
def call_pipe(connection,       # : multiprocessing.Connection
 
 
821
              func, *args, **kwargs):
 
 
822
    """This function is meant to be called by multiprocessing.Process
 
 
824
    This function runs func(*args, **kwargs), and writes the resulting
 
 
825
    return value on the provided multiprocessing.Connection.
 
 
827
    connection.send(func(*args, **kwargs))
 
389
832
    """A representation of a client host served by this server.
 
392
835
    approved:   bool(); 'None' if not yet approved/disapproved
 
393
836
    approval_delay: datetime.timedelta(); Time to wait for approval
 
394
837
    approval_duration: datetime.timedelta(); Duration of one approval
 
395
 
    checker:    subprocess.Popen(); a running checker process used
 
396
 
                                    to see if the client lives.
 
397
 
                                    'None' if no process is running.
 
398
 
    checker_callback_tag: a gobject event source tag, or None
 
 
838
    checker: multiprocessing.Process(); a running checker process used
 
 
839
             to see if the client lives. 'None' if no process is
 
 
841
    checker_callback_tag: a GLib event source tag, or None
 
399
842
    checker_command: string; External command which is run to check
 
400
843
                     if client lives.  %() expansions are done at
 
401
844
                     runtime with vars(self) as dict, so that for
 
402
845
                     instance %(name)s can be used in the command.
 
403
 
    checker_initiator_tag: a gobject event source tag, or None
 
 
846
    checker_initiator_tag: a GLib event source tag, or None
 
404
847
    created:    datetime.datetime(); (UTC) object creation
 
405
848
    client_structure: Object describing what attributes a client has
 
406
849
                      and is used for storing the client at exit
 
407
850
    current_checker_command: string; current running checker_command
 
408
 
    disable_initiator_tag: a gobject event source tag, or None
 
 
851
    disable_initiator_tag: a GLib event source tag, or None
 
410
853
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
411
 
                 uniquely identify the client
 
 
854
                 uniquely identify an OpenPGP client
 
 
855
    key_id: string (64 hexadecimal digits); used to uniquely identify
 
 
856
            a client using raw public keys
 
412
857
    host:       string; available for use by the checker command
 
413
858
    interval:   datetime.timedelta(); How often to start a new checker
 
414
859
    last_approval_request: datetime.datetime(); (UTC) or None
 
 
541
980
        self.current_checker_command = None
 
542
981
        self.approved = None
 
543
982
        self.approvals_pending = 0
 
544
 
        self.changedstate = (multiprocessing_manager
 
545
 
                             .Condition(multiprocessing_manager
 
547
 
        self.client_structure = [attr for attr in
 
548
 
                                 self.__dict__.iterkeys()
 
 
983
        self.changedstate = multiprocessing_manager.Condition(
 
 
984
            multiprocessing_manager.Lock())
 
 
985
        self.client_structure = [attr
 
 
986
                                 for attr in self.__dict__.keys()
 
549
987
                                 if not attr.startswith("_")]
 
550
988
        self.client_structure.append("client_structure")
 
552
 
        for name, t in inspect.getmembers(type(self),
 
 
990
        for name, t in inspect.getmembers(
 
 
991
                type(self), lambda obj: isinstance(obj, property)):
 
556
992
            if not name.startswith("_"):
 
557
993
                self.client_structure.append(name)
 
559
995
    # Send notice to process children that client state has changed
 
560
996
    def send_changedstate(self):
 
561
997
        with self.changedstate:
 
562
998
            self.changedstate.notify_all()
 
564
1000
    def enable(self):
 
565
1001
        """Start this client's checker and timeout hooks"""
 
566
1002
        if getattr(self, "enabled", False):
 
567
1003
            # Already enabled
 
569
 
        self.send_changedstate()
 
570
1005
        self.expires = datetime.datetime.utcnow() + self.timeout
 
571
1006
        self.enabled = True
 
572
1007
        self.last_enabled = datetime.datetime.utcnow()
 
573
1008
        self.init_checker()
 
 
1009
        self.send_changedstate()
 
575
1011
    def disable(self, quiet=True):
 
576
1012
        """Disable this client."""
 
577
1013
        if not getattr(self, "enabled", False):
 
580
 
            self.send_changedstate()
 
582
1016
            logger.info("Disabling client %s", self.name)
 
583
 
        if getattr(self, "disable_initiator_tag", False):
 
584
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1017
        if getattr(self, "disable_initiator_tag", None) is not None:
 
 
1018
            GLib.source_remove(self.disable_initiator_tag)
 
585
1019
            self.disable_initiator_tag = None
 
586
1020
        self.expires = None
 
587
 
        if getattr(self, "checker_initiator_tag", False):
 
588
 
            gobject.source_remove(self.checker_initiator_tag)
 
 
1021
        if getattr(self, "checker_initiator_tag", None) is not None:
 
 
1022
            GLib.source_remove(self.checker_initiator_tag)
 
589
1023
            self.checker_initiator_tag = None
 
590
1024
        self.stop_checker()
 
591
1025
        self.enabled = False
 
592
 
        # Do not run this again if called by a gobject.timeout_add
 
 
1027
            self.send_changedstate()
 
 
1028
        # Do not run this again if called by a GLib.timeout_add
 
595
1031
    def __del__(self):
 
598
1034
    def init_checker(self):
 
599
1035
        # Schedule a new checker to be started an 'interval' from now,
 
600
1036
        # and every interval from then on.
 
601
 
        self.checker_initiator_tag = (gobject.timeout_add
 
602
 
                                      (self.interval_milliseconds(),
 
 
1037
        if self.checker_initiator_tag is not None:
 
 
1038
            GLib.source_remove(self.checker_initiator_tag)
 
 
1039
        self.checker_initiator_tag = GLib.timeout_add(
 
 
1040
            int(self.interval.total_seconds() * 1000),
 
604
1042
        # Schedule a disable() when 'timeout' has passed
 
605
 
        self.disable_initiator_tag = (gobject.timeout_add
 
606
 
                                   (self.timeout_milliseconds(),
 
 
1043
        if self.disable_initiator_tag is not None:
 
 
1044
            GLib.source_remove(self.disable_initiator_tag)
 
 
1045
        self.disable_initiator_tag = GLib.timeout_add(
 
 
1046
            int(self.timeout.total_seconds() * 1000), self.disable)
 
608
1047
        # Also start a new checker *right now*.
 
609
1048
        self.start_checker()
 
611
 
    def checker_callback(self, pid, condition, command):
 
 
1050
    def checker_callback(self, source, condition, connection,
 
612
1052
        """The checker has completed, so take appropriate actions."""
 
 
1053
        # Read return code from connection (see call_pipe)
 
 
1054
        returncode = connection.recv()
 
613
1057
        self.checker_callback_tag = None
 
614
1058
        self.checker = None
 
615
 
        if os.WIFEXITED(condition):
 
616
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
 
1061
            self.last_checker_status = returncode
 
 
1062
            self.last_checker_signal = None
 
617
1063
            if self.last_checker_status == 0:
 
618
1064
                logger.info("Checker for %(name)s succeeded",
 
620
1066
                self.checked_ok()
 
622
 
                logger.info("Checker for %(name)s failed",
 
 
1068
                logger.info("Checker for %(name)s failed", vars(self))
 
625
1070
            self.last_checker_status = -1
 
 
1071
            self.last_checker_signal = -returncode
 
626
1072
            logger.warning("Checker for %(name)s crashed?",
 
629
1076
    def checked_ok(self):
 
630
1077
        """Assert that the client has been seen, alive and well."""
 
631
1078
        self.last_checked_ok = datetime.datetime.utcnow()
 
632
1079
        self.last_checker_status = 0
 
 
1080
        self.last_checker_signal = None
 
633
1081
        self.bump_timeout()
 
635
1083
    def bump_timeout(self, timeout=None):
 
636
1084
        """Bump up the timeout for this client."""
 
637
1085
        if timeout is None:
 
638
1086
            timeout = self.timeout
 
639
1087
        if self.disable_initiator_tag is not None:
 
640
 
            gobject.source_remove(self.disable_initiator_tag)
 
 
1088
            GLib.source_remove(self.disable_initiator_tag)
 
 
1089
            self.disable_initiator_tag = None
 
641
1090
        if getattr(self, "enabled", False):
 
642
 
            self.disable_initiator_tag = (gobject.timeout_add
 
643
 
                                          (timedelta_to_milliseconds
 
644
 
                                           (timeout), self.disable))
 
 
1091
            self.disable_initiator_tag = GLib.timeout_add(
 
 
1092
                int(timeout.total_seconds() * 1000), self.disable)
 
645
1093
            self.expires = datetime.datetime.utcnow() + timeout
 
647
1095
    def need_approval(self):
 
648
1096
        self.last_approval_request = datetime.datetime.utcnow()
 
650
1098
    def start_checker(self):
 
651
1099
        """Start a new checker subprocess if one is not running.
 
653
1101
        If a checker already exists, leave it running and do
 
655
1103
        # The reason for not killing a running checker is that if we
 
656
 
        # did that, then if a checker (for some reason) started
 
657
 
        # running slowly and taking more than 'interval' time, the
 
658
 
        # client would inevitably timeout, since no checker would get
 
659
 
        # a chance to run to completion.  If we instead leave running
 
 
1104
        # did that, and if a checker (for some reason) started running
 
 
1105
        # slowly and taking more than 'interval' time, then the client
 
 
1106
        # would inevitably timeout, since no checker would get a
 
 
1107
        # chance to run to completion.  If we instead leave running
 
660
1108
        # checkers alone, the checker would have to take more time
 
661
1109
        # than 'timeout' for the client to be disabled, which is as it
 
664
 
        # If a checker exists, make sure it is not a zombie
 
666
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
667
 
        except (AttributeError, OSError) as error:
 
668
 
            if (isinstance(error, OSError)
 
669
 
                and error.errno != errno.ECHILD):
 
673
 
                logger.warning("Checker was a zombie")
 
674
 
                gobject.source_remove(self.checker_callback_tag)
 
675
 
                self.checker_callback(pid, status,
 
676
 
                                      self.current_checker_command)
 
 
1112
        if self.checker is not None and not self.checker.is_alive():
 
 
1113
            logger.warning("Checker was not alive; joining")
 
677
1116
        # Start a new checker if needed
 
678
1117
        if self.checker is None:
 
 
1118
            # Escape attributes for the shell
 
 
1120
                attr: re.escape(str(getattr(self, attr)))
 
 
1121
                for attr in self.runtime_expansions}
 
680
 
                # In case checker_command has exactly one % operator
 
681
 
                command = self.checker_command % self.host
 
683
 
                # Escape attributes for the shell
 
684
 
                escaped_attrs = dict(
 
686
 
                     re.escape(unicode(str(getattr(self, attr, "")),
 
690
 
                    self.runtime_expansions)
 
693
 
                    command = self.checker_command % escaped_attrs
 
694
 
                except TypeError as error:
 
695
 
                    logger.error('Could not format string "%s":'
 
696
 
                                 ' %s', self.checker_command, error)
 
697
 
                    return True # Try again later
 
 
1123
                command = self.checker_command % escaped_attrs
 
 
1124
            except TypeError as error:
 
 
1125
                logger.error('Could not format string "%s"',
 
 
1126
                             self.checker_command,
 
 
1128
                return True     # Try again later
 
698
1129
            self.current_checker_command = command
 
700
 
                logger.info("Starting checker %r for %s",
 
702
 
                # We don't need to redirect stdout and stderr, since
 
703
 
                # in normal mode, that is already done by daemon(),
 
704
 
                # and in debug mode we don't want to.  (Stdin is
 
705
 
                # always replaced by /dev/null.)
 
706
 
                self.checker = subprocess.Popen(command,
 
709
 
                self.checker_callback_tag = (gobject.child_watch_add
 
711
 
                                              self.checker_callback,
 
713
 
                # The checker may have completed before the gobject
 
714
 
                # watch was added.  Check for this.
 
715
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
717
 
                    gobject.source_remove(self.checker_callback_tag)
 
718
 
                    self.checker_callback(pid, status, command)
 
719
 
            except OSError as error:
 
720
 
                logger.error("Failed to start subprocess: %s",
 
722
 
        # Re-run this periodically if run by gobject.timeout_add
 
 
1130
            logger.info("Starting checker %r for %s", command,
 
 
1132
            # We don't need to redirect stdout and stderr, since
 
 
1133
            # in normal mode, that is already done by daemon(),
 
 
1134
            # and in debug mode we don't want to.  (Stdin is
 
 
1135
            # always replaced by /dev/null.)
 
 
1136
            # The exception is when not debugging but nevertheless
 
 
1137
            # running in the foreground; use the previously
 
 
1139
            popen_args = {"close_fds": True,
 
 
1142
            if (not self.server_settings["debug"]
 
 
1143
                and self.server_settings["foreground"]):
 
 
1144
                popen_args.update({"stdout": wnull,
 
 
1146
            pipe = multiprocessing.Pipe(duplex=False)
 
 
1147
            self.checker = multiprocessing.Process(
 
 
1149
                args=(pipe[1], subprocess.call, command),
 
 
1151
            self.checker.start()
 
 
1152
            self.checker_callback_tag = GLib.io_add_watch(
 
 
1153
                GLib.IOChannel.unix_new(pipe[0].fileno()),
 
 
1154
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
 
1155
                self.checker_callback, pipe[0], command)
 
 
1156
        # Re-run this periodically if run by GLib.timeout_add
 
725
1159
    def stop_checker(self):
 
726
1160
        """Force the checker process, if any, to stop."""
 
727
1161
        if self.checker_callback_tag:
 
728
 
            gobject.source_remove(self.checker_callback_tag)
 
 
1162
            GLib.source_remove(self.checker_callback_tag)
 
729
1163
            self.checker_callback_tag = None
 
730
1164
        if getattr(self, "checker", None) is None:
 
732
1166
        logger.debug("Stopping checker for %(name)s", vars(self))
 
734
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
736
 
            #if self.checker.poll() is None:
 
737
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
738
 
        except OSError as error:
 
739
 
            if error.errno != errno.ESRCH: # No such process
 
 
1167
        self.checker.terminate()
 
741
1168
        self.checker = None
 
744
 
def dbus_service_property(dbus_interface, signature="v",
 
745
 
                          access="readwrite", byte_arrays=False):
 
 
1171
def dbus_service_property(dbus_interface,
 
746
1175
    """Decorators for marking methods of a DBusObjectWithProperties to
 
747
1176
    become properties on the D-Bus.
 
749
1178
    The decorated method will be called with no arguments by "Get"
 
750
1179
    and with one argument by "Set".
 
752
1181
    The parameters, where they are supported, are the same as
 
753
1182
    dbus.service.method, except there is only "signature", since the
 
754
1183
    type from Get() and the type sent to Set() is the same.
 
 
793
 
class DBusObjectWithProperties(dbus.service.Object):
 
 
1266
class DBusObjectWithAnnotations(dbus.service.Object):
 
 
1267
    """A D-Bus object with annotations.
 
 
1269
    Classes inheriting from this can use the dbus_annotations
 
 
1270
    decorator to add annotations to methods or signals.
 
 
1274
    def _is_dbus_thing(thing):
 
 
1275
        """Returns a function testing if an attribute is a D-Bus thing
 
 
1277
        If called like _is_dbus_thing("method") it returns a function
 
 
1278
        suitable for use as predicate to inspect.getmembers().
 
 
1280
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
 
1283
    def _get_all_dbus_things(self, thing):
 
 
1284
        """Returns a generator of (name, attribute) pairs
 
 
1286
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
 
1287
                 athing.__get__(self))
 
 
1288
                for cls in self.__class__.__mro__
 
 
1290
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
 
1292
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1294
                         path_keyword='object_path',
 
 
1295
                         connection_keyword='connection')
 
 
1296
    def Introspect(self, object_path, connection):
 
 
1297
        """Overloading of standard D-Bus method.
 
 
1299
        Inserts annotation tags on methods and signals.
 
 
1301
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
1304
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1306
            for if_tag in document.getElementsByTagName("interface"):
 
 
1307
                # Add annotation tags
 
 
1308
                for typ in ("method", "signal"):
 
 
1309
                    for tag in if_tag.getElementsByTagName(typ):
 
 
1311
                        for name, prop in (self.
 
 
1312
                                           _get_all_dbus_things(typ)):
 
 
1313
                            if (name == tag.getAttribute("name")
 
 
1314
                                and prop._dbus_interface
 
 
1315
                                == if_tag.getAttribute("name")):
 
 
1316
                                annots.update(getattr(
 
 
1317
                                    prop, "_dbus_annotations", {}))
 
 
1318
                        for name, value in annots.items():
 
 
1319
                            ann_tag = document.createElement(
 
 
1321
                            ann_tag.setAttribute("name", name)
 
 
1322
                            ann_tag.setAttribute("value", value)
 
 
1323
                            tag.appendChild(ann_tag)
 
 
1324
                # Add interface annotation tags
 
 
1325
                for annotation, value in dict(
 
 
1326
                    itertools.chain.from_iterable(
 
 
1327
                        annotations().items()
 
 
1328
                        for name, annotations
 
 
1329
                        in self._get_all_dbus_things("interface")
 
 
1330
                        if name == if_tag.getAttribute("name")
 
 
1332
                    ann_tag = document.createElement("annotation")
 
 
1333
                    ann_tag.setAttribute("name", annotation)
 
 
1334
                    ann_tag.setAttribute("value", value)
 
 
1335
                    if_tag.appendChild(ann_tag)
 
 
1336
                # Fix argument name for the Introspect method itself
 
 
1337
                if (if_tag.getAttribute("name")
 
 
1338
                    == dbus.INTROSPECTABLE_IFACE):
 
 
1339
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1340
                        if cn.getAttribute("name") == "Introspect":
 
 
1341
                            for arg in cn.getElementsByTagName("arg"):
 
 
1342
                                if (arg.getAttribute("direction")
 
 
1344
                                    arg.setAttribute("name",
 
 
1346
            xmlstring = document.toxml("utf-8")
 
 
1348
        except (AttributeError, xml.dom.DOMException,
 
 
1349
                xml.parsers.expat.ExpatError) as error:
 
 
1350
            logger.error("Failed to override Introspection method",
 
 
1355
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
794
1356
    """A D-Bus object with properties.
 
796
1358
    Classes inheriting from this can use the dbus_service_property
 
797
1359
    decorator to expose methods as D-Bus properties.  It exposes the
 
798
1360
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
802
 
    def _is_dbus_property(obj):
 
803
 
        return getattr(obj, "_dbus_is_property", False)
 
805
 
    def _get_all_dbus_properties(self):
 
806
 
        """Returns a generator of (name, attribute) pairs
 
808
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
809
 
                for cls in self.__class__.__mro__
 
811
 
                inspect.getmembers(cls, self._is_dbus_property))
 
813
1363
    def _get_dbus_property(self, interface_name, property_name):
 
814
1364
        """Returns a bound method if one exists which is a D-Bus
 
815
1365
        property with the specified name and interface.
 
817
 
        for cls in  self.__class__.__mro__:
 
818
 
            for name, value in (inspect.getmembers
 
819
 
                                (cls, self._is_dbus_property)):
 
 
1367
        for cls in self.__class__.__mro__:
 
 
1368
            for name, value in inspect.getmembers(
 
 
1369
                    cls, self._is_dbus_thing("property")):
 
820
1370
                if (value._dbus_name == property_name
 
821
1371
                    and value._dbus_interface == interface_name):
 
822
1372
                    return value.__get__(self)
 
824
1374
        # No such property
 
825
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
826
 
                                   + interface_name + "."
 
829
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
 
1375
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
 
1376
            self.dbus_object_path, interface_name, property_name))
 
 
1379
    def _get_all_interface_names(cls):
 
 
1380
        """Get a sequence of all interfaces supported by an object"""
 
 
1381
        return (name for name in set(getattr(getattr(x, attr),
 
 
1382
                                             "_dbus_interface", None)
 
 
1383
                                     for x in (inspect.getmro(cls))
 
 
1385
                if name is not None)
 
 
1387
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
830
1389
                         out_signature="v")
 
831
1390
    def Get(self, interface_name, property_name):
 
832
1391
        """Standard D-Bus property Get() method, see D-Bus standard.
 
 
876
1438
            if not hasattr(value, "variant_level"):
 
877
1439
                properties[name] = value
 
879
 
            properties[name] = type(value)(value, variant_level=
 
880
 
                                           value.variant_level+1)
 
 
1441
            properties[name] = type(value)(
 
 
1442
                value, variant_level=value.variant_level + 1)
 
881
1443
        return dbus.Dictionary(properties, signature="sv")
 
 
1445
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
 
1446
    def PropertiesChanged(self, interface_name, changed_properties,
 
 
1447
                          invalidated_properties):
 
 
1448
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
883
1453
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
884
1454
                         out_signature="s",
 
885
1455
                         path_keyword='object_path',
 
886
1456
                         connection_keyword='connection')
 
887
1457
    def Introspect(self, object_path, connection):
 
888
 
        """Standard D-Bus method, overloaded to insert property tags.
 
 
1458
        """Overloading of standard D-Bus method.
 
 
1460
        Inserts property tags and interface annotation tags.
 
890
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
 
1462
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
893
1466
            document = xml.dom.minidom.parseString(xmlstring)
 
894
1468
            def make_tag(document, name, prop):
 
895
1469
                e = document.createElement("property")
 
896
1470
                e.setAttribute("name", name)
 
897
1471
                e.setAttribute("type", prop._dbus_signature)
 
898
1472
                e.setAttribute("access", prop._dbus_access)
 
900
1475
            for if_tag in document.getElementsByTagName("interface"):
 
901
1477
                for tag in (make_tag(document, name, prop)
 
903
 
                            in self._get_all_dbus_properties()
 
 
1479
                            in self._get_all_dbus_things("property")
 
904
1480
                            if prop._dbus_interface
 
905
1481
                            == if_tag.getAttribute("name")):
 
906
1482
                    if_tag.appendChild(tag)
 
 
1483
                # Add annotation tags for properties
 
 
1484
                for tag in if_tag.getElementsByTagName("property"):
 
 
1486
                    for name, prop in self._get_all_dbus_things(
 
 
1488
                        if (name == tag.getAttribute("name")
 
 
1489
                            and prop._dbus_interface
 
 
1490
                            == if_tag.getAttribute("name")):
 
 
1491
                            annots.update(getattr(
 
 
1492
                                prop, "_dbus_annotations", {}))
 
 
1493
                    for name, value in annots.items():
 
 
1494
                        ann_tag = document.createElement(
 
 
1496
                        ann_tag.setAttribute("name", name)
 
 
1497
                        ann_tag.setAttribute("value", value)
 
 
1498
                        tag.appendChild(ann_tag)
 
907
1499
                # Add the names to the return values for the
 
908
1500
                # "org.freedesktop.DBus.Properties" methods
 
909
1501
                if (if_tag.getAttribute("name")
 
 
924
1516
        except (AttributeError, xml.dom.DOMException,
 
925
1517
                xml.parsers.expat.ExpatError) as error:
 
926
1518
            logger.error("Failed to override Introspection method",
 
931
 
def datetime_to_dbus (dt, variant_level=0):
 
 
1524
    dbus.OBJECT_MANAGER_IFACE
 
 
1525
except AttributeError:
 
 
1526
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
 
1529
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
 
 
1530
    """A D-Bus object with an ObjectManager.
 
 
1532
    Classes inheriting from this exposes the standard
 
 
1533
    GetManagedObjects call and the InterfacesAdded and
 
 
1534
    InterfacesRemoved signals on the standard
 
 
1535
    "org.freedesktop.DBus.ObjectManager" interface.
 
 
1537
    Note: No signals are sent automatically; they must be sent
 
 
1540
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
1541
                         out_signature="a{oa{sa{sv}}}")
 
 
1542
    def GetManagedObjects(self):
 
 
1543
        """This function must be overridden"""
 
 
1544
        raise NotImplementedError()
 
 
1546
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
 
 
1547
                         signature="oa{sa{sv}}")
 
 
1548
    def InterfacesAdded(self, object_path, interfaces_and_properties):
 
 
1551
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
 
 
1552
    def InterfacesRemoved(self, object_path, interfaces):
 
 
1555
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
 
 
1557
                         path_keyword='object_path',
 
 
1558
                         connection_keyword='connection')
 
 
1559
    def Introspect(self, object_path, connection):
 
 
1560
        """Overloading of standard D-Bus method.
 
 
1562
        Override return argument name of GetManagedObjects to be
 
 
1563
        "objpath_interfaces_and_properties"
 
 
1565
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
 
 
1569
            document = xml.dom.minidom.parseString(xmlstring)
 
 
1571
            for if_tag in document.getElementsByTagName("interface"):
 
 
1572
                # Fix argument name for the GetManagedObjects method
 
 
1573
                if (if_tag.getAttribute("name")
 
 
1574
                    == dbus.OBJECT_MANAGER_IFACE):
 
 
1575
                    for cn in if_tag.getElementsByTagName("method"):
 
 
1576
                        if (cn.getAttribute("name")
 
 
1577
                            == "GetManagedObjects"):
 
 
1578
                            for arg in cn.getElementsByTagName("arg"):
 
 
1579
                                if (arg.getAttribute("direction")
 
 
1583
                                        "objpath_interfaces"
 
 
1585
            xmlstring = document.toxml("utf-8")
 
 
1587
        except (AttributeError, xml.dom.DOMException,
 
 
1588
                xml.parsers.expat.ExpatError) as error:
 
 
1589
            logger.error("Failed to override Introspection method",
 
 
1594
def datetime_to_dbus(dt, variant_level=0):
 
932
1595
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
934
 
        return dbus.String("", variant_level = variant_level)
 
935
 
    return dbus.String(dt.isoformat(),
 
936
 
                       variant_level=variant_level)
 
939
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
941
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
942
 
    will add additional D-Bus attributes matching a certain pattern.
 
 
1597
        return dbus.String("", variant_level=variant_level)
 
 
1598
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
 
1601
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
 
1602
    """A class decorator; applied to a subclass of
 
 
1603
    dbus.service.Object, it will add alternate D-Bus attributes with
 
 
1604
    interface names according to the "alt_interface_names" mapping.
 
 
1607
    @alternate_dbus_interfaces({"org.example.Interface":
 
 
1608
                                    "net.example.AlternateInterface"})
 
 
1609
    class SampleDBusObject(dbus.service.Object):
 
 
1610
        @dbus.service.method("org.example.Interface")
 
 
1611
        def SampleDBusMethod():
 
 
1614
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
 
1615
    reachable via two interfaces: "org.example.Interface" and
 
 
1616
    "net.example.AlternateInterface", the latter of which will have
 
 
1617
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
 
1618
    "true", unless "deprecate" is passed with a False value.
 
 
1620
    This works for methods and signals, and also for D-Bus properties
 
 
1621
    (from DBusObjectWithProperties) and interfaces (from the
 
 
1622
    dbus_interface_annotations decorator).
 
944
 
    def __new__(mcs, name, bases, attr):
 
945
 
        # Go through all the base classes which could have D-Bus
 
946
 
        # methods, signals, or properties in them
 
947
 
        for base in (b for b in bases
 
948
 
                     if issubclass(b, dbus.service.Object)):
 
949
 
            # Go though all attributes of the base class
 
950
 
            for attrname, attribute in inspect.getmembers(base):
 
 
1626
        for orig_interface_name, alt_interface_name in (
 
 
1627
                alt_interface_names.items()):
 
 
1629
            interface_names = set()
 
 
1630
            # Go though all attributes of the class
 
 
1631
            for attrname, attribute in inspect.getmembers(cls):
 
951
1632
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
952
1633
                # with the wrong interface name
 
953
1634
                if (not hasattr(attribute, "_dbus_interface")
 
954
 
                    or not attribute._dbus_interface
 
955
 
                    .startswith("se.recompile.Mandos")):
 
 
1635
                    or not attribute._dbus_interface.startswith(
 
 
1636
                        orig_interface_name)):
 
957
1638
                # Create an alternate D-Bus interface name based on
 
958
1639
                # the current name
 
959
 
                alt_interface = (attribute._dbus_interface
 
960
 
                                 .replace("se.recompile.Mandos",
 
961
 
                                          "se.bsnet.fukt.Mandos"))
 
 
1640
                alt_interface = attribute._dbus_interface.replace(
 
 
1641
                    orig_interface_name, alt_interface_name)
 
 
1642
                interface_names.add(alt_interface)
 
962
1643
                # Is this a D-Bus signal?
 
963
1644
                if getattr(attribute, "_dbus_is_signal", False):
 
964
 
                    # Extract the original non-method function by
 
966
 
                    nonmethod_func = (dict(
 
 
1645
                    # Extract the original non-method undecorated
 
 
1646
                    # function by black magic
 
 
1647
                    if sys.version_info.major == 2:
 
 
1648
                        nonmethod_func = (dict(
 
967
1649
                            zip(attribute.func_code.co_freevars,
 
968
 
                                attribute.__closure__))["func"]
 
 
1650
                                attribute.__closure__))
 
 
1651
                                          ["func"].cell_contents)
 
 
1653
                        nonmethod_func = (dict(
 
 
1654
                            zip(attribute.__code__.co_freevars,
 
 
1655
                                attribute.__closure__))
 
 
1656
                                          ["func"].cell_contents)
 
970
1657
                    # Create a new, but exactly alike, function
 
971
1658
                    # object, and decorate it to be a new D-Bus signal
 
972
1659
                    # with the alternate D-Bus interface name
 
973
 
                    new_function = (dbus.service.signal
 
975
 
                                     attribute._dbus_signature)
 
977
 
                                nonmethod_func.func_code,
 
978
 
                                nonmethod_func.func_globals,
 
979
 
                                nonmethod_func.func_name,
 
980
 
                                nonmethod_func.func_defaults,
 
981
 
                                nonmethod_func.func_closure)))
 
 
1660
                    new_function = copy_function(nonmethod_func)
 
 
1661
                    new_function = (dbus.service.signal(
 
 
1663
                        attribute._dbus_signature)(new_function))
 
 
1664
                    # Copy annotations, if any
 
 
1666
                        new_function._dbus_annotations = dict(
 
 
1667
                            attribute._dbus_annotations)
 
 
1668
                    except AttributeError:
 
982
1671
                    # Define a creator of a function to call both the
 
983
 
                    # old and new functions, so both the old and new
 
984
 
                    # signals gets sent when the function is called
 
 
1672
                    # original and alternate functions, so both the
 
 
1673
                    # original and alternate signals gets sent when
 
 
1674
                    # the function is called
 
985
1675
                    def fixscope(func1, func2):
 
986
1676
                        """This function is a scope container to pass
 
987
1677
                        func1 and func2 to the "call_both" function
 
988
1678
                        outside of its arguments"""
 
 
1680
                        @functools.wraps(func2)
 
989
1681
                        def call_both(*args, **kwargs):
 
990
1682
                            """This function will emit two D-Bus
 
991
1683
                            signals by calling func1 and func2"""
 
992
1684
                            func1(*args, **kwargs)
 
993
1685
                            func2(*args, **kwargs)
 
 
1686
                        # Make wrapper function look like a D-Bus
 
 
1688
                        for name, attr in inspect.getmembers(func2):
 
 
1689
                            if name.startswith("_dbus_"):
 
 
1690
                                setattr(call_both, name, attr)
 
994
1692
                        return call_both
 
995
1693
                    # Create the "call_both" function and add it to
 
997
 
                    attr[attrname] = fixscope(attribute,
 
 
1695
                    attr[attrname] = fixscope(attribute, new_function)
 
999
1696
                # Is this a D-Bus method?
 
1000
1697
                elif getattr(attribute, "_dbus_is_method", False):
 
1001
1698
                    # Create a new, but exactly alike, function
 
1002
1699
                    # object.  Decorate it to be a new D-Bus method
 
1003
1700
                    # with the alternate D-Bus interface name.  Add it
 
1004
1701
                    # to the class.
 
1005
 
                    attr[attrname] = (dbus.service.method
 
1007
 
                                       attribute._dbus_in_signature,
 
1008
 
                                       attribute._dbus_out_signature)
 
1010
 
                                       (attribute.func_code,
 
1011
 
                                        attribute.func_globals,
 
1012
 
                                        attribute.func_name,
 
1013
 
                                        attribute.func_defaults,
 
1014
 
                                        attribute.func_closure)))
 
 
1703
                        dbus.service.method(
 
 
1705
                            attribute._dbus_in_signature,
 
 
1706
                            attribute._dbus_out_signature)
 
 
1707
                        (copy_function(attribute)))
 
 
1708
                    # Copy annotations, if any
 
 
1710
                        attr[attrname]._dbus_annotations = dict(
 
 
1711
                            attribute._dbus_annotations)
 
 
1712
                    except AttributeError:
 
1015
1714
                # Is this a D-Bus property?
 
1016
1715
                elif getattr(attribute, "_dbus_is_property", False):
 
1017
1716
                    # Create a new, but exactly alike, function
 
1018
1717
                    # object, and decorate it to be a new D-Bus
 
1019
1718
                    # property with the alternate D-Bus interface
 
1020
1719
                    # name.  Add it to the class.
 
1021
 
                    attr[attrname] = (dbus_service_property
 
1023
 
                                       attribute._dbus_signature,
 
1024
 
                                       attribute._dbus_access,
 
1026
 
                                       ._dbus_get_args_options
 
1029
 
                                       (attribute.func_code,
 
1030
 
                                        attribute.func_globals,
 
1031
 
                                        attribute.func_name,
 
1032
 
                                        attribute.func_defaults,
 
1033
 
                                        attribute.func_closure)))
 
1034
 
        return type.__new__(mcs, name, bases, attr)
 
 
1720
                    attr[attrname] = (dbus_service_property(
 
 
1721
                        alt_interface, attribute._dbus_signature,
 
 
1722
                        attribute._dbus_access,
 
 
1723
                        attribute._dbus_get_args_options
 
 
1725
                                      (copy_function(attribute)))
 
 
1726
                    # Copy annotations, if any
 
 
1728
                        attr[attrname]._dbus_annotations = dict(
 
 
1729
                            attribute._dbus_annotations)
 
 
1730
                    except AttributeError:
 
 
1732
                # Is this a D-Bus interface?
 
 
1733
                elif getattr(attribute, "_dbus_is_interface", False):
 
 
1734
                    # Create a new, but exactly alike, function
 
 
1735
                    # object.  Decorate it to be a new D-Bus interface
 
 
1736
                    # with the alternate D-Bus interface name.  Add it
 
 
1739
                        dbus_interface_annotations(alt_interface)
 
 
1740
                        (copy_function(attribute)))
 
 
1742
                # Deprecate all alternate interfaces
 
 
1743
                iname = "_AlternateDBusNames_interface_annotation{}"
 
 
1744
                for interface_name in interface_names:
 
 
1746
                    @dbus_interface_annotations(interface_name)
 
 
1748
                        return {"org.freedesktop.DBus.Deprecated":
 
 
1750
                    # Find an unused name
 
 
1751
                    for aname in (iname.format(i)
 
 
1752
                                  for i in itertools.count()):
 
 
1753
                        if aname not in attr:
 
 
1757
                # Replace the class with a new subclass of it with
 
 
1758
                # methods, signals, etc. as created above.
 
 
1759
                if sys.version_info.major == 2:
 
 
1760
                    cls = type(b"{}Alternate".format(cls.__name__),
 
 
1763
                    cls = type("{}Alternate".format(cls.__name__),
 
 
1770
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
 
1771
                            "se.bsnet.fukt.Mandos"})
 
1037
1772
class ClientDBus(Client, DBusObjectWithProperties):
 
1038
1773
    """A Client class using D-Bus
 
1041
1776
    dbus_object_path: dbus.ObjectPath
 
1042
1777
    bus: dbus.SystemBus()
 
1045
1780
    runtime_expansions = (Client.runtime_expansions
 
1046
 
                          + ("dbus_object_path",))
 
 
1781
                          + ("dbus_object_path", ))
 
 
1783
    _interface = "se.recompile.Mandos.Client"
 
1048
1785
    # dbus.service.Object doesn't use super(), so we can't either.
 
1050
 
    def __init__(self, bus = None, *args, **kwargs):
 
 
1787
    def __init__(self, bus=None, *args, **kwargs):
 
1052
1789
        Client.__init__(self, *args, **kwargs)
 
1053
1790
        # Only now, when this client is initialized, can it show up on
 
1055
 
        client_object_name = unicode(self.name).translate(
 
 
1792
        client_object_name = str(self.name).translate(
 
1056
1793
            {ord("."): ord("_"),
 
1057
1794
             ord("-"): ord("_")})
 
1058
 
        self.dbus_object_path = (dbus.ObjectPath
 
1059
 
                                 ("/clients/" + client_object_name))
 
 
1795
        self.dbus_object_path = dbus.ObjectPath(
 
 
1796
            "/clients/" + client_object_name)
 
1060
1797
        DBusObjectWithProperties.__init__(self, self.bus,
 
1061
1798
                                          self.dbus_object_path)
 
1063
 
    def notifychangeproperty(transform_func,
 
1064
 
                             dbus_name, type_func=lambda x: x,
 
 
1800
    def notifychangeproperty(transform_func, dbus_name,
 
 
1801
                             type_func=lambda x: x,
 
 
1803
                             invalidate_only=False,
 
 
1804
                             _interface=_interface):
 
1066
1805
        """ Modify a variable so that it's a property which announces
 
1067
1806
        its changes to DBus.
 
1069
1808
        transform_fun: Function that takes a value and a variant_level
 
1070
1809
                       and transforms it to a D-Bus type.
 
1071
1810
        dbus_name: D-Bus name of the variable
 
 
1214
1962
        server to mandos-client
 
1218
1966
    # Rejected - signal
 
1219
1967
    @dbus.service.signal(_interface, signature="s")
 
1220
1968
    def Rejected(self, reason):
 
1224
1972
    # NeedApproval - signal
 
1225
1973
    @dbus.service.signal(_interface, signature="tb")
 
1226
1974
    def NeedApproval(self, timeout, default):
 
1228
1976
        return self.need_approval()
 
1232
1980
    # Approve - method
 
1233
1981
    @dbus.service.method(_interface, in_signature="b")
 
1234
1982
    def Approve(self, value):
 
1235
1983
        self.approve(value)
 
1237
1985
    # CheckedOK - method
 
1238
1986
    @dbus.service.method(_interface)
 
1239
1987
    def CheckedOK(self):
 
1240
1988
        self.checked_ok()
 
1242
1990
    # Enable - method
 
 
1991
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1243
1992
    @dbus.service.method(_interface)
 
1244
1993
    def Enable(self):
 
1248
1997
    # StartChecker - method
 
 
1998
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1249
1999
    @dbus.service.method(_interface)
 
1250
2000
    def StartChecker(self):
 
1252
2002
        self.start_checker()
 
1254
2004
    # Disable - method
 
 
2005
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1255
2006
    @dbus.service.method(_interface)
 
1256
2007
    def Disable(self):
 
1260
2011
    # StopChecker - method
 
 
2012
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
 
1261
2013
    @dbus.service.method(_interface)
 
1262
2014
    def StopChecker(self):
 
1263
2015
        self.stop_checker()
 
1267
2019
    # ApprovalPending - property
 
1268
2020
    @dbus_service_property(_interface, signature="b", access="read")
 
1269
2021
    def ApprovalPending_dbus_property(self):
 
1270
2022
        return dbus.Boolean(bool(self.approvals_pending))
 
1272
2024
    # ApprovedByDefault - property
 
1273
 
    @dbus_service_property(_interface, signature="b",
 
 
2025
    @dbus_service_property(_interface,
 
1274
2027
                           access="readwrite")
 
1275
2028
    def ApprovedByDefault_dbus_property(self, value=None):
 
1276
2029
        if value is None:       # get
 
1277
2030
            return dbus.Boolean(self.approved_by_default)
 
1278
2031
        self.approved_by_default = bool(value)
 
1280
2033
    # ApprovalDelay - property
 
1281
 
    @dbus_service_property(_interface, signature="t",
 
 
2034
    @dbus_service_property(_interface,
 
1282
2036
                           access="readwrite")
 
1283
2037
    def ApprovalDelay_dbus_property(self, value=None):
 
1284
2038
        if value is None:       # get
 
1285
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
 
2039
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1286
2041
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1288
2043
    # ApprovalDuration - property
 
1289
 
    @dbus_service_property(_interface, signature="t",
 
 
2044
    @dbus_service_property(_interface,
 
1290
2046
                           access="readwrite")
 
1291
2047
    def ApprovalDuration_dbus_property(self, value=None):
 
1292
2048
        if value is None:       # get
 
1293
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1294
 
                    self.approval_duration))
 
 
2049
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1295
2051
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1297
2053
    # Name - property
 
 
2055
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1298
2056
    @dbus_service_property(_interface, signature="s", access="read")
 
1299
2057
    def Name_dbus_property(self):
 
1300
2058
        return dbus.String(self.name)
 
 
2062
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
 
2063
    @dbus_service_property(_interface, signature="s", access="read")
 
 
2064
    def KeyID_dbus_property(self):
 
 
2065
        return dbus.String(self.key_id)
 
1302
2067
    # Fingerprint - property
 
 
2069
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1303
2070
    @dbus_service_property(_interface, signature="s", access="read")
 
1304
2071
    def Fingerprint_dbus_property(self):
 
1305
2072
        return dbus.String(self.fingerprint)
 
1307
2074
    # Host - property
 
1308
 
    @dbus_service_property(_interface, signature="s",
 
 
2075
    @dbus_service_property(_interface,
 
1309
2077
                           access="readwrite")
 
1310
2078
    def Host_dbus_property(self, value=None):
 
1311
2079
        if value is None:       # get
 
1312
2080
            return dbus.String(self.host)
 
1313
 
        self.host = unicode(value)
 
 
2081
        self.host = str(value)
 
1315
2083
    # Created - property
 
 
2085
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
 
1316
2086
    @dbus_service_property(_interface, signature="s", access="read")
 
1317
2087
    def Created_dbus_property(self):
 
1318
2088
        return datetime_to_dbus(self.created)
 
1320
2090
    # LastEnabled - property
 
1321
2091
    @dbus_service_property(_interface, signature="s", access="read")
 
1322
2092
    def LastEnabled_dbus_property(self):
 
1323
2093
        return datetime_to_dbus(self.last_enabled)
 
1325
2095
    # Enabled - property
 
1326
 
    @dbus_service_property(_interface, signature="b",
 
 
2096
    @dbus_service_property(_interface,
 
1327
2098
                           access="readwrite")
 
1328
2099
    def Enabled_dbus_property(self, value=None):
 
1329
2100
        if value is None:       # get
 
 
1336
2107
    # LastCheckedOK - property
 
1337
 
    @dbus_service_property(_interface, signature="s",
 
 
2108
    @dbus_service_property(_interface,
 
1338
2110
                           access="readwrite")
 
1339
2111
    def LastCheckedOK_dbus_property(self, value=None):
 
1340
2112
        if value is not None:
 
1341
2113
            self.checked_ok()
 
1343
2115
        return datetime_to_dbus(self.last_checked_ok)
 
1345
2117
    # LastCheckerStatus - property
 
1346
 
    @dbus_service_property(_interface, signature="n",
 
 
2118
    @dbus_service_property(_interface, signature="n", access="read")
 
1348
2119
    def LastCheckerStatus_dbus_property(self):
 
1349
2120
        return dbus.Int16(self.last_checker_status)
 
1351
2122
    # Expires - property
 
1352
2123
    @dbus_service_property(_interface, signature="s", access="read")
 
1353
2124
    def Expires_dbus_property(self):
 
1354
2125
        return datetime_to_dbus(self.expires)
 
1356
2127
    # LastApprovalRequest - property
 
1357
2128
    @dbus_service_property(_interface, signature="s", access="read")
 
1358
2129
    def LastApprovalRequest_dbus_property(self):
 
1359
2130
        return datetime_to_dbus(self.last_approval_request)
 
1361
2132
    # Timeout - property
 
1362
 
    @dbus_service_property(_interface, signature="t",
 
 
2133
    @dbus_service_property(_interface,
 
1363
2135
                           access="readwrite")
 
1364
2136
    def Timeout_dbus_property(self, value=None):
 
1365
2137
        if value is None:       # get
 
1366
 
            return dbus.UInt64(self.timeout_milliseconds())
 
 
2138
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
 
2139
        old_timeout = self.timeout
 
1367
2140
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1368
 
        # Reschedule timeout
 
 
2141
        # Reschedule disabling
 
1369
2142
        if self.enabled:
 
1370
2143
            now = datetime.datetime.utcnow()
 
1371
 
            time_to_die = timedelta_to_milliseconds(
 
1372
 
                (self.last_checked_ok + self.timeout) - now)
 
1373
 
            if time_to_die <= 0:
 
 
2144
            self.expires += self.timeout - old_timeout
 
 
2145
            if self.expires <= now:
 
1374
2146
                # The timeout has passed
 
1377
 
                self.expires = (now +
 
1378
 
                                datetime.timedelta(milliseconds =
 
1380
2149
                if (getattr(self, "disable_initiator_tag", None)
 
1383
 
                gobject.source_remove(self.disable_initiator_tag)
 
1384
 
                self.disable_initiator_tag = (gobject.timeout_add
 
 
2152
                GLib.source_remove(self.disable_initiator_tag)
 
 
2153
                self.disable_initiator_tag = GLib.timeout_add(
 
 
2154
                    int((self.expires - now).total_seconds() * 1000),
 
1388
2157
    # ExtendedTimeout - property
 
1389
 
    @dbus_service_property(_interface, signature="t",
 
 
2158
    @dbus_service_property(_interface,
 
1390
2160
                           access="readwrite")
 
1391
2161
    def ExtendedTimeout_dbus_property(self, value=None):
 
1392
2162
        if value is None:       # get
 
1393
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
 
2163
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1394
2165
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1396
2167
    # Interval - property
 
1397
 
    @dbus_service_property(_interface, signature="t",
 
 
2168
    @dbus_service_property(_interface,
 
1398
2170
                           access="readwrite")
 
1399
2171
    def Interval_dbus_property(self, value=None):
 
1400
2172
        if value is None:       # get
 
1401
 
            return dbus.UInt64(self.interval_milliseconds())
 
 
2173
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1402
2174
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1403
2175
        if getattr(self, "checker_initiator_tag", None) is None:
 
1405
2177
        if self.enabled:
 
1406
2178
            # Reschedule checker run
 
1407
 
            gobject.source_remove(self.checker_initiator_tag)
 
1408
 
            self.checker_initiator_tag = (gobject.timeout_add
 
1409
 
                                          (value, self.start_checker))
 
1410
 
            self.start_checker()    # Start one now, too
 
 
2179
            GLib.source_remove(self.checker_initiator_tag)
 
 
2180
            self.checker_initiator_tag = GLib.timeout_add(
 
 
2181
                value, self.start_checker)
 
 
2182
            self.start_checker()  # Start one now, too
 
1412
2184
    # Checker - property
 
1413
 
    @dbus_service_property(_interface, signature="s",
 
 
2185
    @dbus_service_property(_interface,
 
1414
2187
                           access="readwrite")
 
1415
2188
    def Checker_dbus_property(self, value=None):
 
1416
2189
        if value is None:       # get
 
1417
2190
            return dbus.String(self.checker_command)
 
1418
 
        self.checker_command = unicode(value)
 
 
2191
        self.checker_command = str(value)
 
1420
2193
    # CheckerRunning - property
 
1421
 
    @dbus_service_property(_interface, signature="b",
 
 
2194
    @dbus_service_property(_interface,
 
1422
2196
                           access="readwrite")
 
1423
2197
    def CheckerRunning_dbus_property(self, value=None):
 
1424
2198
        if value is None:       # get
 
 
1457
2239
        if data[0] == 'data':
 
1459
2241
        if data[0] == 'function':
 
1460
2243
            def func(*args, **kwargs):
 
1461
2244
                self._pipe.send(('funcall', name, args, kwargs))
 
1462
2245
                return self._pipe.recv()[1]
 
1465
2249
    def __setattr__(self, name, value):
 
1466
2250
        if name == '_pipe':
 
1467
2251
            return super(ProxyClient, self).__setattr__(name, value)
 
1468
2252
        self._pipe.send(('setattr', name, value))
 
1471
 
class ClientDBusTransitional(ClientDBus):
 
1472
 
    __metaclass__ = AlternateDBusNamesMetaclass
 
1475
2255
class ClientHandler(socketserver.BaseRequestHandler, object):
 
1476
2256
    """A class to handle client connections.
 
1478
2258
    Instantiated once for each connection to handle it.
 
1479
2259
    Note: This will run in its own forked process."""
 
1481
2261
    def handle(self):
 
1482
2262
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1483
2263
            logger.info("TCP connection from: %s",
 
1484
 
                        unicode(self.client_address))
 
 
2264
                        str(self.client_address))
 
1485
2265
            logger.debug("Pipe FD: %d",
 
1486
2266
                         self.server.child_pipe.fileno())
 
1488
 
            session = (gnutls.connection
 
1489
 
                       .ClientSession(self.request,
 
1491
 
                                      .X509Credentials()))
 
1493
 
            # Note: gnutls.connection.X509Credentials is really a
 
1494
 
            # generic GnuTLS certificate credentials object so long as
 
1495
 
            # no X.509 keys are added to it.  Therefore, we can use it
 
1496
 
            # here despite using OpenPGP certificates.
 
1498
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1499
 
            #                      "+AES-256-CBC", "+SHA1",
 
1500
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
 
2268
            session = gnutls.ClientSession(self.request)
 
 
2270
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
 
2271
            #                       "+AES-256-CBC", "+SHA1",
 
 
2272
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
 
1502
2274
            # Use a fallback default, since this MUST be set.
 
1503
2275
            priority = self.server.gnutls_priority
 
1504
2276
            if priority is None:
 
1505
2277
                priority = "NORMAL"
 
1506
 
            (gnutls.library.functions
 
1507
 
             .gnutls_priority_set_direct(session._c_object,
 
 
2278
            gnutls.priority_set_direct(session._c_object,
 
 
2279
                                       priority.encode("utf-8"),
 
1510
2282
            # Start communication using the Mandos protocol
 
1511
2283
            # Get protocol number
 
1512
2284
            line = self.request.makefile().readline()
 
1513
2285
            logger.debug("Protocol version: %r", line)
 
1515
2287
                if int(line.strip().split()[0]) > 1:
 
 
2288
                    raise RuntimeError(line)
 
1517
2289
            except (ValueError, IndexError, RuntimeError) as error:
 
1518
2290
                logger.error("Unknown protocol version: %s", error)
 
1521
2293
            # Start GnuTLS connection
 
1523
2295
                session.handshake()
 
1524
 
            except gnutls.errors.GNUTLSError as error:
 
 
2296
            except gnutls.Error as error:
 
1525
2297
                logger.warning("Handshake failed: %s", error)
 
1526
2298
                # Do not run session.bye() here: the session is not
 
1527
2299
                # established.  Just abandon the request.
 
1529
2301
            logger.debug("Handshake succeeded")
 
1531
2303
            approval_required = False
 
1534
 
                    fpr = self.fingerprint(self.peer_certificate
 
1537
 
                        gnutls.errors.GNUTLSError) as error:
 
1538
 
                    logger.warning("Bad certificate: %s", error)
 
1540
 
                logger.debug("Fingerprint: %s", fpr)
 
1543
 
                    client = ProxyClient(child_pipe, fpr,
 
 
2305
                if gnutls.has_rawpk:
 
 
2308
                        key_id = self.key_id(
 
 
2309
                            self.peer_certificate(session))
 
 
2310
                    except (TypeError, gnutls.Error) as error:
 
 
2311
                        logger.warning("Bad certificate: %s", error)
 
 
2313
                    logger.debug("Key ID: %s", key_id)
 
 
2318
                        fpr = self.fingerprint(
 
 
2319
                            self.peer_certificate(session))
 
 
2320
                    except (TypeError, gnutls.Error) as error:
 
 
2321
                        logger.warning("Bad certificate: %s", error)
 
 
2323
                    logger.debug("Fingerprint: %s", fpr)
 
 
2326
                    client = ProxyClient(child_pipe, key_id, fpr,
 
1544
2327
                                         self.client_address)
 
1545
2328
                except KeyError:
 
1548
2331
                if client.approval_delay:
 
1549
2332
                    delay = client.approval_delay
 
1550
2333
                    client.approvals_pending += 1
 
1551
2334
                    approval_required = True
 
1554
2337
                    if not client.enabled:
 
1555
2338
                        logger.info("Client %s is disabled",
 
1557
2340
                        if self.server.use_dbus:
 
1558
2341
                            # Emit D-Bus signal
 
1559
2342
                            client.Rejected("Disabled")
 
1562
2345
                    if client.approved or not client.approval_delay:
 
1563
 
                        #We are approved or approval is disabled
 
 
2346
                        # We are approved or approval is disabled
 
1565
2348
                    elif client.approved is None:
 
1566
2349
                        logger.info("Client %s needs approval",
 
 
1601
2382
                        delay -= time2 - time
 
1604
 
                while sent_size < len(client.secret):
 
1606
 
                        sent = session.send(client.secret[sent_size:])
 
1607
 
                    except gnutls.errors.GNUTLSError as error:
 
1608
 
                        logger.warning("gnutls send failed")
 
1610
 
                    logger.debug("Sent: %d, remaining: %d",
 
1611
 
                                 sent, len(client.secret)
 
1612
 
                                 - (sent_size + sent))
 
 
2385
                    session.send(client.secret)
 
 
2386
                except gnutls.Error as error:
 
 
2387
                    logger.warning("gnutls send failed",
 
1615
2391
                logger.info("Sending secret to %s", client.name)
 
1616
2392
                # bump the timeout using extended_timeout
 
1617
2393
                client.bump_timeout(client.extended_timeout)
 
1618
2394
                if self.server.use_dbus:
 
1619
2395
                    # Emit D-Bus signal
 
1620
2396
                    client.GotSecret()
 
1623
2399
                if approval_required:
 
1624
2400
                    client.approvals_pending -= 1
 
1627
 
                except gnutls.errors.GNUTLSError as error:
 
1628
 
                    logger.warning("GnuTLS bye failed")
 
 
2403
                except gnutls.Error as error:
 
 
2404
                    logger.warning("GnuTLS bye failed",
 
1631
2408
    def peer_certificate(session):
 
1632
 
        "Return the peer's OpenPGP certificate as a bytestring"
 
1633
 
        # If not an OpenPGP certificate...
 
1634
 
        if (gnutls.library.functions
 
1635
 
            .gnutls_certificate_type_get(session._c_object)
 
1636
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1637
 
            # ...do the normal thing
 
1638
 
            return session.peer_certificate
 
 
2409
        "Return the peer's certificate as a bytestring"
 
 
2411
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
 
2413
        except AttributeError:
 
 
2414
            cert_type = gnutls.certificate_type_get(session._c_object)
 
 
2415
        if gnutls.has_rawpk:
 
 
2416
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
 
 
2418
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
 
 
2419
        # If not a valid certificate type...
 
 
2420
        if cert_type not in valid_cert_types:
 
 
2421
            logger.info("Cert type %r not in %r", cert_type,
 
 
2423
            # ...return invalid data
 
1639
2425
        list_size = ctypes.c_uint(1)
 
1640
 
        cert_list = (gnutls.library.functions
 
1641
 
                     .gnutls_certificate_get_peers
 
 
2426
        cert_list = (gnutls.certificate_get_peers
 
1642
2427
                     (session._c_object, ctypes.byref(list_size)))
 
1643
2428
        if not bool(cert_list) and list_size.value != 0:
 
1644
 
            raise gnutls.errors.GNUTLSError("error getting peer"
 
 
2429
            raise gnutls.Error("error getting peer certificate")
 
1646
2430
        if list_size.value == 0:
 
1648
2432
        cert = cert_list[0]
 
1649
2433
        return ctypes.string_at(cert.data, cert.size)
 
 
2436
    def key_id(certificate):
 
 
2437
        "Convert a certificate bytestring to a hexdigit key ID"
 
 
2438
        # New GnuTLS "datum" with the public key
 
 
2439
        datum = gnutls.datum_t(
 
 
2440
            ctypes.cast(ctypes.c_char_p(certificate),
 
 
2441
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2442
            ctypes.c_uint(len(certificate)))
 
 
2443
        # XXX all these need to be created in the gnutls "module"
 
 
2444
        # New empty GnuTLS certificate
 
 
2445
        pubkey = gnutls.pubkey_t()
 
 
2446
        gnutls.pubkey_init(ctypes.byref(pubkey))
 
 
2447
        # Import the raw public key into the certificate
 
 
2448
        gnutls.pubkey_import(pubkey,
 
 
2449
                             ctypes.byref(datum),
 
 
2450
                             gnutls.X509_FMT_DER)
 
 
2451
        # New buffer for the key ID
 
 
2452
        buf = ctypes.create_string_buffer(32)
 
 
2453
        buf_len = ctypes.c_size_t(len(buf))
 
 
2454
        # Get the key ID from the raw public key into the buffer
 
 
2455
        gnutls.pubkey_get_key_id(pubkey,
 
 
2456
                                 gnutls.KEYID_USE_SHA256,
 
 
2457
                                 ctypes.cast(ctypes.byref(buf),
 
 
2458
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
 
2459
                                 ctypes.byref(buf_len))
 
 
2460
        # Deinit the certificate
 
 
2461
        gnutls.pubkey_deinit(pubkey)
 
 
2463
        # Convert the buffer to a Python bytestring
 
 
2464
        key_id = ctypes.string_at(buf, buf_len.value)
 
 
2465
        # Convert the bytestring to hexadecimal notation
 
 
2466
        hex_key_id = binascii.hexlify(key_id).upper()
 
1652
2470
    def fingerprint(openpgp):
 
1653
2471
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
 
1654
2472
        # New GnuTLS "datum" with the OpenPGP public key
 
1655
 
        datum = (gnutls.library.types
 
1656
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1659
 
                                 ctypes.c_uint(len(openpgp))))
 
 
2473
        datum = gnutls.datum_t(
 
 
2474
            ctypes.cast(ctypes.c_char_p(openpgp),
 
 
2475
                        ctypes.POINTER(ctypes.c_ubyte)),
 
 
2476
            ctypes.c_uint(len(openpgp)))
 
1660
2477
        # New empty GnuTLS certificate
 
1661
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1662
 
        (gnutls.library.functions
 
1663
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
 
2478
        crt = gnutls.openpgp_crt_t()
 
 
2479
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1664
2480
        # Import the OpenPGP public key into the certificate
 
1665
 
        (gnutls.library.functions
 
1666
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1667
 
                                    gnutls.library.constants
 
1668
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
 
2481
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
 
 
2482
                                  gnutls.OPENPGP_FMT_RAW)
 
1669
2483
        # Verify the self signature in the key
 
1670
2484
        crtverify = ctypes.c_uint()
 
1671
 
        (gnutls.library.functions
 
1672
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1673
 
                                         ctypes.byref(crtverify)))
 
 
2485
        gnutls.openpgp_crt_verify_self(crt, 0,
 
 
2486
                                       ctypes.byref(crtverify))
 
1674
2487
        if crtverify.value != 0:
 
1675
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1676
 
            raise (gnutls.errors.CertificateSecurityError
 
 
2488
            gnutls.openpgp_crt_deinit(crt)
 
 
2489
            raise gnutls.CertificateSecurityError(code
 
1678
2491
        # New buffer for the fingerprint
 
1679
2492
        buf = ctypes.create_string_buffer(20)
 
1680
2493
        buf_len = ctypes.c_size_t()
 
1681
2494
        # Get the fingerprint from the certificate into the buffer
 
1682
 
        (gnutls.library.functions
 
1683
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1684
 
                                             ctypes.byref(buf_len)))
 
 
2495
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
 
2496
                                           ctypes.byref(buf_len))
 
1685
2497
        # Deinit the certificate
 
1686
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
 
2498
        gnutls.openpgp_crt_deinit(crt)
 
1687
2499
        # Convert the buffer to a Python bytestring
 
1688
2500
        fpr = ctypes.string_at(buf, buf_len.value)
 
1689
2501
        # Convert the bytestring to hexadecimal notation
 
 
1694
 
class MultiprocessingMixIn(object):
 
 
2506
class MultiprocessingMixIn:
 
1695
2507
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1696
2509
    def sub_process_main(self, request, address):
 
1698
2511
            self.finish_request(request, address)
 
1699
2512
        except Exception:
 
1700
2513
            self.handle_error(request, address)
 
1701
2514
        self.close_request(request)
 
1703
2516
    def process_request(self, request, address):
 
1704
2517
        """Start a new process to process the request."""
 
1705
 
        proc = multiprocessing.Process(target = self.sub_process_main,
 
 
2518
        proc = multiprocessing.Process(target=self.sub_process_main,
 
 
2519
                                       args=(request, address))
 
1712
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
 
2524
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
1713
2525
    """ adds a pipe to the MixIn """
 
1714
2527
    def process_request(self, request, client_address):
 
1715
2528
        """Overrides and wraps the original process_request().
 
1717
2530
        This function creates a new pipe in self.pipe
 
1719
2532
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1721
2534
        proc = MultiprocessingMixIn.process_request(self, request,
 
1722
2535
                                                    client_address)
 
1723
2536
        self.child_pipe.close()
 
1724
2537
        self.add_pipe(parent_pipe, proc)
 
1726
2539
    def add_pipe(self, parent_pipe, proc):
 
1727
2540
        """Dummy function; override as necessary"""
 
1728
 
        raise NotImplementedError
 
 
2541
        raise NotImplementedError()
 
1731
2544
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
 
1732
 
                     socketserver.TCPServer, object):
 
 
2545
                     socketserver.TCPServer):
 
1733
2546
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
1736
2549
        enabled:        Boolean; whether this server is activated yet
 
1737
2550
        interface:      None or a network interface name (string)
 
1738
2551
        use_ipv6:       Boolean; to use IPv6 or not
 
1740
2554
    def __init__(self, server_address, RequestHandlerClass,
 
1741
 
                 interface=None, use_ipv6=True):
 
 
2558
        """If socketfd is set, use that file descriptor instead of
 
 
2559
        creating a new one with socket.socket().
 
1742
2561
        self.interface = interface
 
1744
2563
            self.address_family = socket.AF_INET6
 
 
2564
        if socketfd is not None:
 
 
2565
            # Save the file descriptor
 
 
2566
            self.socketfd = socketfd
 
 
2567
            # Save the original socket.socket() function
 
 
2568
            self.socket_socket = socket.socket
 
 
2570
            # To implement --socket, we monkey patch socket.socket.
 
 
2572
            # (When socketserver.TCPServer is a new-style class, we
 
 
2573
            # could make self.socket into a property instead of monkey
 
 
2574
            # patching socket.socket.)
 
 
2576
            # Create a one-time-only replacement for socket.socket()
 
 
2577
            @functools.wraps(socket.socket)
 
 
2578
            def socket_wrapper(*args, **kwargs):
 
 
2579
                # Restore original function so subsequent calls are
 
 
2581
                socket.socket = self.socket_socket
 
 
2582
                del self.socket_socket
 
 
2583
                # This time only, return a new socket object from the
 
 
2584
                # saved file descriptor.
 
 
2585
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
 
2586
            # Replace socket.socket() function with wrapper
 
 
2587
            socket.socket = socket_wrapper
 
 
2588
        # The socketserver.TCPServer.__init__ will call
 
 
2589
        # socket.socket(), which might be our replacement,
 
 
2590
        # socket_wrapper(), if socketfd was set.
 
1745
2591
        socketserver.TCPServer.__init__(self, server_address,
 
1746
2592
                                        RequestHandlerClass)
 
1747
2594
    def server_bind(self):
 
1748
2595
        """This overrides the normal server_bind() function
 
1749
2596
        to bind to an interface if one was specified, and also NOT to
 
1750
2597
        bind to an address or port if they were not specified."""
 
 
2598
        global SO_BINDTODEVICE
 
1751
2599
        if self.interface is not None:
 
1752
2600
            if SO_BINDTODEVICE is None:
 
1753
 
                logger.error("SO_BINDTODEVICE does not exist;"
 
1754
 
                             " cannot bind to interface %s",
 
1758
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1762
 
                except socket.error as error:
 
1763
 
                    if error[0] == errno.EPERM:
 
1764
 
                        logger.error("No permission to"
 
1765
 
                                     " bind to interface %s",
 
1767
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1768
 
                        logger.error("SO_BINDTODEVICE not available;"
 
1769
 
                                     " cannot bind to interface %s",
 
 
2601
                # Fall back to a hard-coded value which seems to be
 
 
2603
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
 
2604
                SO_BINDTODEVICE = 25
 
 
2606
                self.socket.setsockopt(
 
 
2607
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
 
 
2608
                    (self.interface + "\0").encode("utf-8"))
 
 
2609
            except socket.error as error:
 
 
2610
                if error.errno == errno.EPERM:
 
 
2611
                    logger.error("No permission to bind to"
 
 
2612
                                 " interface %s", self.interface)
 
 
2613
                elif error.errno == errno.ENOPROTOOPT:
 
 
2614
                    logger.error("SO_BINDTODEVICE not available;"
 
 
2615
                                 " cannot bind to interface %s",
 
 
2617
                elif error.errno == errno.ENODEV:
 
 
2618
                    logger.error("Interface %s does not exist,"
 
 
2619
                                 " cannot bind", self.interface)
 
1773
2622
        # Only bind(2) the socket if we really need to.
 
1774
2623
        if self.server_address[0] or self.server_address[1]:
 
 
2624
            if self.server_address[1]:
 
 
2625
                self.allow_reuse_address = True
 
1775
2626
            if not self.server_address[0]:
 
1776
2627
                if self.address_family == socket.AF_INET6:
 
1777
 
                    any_address = "::" # in6addr_any
 
 
2628
                    any_address = "::"  # in6addr_any
 
1779
 
                    any_address = socket.INADDR_ANY
 
 
2630
                    any_address = "0.0.0.0"  # INADDR_ANY
 
1780
2631
                self.server_address = (any_address,
 
1781
2632
                                       self.server_address[1])
 
1782
2633
            elif not self.server_address[1]:
 
1783
 
                self.server_address = (self.server_address[0],
 
 
2634
                self.server_address = (self.server_address[0], 0)
 
1785
2635
#                 if self.interface:
 
1786
2636
#                     self.server_address = (self.server_address[0],
 
 
1812
2667
        self.gnutls_priority = gnutls_priority
 
1813
2668
        IPv6_TCPServer.__init__(self, server_address,
 
1814
2669
                                RequestHandlerClass,
 
1815
 
                                interface = interface,
 
1816
 
                                use_ipv6 = use_ipv6)
 
 
2670
                                interface=interface,
 
1817
2674
    def server_activate(self):
 
1818
2675
        if self.enabled:
 
1819
2676
            return socketserver.TCPServer.server_activate(self)
 
1821
2678
    def enable(self):
 
1822
2679
        self.enabled = True
 
1824
2681
    def add_pipe(self, parent_pipe, proc):
 
1825
2682
        # Call "handle_ipc" for both data and EOF events
 
1826
 
        gobject.io_add_watch(parent_pipe.fileno(),
 
1827
 
                             gobject.IO_IN | gobject.IO_HUP,
 
1828
 
                             functools.partial(self.handle_ipc,
 
1833
 
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1834
 
                   proc = None, client_object=None):
 
1836
 
            gobject.IO_IN: "IN",   # There is data to read.
 
1837
 
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1839
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1840
 
            gobject.IO_ERR: "ERR", # Error condition.
 
1841
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1842
 
                                    # broken, usually for pipes and
 
1845
 
        conditions_string = ' | '.join(name
 
1847
 
                                       condition_names.iteritems()
 
1848
 
                                       if cond & condition)
 
 
2684
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
 
2685
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
 
2686
            functools.partial(self.handle_ipc,
 
 
2687
                              parent_pipe=parent_pipe,
 
 
2690
    def handle_ipc(self, source, condition,
 
 
2693
                   client_object=None):
 
1849
2694
        # error, or the other end of multiprocessing.Pipe has closed
 
1850
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
 
2695
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
1851
2696
            # Wait for other process to exit
 
1855
2700
        # Read a request from the child
 
1856
2701
        request = parent_pipe.recv()
 
1857
2702
        command = request[0]
 
1859
2704
        if command == 'init':
 
1861
 
            address = request[2]
 
1863
 
            for c in self.clients.itervalues():
 
1864
 
                if c.fingerprint == fpr:
 
 
2705
            key_id = request[1].decode("ascii")
 
 
2706
            fpr = request[2].decode("ascii")
 
 
2707
            address = request[3]
 
 
2709
            for c in self.clients.values():
 
 
2710
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
 
2712
                if key_id and c.key_id == key_id:
 
 
2715
                if fpr and c.fingerprint == fpr:
 
1868
 
                logger.info("Client not found for fingerprint: %s, ad"
 
1869
 
                            "dress: %s", fpr, address)
 
 
2719
                logger.info("Client not found for key ID: %s, address"
 
 
2720
                            ": %s", key_id or fpr, address)
 
1870
2721
                if self.use_dbus:
 
1871
2722
                    # Emit D-Bus signal
 
1872
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
 
2723
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
1874
2725
                parent_pipe.send(False)
 
1877
 
            gobject.io_add_watch(parent_pipe.fileno(),
 
1878
 
                                 gobject.IO_IN | gobject.IO_HUP,
 
1879
 
                                 functools.partial(self.handle_ipc,
 
 
2729
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
 
2730
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
 
2731
                functools.partial(self.handle_ipc,
 
 
2732
                                  parent_pipe=parent_pipe,
 
 
2734
                                  client_object=client))
 
1885
2735
            parent_pipe.send(True)
 
1886
2736
            # remove the old hook in favor of the new above hook on
 
 
1890
2740
            funcname = request[1]
 
1891
2741
            args = request[2]
 
1892
2742
            kwargs = request[3]
 
1894
2744
            parent_pipe.send(('data', getattr(client_object,
 
1895
2745
                                              funcname)(*args,
 
1898
2748
        if command == 'getattr':
 
1899
2749
            attrname = request[1]
 
1900
 
            if callable(client_object.__getattribute__(attrname)):
 
1901
 
                parent_pipe.send(('function',))
 
 
2750
            if isinstance(client_object.__getattribute__(attrname),
 
 
2751
                          collections.Callable):
 
 
2752
                parent_pipe.send(('function', ))
 
1903
 
                parent_pipe.send(('data', client_object
 
1904
 
                                  .__getattribute__(attrname)))
 
 
2755
                    'data', client_object.__getattribute__(attrname)))
 
1906
2757
        if command == 'setattr':
 
1907
2758
            attrname = request[1]
 
1908
2759
            value = request[2]
 
1909
2760
            setattr(client_object, attrname, value)
 
 
2765
def rfc3339_duration_to_delta(duration):
 
 
2766
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
 
2768
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
 
 
2770
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
 
 
2772
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
 
 
2774
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
 
 
2776
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
 
 
2778
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
 
 
2780
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
 
 
2784
    # Parsing an RFC 3339 duration with regular expressions is not
 
 
2785
    # possible - there would have to be multiple places for the same
 
 
2786
    # values, like seconds.  The current code, while more esoteric, is
 
 
2787
    # cleaner without depending on a parsing library.  If Python had a
 
 
2788
    # built-in library for parsing we would use it, but we'd like to
 
 
2789
    # avoid excessive use of external libraries.
 
 
2791
    # New type for defining tokens, syntax, and semantics all-in-one
 
 
2792
    Token = collections.namedtuple("Token", (
 
 
2793
        "regexp",  # To match token; if "value" is not None, must have
 
 
2794
                   # a "group" containing digits
 
 
2795
        "value",   # datetime.timedelta or None
 
 
2796
        "followers"))           # Tokens valid after this token
 
 
2797
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
 
2798
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
 
2799
    token_end = Token(re.compile(r"$"), None, frozenset())
 
 
2800
    token_second = Token(re.compile(r"(\d+)S"),
 
 
2801
                         datetime.timedelta(seconds=1),
 
 
2802
                         frozenset((token_end, )))
 
 
2803
    token_minute = Token(re.compile(r"(\d+)M"),
 
 
2804
                         datetime.timedelta(minutes=1),
 
 
2805
                         frozenset((token_second, token_end)))
 
 
2806
    token_hour = Token(re.compile(r"(\d+)H"),
 
 
2807
                       datetime.timedelta(hours=1),
 
 
2808
                       frozenset((token_minute, token_end)))
 
 
2809
    token_time = Token(re.compile(r"T"),
 
 
2811
                       frozenset((token_hour, token_minute,
 
 
2813
    token_day = Token(re.compile(r"(\d+)D"),
 
 
2814
                      datetime.timedelta(days=1),
 
 
2815
                      frozenset((token_time, token_end)))
 
 
2816
    token_month = Token(re.compile(r"(\d+)M"),
 
 
2817
                        datetime.timedelta(weeks=4),
 
 
2818
                        frozenset((token_day, token_end)))
 
 
2819
    token_year = Token(re.compile(r"(\d+)Y"),
 
 
2820
                       datetime.timedelta(weeks=52),
 
 
2821
                       frozenset((token_month, token_end)))
 
 
2822
    token_week = Token(re.compile(r"(\d+)W"),
 
 
2823
                       datetime.timedelta(weeks=1),
 
 
2824
                       frozenset((token_end, )))
 
 
2825
    token_duration = Token(re.compile(r"P"), None,
 
 
2826
                           frozenset((token_year, token_month,
 
 
2827
                                      token_day, token_time,
 
 
2829
    # Define starting values:
 
 
2831
    value = datetime.timedelta()
 
 
2833
    # Following valid tokens
 
 
2834
    followers = frozenset((token_duration, ))
 
 
2835
    # String left to parse
 
 
2837
    # Loop until end token is found
 
 
2838
    while found_token is not token_end:
 
 
2839
        # Search for any currently valid tokens
 
 
2840
        for token in followers:
 
 
2841
            match = token.regexp.match(s)
 
 
2842
            if match is not None:
 
 
2844
                if token.value is not None:
 
 
2845
                    # Value found, parse digits
 
 
2846
                    factor = int(match.group(1), 10)
 
 
2847
                    # Add to value so far
 
 
2848
                    value += factor * token.value
 
 
2849
                # Strip token from string
 
 
2850
                s = token.regexp.sub("", s, 1)
 
 
2853
                # Set valid next tokens
 
 
2854
                followers = found_token.followers
 
 
2857
            # No currently valid tokens were found
 
 
2858
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
1914
2864
def string_to_delta(interval):
 
1915
2865
    """Parse a string and return a datetime.timedelta
 
1917
 
    >>> string_to_delta('7d')
 
1918
 
    datetime.timedelta(7)
 
1919
 
    >>> string_to_delta('60s')
 
1920
 
    datetime.timedelta(0, 60)
 
1921
 
    >>> string_to_delta('60m')
 
1922
 
    datetime.timedelta(0, 3600)
 
1923
 
    >>> string_to_delta('24h')
 
1924
 
    datetime.timedelta(1)
 
1925
 
    >>> string_to_delta('1w')
 
1926
 
    datetime.timedelta(7)
 
1927
 
    >>> string_to_delta('5m 30s')
 
1928
 
    datetime.timedelta(0, 330)
 
 
2867
    >>> string_to_delta('7d') == datetime.timedelta(7)
 
 
2869
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
 
 
2871
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
 
 
2873
    >>> string_to_delta('24h') == datetime.timedelta(1)
 
 
2875
    >>> string_to_delta('1w') == datetime.timedelta(7)
 
 
2877
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
 
 
2882
        return rfc3339_duration_to_delta(interval)
 
1930
2886
    timevalue = datetime.timedelta(0)
 
1931
2887
    for s in interval.split():
 
1933
 
            suffix = unicode(s[-1])
 
1934
2890
            value = int(s[:-1])
 
1935
2891
            if suffix == "d":
 
1936
2892
                delta = datetime.timedelta(value)
 
 
2008
2964
    parser.add_argument("--no-dbus", action="store_false",
 
2009
2965
                        dest="use_dbus", help="Do not provide D-Bus"
 
2010
 
                        " system bus interface")
 
 
2966
                        " system bus interface", default=None)
 
2011
2967
    parser.add_argument("--no-ipv6", action="store_false",
 
2012
 
                        dest="use_ipv6", help="Do not use IPv6")
 
 
2968
                        dest="use_ipv6", help="Do not use IPv6",
 
2013
2970
    parser.add_argument("--no-restore", action="store_false",
 
2014
2971
                        dest="restore", help="Do not restore stored"
 
 
2972
                        " state", default=None)
 
 
2973
    parser.add_argument("--socket", type=int,
 
 
2974
                        help="Specify a file descriptor to a network"
 
 
2975
                        " socket to use instead of creating one")
 
2016
2976
    parser.add_argument("--statedir", metavar="DIR",
 
2017
2977
                        help="Directory to save/restore state in")
 
 
2978
    parser.add_argument("--foreground", action="store_true",
 
 
2979
                        help="Run in foreground", default=None)
 
 
2980
    parser.add_argument("--no-zeroconf", action="store_false",
 
 
2981
                        dest="zeroconf", help="Do not use Zeroconf",
 
2019
2984
    options = parser.parse_args()
 
2026
2986
    # Default values for config file for server-global settings
 
2027
 
    server_defaults = { "interface": "",
 
2032
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2033
 
                        "servicename": "Mandos",
 
2038
 
                        "statedir": "/var/lib/mandos"
 
 
2987
    if gnutls.has_rawpk:
 
 
2988
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
 
 
2989
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
 
 
2991
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
 
2992
                    ":+SIGN-DSA-SHA256")
 
 
2993
    server_defaults = {"interface": "",
 
 
2997
                       "priority": priority,
 
 
2998
                       "servicename": "Mandos",
 
 
3004
                       "statedir": "/var/lib/mandos",
 
 
3005
                       "foreground": "False",
 
2041
3010
    # Parse config file for server-global settings
 
2042
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
 
3011
    server_config = configparser.ConfigParser(server_defaults)
 
2043
3012
    del server_defaults
 
2044
 
    server_config.read(os.path.join(options.configdir,
 
2046
 
    # Convert the SafeConfigParser object to a dict
 
 
3013
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
 
3014
    # Convert the ConfigParser object to a dict
 
2047
3015
    server_settings = server_config.defaults()
 
2048
3016
    # Use the appropriate methods on the non-string config options
 
2049
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
 
3017
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3018
                   "foreground", "zeroconf"):
 
2050
3019
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2052
3021
    if server_settings["port"]:
 
2053
3022
        server_settings["port"] = server_config.getint("DEFAULT",
 
 
3024
    if server_settings["socket"]:
 
 
3025
        server_settings["socket"] = server_config.getint("DEFAULT",
 
 
3027
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
 
3028
        # over with an opened os.devnull.  But we don't want this to
 
 
3029
        # happen with a supplied network socket.
 
 
3030
        if 0 <= server_settings["socket"] <= 2:
 
 
3031
            server_settings["socket"] = os.dup(server_settings
 
2055
3033
    del server_config
 
2057
3035
    # Override the settings from the config file with command line
 
2058
3036
    # options, if set.
 
2059
3037
    for option in ("interface", "address", "port", "debug",
 
2060
 
                   "priority", "servicename", "configdir",
 
2061
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
 
3038
                   "priority", "servicename", "configdir", "use_dbus",
 
 
3039
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
 
3040
                   "socket", "foreground", "zeroconf"):
 
2063
3041
        value = getattr(options, option)
 
2064
3042
        if value is not None:
 
2065
3043
            server_settings[option] = value
 
2067
3045
    # Force all strings to be unicode
 
2068
3046
    for option in server_settings.keys():
 
2069
 
        if type(server_settings[option]) is str:
 
2070
 
            server_settings[option] = unicode(server_settings[option])
 
 
3047
        if isinstance(server_settings[option], bytes):
 
 
3048
            server_settings[option] = (server_settings[option]
 
 
3050
    # Force all boolean options to be boolean
 
 
3051
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
 
3052
                   "foreground", "zeroconf"):
 
 
3053
        server_settings[option] = bool(server_settings[option])
 
 
3054
    # Debug implies foreground
 
 
3055
    if server_settings["debug"]:
 
 
3056
        server_settings["foreground"] = True
 
2071
3057
    # Now we have our good server settings in "server_settings"
 
2073
3059
    ##################################################################
 
 
3061
    if (not server_settings["zeroconf"]
 
 
3062
        and not (server_settings["port"]
 
 
3063
                 or server_settings["socket"] != "")):
 
 
3064
        parser.error("Needs port or socket to work without Zeroconf")
 
2075
3066
    # For convenience
 
2076
3067
    debug = server_settings["debug"]
 
2077
3068
    debuglevel = server_settings["debuglevel"]
 
 
2089
3082
            level = getattr(logging, debuglevel.upper())
 
2090
3083
            initlogger(debug, level)
 
2092
3085
    if server_settings["servicename"] != "Mandos":
 
2093
 
        syslogger.setFormatter(logging.Formatter
 
2094
 
                               ('Mandos (%s) [%%(process)d]:'
 
2095
 
                                ' %%(levelname)s: %%(message)s'
 
2096
 
                                % server_settings["servicename"]))
 
 
3086
        syslogger.setFormatter(
 
 
3087
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
 
3088
                              ' %(levelname)s: %(message)s'.format(
 
 
3089
                                  server_settings["servicename"])))
 
2098
3091
    # Parse config file with clients
 
2099
 
    client_config = configparser.SafeConfigParser(Client
 
 
3092
    client_config = configparser.ConfigParser(Client.client_defaults)
 
2101
3093
    client_config.read(os.path.join(server_settings["configdir"],
 
2102
3094
                                    "clients.conf"))
 
2104
3096
    global mandos_dbus_service
 
2105
3097
    mandos_dbus_service = None
 
2107
 
    tcp_server = MandosServer((server_settings["address"],
 
2108
 
                               server_settings["port"]),
 
2110
 
                              interface=(server_settings["interface"]
 
2114
 
                              server_settings["priority"],
 
2117
 
        pidfilename = "/var/run/mandos.pid"
 
2119
 
            pidfile = open(pidfilename, "w")
 
2121
 
            logger.error("Could not open file %r", pidfilename)
 
2124
 
        uid = pwd.getpwnam("_mandos").pw_uid
 
2125
 
        gid = pwd.getpwnam("_mandos").pw_gid
 
2128
 
            uid = pwd.getpwnam("mandos").pw_uid
 
2129
 
            gid = pwd.getpwnam("mandos").pw_gid
 
 
3100
    if server_settings["socket"] != "":
 
 
3101
        socketfd = server_settings["socket"]
 
 
3102
    tcp_server = MandosServer(
 
 
3103
        (server_settings["address"], server_settings["port"]),
 
 
3105
        interface=(server_settings["interface"] or None),
 
 
3107
        gnutls_priority=server_settings["priority"],
 
 
3111
        pidfilename = "/run/mandos.pid"
 
 
3112
        if not os.path.isdir("/run/."):
 
 
3113
            pidfilename = "/var/run/mandos.pid"
 
 
3116
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
 
3117
        except IOError as e:
 
 
3118
            logger.error("Could not open file %r", pidfilename,
 
 
3121
    for name, group in (("_mandos", "_mandos"),
 
 
3122
                        ("mandos", "mandos"),
 
 
3123
                        ("nobody", "nogroup")):
 
 
3125
            uid = pwd.getpwnam(name).pw_uid
 
 
3126
            gid = pwd.getpwnam(group).pw_gid
 
2130
3128
        except KeyError:
 
2132
 
                uid = pwd.getpwnam("nobody").pw_uid
 
2133
 
                gid = pwd.getpwnam("nobody").pw_gid
 
 
3137
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
2140
3139
    except OSError as error:
 
2141
 
        if error[0] != errno.EPERM:
 
 
3140
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
 
3141
                       .format(uid, gid, os.strerror(error.errno)))
 
 
3142
        if error.errno != errno.EPERM:
 
2145
3146
        # Enable all possible GnuTLS debugging
 
2147
3148
        # "Use a log level over 10 to enable all debugging options."
 
2148
3149
        # - GnuTLS manual
 
2149
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2151
 
        @gnutls.library.types.gnutls_log_func
 
 
3150
        gnutls.global_set_log_level(11)
 
2152
3153
        def debug_gnutls(level, string):
 
2153
3154
            logger.debug("GnuTLS: %s", string[:-1])
 
2155
 
        (gnutls.library.functions
 
2156
 
         .gnutls_global_set_log_function(debug_gnutls))
 
 
3156
        gnutls.global_set_log_function(debug_gnutls)
 
2158
3158
        # Redirect stdin so all checkers get /dev/null
 
2159
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
3159
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2160
3160
        os.dup2(null, sys.stdin.fileno())
 
2164
3164
    # Need to fork before connecting to D-Bus
 
2166
3166
        # Close all input and output, do double fork, etc.
 
2169
 
    gobject.threads_init()
 
 
3169
    if gi.version_info < (3, 10, 2):
 
 
3170
        # multiprocessing will use threads, so before we use GLib we
 
 
3171
        # need to inform GLib that threads will be used.
 
2171
3174
    global main_loop
 
2172
3175
    # From the Avahi example code
 
2173
 
    DBusGMainLoop(set_as_default=True )
 
2174
 
    main_loop = gobject.MainLoop()
 
 
3176
    DBusGMainLoop(set_as_default=True)
 
 
3177
    main_loop = GLib.MainLoop()
 
2175
3178
    bus = dbus.SystemBus()
 
2176
3179
    # End of Avahi example code
 
2179
3182
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
2180
 
                                            bus, do_not_queue=True)
 
2181
 
            old_bus_name = (dbus.service.BusName
 
2182
 
                            ("se.bsnet.fukt.Mandos", bus,
 
2184
 
        except dbus.exceptions.NameExistsException as e:
 
2185
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
 
3185
            old_bus_name = dbus.service.BusName(
 
 
3186
                "se.bsnet.fukt.Mandos", bus,
 
 
3188
        except dbus.exceptions.DBusException as e:
 
 
3189
            logger.error("Disabling D-Bus:", exc_info=e)
 
2186
3190
            use_dbus = False
 
2187
3191
            server_settings["use_dbus"] = False
 
2188
3192
            tcp_server.use_dbus = False
 
2189
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2190
 
    service = AvahiServiceToSyslog(name =
 
2191
 
                                   server_settings["servicename"],
 
2192
 
                                   servicetype = "_mandos._tcp",
 
2193
 
                                   protocol = protocol, bus = bus)
 
2194
 
    if server_settings["interface"]:
 
2195
 
        service.interface = (if_nametoindex
 
2196
 
                             (str(server_settings["interface"])))
 
 
3194
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
3195
        service = AvahiServiceToSyslog(
 
 
3196
            name=server_settings["servicename"],
 
 
3197
            servicetype="_mandos._tcp",
 
 
3200
        if server_settings["interface"]:
 
 
3201
            service.interface = if_nametoindex(
 
 
3202
                server_settings["interface"].encode("utf-8"))
 
2198
3204
    global multiprocessing_manager
 
2199
3205
    multiprocessing_manager = multiprocessing.Manager()
 
2201
3207
    client_class = Client
 
2203
 
        client_class = functools.partial(ClientDBusTransitional,
 
 
3209
        client_class = functools.partial(ClientDBus, bus=bus)
 
2206
3211
    client_settings = Client.config_parser(client_config)
 
2207
3212
    old_client_settings = {}
 
2208
3213
    clients_data = {}
 
 
3215
    # This is used to redirect stdout and stderr for checker processes
 
 
3217
    wnull = open(os.devnull, "w")  # A writable /dev/null
 
 
3218
    # Only used if server is running in foreground but not in debug
 
 
3220
    if debug or not foreground:
 
2210
3223
    # Get client data and settings from last running state.
 
2211
3224
    if server_settings["restore"]:
 
2213
3226
            with open(stored_state_path, "rb") as stored_state:
 
2214
 
                clients_data, old_client_settings = (pickle.load
 
 
3227
                if sys.version_info.major == 2:
 
 
3228
                    clients_data, old_client_settings = pickle.load(
 
 
3231
                    bytes_clients_data, bytes_old_client_settings = (
 
 
3232
                        pickle.load(stored_state, encoding="bytes"))
 
 
3233
                    #   Fix bytes to strings
 
 
3236
                    clients_data = {(key.decode("utf-8")
 
 
3237
                                     if isinstance(key, bytes)
 
 
3240
                                    bytes_clients_data.items()}
 
 
3241
                    del bytes_clients_data
 
 
3242
                    for key in clients_data:
 
 
3243
                        value = {(k.decode("utf-8")
 
 
3244
                                  if isinstance(k, bytes) else k): v
 
 
3246
                                 clients_data[key].items()}
 
 
3247
                        clients_data[key] = value
 
 
3249
                        value["client_structure"] = [
 
 
3251
                             if isinstance(s, bytes)
 
 
3253
                            value["client_structure"]]
 
 
3255
                        for k in ("name", "host"):
 
 
3256
                            if isinstance(value[k], bytes):
 
 
3257
                                value[k] = value[k].decode("utf-8")
 
 
3258
                        if "key_id" not in value:
 
 
3259
                            value["key_id"] = ""
 
 
3260
                        elif "fingerprint" not in value:
 
 
3261
                            value["fingerprint"] = ""
 
 
3262
                    #  old_client_settings
 
 
3264
                    old_client_settings = {
 
 
3265
                        (key.decode("utf-8")
 
 
3266
                         if isinstance(key, bytes)
 
 
3269
                        bytes_old_client_settings.items()}
 
 
3270
                    del bytes_old_client_settings
 
 
3272
                    for value in old_client_settings.values():
 
 
3273
                        if isinstance(value["host"], bytes):
 
 
3274
                            value["host"] = (value["host"]
 
2216
3276
            os.remove(stored_state_path)
 
2217
3277
        except IOError as e:
 
2218
 
            logger.warning("Could not load persistent state: {0}"
 
2220
 
            if e.errno != errno.ENOENT:
 
 
3278
            if e.errno == errno.ENOENT:
 
 
3279
                logger.warning("Could not load persistent state:"
 
 
3280
                               " {}".format(os.strerror(e.errno)))
 
 
3282
                logger.critical("Could not load persistent state:",
 
2222
3285
        except EOFError as e:
 
2223
3286
            logger.warning("Could not load persistent state: "
 
2224
 
                           "EOFError: {0}".format(e))
 
2226
3290
    with PGPEngine() as pgp:
 
2227
 
        for client_name, client in clients_data.iteritems():
 
 
3291
        for client_name, client in clients_data.items():
 
 
3292
            # Skip removed clients
 
 
3293
            if client_name not in client_settings:
 
2228
3296
            # Decide which value to use after restoring saved state.
 
2229
3297
            # We have three different values: Old config file,
 
2230
3298
            # new config file, and saved state.
 
 
2291
3358
        clients_data[client_name] = client_settings[client_name]
 
2293
3360
    # Create all client objects
 
2294
 
    for client_name, client in clients_data.iteritems():
 
 
3361
    for client_name, client in clients_data.items():
 
2295
3362
        tcp_server.clients[client_name] = client_class(
 
2296
 
            name = client_name, settings = client)
 
 
3365
            server_settings=server_settings)
 
2298
3367
    if not tcp_server.clients:
 
2299
3368
        logger.warning("No clients defined")
 
2305
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2308
 
            logger.error("Could not write to file %r with PID %d",
 
2311
 
            # "pidfile" was never created
 
 
3371
        if pidfile is not None:
 
 
3375
                    print(pid, file=pidfile)
 
 
3377
                logger.error("Could not write to file %r with PID %d",
 
2313
3380
        del pidfilename
 
2314
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
2316
 
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2317
 
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
 
3382
    for termsig in (signal.SIGHUP, signal.SIGTERM):
 
 
3383
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
 
 
3384
                             lambda: main_loop.quit() and False)
 
2320
 
        class MandosDBusService(dbus.service.Object):
 
 
3388
        @alternate_dbus_interfaces(
 
 
3389
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
 
 
3390
        class MandosDBusService(DBusObjectWithObjectManager):
 
2321
3391
            """A D-Bus proxy object"""
 
2322
3393
            def __init__(self):
 
2323
3394
                dbus.service.Object.__init__(self, bus, "/")
 
2324
3396
            _interface = "se.recompile.Mandos"
 
2326
3398
            @dbus.service.signal(_interface, signature="o")
 
2327
3399
            def ClientAdded(self, objpath):
 
2331
3403
            @dbus.service.signal(_interface, signature="ss")
 
2332
 
            def ClientNotFound(self, fingerprint, address):
 
 
3404
            def ClientNotFound(self, key_id, address):
 
 
3408
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2336
3410
            @dbus.service.signal(_interface, signature="os")
 
2337
3411
            def ClientRemoved(self, objpath, name):
 
 
3415
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2341
3417
            @dbus.service.method(_interface, out_signature="ao")
 
2342
3418
            def GetAllClients(self):
 
2344
 
                return dbus.Array(c.dbus_object_path
 
2346
 
                                  tcp_server.clients.itervalues())
 
 
3420
                return dbus.Array(c.dbus_object_path for c in
 
 
3421
                                  tcp_server.clients.values())
 
 
3423
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
 
2348
3425
            @dbus.service.method(_interface,
 
2349
3426
                                 out_signature="a{oa{sv}}")
 
2350
3427
            def GetAllClientsWithProperties(self):
 
2352
3429
                return dbus.Dictionary(
 
2353
 
                    ((c.dbus_object_path, c.GetAll(""))
 
2354
 
                     for c in tcp_server.clients.itervalues()),
 
 
3430
                    {c.dbus_object_path: c.GetAll(
 
 
3431
                        "se.recompile.Mandos.Client")
 
 
3432
                     for c in tcp_server.clients.values()},
 
2355
3433
                    signature="oa{sv}")
 
2357
3435
            @dbus.service.method(_interface, in_signature="o")
 
2358
3436
            def RemoveClient(self, object_path):
 
2360
 
                for c in tcp_server.clients.itervalues():
 
 
3438
                for c in tcp_server.clients.values():
 
2361
3439
                    if c.dbus_object_path == object_path:
 
2362
3440
                        del tcp_server.clients[c.name]
 
2363
3441
                        c.remove_from_connection()
 
2364
 
                        # Don't signal anything except ClientRemoved
 
 
3442
                        # Don't signal the disabling
 
2365
3443
                        c.disable(quiet=True)
 
2367
 
                        self.ClientRemoved(object_path, c.name)
 
 
3444
                        # Emit D-Bus signal for removal
 
 
3445
                        self.client_removed_signal(c)
 
2369
3447
                raise KeyError(object_path)
 
2373
 
        class MandosDBusServiceTransitional(MandosDBusService):
 
2374
 
            __metaclass__ = AlternateDBusNamesMetaclass
 
2375
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
 
3451
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
 
 
3452
                                 out_signature="a{oa{sa{sv}}}")
 
 
3453
            def GetManagedObjects(self):
 
 
3455
                return dbus.Dictionary(
 
 
3456
                    {client.dbus_object_path:
 
 
3458
                         {interface: client.GetAll(interface)
 
 
3460
                          client._get_all_interface_names()})
 
 
3461
                     for client in tcp_server.clients.values()})
 
 
3463
            def client_added_signal(self, client):
 
 
3464
                """Send the new standard signal and the old signal"""
 
 
3466
                    # New standard signal
 
 
3467
                    self.InterfacesAdded(
 
 
3468
                        client.dbus_object_path,
 
 
3470
                            {interface: client.GetAll(interface)
 
 
3472
                             client._get_all_interface_names()}))
 
 
3474
                    self.ClientAdded(client.dbus_object_path)
 
 
3476
            def client_removed_signal(self, client):
 
 
3477
                """Send the new standard signal and the old signal"""
 
 
3479
                    # New standard signal
 
 
3480
                    self.InterfacesRemoved(
 
 
3481
                        client.dbus_object_path,
 
 
3482
                        client._get_all_interface_names())
 
 
3484
                    self.ClientRemoved(client.dbus_object_path,
 
 
3487
        mandos_dbus_service = MandosDBusService()
 
 
3489
    # Save modules to variables to exempt the modules from being
 
 
3490
    # unloaded before the function registered with atexit() is run.
 
 
3491
    mp = multiprocessing
 
2378
3495
        "Cleanup function; run on exit"
 
2381
 
        multiprocessing.active_children()
 
 
3499
        mp.active_children()
 
2382
3501
        if not (tcp_server.clients or client_settings):
 
2385
3504
        # Store client before exiting. Secrets are encrypted with key
 
2386
3505
        # based on what config file has. If config file is
 
2387
3506
        # removed/edited, old secret will thus be unrecovable.
 
2389
3508
        with PGPEngine() as pgp:
 
2390
 
            for client in tcp_server.clients.itervalues():
 
 
3509
            for client in tcp_server.clients.values():
 
2391
3510
                key = client_settings[client.name]["secret"]
 
2392
3511
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2394
3513
                client_dict = {}
 
2396
3515
                # A list of attributes that can not be pickled
 
2398
 
                exclude = set(("bus", "changedstate", "secret",
 
2400
 
                for name, typ in (inspect.getmembers
 
2401
 
                                  (dbus.service.Object)):
 
 
3517
                exclude = {"bus", "changedstate", "secret",
 
 
3518
                           "checker", "server_settings"}
 
 
3519
                for name, typ in inspect.getmembers(dbus.service
 
2402
3521
                    exclude.add(name)
 
2404
3523
                client_dict["encrypted_secret"] = (client
 
2405
3524
                                                   .encrypted_secret)
 
2406
3525
                for attr in client.client_structure:
 
2407
3526
                    if attr not in exclude:
 
2408
3527
                        client_dict[attr] = getattr(client, attr)
 
2410
3529
                clients[client.name] = client_dict
 
2411
3530
                del client_settings[client.name]["secret"]
 
2414
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2417
 
                                                (stored_state_path))
 
2418
 
            with os.fdopen(tempfd, "wb") as stored_state:
 
2419
 
                pickle.dump((clients, client_settings), stored_state)
 
 
3533
            with tempfile.NamedTemporaryFile(
 
 
3537
                    dir=os.path.dirname(stored_state_path),
 
 
3538
                    delete=False) as stored_state:
 
 
3539
                pickle.dump((clients, client_settings), stored_state,
 
 
3541
                tempname = stored_state.name
 
2420
3542
            os.rename(tempname, stored_state_path)
 
2421
3543
        except (IOError, OSError) as e:
 
2422
 
            logger.warning("Could not save persistent state: {0}"
 
2426
3546
                    os.remove(tempname)
 
2427
3547
                except NameError:
 
2429
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
 
3549
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
 
3550
                logger.warning("Could not save persistent state: {}"
 
 
3551
                               .format(os.strerror(e.errno)))
 
 
3553
                logger.warning("Could not save persistent state:",
 
2433
3557
        # Delete all clients, and settings from config
 
2434
3558
        while tcp_server.clients:
 
2435
3559
            name, client = tcp_server.clients.popitem()
 
2437
3561
                client.remove_from_connection()
 
2438
 
            # Don't signal anything except ClientRemoved
 
 
3562
            # Don't signal the disabling
 
2439
3563
            client.disable(quiet=True)
 
 
3564
            # Emit D-Bus signal for removal
 
2442
 
                mandos_dbus_service.ClientRemoved(client
 
 
3566
                mandos_dbus_service.client_removed_signal(client)
 
2445
3567
        client_settings.clear()
 
2447
3569
    atexit.register(cleanup)
 
2449
 
    for client in tcp_server.clients.itervalues():
 
 
3571
    for client in tcp_server.clients.values():
 
2452
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
 
3573
            # Emit D-Bus signal for adding
 
 
3574
            mandos_dbus_service.client_added_signal(client)
 
2453
3575
        # Need to initiate checking of clients
 
2454
3576
        if client.enabled:
 
2455
3577
            client.init_checker()
 
2457
3579
    tcp_server.enable()
 
2458
3580
    tcp_server.server_activate()
 
2460
3582
    # Find out what port we got
 
2461
 
    service.port = tcp_server.socket.getsockname()[1]
 
 
3584
        service.port = tcp_server.socket.getsockname()[1]
 
2463
3586
        logger.info("Now listening on address %r, port %d,"
 
2464
 
                    " flowinfo %d, scope_id %d"
 
2465
 
                    % tcp_server.socket.getsockname())
 
 
3587
                    " flowinfo %d, scope_id %d",
 
 
3588
                    *tcp_server.socket.getsockname())
 
2467
 
        logger.info("Now listening on address %r, port %d"
 
2468
 
                    % tcp_server.socket.getsockname())
 
2470
 
    #service.interface = tcp_server.socket.getsockname()[3]
 
 
3590
        logger.info("Now listening on address %r, port %d",
 
 
3591
                    *tcp_server.socket.getsockname())
 
 
3593
    # service.interface = tcp_server.socket.getsockname()[3]
 
2473
 
        # From the Avahi example code
 
2476
 
        except dbus.exceptions.DBusException as error:
 
2477
 
            logger.critical("DBusException: %s", error)
 
2480
 
        # End of Avahi example code
 
2482
 
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
2483
 
                             lambda *args, **kwargs:
 
2484
 
                             (tcp_server.handle_request
 
2485
 
                              (*args[2:], **kwargs) or True))
 
 
3597
            # From the Avahi example code
 
 
3600
            except dbus.exceptions.DBusException as error:
 
 
3601
                logger.critical("D-Bus Exception", exc_info=error)
 
 
3604
            # End of Avahi example code
 
 
3607
            GLib.IOChannel.unix_new(tcp_server.fileno()),
 
 
3608
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
 
3609
            lambda *args, **kwargs: (tcp_server.handle_request
 
 
3610
                                     (*args[2:], **kwargs) or True))
 
2487
3612
        logger.debug("Starting main loop")
 
2488
3613
        main_loop.run()
 
2489
3614
    except AvahiError as error:
 
2490
 
        logger.critical("AvahiError: %s", error)
 
 
3615
        logger.critical("Avahi Error", exc_info=error)
 
2493
3618
    except KeyboardInterrupt: