/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2019-02-10 04:20:26 UTC
  • Revision ID: teddy@recompile.se-20190210042026-3ntr3anw5scz07s0
Update copyright year to 2019

* DBUS-API: Update copyright year to 2019.
* debian/copyright: - '' -
* intro.xml: - '' -
* mandos: - '' -
* mandos-clients.conf.xml: - '' -
* mandos-ctl: - '' -
* mandos-ctl.xml: - '' -
* mandos-keygen: - '' -
* mandos-keygen.xml: - '' -
* mandos-monitor: - '' -
* mandos-monitor.xml: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
* plugin-runner.xml: - '' -
* plugins.d/askpass-fifo.xml: - '' -
* plugins.d/mandos-client.c: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.xml: - '' -
* plugins.d/plymouth.xml: - '' -
* plugins.d/splashy.xml: - '' -
* plugins.d/usplash.xml: - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1
 
#!/usr/bin/python3 -bI
2
 
# -*- mode: python; after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-
 
1
#!/usr/bin/python
 
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
5
5
#
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
 
# Copyright © 2008-2020 Teddy Hogeborn
15
 
# Copyright © 2008-2020 Björn Påhlsson
 
14
# Copyright © 2008-2019 Teddy Hogeborn
 
15
# Copyright © 2008-2019 Björn Påhlsson
16
16
#
17
17
# This file is part of Mandos.
18
18
#
77
77
import itertools
78
78
import collections
79
79
import codecs
80
 
import unittest
81
 
import random
82
 
import shlex
83
80
 
84
81
import dbus
85
82
import dbus.service
86
 
import gi
87
83
from gi.repository import GLib
88
84
from dbus.mainloop.glib import DBusGMainLoop
89
85
import ctypes
91
87
import xml.dom.minidom
92
88
import inspect
93
89
 
94
 
if sys.version_info.major == 2:
95
 
    __metaclass__ = type
96
 
    str = unicode
97
 
 
98
 
# Add collections.abc.Callable if it does not exist
99
 
try:
100
 
    collections.abc.Callable
101
 
except AttributeError:
102
 
    class abc:
103
 
        Callable = collections.Callable
104
 
    collections.abc = abc
105
 
    del abc
106
 
 
107
 
# Add shlex.quote if it does not exist
108
 
try:
109
 
    shlex.quote
110
 
except AttributeError:
111
 
    shlex.quote = re.escape
112
 
 
113
 
# Show warnings by default
114
 
if not sys.warnoptions:
115
 
    import warnings
116
 
    warnings.simplefilter("default")
117
 
 
118
90
# Try to find the value of SO_BINDTODEVICE:
119
91
try:
120
92
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
140
112
            # No value found
141
113
            SO_BINDTODEVICE = None
142
114
 
143
 
if sys.version_info < (3, 2):
144
 
    configparser.Configparser = configparser.SafeConfigParser
 
115
if sys.version_info.major == 2:
 
116
    str = unicode
145
117
 
146
 
version = "1.8.14"
 
118
version = "1.7.20"
147
119
stored_state_file = "clients.pickle"
148
120
 
149
121
logger = logging.getLogger()
150
 
logging.captureWarnings(True)   # Show warnings via the logging system
151
122
syslogger = None
152
123
 
153
124
try:
189
160
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
190
161
        address="/dev/log"))
191
162
    syslogger.setFormatter(logging.Formatter
192
 
                           ("Mandos [%(process)d]: %(levelname)s:"
193
 
                            " %(message)s"))
 
163
                           ('Mandos [%(process)d]: %(levelname)s:'
 
164
                            ' %(message)s'))
194
165
    logger.addHandler(syslogger)
195
166
 
196
167
    if debug:
197
168
        console = logging.StreamHandler()
198
 
        console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
199
 
                                               " [%(process)d]:"
200
 
                                               " %(levelname)s:"
201
 
                                               " %(message)s"))
 
169
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
170
                                               ' [%(process)d]:'
 
171
                                               ' %(levelname)s:'
 
172
                                               ' %(message)s'))
202
173
        logger.addHandler(console)
203
174
    logger.setLevel(level)
204
175
 
208
179
    pass
209
180
 
210
181
 
211
 
class PGPEngine:
 
182
class PGPEngine(object):
212
183
    """A simple class for OpenPGP symmetric encryption & decryption"""
213
184
 
214
185
    def __init__(self):
218
189
            output = subprocess.check_output(["gpgconf"])
219
190
            for line in output.splitlines():
220
191
                name, text, path = line.split(b":")
221
 
                if name == b"gpg":
 
192
                if name == "gpg":
222
193
                    self.gpg = path
223
194
                    break
224
195
        except OSError as e:
225
196
            if e.errno != errno.ENOENT:
226
197
                raise
227
 
        self.gnupgargs = ["--batch",
228
 
                          "--homedir", self.tempdir,
229
 
                          "--force-mdc",
230
 
                          "--quiet"]
 
198
        self.gnupgargs = ['--batch',
 
199
                          '--homedir', self.tempdir,
 
200
                          '--force-mdc',
 
201
                          '--quiet']
231
202
        # Only GPG version 1 has the --no-use-agent option.
232
 
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
 
203
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
233
204
            self.gnupgargs.append("--no-use-agent")
234
205
 
235
206
    def __enter__(self):
272
243
                dir=self.tempdir) as passfile:
273
244
            passfile.write(passphrase)
274
245
            passfile.flush()
275
 
            proc = subprocess.Popen([self.gpg, "--symmetric",
276
 
                                     "--passphrase-file",
 
246
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
247
                                     '--passphrase-file',
277
248
                                     passfile.name]
278
249
                                    + self.gnupgargs,
279
250
                                    stdin=subprocess.PIPE,
290
261
                dir=self.tempdir) as passfile:
291
262
            passfile.write(passphrase)
292
263
            passfile.flush()
293
 
            proc = subprocess.Popen([self.gpg, "--decrypt",
294
 
                                     "--passphrase-file",
 
264
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
265
                                     '--passphrase-file',
295
266
                                     passfile.name]
296
267
                                    + self.gnupgargs,
297
268
                                    stdin=subprocess.PIPE,
304
275
 
305
276
 
306
277
# Pretend that we have an Avahi module
307
 
class avahi:
308
 
    """This isn't so much a class as it is a module-like namespace."""
 
278
class Avahi(object):
 
279
    """This isn't so much a class as it is a module-like namespace.
 
280
    It is instantiated once, and simulates having an Avahi module."""
309
281
    IF_UNSPEC = -1               # avahi-common/address.h
310
282
    PROTO_UNSPEC = -1            # avahi-common/address.h
311
283
    PROTO_INET = 0               # avahi-common/address.h
315
287
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
316
288
    DBUS_PATH_SERVER = "/"
317
289
 
318
 
    @staticmethod
319
 
    def string_array_to_txt_array(t):
 
290
    def string_array_to_txt_array(self, t):
320
291
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
321
292
                           for s in t), signature="ay")
322
293
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
327
298
    SERVER_RUNNING = 2           # avahi-common/defs.h
328
299
    SERVER_COLLISION = 3         # avahi-common/defs.h
329
300
    SERVER_FAILURE = 4           # avahi-common/defs.h
 
301
avahi = Avahi()
330
302
 
331
303
 
332
304
class AvahiError(Exception):
344
316
    pass
345
317
 
346
318
 
347
 
class AvahiService:
 
319
class AvahiService(object):
348
320
    """An Avahi (Zeroconf) service.
349
321
 
350
322
    Attributes:
351
323
    interface: integer; avahi.IF_UNSPEC or an interface index.
352
324
               Used to optionally bind to the specified interface.
353
 
    name: string; Example: "Mandos"
354
 
    type: string; Example: "_mandos._tcp".
 
325
    name: string; Example: 'Mandos'
 
326
    type: string; Example: '_mandos._tcp'.
355
327
     See <https://www.iana.org/assignments/service-names-port-numbers>
356
328
    port: integer; what port to announce
357
329
    TXT: list of strings; TXT record for the service
435
407
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
436
408
        self.entry_group_state_changed_match = (
437
409
            self.group.connect_to_signal(
438
 
                "StateChanged", self.entry_group_state_changed))
 
410
                'StateChanged', self.entry_group_state_changed))
439
411
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
440
412
                     self.name, self.type)
441
413
        self.group.AddService(
524
496
class AvahiServiceToSyslog(AvahiService):
525
497
    def rename(self, *args, **kwargs):
526
498
        """Add the new name to the syslog messages"""
527
 
        ret = super(AvahiServiceToSyslog, self).rename(*args,
528
 
                                                       **kwargs)
 
499
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
529
500
        syslogger.setFormatter(logging.Formatter(
530
 
            "Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
 
501
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
531
502
            .format(self.name)))
532
503
        return ret
533
504
 
534
505
 
535
506
# Pretend that we have a GnuTLS module
536
 
class gnutls:
537
 
    """This isn't so much a class as it is a module-like namespace."""
 
507
class GnuTLS(object):
 
508
    """This isn't so much a class as it is a module-like namespace.
 
509
    It is instantiated once, and simulates having a GnuTLS module."""
538
510
 
539
511
    library = ctypes.util.find_library("gnutls")
540
512
    if library is None:
541
513
        library = ctypes.util.find_library("gnutls-deb0")
542
514
    _library = ctypes.cdll.LoadLibrary(library)
543
515
    del library
 
516
    _need_version = b"3.3.0"
 
517
    _tls_rawpk_version = b"3.6.6"
 
518
 
 
519
    def __init__(self):
 
520
        # Need to use "self" here, since this method is called before
 
521
        # the assignment to the "gnutls" global variable happens.
 
522
        if self.check_version(self._need_version) is None:
 
523
            raise self.Error("Needs GnuTLS {} or later"
 
524
                             .format(self._need_version))
544
525
 
545
526
    # Unless otherwise indicated, the constants and types below are
546
527
    # all from the gnutls/gnutls.h C header file.
563
544
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
564
545
 
565
546
    # Types
566
 
    class _session_int(ctypes.Structure):
 
547
    class session_int(ctypes.Structure):
567
548
        _fields_ = []
568
 
    session_t = ctypes.POINTER(_session_int)
 
549
    session_t = ctypes.POINTER(session_int)
569
550
 
570
551
    class certificate_credentials_st(ctypes.Structure):
571
552
        _fields_ = []
574
555
    certificate_type_t = ctypes.c_int
575
556
 
576
557
    class datum_t(ctypes.Structure):
577
 
        _fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
578
 
                    ("size", ctypes.c_uint)]
 
558
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
559
                    ('size', ctypes.c_uint)]
579
560
 
580
 
    class _openpgp_crt_int(ctypes.Structure):
 
561
    class openpgp_crt_int(ctypes.Structure):
581
562
        _fields_ = []
582
 
    openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
 
563
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
583
564
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
584
565
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
585
566
    credentials_type_t = ctypes.c_int
588
569
 
589
570
    # Exceptions
590
571
    class Error(Exception):
 
572
        # We need to use the class name "GnuTLS" here, since this
 
573
        # exception might be raised from within GnuTLS.__init__,
 
574
        # which is called before the assignment to the "gnutls"
 
575
        # global variable has happened.
591
576
        def __init__(self, message=None, code=None, args=()):
592
577
            # Default usage is by a message string, but if a return
593
578
            # code is passed, convert it to a string with
594
579
            # gnutls.strerror()
595
580
            self.code = code
596
581
            if message is None and code is not None:
597
 
                message = gnutls.strerror(code).decode(
598
 
                    "utf-8", errors="replace")
599
 
            return super(gnutls.Error, self).__init__(
 
582
                message = GnuTLS.strerror(code)
 
583
            return super(GnuTLS.Error, self).__init__(
600
584
                message, *args)
601
585
 
602
586
    class CertificateSecurityError(Error):
603
587
        pass
604
588
 
605
 
    class PointerTo:
606
 
        def __init__(self, cls):
607
 
            self.cls = cls
608
 
 
609
 
        def from_param(self, obj):
610
 
            if not isinstance(obj, self.cls):
611
 
                raise TypeError("Not of type {}: {!r}"
612
 
                                .format(self.cls.__name__, obj))
613
 
            return ctypes.byref(obj.from_param(obj))
614
 
 
615
 
    class CastToVoidPointer:
616
 
        def __init__(self, cls):
617
 
            self.cls = cls
618
 
 
619
 
        def from_param(self, obj):
620
 
            if not isinstance(obj, self.cls):
621
 
                raise TypeError("Not of type {}: {!r}"
622
 
                                .format(self.cls.__name__, obj))
623
 
            return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
624
 
 
625
 
    class With_from_param:
626
 
        @classmethod
627
 
        def from_param(cls, obj):
628
 
            return obj._as_parameter_
629
 
 
630
589
    # Classes
631
 
    class Credentials(With_from_param):
 
590
    class Credentials(object):
632
591
        def __init__(self):
633
 
            self._as_parameter_ = gnutls.certificate_credentials_t()
634
 
            gnutls.certificate_allocate_credentials(self)
 
592
            self._c_object = gnutls.certificate_credentials_t()
 
593
            gnutls.certificate_allocate_credentials(
 
594
                ctypes.byref(self._c_object))
635
595
            self.type = gnutls.CRD_CERTIFICATE
636
596
 
637
597
        def __del__(self):
638
 
            gnutls.certificate_free_credentials(self)
 
598
            gnutls.certificate_free_credentials(self._c_object)
639
599
 
640
 
    class ClientSession(With_from_param):
 
600
    class ClientSession(object):
641
601
        def __init__(self, socket, credentials=None):
642
 
            self._as_parameter_ = gnutls.session_t()
 
602
            self._c_object = gnutls.session_t()
643
603
            gnutls_flags = gnutls.CLIENT
644
 
            if gnutls.check_version(b"3.5.6"):
 
604
            if gnutls.check_version("3.5.6"):
645
605
                gnutls_flags |= gnutls.NO_TICKETS
646
606
            if gnutls.has_rawpk:
647
607
                gnutls_flags |= gnutls.ENABLE_RAWPK
648
 
            gnutls.init(self, gnutls_flags)
 
608
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
649
609
            del gnutls_flags
650
 
            gnutls.set_default_priority(self)
651
 
            gnutls.transport_set_ptr(self, socket.fileno())
652
 
            gnutls.handshake_set_private_extensions(self, True)
 
610
            gnutls.set_default_priority(self._c_object)
 
611
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
612
            gnutls.handshake_set_private_extensions(self._c_object,
 
613
                                                    True)
653
614
            self.socket = socket
654
615
            if credentials is None:
655
616
                credentials = gnutls.Credentials()
656
 
            gnutls.credentials_set(self, credentials.type,
657
 
                                   credentials)
 
617
            gnutls.credentials_set(self._c_object, credentials.type,
 
618
                                   ctypes.cast(credentials._c_object,
 
619
                                               ctypes.c_void_p))
658
620
            self.credentials = credentials
659
621
 
660
622
        def __del__(self):
661
 
            gnutls.deinit(self)
 
623
            gnutls.deinit(self._c_object)
662
624
 
663
625
        def handshake(self):
664
 
            return gnutls.handshake(self)
 
626
            return gnutls.handshake(self._c_object)
665
627
 
666
628
        def send(self, data):
667
629
            data = bytes(data)
668
630
            data_len = len(data)
669
631
            while data_len > 0:
670
 
                data_len -= gnutls.record_send(self, data[-data_len:],
 
632
                data_len -= gnutls.record_send(self._c_object,
 
633
                                               data[-data_len:],
671
634
                                               data_len)
672
635
 
673
636
        def bye(self):
674
 
            return gnutls.bye(self, gnutls.SHUT_RDWR)
 
637
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
675
638
 
676
639
    # Error handling functions
677
640
    def _error_code(result):
678
641
        """A function to raise exceptions on errors, suitable
679
 
        for the "restype" attribute on ctypes functions"""
680
 
        if result >= gnutls.E_SUCCESS:
 
642
        for the 'restype' attribute on ctypes functions"""
 
643
        if result >= 0:
681
644
            return result
682
645
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
683
646
            raise gnutls.CertificateSecurityError(code=result)
684
647
        raise gnutls.Error(code=result)
685
648
 
686
 
    def _retry_on_error(result, func, arguments,
687
 
                        _error_code=_error_code):
 
649
    def _retry_on_error(result, func, arguments):
688
650
        """A function to retry on some errors, suitable
689
 
        for the "errcheck" attribute on ctypes functions"""
690
 
        while result < gnutls.E_SUCCESS:
 
651
        for the 'errcheck' attribute on ctypes functions"""
 
652
        while result < 0:
691
653
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
692
654
                return _error_code(result)
693
655
            result = func(*arguments)
698
660
 
699
661
    # Functions
700
662
    priority_set_direct = _library.gnutls_priority_set_direct
701
 
    priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
 
663
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
702
664
                                    ctypes.POINTER(ctypes.c_char_p)]
703
665
    priority_set_direct.restype = _error_code
704
666
 
705
667
    init = _library.gnutls_init
706
 
    init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
 
668
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
707
669
    init.restype = _error_code
708
670
 
709
671
    set_default_priority = _library.gnutls_set_default_priority
710
 
    set_default_priority.argtypes = [ClientSession]
 
672
    set_default_priority.argtypes = [session_t]
711
673
    set_default_priority.restype = _error_code
712
674
 
713
675
    record_send = _library.gnutls_record_send
714
 
    record_send.argtypes = [ClientSession, ctypes.c_void_p,
 
676
    record_send.argtypes = [session_t, ctypes.c_void_p,
715
677
                            ctypes.c_size_t]
716
678
    record_send.restype = ctypes.c_ssize_t
717
679
    record_send.errcheck = _retry_on_error
719
681
    certificate_allocate_credentials = (
720
682
        _library.gnutls_certificate_allocate_credentials)
721
683
    certificate_allocate_credentials.argtypes = [
722
 
        PointerTo(Credentials)]
 
684
        ctypes.POINTER(certificate_credentials_t)]
723
685
    certificate_allocate_credentials.restype = _error_code
724
686
 
725
687
    certificate_free_credentials = (
726
688
        _library.gnutls_certificate_free_credentials)
727
 
    certificate_free_credentials.argtypes = [Credentials]
 
689
    certificate_free_credentials.argtypes = [
 
690
        certificate_credentials_t]
728
691
    certificate_free_credentials.restype = None
729
692
 
730
693
    handshake_set_private_extensions = (
731
694
        _library.gnutls_handshake_set_private_extensions)
732
 
    handshake_set_private_extensions.argtypes = [ClientSession,
 
695
    handshake_set_private_extensions.argtypes = [session_t,
733
696
                                                 ctypes.c_int]
734
697
    handshake_set_private_extensions.restype = None
735
698
 
736
699
    credentials_set = _library.gnutls_credentials_set
737
 
    credentials_set.argtypes = [ClientSession, credentials_type_t,
738
 
                                CastToVoidPointer(Credentials)]
 
700
    credentials_set.argtypes = [session_t, credentials_type_t,
 
701
                                ctypes.c_void_p]
739
702
    credentials_set.restype = _error_code
740
703
 
741
704
    strerror = _library.gnutls_strerror
743
706
    strerror.restype = ctypes.c_char_p
744
707
 
745
708
    certificate_type_get = _library.gnutls_certificate_type_get
746
 
    certificate_type_get.argtypes = [ClientSession]
 
709
    certificate_type_get.argtypes = [session_t]
747
710
    certificate_type_get.restype = _error_code
748
711
 
749
712
    certificate_get_peers = _library.gnutls_certificate_get_peers
750
 
    certificate_get_peers.argtypes = [ClientSession,
 
713
    certificate_get_peers.argtypes = [session_t,
751
714
                                      ctypes.POINTER(ctypes.c_uint)]
752
715
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
753
716
 
760
723
    global_set_log_function.restype = None
761
724
 
762
725
    deinit = _library.gnutls_deinit
763
 
    deinit.argtypes = [ClientSession]
 
726
    deinit.argtypes = [session_t]
764
727
    deinit.restype = None
765
728
 
766
729
    handshake = _library.gnutls_handshake
767
 
    handshake.argtypes = [ClientSession]
768
 
    handshake.restype = ctypes.c_int
 
730
    handshake.argtypes = [session_t]
 
731
    handshake.restype = _error_code
769
732
    handshake.errcheck = _retry_on_error
770
733
 
771
734
    transport_set_ptr = _library.gnutls_transport_set_ptr
772
 
    transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
 
735
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
773
736
    transport_set_ptr.restype = None
774
737
 
775
738
    bye = _library.gnutls_bye
776
 
    bye.argtypes = [ClientSession, close_request_t]
777
 
    bye.restype = ctypes.c_int
 
739
    bye.argtypes = [session_t, close_request_t]
 
740
    bye.restype = _error_code
778
741
    bye.errcheck = _retry_on_error
779
742
 
780
743
    check_version = _library.gnutls_check_version
781
744
    check_version.argtypes = [ctypes.c_char_p]
782
745
    check_version.restype = ctypes.c_char_p
783
746
 
784
 
    _need_version = b"3.3.0"
785
 
    if check_version(_need_version) is None:
786
 
        raise self.Error("Needs GnuTLS {} or later"
787
 
                         .format(_need_version))
788
 
 
789
 
    _tls_rawpk_version = b"3.6.6"
790
747
    has_rawpk = bool(check_version(_tls_rawpk_version))
791
748
 
792
749
    if has_rawpk:
797
754
 
798
755
        x509_crt_fmt_t = ctypes.c_int
799
756
 
800
 
        # All the function declarations below are from
801
 
        # gnutls/abstract.h
 
757
        # All the function declarations below are from gnutls/abstract.h
802
758
        pubkey_init = _library.gnutls_pubkey_init
803
759
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
804
760
        pubkey_init.restype = _error_code
818
774
        pubkey_deinit.argtypes = [pubkey_t]
819
775
        pubkey_deinit.restype = None
820
776
    else:
821
 
        # All the function declarations below are from
822
 
        # gnutls/openpgp.h
 
777
        # All the function declarations below are from gnutls/openpgp.h
823
778
 
824
779
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
825
780
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
831
786
                                       openpgp_crt_fmt_t]
832
787
        openpgp_crt_import.restype = _error_code
833
788
 
834
 
        openpgp_crt_verify_self = \
835
 
            _library.gnutls_openpgp_crt_verify_self
836
 
        openpgp_crt_verify_self.argtypes = [
837
 
            openpgp_crt_t,
838
 
            ctypes.c_uint,
839
 
            ctypes.POINTER(ctypes.c_uint),
840
 
        ]
 
789
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
790
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
791
                                            ctypes.POINTER(ctypes.c_uint)]
841
792
        openpgp_crt_verify_self.restype = _error_code
842
793
 
843
794
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
852
803
                                                    ctypes.c_size_t)]
853
804
        openpgp_crt_get_fingerprint.restype = _error_code
854
805
 
855
 
    if check_version(b"3.6.4"):
 
806
    if check_version("3.6.4"):
856
807
        certificate_type_get2 = _library.gnutls_certificate_type_get2
857
 
        certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
 
808
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
858
809
        certificate_type_get2.restype = _error_code
859
810
 
860
811
    # Remove non-public functions
861
812
    del _error_code, _retry_on_error
 
813
# Create the global "gnutls" object, simulating a module
 
814
gnutls = GnuTLS()
862
815
 
863
816
 
864
817
def call_pipe(connection,       # : multiprocessing.Connection
872
825
    connection.close()
873
826
 
874
827
 
875
 
class Client:
 
828
class Client(object):
876
829
    """A representation of a client host served by this server.
877
830
 
878
831
    Attributes:
879
 
    approved:   bool(); None if not yet approved/disapproved
 
832
    approved:   bool(); 'None' if not yet approved/disapproved
880
833
    approval_delay: datetime.timedelta(); Time to wait for approval
881
834
    approval_duration: datetime.timedelta(); Duration of one approval
882
 
    checker: multiprocessing.Process(); a running checker process used
883
 
             to see if the client lives. None if no process is
884
 
             running.
 
835
    checker:    subprocess.Popen(); a running checker process used
 
836
                                    to see if the client lives.
 
837
                                    'None' if no process is running.
885
838
    checker_callback_tag: a GLib event source tag, or None
886
839
    checker_command: string; External command which is run to check
887
840
                     if client lives.  %() expansions are done at
1081
1034
        if self.checker_initiator_tag is not None:
1082
1035
            GLib.source_remove(self.checker_initiator_tag)
1083
1036
        self.checker_initiator_tag = GLib.timeout_add(
1084
 
            random.randrange(int(self.interval.total_seconds() * 1000
1085
 
                                 + 1)),
 
1037
            int(self.interval.total_seconds() * 1000),
1086
1038
            self.start_checker)
1087
1039
        # Schedule a disable() when 'timeout' has passed
1088
1040
        if self.disable_initiator_tag is not None:
1095
1047
    def checker_callback(self, source, condition, connection,
1096
1048
                         command):
1097
1049
        """The checker has completed, so take appropriate actions."""
 
1050
        self.checker_callback_tag = None
 
1051
        self.checker = None
1098
1052
        # Read return code from connection (see call_pipe)
1099
1053
        returncode = connection.recv()
1100
1054
        connection.close()
1101
 
        if self.checker is not None:
1102
 
            self.checker.join()
1103
 
        self.checker_callback_tag = None
1104
 
        self.checker = None
1105
1055
 
1106
1056
        if returncode >= 0:
1107
1057
            self.last_checker_status = returncode
1163
1113
        if self.checker is None:
1164
1114
            # Escape attributes for the shell
1165
1115
            escaped_attrs = {
1166
 
                attr: shlex.quote(str(getattr(self, attr)))
 
1116
                attr: re.escape(str(getattr(self, attr)))
1167
1117
                for attr in self.runtime_expansions}
1168
1118
            try:
1169
1119
                command = self.checker_command % escaped_attrs
1196
1146
                kwargs=popen_args)
1197
1147
            self.checker.start()
1198
1148
            self.checker_callback_tag = GLib.io_add_watch(
1199
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
1200
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1149
                pipe[0].fileno(), GLib.IO_IN,
1201
1150
                self.checker_callback, pipe[0], command)
1202
1151
        # Re-run this periodically if run by GLib.timeout_add
1203
1152
        return True
1242
1191
        func._dbus_name = func.__name__
1243
1192
        if func._dbus_name.endswith("_dbus_property"):
1244
1193
            func._dbus_name = func._dbus_name[:-14]
1245
 
        func._dbus_get_args_options = {"byte_arrays": byte_arrays}
 
1194
        func._dbus_get_args_options = {'byte_arrays': byte_arrays}
1246
1195
        return func
1247
1196
 
1248
1197
    return decorator
1337
1286
 
1338
1287
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1339
1288
                         out_signature="s",
1340
 
                         path_keyword="object_path",
1341
 
                         connection_keyword="connection")
 
1289
                         path_keyword='object_path',
 
1290
                         connection_keyword='connection')
1342
1291
    def Introspect(self, object_path, connection):
1343
1292
        """Overloading of standard D-Bus method.
1344
1293
 
1458
1407
                raise ValueError("Byte arrays not supported for non-"
1459
1408
                                 "'ay' signature {!r}"
1460
1409
                                 .format(prop._dbus_signature))
1461
 
            value = dbus.ByteArray(bytes(value))
 
1410
            value = dbus.ByteArray(b''.join(chr(byte)
 
1411
                                            for byte in value))
1462
1412
        prop(value)
1463
1413
 
1464
1414
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1497
1447
 
1498
1448
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1499
1449
                         out_signature="s",
1500
 
                         path_keyword="object_path",
1501
 
                         connection_keyword="connection")
 
1450
                         path_keyword='object_path',
 
1451
                         connection_keyword='connection')
1502
1452
    def Introspect(self, object_path, connection):
1503
1453
        """Overloading of standard D-Bus method.
1504
1454
 
1599
1549
 
1600
1550
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1601
1551
                         out_signature="s",
1602
 
                         path_keyword="object_path",
1603
 
                         connection_keyword="connection")
 
1552
                         path_keyword='object_path',
 
1553
                         connection_keyword='connection')
1604
1554
    def Introspect(self, object_path, connection):
1605
1555
        """Overloading of standard D-Bus method.
1606
1556
 
2269
2219
    del _interface
2270
2220
 
2271
2221
 
2272
 
class ProxyClient:
 
2222
class ProxyClient(object):
2273
2223
    def __init__(self, child_pipe, key_id, fpr, address):
2274
2224
        self._pipe = child_pipe
2275
 
        self._pipe.send(("init", key_id, fpr, address))
 
2225
        self._pipe.send(('init', key_id, fpr, address))
2276
2226
        if not self._pipe.recv():
2277
2227
            raise KeyError(key_id or fpr)
2278
2228
 
2279
2229
    def __getattribute__(self, name):
2280
 
        if name == "_pipe":
 
2230
        if name == '_pipe':
2281
2231
            return super(ProxyClient, self).__getattribute__(name)
2282
 
        self._pipe.send(("getattr", name))
 
2232
        self._pipe.send(('getattr', name))
2283
2233
        data = self._pipe.recv()
2284
 
        if data[0] == "data":
 
2234
        if data[0] == 'data':
2285
2235
            return data[1]
2286
 
        if data[0] == "function":
 
2236
        if data[0] == 'function':
2287
2237
 
2288
2238
            def func(*args, **kwargs):
2289
 
                self._pipe.send(("funcall", name, args, kwargs))
 
2239
                self._pipe.send(('funcall', name, args, kwargs))
2290
2240
                return self._pipe.recv()[1]
2291
2241
 
2292
2242
            return func
2293
2243
 
2294
2244
    def __setattr__(self, name, value):
2295
 
        if name == "_pipe":
 
2245
        if name == '_pipe':
2296
2246
            return super(ProxyClient, self).__setattr__(name, value)
2297
 
        self._pipe.send(("setattr", name, value))
 
2247
        self._pipe.send(('setattr', name, value))
2298
2248
 
2299
2249
 
2300
2250
class ClientHandler(socketserver.BaseRequestHandler, object):
2312
2262
 
2313
2263
            session = gnutls.ClientSession(self.request)
2314
2264
 
2315
 
            # priority = ":".join(("NONE", "+VERS-TLS1.1",
 
2265
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
2316
2266
            #                       "+AES-256-CBC", "+SHA1",
2317
2267
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
2318
2268
            #                       "+DHE-DSS"))
2320
2270
            priority = self.server.gnutls_priority
2321
2271
            if priority is None:
2322
2272
                priority = "NORMAL"
2323
 
            gnutls.priority_set_direct(session,
2324
 
                                       priority.encode("utf-8"), None)
 
2273
            gnutls.priority_set_direct(session._c_object,
 
2274
                                       priority.encode("utf-8"),
 
2275
                                       None)
2325
2276
 
2326
2277
            # Start communication using the Mandos protocol
2327
2278
            # Get protocol number
2347
2298
            approval_required = False
2348
2299
            try:
2349
2300
                if gnutls.has_rawpk:
2350
 
                    fpr = b""
 
2301
                    fpr = ""
2351
2302
                    try:
2352
2303
                        key_id = self.key_id(
2353
2304
                            self.peer_certificate(session))
2354
2305
                    except (TypeError, gnutls.Error) as error:
2355
2306
                        logger.warning("Bad certificate: %s", error)
2356
2307
                        return
2357
 
                    logger.debug("Key ID: %s",
2358
 
                                 key_id.decode("utf-8",
2359
 
                                               errors="replace"))
 
2308
                    logger.debug("Key ID: %s", key_id)
2360
2309
 
2361
2310
                else:
2362
 
                    key_id = b""
 
2311
                    key_id = ""
2363
2312
                    try:
2364
2313
                        fpr = self.fingerprint(
2365
2314
                            self.peer_certificate(session))
2454
2403
    def peer_certificate(session):
2455
2404
        "Return the peer's certificate as a bytestring"
2456
2405
        try:
2457
 
            cert_type = gnutls.certificate_type_get2(
2458
 
                session, gnutls.CTYPE_PEERS)
 
2406
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
2407
                                                     gnutls.CTYPE_PEERS)
2459
2408
        except AttributeError:
2460
 
            cert_type = gnutls.certificate_type_get(session)
 
2409
            cert_type = gnutls.certificate_type_get(session._c_object)
2461
2410
        if gnutls.has_rawpk:
2462
2411
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2463
2412
        else:
2470
2419
            return b""
2471
2420
        list_size = ctypes.c_uint(1)
2472
2421
        cert_list = (gnutls.certificate_get_peers
2473
 
                     (session, ctypes.byref(list_size)))
 
2422
                     (session._c_object, ctypes.byref(list_size)))
2474
2423
        if not bool(cert_list) and list_size.value != 0:
2475
2424
            raise gnutls.Error("error getting peer certificate")
2476
2425
        if list_size.value == 0:
2498
2447
        buf = ctypes.create_string_buffer(32)
2499
2448
        buf_len = ctypes.c_size_t(len(buf))
2500
2449
        # Get the key ID from the raw public key into the buffer
2501
 
        gnutls.pubkey_get_key_id(
2502
 
            pubkey,
2503
 
            gnutls.KEYID_USE_SHA256,
2504
 
            ctypes.cast(ctypes.byref(buf),
2505
 
                        ctypes.POINTER(ctypes.c_ubyte)),
2506
 
            ctypes.byref(buf_len))
 
2450
        gnutls.pubkey_get_key_id(pubkey,
 
2451
                                 gnutls.KEYID_USE_SHA256,
 
2452
                                 ctypes.cast(ctypes.byref(buf),
 
2453
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
2454
                                 ctypes.byref(buf_len))
2507
2455
        # Deinit the certificate
2508
2456
        gnutls.pubkey_deinit(pubkey)
2509
2457
 
2550
2498
        return hex_fpr
2551
2499
 
2552
2500
 
2553
 
class MultiprocessingMixIn:
 
2501
class MultiprocessingMixIn(object):
2554
2502
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2555
2503
 
2556
2504
    def sub_process_main(self, request, address):
2568
2516
        return proc
2569
2517
 
2570
2518
 
2571
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2519
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2572
2520
    """ adds a pipe to the MixIn """
2573
2521
 
2574
2522
    def process_request(self, request, client_address):
2589
2537
 
2590
2538
 
2591
2539
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2592
 
                     socketserver.TCPServer):
2593
 
    """IPv6-capable TCP server.  Accepts None as address and/or port
 
2540
                     socketserver.TCPServer, object):
 
2541
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2594
2542
 
2595
2543
    Attributes:
2596
2544
        enabled:        Boolean; whether this server is activated yet
2668
2616
                    raise
2669
2617
        # Only bind(2) the socket if we really need to.
2670
2618
        if self.server_address[0] or self.server_address[1]:
2671
 
            if self.server_address[1]:
2672
 
                self.allow_reuse_address = True
2673
2619
            if not self.server_address[0]:
2674
2620
                if self.address_family == socket.AF_INET6:
2675
2621
                    any_address = "::"  # in6addr_any
2728
2674
    def add_pipe(self, parent_pipe, proc):
2729
2675
        # Call "handle_ipc" for both data and EOF events
2730
2676
        GLib.io_add_watch(
2731
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
2732
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2677
            parent_pipe.fileno(),
 
2678
            GLib.IO_IN | GLib.IO_HUP,
2733
2679
            functools.partial(self.handle_ipc,
2734
2680
                              parent_pipe=parent_pipe,
2735
2681
                              proc=proc))
2748
2694
        request = parent_pipe.recv()
2749
2695
        command = request[0]
2750
2696
 
2751
 
        if command == "init":
 
2697
        if command == 'init':
2752
2698
            key_id = request[1].decode("ascii")
2753
2699
            fpr = request[2].decode("ascii")
2754
2700
            address = request[3]
2755
2701
 
2756
2702
            for c in self.clients.values():
2757
 
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2758
 
                              "27AE41E4649B934CA495991B7852B855"):
2759
 
                    continue
2760
2703
                if key_id and c.key_id == key_id:
2761
2704
                    client = c
2762
2705
                    break
2774
2717
                return False
2775
2718
 
2776
2719
            GLib.io_add_watch(
2777
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
2778
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2720
                parent_pipe.fileno(),
 
2721
                GLib.IO_IN | GLib.IO_HUP,
2779
2722
                functools.partial(self.handle_ipc,
2780
2723
                                  parent_pipe=parent_pipe,
2781
2724
                                  proc=proc,
2784
2727
            # remove the old hook in favor of the new above hook on
2785
2728
            # same fileno
2786
2729
            return False
2787
 
        if command == "funcall":
 
2730
        if command == 'funcall':
2788
2731
            funcname = request[1]
2789
2732
            args = request[2]
2790
2733
            kwargs = request[3]
2791
2734
 
2792
 
            parent_pipe.send(("data", getattr(client_object,
 
2735
            parent_pipe.send(('data', getattr(client_object,
2793
2736
                                              funcname)(*args,
2794
2737
                                                        **kwargs)))
2795
2738
 
2796
 
        if command == "getattr":
 
2739
        if command == 'getattr':
2797
2740
            attrname = request[1]
2798
2741
            if isinstance(client_object.__getattribute__(attrname),
2799
 
                          collections.abc.Callable):
2800
 
                parent_pipe.send(("function", ))
 
2742
                          collections.Callable):
 
2743
                parent_pipe.send(('function', ))
2801
2744
            else:
2802
2745
                parent_pipe.send((
2803
 
                    "data", client_object.__getattribute__(attrname)))
 
2746
                    'data', client_object.__getattribute__(attrname)))
2804
2747
 
2805
 
        if command == "setattr":
 
2748
        if command == 'setattr':
2806
2749
            attrname = request[1]
2807
2750
            value = request[2]
2808
2751
            setattr(client_object, attrname, value)
2813
2756
def rfc3339_duration_to_delta(duration):
2814
2757
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2815
2758
 
2816
 
    >>> timedelta = datetime.timedelta
2817
 
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2818
 
    True
2819
 
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2820
 
    True
2821
 
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2822
 
    True
2823
 
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2824
 
    True
2825
 
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2826
 
    True
2827
 
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2828
 
    True
2829
 
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2830
 
    True
2831
 
    >>> del timedelta
 
2759
    >>> rfc3339_duration_to_delta("P7D")
 
2760
    datetime.timedelta(7)
 
2761
    >>> rfc3339_duration_to_delta("PT60S")
 
2762
    datetime.timedelta(0, 60)
 
2763
    >>> rfc3339_duration_to_delta("PT60M")
 
2764
    datetime.timedelta(0, 3600)
 
2765
    >>> rfc3339_duration_to_delta("PT24H")
 
2766
    datetime.timedelta(1)
 
2767
    >>> rfc3339_duration_to_delta("P1W")
 
2768
    datetime.timedelta(7)
 
2769
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2770
    datetime.timedelta(0, 330)
 
2771
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2772
    datetime.timedelta(1, 200)
2832
2773
    """
2833
2774
 
2834
2775
    # Parsing an RFC 3339 duration with regular expressions is not
2914
2855
def string_to_delta(interval):
2915
2856
    """Parse a string and return a datetime.timedelta
2916
2857
 
2917
 
    >>> string_to_delta("7d") == datetime.timedelta(7)
2918
 
    True
2919
 
    >>> string_to_delta("60s") == datetime.timedelta(0, 60)
2920
 
    True
2921
 
    >>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2922
 
    True
2923
 
    >>> string_to_delta("24h") == datetime.timedelta(1)
2924
 
    True
2925
 
    >>> string_to_delta("1w") == datetime.timedelta(7)
2926
 
    True
2927
 
    >>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
2928
 
    True
 
2858
    >>> string_to_delta('7d')
 
2859
    datetime.timedelta(7)
 
2860
    >>> string_to_delta('60s')
 
2861
    datetime.timedelta(0, 60)
 
2862
    >>> string_to_delta('60m')
 
2863
    datetime.timedelta(0, 3600)
 
2864
    >>> string_to_delta('24h')
 
2865
    datetime.timedelta(1)
 
2866
    >>> string_to_delta('1w')
 
2867
    datetime.timedelta(7)
 
2868
    >>> string_to_delta('5m 30s')
 
2869
    datetime.timedelta(0, 330)
2929
2870
    """
2930
2871
 
2931
2872
    try:
3033
2974
 
3034
2975
    options = parser.parse_args()
3035
2976
 
 
2977
    if options.check:
 
2978
        import doctest
 
2979
        fail_count, test_count = doctest.testmod()
 
2980
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2981
 
3036
2982
    # Default values for config file for server-global settings
3037
2983
    if gnutls.has_rawpk:
3038
2984
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3058
3004
    del priority
3059
3005
 
3060
3006
    # Parse config file for server-global settings
3061
 
    server_config = configparser.ConfigParser(server_defaults)
 
3007
    server_config = configparser.SafeConfigParser(server_defaults)
3062
3008
    del server_defaults
3063
3009
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
3064
 
    # Convert the ConfigParser object to a dict
 
3010
    # Convert the SafeConfigParser object to a dict
3065
3011
    server_settings = server_config.defaults()
3066
3012
    # Use the appropriate methods on the non-string config options
3067
3013
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
3134
3080
 
3135
3081
    if server_settings["servicename"] != "Mandos":
3136
3082
        syslogger.setFormatter(
3137
 
            logging.Formatter("Mandos ({}) [%(process)d]:"
3138
 
                              " %(levelname)s: %(message)s".format(
 
3083
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
3084
                              ' %(levelname)s: %(message)s'.format(
3139
3085
                                  server_settings["servicename"])))
3140
3086
 
3141
3087
    # Parse config file with clients
3142
 
    client_config = configparser.ConfigParser(Client.client_defaults)
 
3088
    client_config = configparser.SafeConfigParser(Client
 
3089
                                                  .client_defaults)
3143
3090
    client_config.read(os.path.join(server_settings["configdir"],
3144
3091
                                    "clients.conf"))
3145
3092
 
3201
3148
 
3202
3149
        @gnutls.log_func
3203
3150
        def debug_gnutls(level, string):
3204
 
            logger.debug("GnuTLS: %s",
3205
 
                         string[:-1].decode("utf-8",
3206
 
                                            errors="replace"))
 
3151
            logger.debug("GnuTLS: %s", string[:-1])
3207
3152
 
3208
3153
        gnutls.global_set_log_function(debug_gnutls)
3209
3154
 
3218
3163
        # Close all input and output, do double fork, etc.
3219
3164
        daemon()
3220
3165
 
3221
 
    if gi.version_info < (3, 10, 2):
3222
 
        # multiprocessing will use threads, so before we use GLib we
3223
 
        # need to inform GLib that threads will be used.
3224
 
        GLib.threads_init()
 
3166
    # multiprocessing will use threads, so before we use GLib we need
 
3167
    # to inform GLib that threads will be used.
 
3168
    GLib.threads_init()
3225
3169
 
3226
3170
    global main_loop
3227
3171
    # From the Avahi example code
3303
3247
                             if isinstance(s, bytes)
3304
3248
                             else s) for s in
3305
3249
                            value["client_structure"]]
3306
 
                        # .name, .host, and .checker_command
3307
 
                        for k in ("name", "host", "checker_command"):
 
3250
                        # .name & .host
 
3251
                        for k in ("name", "host"):
3308
3252
                            if isinstance(value[k], bytes):
3309
3253
                                value[k] = value[k].decode("utf-8")
3310
 
                        if "key_id" not in value:
 
3254
                        if not value.has_key("key_id"):
3311
3255
                            value["key_id"] = ""
3312
 
                        elif "fingerprint" not in value:
 
3256
                        elif not value.has_key("fingerprint"):
3313
3257
                            value["fingerprint"] = ""
3314
3258
                    #  old_client_settings
3315
3259
                    # .keys()
3320
3264
                        for key, value in
3321
3265
                        bytes_old_client_settings.items()}
3322
3266
                    del bytes_old_client_settings
3323
 
                    # .host and .checker_command
 
3267
                    # .host
3324
3268
                    for value in old_client_settings.values():
3325
 
                        for attribute in ("host", "checker_command"):
3326
 
                            if isinstance(value[attribute], bytes):
3327
 
                                value[attribute] = (value[attribute]
3328
 
                                                    .decode("utf-8"))
 
3269
                        if isinstance(value["host"], bytes):
 
3270
                            value["host"] = (value["host"]
 
3271
                                             .decode("utf-8"))
3329
3272
            os.remove(stored_state_path)
3330
3273
        except IOError as e:
3331
3274
            if e.errno == errno.ENOENT:
3584
3527
 
3585
3528
        try:
3586
3529
            with tempfile.NamedTemporaryFile(
3587
 
                    mode="wb",
 
3530
                    mode='wb',
3588
3531
                    suffix=".pickle",
3589
 
                    prefix="clients-",
 
3532
                    prefix='clients-',
3590
3533
                    dir=os.path.dirname(stored_state_path),
3591
3534
                    delete=False) as stored_state:
3592
3535
                pickle.dump((clients, client_settings), stored_state,
3656
3599
                sys.exit(1)
3657
3600
            # End of Avahi example code
3658
3601
 
3659
 
        GLib.io_add_watch(
3660
 
            GLib.IOChannel.unix_new(tcp_server.fileno()),
3661
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3662
 
            lambda *args, **kwargs: (tcp_server.handle_request
3663
 
                                     (*args[2:], **kwargs) or True))
 
3602
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3603
                          lambda *args, **kwargs:
 
3604
                          (tcp_server.handle_request
 
3605
                           (*args[2:], **kwargs) or True))
3664
3606
 
3665
3607
        logger.debug("Starting main loop")
3666
3608
        main_loop.run()
3676
3618
    # Must run before the D-Bus bus name gets deregistered
3677
3619
    cleanup()
3678
3620
 
3679
 
 
3680
 
def should_only_run_tests():
3681
 
    parser = argparse.ArgumentParser(add_help=False)
3682
 
    parser.add_argument("--check", action="store_true")
3683
 
    args, unknown_args = parser.parse_known_args()
3684
 
    run_tests = args.check
3685
 
    if run_tests:
3686
 
        # Remove --check argument from sys.argv
3687
 
        sys.argv[1:] = unknown_args
3688
 
    return run_tests
3689
 
 
3690
 
# Add all tests from doctest strings
3691
 
def load_tests(loader, tests, none):
3692
 
    import doctest
3693
 
    tests.addTests(doctest.DocTestSuite())
3694
 
    return tests
3695
 
 
3696
 
if __name__ == "__main__":
3697
 
    try:
3698
 
        if should_only_run_tests():
3699
 
            # Call using ./mandos --check [--verbose]
3700
 
            unittest.main()
3701
 
        else:
3702
 
            main()
3703
 
    finally:
3704
 
        logging.shutdown()
 
3621
 
 
3622
if __name__ == '__main__':
 
3623
    main()