/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-08-05 21:03:31 UTC
  • Revision ID: teddy@recompile.se-20190805210331-vut4mdrc129c6ycs
Override lintian warning about old debhelper format

* debian/source/lintian-overrides
  (package-uses-old-debhelper-compat-version): New; set to "10".

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
91
88
import xml.dom.minidom
92
89
import inspect
93
90
 
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
91
# Try to find the value of SO_BINDTODEVICE:
119
92
try:
120
93
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
140
113
            # No value found
141
114
            SO_BINDTODEVICE = None
142
115
 
 
116
if sys.version_info.major == 2:
 
117
    str = unicode
 
118
 
143
119
if sys.version_info < (3, 2):
144
120
    configparser.Configparser = configparser.SafeConfigParser
145
121
 
146
 
version = "1.8.14"
 
122
version = "1.8.6"
147
123
stored_state_file = "clients.pickle"
148
124
 
149
125
logger = logging.getLogger()
150
 
logging.captureWarnings(True)   # Show warnings via the logging system
151
126
syslogger = None
152
127
 
153
128
try:
189
164
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
190
165
        address="/dev/log"))
191
166
    syslogger.setFormatter(logging.Formatter
192
 
                           ("Mandos [%(process)d]: %(levelname)s:"
193
 
                            " %(message)s"))
 
167
                           ('Mandos [%(process)d]: %(levelname)s:'
 
168
                            ' %(message)s'))
194
169
    logger.addHandler(syslogger)
195
170
 
196
171
    if debug:
197
172
        console = logging.StreamHandler()
198
 
        console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
199
 
                                               " [%(process)d]:"
200
 
                                               " %(levelname)s:"
201
 
                                               " %(message)s"))
 
173
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
174
                                               ' [%(process)d]:'
 
175
                                               ' %(levelname)s:'
 
176
                                               ' %(message)s'))
202
177
        logger.addHandler(console)
203
178
    logger.setLevel(level)
204
179
 
208
183
    pass
209
184
 
210
185
 
211
 
class PGPEngine:
 
186
class PGPEngine(object):
212
187
    """A simple class for OpenPGP symmetric encryption & decryption"""
213
188
 
214
189
    def __init__(self):
218
193
            output = subprocess.check_output(["gpgconf"])
219
194
            for line in output.splitlines():
220
195
                name, text, path = line.split(b":")
221
 
                if name == b"gpg":
 
196
                if name == "gpg":
222
197
                    self.gpg = path
223
198
                    break
224
199
        except OSError as e:
225
200
            if e.errno != errno.ENOENT:
226
201
                raise
227
 
        self.gnupgargs = ["--batch",
228
 
                          "--homedir", self.tempdir,
229
 
                          "--force-mdc",
230
 
                          "--quiet"]
 
202
        self.gnupgargs = ['--batch',
 
203
                          '--homedir', self.tempdir,
 
204
                          '--force-mdc',
 
205
                          '--quiet']
231
206
        # Only GPG version 1 has the --no-use-agent option.
232
 
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
 
207
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
233
208
            self.gnupgargs.append("--no-use-agent")
234
209
 
235
210
    def __enter__(self):
272
247
                dir=self.tempdir) as passfile:
273
248
            passfile.write(passphrase)
274
249
            passfile.flush()
275
 
            proc = subprocess.Popen([self.gpg, "--symmetric",
276
 
                                     "--passphrase-file",
 
250
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
251
                                     '--passphrase-file',
277
252
                                     passfile.name]
278
253
                                    + self.gnupgargs,
279
254
                                    stdin=subprocess.PIPE,
290
265
                dir=self.tempdir) as passfile:
291
266
            passfile.write(passphrase)
292
267
            passfile.flush()
293
 
            proc = subprocess.Popen([self.gpg, "--decrypt",
294
 
                                     "--passphrase-file",
 
268
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
269
                                     '--passphrase-file',
295
270
                                     passfile.name]
296
271
                                    + self.gnupgargs,
297
272
                                    stdin=subprocess.PIPE,
304
279
 
305
280
 
306
281
# Pretend that we have an Avahi module
307
 
class avahi:
 
282
class avahi(object):
308
283
    """This isn't so much a class as it is a module-like namespace."""
309
284
    IF_UNSPEC = -1               # avahi-common/address.h
310
285
    PROTO_UNSPEC = -1            # avahi-common/address.h
344
319
    pass
345
320
 
346
321
 
347
 
class AvahiService:
 
322
class AvahiService(object):
348
323
    """An Avahi (Zeroconf) service.
349
324
 
350
325
    Attributes:
351
326
    interface: integer; avahi.IF_UNSPEC or an interface index.
352
327
               Used to optionally bind to the specified interface.
353
 
    name: string; Example: "Mandos"
354
 
    type: string; Example: "_mandos._tcp".
 
328
    name: string; Example: 'Mandos'
 
329
    type: string; Example: '_mandos._tcp'.
355
330
     See <https://www.iana.org/assignments/service-names-port-numbers>
356
331
    port: integer; what port to announce
357
332
    TXT: list of strings; TXT record for the service
435
410
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
436
411
        self.entry_group_state_changed_match = (
437
412
            self.group.connect_to_signal(
438
 
                "StateChanged", self.entry_group_state_changed))
 
413
                'StateChanged', self.entry_group_state_changed))
439
414
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
440
415
                     self.name, self.type)
441
416
        self.group.AddService(
524
499
class AvahiServiceToSyslog(AvahiService):
525
500
    def rename(self, *args, **kwargs):
526
501
        """Add the new name to the syslog messages"""
527
 
        ret = super(AvahiServiceToSyslog, self).rename(*args,
528
 
                                                       **kwargs)
 
502
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
529
503
        syslogger.setFormatter(logging.Formatter(
530
 
            "Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
 
504
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
531
505
            .format(self.name)))
532
506
        return ret
533
507
 
534
508
 
535
509
# Pretend that we have a GnuTLS module
536
 
class gnutls:
 
510
class gnutls(object):
537
511
    """This isn't so much a class as it is a module-like namespace."""
538
512
 
539
513
    library = ctypes.util.find_library("gnutls")
563
537
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
564
538
 
565
539
    # Types
566
 
    class _session_int(ctypes.Structure):
 
540
    class session_int(ctypes.Structure):
567
541
        _fields_ = []
568
 
    session_t = ctypes.POINTER(_session_int)
 
542
    session_t = ctypes.POINTER(session_int)
569
543
 
570
544
    class certificate_credentials_st(ctypes.Structure):
571
545
        _fields_ = []
574
548
    certificate_type_t = ctypes.c_int
575
549
 
576
550
    class datum_t(ctypes.Structure):
577
 
        _fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
578
 
                    ("size", ctypes.c_uint)]
 
551
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
552
                    ('size', ctypes.c_uint)]
579
553
 
580
 
    class _openpgp_crt_int(ctypes.Structure):
 
554
    class openpgp_crt_int(ctypes.Structure):
581
555
        _fields_ = []
582
 
    openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
 
556
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
583
557
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
584
558
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
585
559
    credentials_type_t = ctypes.c_int
594
568
            # gnutls.strerror()
595
569
            self.code = code
596
570
            if message is None and code is not None:
597
 
                message = gnutls.strerror(code).decode(
598
 
                    "utf-8", errors="replace")
 
571
                message = gnutls.strerror(code)
599
572
            return super(gnutls.Error, self).__init__(
600
573
                message, *args)
601
574
 
602
575
    class CertificateSecurityError(Error):
603
576
        pass
604
577
 
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
578
    # Classes
631
 
    class Credentials(With_from_param):
 
579
    class Credentials(object):
632
580
        def __init__(self):
633
 
            self._as_parameter_ = gnutls.certificate_credentials_t()
634
 
            gnutls.certificate_allocate_credentials(self)
 
581
            self._c_object = gnutls.certificate_credentials_t()
 
582
            gnutls.certificate_allocate_credentials(
 
583
                ctypes.byref(self._c_object))
635
584
            self.type = gnutls.CRD_CERTIFICATE
636
585
 
637
586
        def __del__(self):
638
 
            gnutls.certificate_free_credentials(self)
 
587
            gnutls.certificate_free_credentials(self._c_object)
639
588
 
640
 
    class ClientSession(With_from_param):
 
589
    class ClientSession(object):
641
590
        def __init__(self, socket, credentials=None):
642
 
            self._as_parameter_ = gnutls.session_t()
 
591
            self._c_object = gnutls.session_t()
643
592
            gnutls_flags = gnutls.CLIENT
644
593
            if gnutls.check_version(b"3.5.6"):
645
594
                gnutls_flags |= gnutls.NO_TICKETS
646
595
            if gnutls.has_rawpk:
647
596
                gnutls_flags |= gnutls.ENABLE_RAWPK
648
 
            gnutls.init(self, gnutls_flags)
 
597
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
649
598
            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)
 
599
            gnutls.set_default_priority(self._c_object)
 
600
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
601
            gnutls.handshake_set_private_extensions(self._c_object,
 
602
                                                    True)
653
603
            self.socket = socket
654
604
            if credentials is None:
655
605
                credentials = gnutls.Credentials()
656
 
            gnutls.credentials_set(self, credentials.type,
657
 
                                   credentials)
 
606
            gnutls.credentials_set(self._c_object, credentials.type,
 
607
                                   ctypes.cast(credentials._c_object,
 
608
                                               ctypes.c_void_p))
658
609
            self.credentials = credentials
659
610
 
660
611
        def __del__(self):
661
 
            gnutls.deinit(self)
 
612
            gnutls.deinit(self._c_object)
662
613
 
663
614
        def handshake(self):
664
 
            return gnutls.handshake(self)
 
615
            return gnutls.handshake(self._c_object)
665
616
 
666
617
        def send(self, data):
667
618
            data = bytes(data)
668
619
            data_len = len(data)
669
620
            while data_len > 0:
670
 
                data_len -= gnutls.record_send(self, data[-data_len:],
 
621
                data_len -= gnutls.record_send(self._c_object,
 
622
                                               data[-data_len:],
671
623
                                               data_len)
672
624
 
673
625
        def bye(self):
674
 
            return gnutls.bye(self, gnutls.SHUT_RDWR)
 
626
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
675
627
 
676
628
    # Error handling functions
677
629
    def _error_code(result):
678
630
        """A function to raise exceptions on errors, suitable
679
 
        for the "restype" attribute on ctypes functions"""
680
 
        if result >= gnutls.E_SUCCESS:
 
631
        for the 'restype' attribute on ctypes functions"""
 
632
        if result >= 0:
681
633
            return result
682
634
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
683
635
            raise gnutls.CertificateSecurityError(code=result)
684
636
        raise gnutls.Error(code=result)
685
637
 
686
 
    def _retry_on_error(result, func, arguments,
687
 
                        _error_code=_error_code):
 
638
    def _retry_on_error(result, func, arguments):
688
639
        """A function to retry on some errors, suitable
689
 
        for the "errcheck" attribute on ctypes functions"""
690
 
        while result < gnutls.E_SUCCESS:
 
640
        for the 'errcheck' attribute on ctypes functions"""
 
641
        while result < 0:
691
642
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
692
643
                return _error_code(result)
693
644
            result = func(*arguments)
698
649
 
699
650
    # Functions
700
651
    priority_set_direct = _library.gnutls_priority_set_direct
701
 
    priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
 
652
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
702
653
                                    ctypes.POINTER(ctypes.c_char_p)]
703
654
    priority_set_direct.restype = _error_code
704
655
 
705
656
    init = _library.gnutls_init
706
 
    init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
 
657
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
707
658
    init.restype = _error_code
708
659
 
709
660
    set_default_priority = _library.gnutls_set_default_priority
710
 
    set_default_priority.argtypes = [ClientSession]
 
661
    set_default_priority.argtypes = [session_t]
711
662
    set_default_priority.restype = _error_code
712
663
 
713
664
    record_send = _library.gnutls_record_send
714
 
    record_send.argtypes = [ClientSession, ctypes.c_void_p,
 
665
    record_send.argtypes = [session_t, ctypes.c_void_p,
715
666
                            ctypes.c_size_t]
716
667
    record_send.restype = ctypes.c_ssize_t
717
668
    record_send.errcheck = _retry_on_error
719
670
    certificate_allocate_credentials = (
720
671
        _library.gnutls_certificate_allocate_credentials)
721
672
    certificate_allocate_credentials.argtypes = [
722
 
        PointerTo(Credentials)]
 
673
        ctypes.POINTER(certificate_credentials_t)]
723
674
    certificate_allocate_credentials.restype = _error_code
724
675
 
725
676
    certificate_free_credentials = (
726
677
        _library.gnutls_certificate_free_credentials)
727
 
    certificate_free_credentials.argtypes = [Credentials]
 
678
    certificate_free_credentials.argtypes = [
 
679
        certificate_credentials_t]
728
680
    certificate_free_credentials.restype = None
729
681
 
730
682
    handshake_set_private_extensions = (
731
683
        _library.gnutls_handshake_set_private_extensions)
732
 
    handshake_set_private_extensions.argtypes = [ClientSession,
 
684
    handshake_set_private_extensions.argtypes = [session_t,
733
685
                                                 ctypes.c_int]
734
686
    handshake_set_private_extensions.restype = None
735
687
 
736
688
    credentials_set = _library.gnutls_credentials_set
737
 
    credentials_set.argtypes = [ClientSession, credentials_type_t,
738
 
                                CastToVoidPointer(Credentials)]
 
689
    credentials_set.argtypes = [session_t, credentials_type_t,
 
690
                                ctypes.c_void_p]
739
691
    credentials_set.restype = _error_code
740
692
 
741
693
    strerror = _library.gnutls_strerror
743
695
    strerror.restype = ctypes.c_char_p
744
696
 
745
697
    certificate_type_get = _library.gnutls_certificate_type_get
746
 
    certificate_type_get.argtypes = [ClientSession]
 
698
    certificate_type_get.argtypes = [session_t]
747
699
    certificate_type_get.restype = _error_code
748
700
 
749
701
    certificate_get_peers = _library.gnutls_certificate_get_peers
750
 
    certificate_get_peers.argtypes = [ClientSession,
 
702
    certificate_get_peers.argtypes = [session_t,
751
703
                                      ctypes.POINTER(ctypes.c_uint)]
752
704
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
753
705
 
760
712
    global_set_log_function.restype = None
761
713
 
762
714
    deinit = _library.gnutls_deinit
763
 
    deinit.argtypes = [ClientSession]
 
715
    deinit.argtypes = [session_t]
764
716
    deinit.restype = None
765
717
 
766
718
    handshake = _library.gnutls_handshake
767
 
    handshake.argtypes = [ClientSession]
768
 
    handshake.restype = ctypes.c_int
 
719
    handshake.argtypes = [session_t]
 
720
    handshake.restype = _error_code
769
721
    handshake.errcheck = _retry_on_error
770
722
 
771
723
    transport_set_ptr = _library.gnutls_transport_set_ptr
772
 
    transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
 
724
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
773
725
    transport_set_ptr.restype = None
774
726
 
775
727
    bye = _library.gnutls_bye
776
 
    bye.argtypes = [ClientSession, close_request_t]
777
 
    bye.restype = ctypes.c_int
 
728
    bye.argtypes = [session_t, close_request_t]
 
729
    bye.restype = _error_code
778
730
    bye.errcheck = _retry_on_error
779
731
 
780
732
    check_version = _library.gnutls_check_version
797
749
 
798
750
        x509_crt_fmt_t = ctypes.c_int
799
751
 
800
 
        # All the function declarations below are from
801
 
        # gnutls/abstract.h
 
752
        # All the function declarations below are from gnutls/abstract.h
802
753
        pubkey_init = _library.gnutls_pubkey_init
803
754
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
804
755
        pubkey_init.restype = _error_code
818
769
        pubkey_deinit.argtypes = [pubkey_t]
819
770
        pubkey_deinit.restype = None
820
771
    else:
821
 
        # All the function declarations below are from
822
 
        # gnutls/openpgp.h
 
772
        # All the function declarations below are from gnutls/openpgp.h
823
773
 
824
774
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
825
775
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
831
781
                                       openpgp_crt_fmt_t]
832
782
        openpgp_crt_import.restype = _error_code
833
783
 
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
 
        ]
 
784
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
785
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
786
                                            ctypes.POINTER(ctypes.c_uint)]
841
787
        openpgp_crt_verify_self.restype = _error_code
842
788
 
843
789
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
854
800
 
855
801
    if check_version(b"3.6.4"):
856
802
        certificate_type_get2 = _library.gnutls_certificate_type_get2
857
 
        certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
 
803
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
858
804
        certificate_type_get2.restype = _error_code
859
805
 
860
806
    # Remove non-public functions
872
818
    connection.close()
873
819
 
874
820
 
875
 
class Client:
 
821
class Client(object):
876
822
    """A representation of a client host served by this server.
877
823
 
878
824
    Attributes:
879
 
    approved:   bool(); None if not yet approved/disapproved
 
825
    approved:   bool(); 'None' if not yet approved/disapproved
880
826
    approval_delay: datetime.timedelta(); Time to wait for approval
881
827
    approval_duration: datetime.timedelta(); Duration of one approval
882
828
    checker: multiprocessing.Process(); a running checker process used
883
 
             to see if the client lives. None if no process is
 
829
             to see if the client lives. 'None' if no process is
884
830
             running.
885
831
    checker_callback_tag: a GLib event source tag, or None
886
832
    checker_command: string; External command which is run to check
1081
1027
        if self.checker_initiator_tag is not None:
1082
1028
            GLib.source_remove(self.checker_initiator_tag)
1083
1029
        self.checker_initiator_tag = GLib.timeout_add(
1084
 
            random.randrange(int(self.interval.total_seconds() * 1000
1085
 
                                 + 1)),
 
1030
            int(self.interval.total_seconds() * 1000),
1086
1031
            self.start_checker)
1087
1032
        # Schedule a disable() when 'timeout' has passed
1088
1033
        if self.disable_initiator_tag is not None:
1098
1043
        # Read return code from connection (see call_pipe)
1099
1044
        returncode = connection.recv()
1100
1045
        connection.close()
1101
 
        if self.checker is not None:
1102
 
            self.checker.join()
 
1046
        self.checker.join()
1103
1047
        self.checker_callback_tag = None
1104
1048
        self.checker = None
1105
1049
 
1163
1107
        if self.checker is None:
1164
1108
            # Escape attributes for the shell
1165
1109
            escaped_attrs = {
1166
 
                attr: shlex.quote(str(getattr(self, attr)))
 
1110
                attr: re.escape(str(getattr(self, attr)))
1167
1111
                for attr in self.runtime_expansions}
1168
1112
            try:
1169
1113
                command = self.checker_command % escaped_attrs
1196
1140
                kwargs=popen_args)
1197
1141
            self.checker.start()
1198
1142
            self.checker_callback_tag = GLib.io_add_watch(
1199
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
1200
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1143
                pipe[0].fileno(), GLib.IO_IN,
1201
1144
                self.checker_callback, pipe[0], command)
1202
1145
        # Re-run this periodically if run by GLib.timeout_add
1203
1146
        return True
1242
1185
        func._dbus_name = func.__name__
1243
1186
        if func._dbus_name.endswith("_dbus_property"):
1244
1187
            func._dbus_name = func._dbus_name[:-14]
1245
 
        func._dbus_get_args_options = {"byte_arrays": byte_arrays}
 
1188
        func._dbus_get_args_options = {'byte_arrays': byte_arrays}
1246
1189
        return func
1247
1190
 
1248
1191
    return decorator
1337
1280
 
1338
1281
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1339
1282
                         out_signature="s",
1340
 
                         path_keyword="object_path",
1341
 
                         connection_keyword="connection")
 
1283
                         path_keyword='object_path',
 
1284
                         connection_keyword='connection')
1342
1285
    def Introspect(self, object_path, connection):
1343
1286
        """Overloading of standard D-Bus method.
1344
1287
 
1458
1401
                raise ValueError("Byte arrays not supported for non-"
1459
1402
                                 "'ay' signature {!r}"
1460
1403
                                 .format(prop._dbus_signature))
1461
 
            value = dbus.ByteArray(bytes(value))
 
1404
            value = dbus.ByteArray(b''.join(chr(byte)
 
1405
                                            for byte in value))
1462
1406
        prop(value)
1463
1407
 
1464
1408
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1497
1441
 
1498
1442
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1499
1443
                         out_signature="s",
1500
 
                         path_keyword="object_path",
1501
 
                         connection_keyword="connection")
 
1444
                         path_keyword='object_path',
 
1445
                         connection_keyword='connection')
1502
1446
    def Introspect(self, object_path, connection):
1503
1447
        """Overloading of standard D-Bus method.
1504
1448
 
1599
1543
 
1600
1544
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1601
1545
                         out_signature="s",
1602
 
                         path_keyword="object_path",
1603
 
                         connection_keyword="connection")
 
1546
                         path_keyword='object_path',
 
1547
                         connection_keyword='connection')
1604
1548
    def Introspect(self, object_path, connection):
1605
1549
        """Overloading of standard D-Bus method.
1606
1550
 
2269
2213
    del _interface
2270
2214
 
2271
2215
 
2272
 
class ProxyClient:
 
2216
class ProxyClient(object):
2273
2217
    def __init__(self, child_pipe, key_id, fpr, address):
2274
2218
        self._pipe = child_pipe
2275
 
        self._pipe.send(("init", key_id, fpr, address))
 
2219
        self._pipe.send(('init', key_id, fpr, address))
2276
2220
        if not self._pipe.recv():
2277
2221
            raise KeyError(key_id or fpr)
2278
2222
 
2279
2223
    def __getattribute__(self, name):
2280
 
        if name == "_pipe":
 
2224
        if name == '_pipe':
2281
2225
            return super(ProxyClient, self).__getattribute__(name)
2282
 
        self._pipe.send(("getattr", name))
 
2226
        self._pipe.send(('getattr', name))
2283
2227
        data = self._pipe.recv()
2284
 
        if data[0] == "data":
 
2228
        if data[0] == 'data':
2285
2229
            return data[1]
2286
 
        if data[0] == "function":
 
2230
        if data[0] == 'function':
2287
2231
 
2288
2232
            def func(*args, **kwargs):
2289
 
                self._pipe.send(("funcall", name, args, kwargs))
 
2233
                self._pipe.send(('funcall', name, args, kwargs))
2290
2234
                return self._pipe.recv()[1]
2291
2235
 
2292
2236
            return func
2293
2237
 
2294
2238
    def __setattr__(self, name, value):
2295
 
        if name == "_pipe":
 
2239
        if name == '_pipe':
2296
2240
            return super(ProxyClient, self).__setattr__(name, value)
2297
 
        self._pipe.send(("setattr", name, value))
 
2241
        self._pipe.send(('setattr', name, value))
2298
2242
 
2299
2243
 
2300
2244
class ClientHandler(socketserver.BaseRequestHandler, object):
2312
2256
 
2313
2257
            session = gnutls.ClientSession(self.request)
2314
2258
 
2315
 
            # priority = ":".join(("NONE", "+VERS-TLS1.1",
 
2259
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
2316
2260
            #                       "+AES-256-CBC", "+SHA1",
2317
2261
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
2318
2262
            #                       "+DHE-DSS"))
2320
2264
            priority = self.server.gnutls_priority
2321
2265
            if priority is None:
2322
2266
                priority = "NORMAL"
2323
 
            gnutls.priority_set_direct(session,
2324
 
                                       priority.encode("utf-8"), None)
 
2267
            gnutls.priority_set_direct(session._c_object,
 
2268
                                       priority.encode("utf-8"),
 
2269
                                       None)
2325
2270
 
2326
2271
            # Start communication using the Mandos protocol
2327
2272
            # Get protocol number
2354
2299
                    except (TypeError, gnutls.Error) as error:
2355
2300
                        logger.warning("Bad certificate: %s", error)
2356
2301
                        return
2357
 
                    logger.debug("Key ID: %s",
2358
 
                                 key_id.decode("utf-8",
2359
 
                                               errors="replace"))
 
2302
                    logger.debug("Key ID: %s", key_id)
2360
2303
 
2361
2304
                else:
2362
2305
                    key_id = b""
2454
2397
    def peer_certificate(session):
2455
2398
        "Return the peer's certificate as a bytestring"
2456
2399
        try:
2457
 
            cert_type = gnutls.certificate_type_get2(
2458
 
                session, gnutls.CTYPE_PEERS)
 
2400
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
2401
                                                     gnutls.CTYPE_PEERS)
2459
2402
        except AttributeError:
2460
 
            cert_type = gnutls.certificate_type_get(session)
 
2403
            cert_type = gnutls.certificate_type_get(session._c_object)
2461
2404
        if gnutls.has_rawpk:
2462
2405
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2463
2406
        else:
2470
2413
            return b""
2471
2414
        list_size = ctypes.c_uint(1)
2472
2415
        cert_list = (gnutls.certificate_get_peers
2473
 
                     (session, ctypes.byref(list_size)))
 
2416
                     (session._c_object, ctypes.byref(list_size)))
2474
2417
        if not bool(cert_list) and list_size.value != 0:
2475
2418
            raise gnutls.Error("error getting peer certificate")
2476
2419
        if list_size.value == 0:
2498
2441
        buf = ctypes.create_string_buffer(32)
2499
2442
        buf_len = ctypes.c_size_t(len(buf))
2500
2443
        # 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))
 
2444
        gnutls.pubkey_get_key_id(pubkey,
 
2445
                                 gnutls.KEYID_USE_SHA256,
 
2446
                                 ctypes.cast(ctypes.byref(buf),
 
2447
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
2448
                                 ctypes.byref(buf_len))
2507
2449
        # Deinit the certificate
2508
2450
        gnutls.pubkey_deinit(pubkey)
2509
2451
 
2550
2492
        return hex_fpr
2551
2493
 
2552
2494
 
2553
 
class MultiprocessingMixIn:
 
2495
class MultiprocessingMixIn(object):
2554
2496
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2555
2497
 
2556
2498
    def sub_process_main(self, request, address):
2568
2510
        return proc
2569
2511
 
2570
2512
 
2571
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2513
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2572
2514
    """ adds a pipe to the MixIn """
2573
2515
 
2574
2516
    def process_request(self, request, client_address):
2589
2531
 
2590
2532
 
2591
2533
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2592
 
                     socketserver.TCPServer):
2593
 
    """IPv6-capable TCP server.  Accepts None as address and/or port
 
2534
                     socketserver.TCPServer, object):
 
2535
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2594
2536
 
2595
2537
    Attributes:
2596
2538
        enabled:        Boolean; whether this server is activated yet
2728
2670
    def add_pipe(self, parent_pipe, proc):
2729
2671
        # Call "handle_ipc" for both data and EOF events
2730
2672
        GLib.io_add_watch(
2731
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
2732
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2673
            parent_pipe.fileno(),
 
2674
            GLib.IO_IN | GLib.IO_HUP,
2733
2675
            functools.partial(self.handle_ipc,
2734
2676
                              parent_pipe=parent_pipe,
2735
2677
                              proc=proc))
2748
2690
        request = parent_pipe.recv()
2749
2691
        command = request[0]
2750
2692
 
2751
 
        if command == "init":
 
2693
        if command == 'init':
2752
2694
            key_id = request[1].decode("ascii")
2753
2695
            fpr = request[2].decode("ascii")
2754
2696
            address = request[3]
2755
2697
 
2756
2698
            for c in self.clients.values():
2757
 
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2758
 
                              "27AE41E4649B934CA495991B7852B855"):
 
2699
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2759
2700
                    continue
2760
2701
                if key_id and c.key_id == key_id:
2761
2702
                    client = c
2774
2715
                return False
2775
2716
 
2776
2717
            GLib.io_add_watch(
2777
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
2778
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2718
                parent_pipe.fileno(),
 
2719
                GLib.IO_IN | GLib.IO_HUP,
2779
2720
                functools.partial(self.handle_ipc,
2780
2721
                                  parent_pipe=parent_pipe,
2781
2722
                                  proc=proc,
2784
2725
            # remove the old hook in favor of the new above hook on
2785
2726
            # same fileno
2786
2727
            return False
2787
 
        if command == "funcall":
 
2728
        if command == 'funcall':
2788
2729
            funcname = request[1]
2789
2730
            args = request[2]
2790
2731
            kwargs = request[3]
2791
2732
 
2792
 
            parent_pipe.send(("data", getattr(client_object,
 
2733
            parent_pipe.send(('data', getattr(client_object,
2793
2734
                                              funcname)(*args,
2794
2735
                                                        **kwargs)))
2795
2736
 
2796
 
        if command == "getattr":
 
2737
        if command == 'getattr':
2797
2738
            attrname = request[1]
2798
2739
            if isinstance(client_object.__getattribute__(attrname),
2799
 
                          collections.abc.Callable):
2800
 
                parent_pipe.send(("function", ))
 
2740
                          collections.Callable):
 
2741
                parent_pipe.send(('function', ))
2801
2742
            else:
2802
2743
                parent_pipe.send((
2803
 
                    "data", client_object.__getattribute__(attrname)))
 
2744
                    'data', client_object.__getattribute__(attrname)))
2804
2745
 
2805
 
        if command == "setattr":
 
2746
        if command == 'setattr':
2806
2747
            attrname = request[1]
2807
2748
            value = request[2]
2808
2749
            setattr(client_object, attrname, value)
2813
2754
def rfc3339_duration_to_delta(duration):
2814
2755
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2815
2756
 
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
 
2757
    >>> rfc3339_duration_to_delta("P7D")
 
2758
    datetime.timedelta(7)
 
2759
    >>> rfc3339_duration_to_delta("PT60S")
 
2760
    datetime.timedelta(0, 60)
 
2761
    >>> rfc3339_duration_to_delta("PT60M")
 
2762
    datetime.timedelta(0, 3600)
 
2763
    >>> rfc3339_duration_to_delta("PT24H")
 
2764
    datetime.timedelta(1)
 
2765
    >>> rfc3339_duration_to_delta("P1W")
 
2766
    datetime.timedelta(7)
 
2767
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2768
    datetime.timedelta(0, 330)
 
2769
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2770
    datetime.timedelta(1, 200)
2832
2771
    """
2833
2772
 
2834
2773
    # Parsing an RFC 3339 duration with regular expressions is not
2914
2853
def string_to_delta(interval):
2915
2854
    """Parse a string and return a datetime.timedelta
2916
2855
 
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
 
2856
    >>> string_to_delta('7d')
 
2857
    datetime.timedelta(7)
 
2858
    >>> string_to_delta('60s')
 
2859
    datetime.timedelta(0, 60)
 
2860
    >>> string_to_delta('60m')
 
2861
    datetime.timedelta(0, 3600)
 
2862
    >>> string_to_delta('24h')
 
2863
    datetime.timedelta(1)
 
2864
    >>> string_to_delta('1w')
 
2865
    datetime.timedelta(7)
 
2866
    >>> string_to_delta('5m 30s')
 
2867
    datetime.timedelta(0, 330)
2929
2868
    """
2930
2869
 
2931
2870
    try:
3033
2972
 
3034
2973
    options = parser.parse_args()
3035
2974
 
 
2975
    if options.check:
 
2976
        import doctest
 
2977
        fail_count, test_count = doctest.testmod()
 
2978
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2979
 
3036
2980
    # Default values for config file for server-global settings
3037
2981
    if gnutls.has_rawpk:
3038
2982
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3134
3078
 
3135
3079
    if server_settings["servicename"] != "Mandos":
3136
3080
        syslogger.setFormatter(
3137
 
            logging.Formatter("Mandos ({}) [%(process)d]:"
3138
 
                              " %(levelname)s: %(message)s".format(
 
3081
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
3082
                              ' %(levelname)s: %(message)s'.format(
3139
3083
                                  server_settings["servicename"])))
3140
3084
 
3141
3085
    # Parse config file with clients
3201
3145
 
3202
3146
        @gnutls.log_func
3203
3147
        def debug_gnutls(level, string):
3204
 
            logger.debug("GnuTLS: %s",
3205
 
                         string[:-1].decode("utf-8",
3206
 
                                            errors="replace"))
 
3148
            logger.debug("GnuTLS: %s", string[:-1])
3207
3149
 
3208
3150
        gnutls.global_set_log_function(debug_gnutls)
3209
3151
 
3303
3245
                             if isinstance(s, bytes)
3304
3246
                             else s) for s in
3305
3247
                            value["client_structure"]]
3306
 
                        # .name, .host, and .checker_command
3307
 
                        for k in ("name", "host", "checker_command"):
 
3248
                        # .name & .host
 
3249
                        for k in ("name", "host"):
3308
3250
                            if isinstance(value[k], bytes):
3309
3251
                                value[k] = value[k].decode("utf-8")
3310
3252
                        if "key_id" not in value:
3320
3262
                        for key, value in
3321
3263
                        bytes_old_client_settings.items()}
3322
3264
                    del bytes_old_client_settings
3323
 
                    # .host and .checker_command
 
3265
                    # .host
3324
3266
                    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"))
 
3267
                        if isinstance(value["host"], bytes):
 
3268
                            value["host"] = (value["host"]
 
3269
                                             .decode("utf-8"))
3329
3270
            os.remove(stored_state_path)
3330
3271
        except IOError as e:
3331
3272
            if e.errno == errno.ENOENT:
3584
3525
 
3585
3526
        try:
3586
3527
            with tempfile.NamedTemporaryFile(
3587
 
                    mode="wb",
 
3528
                    mode='wb',
3588
3529
                    suffix=".pickle",
3589
 
                    prefix="clients-",
 
3530
                    prefix='clients-',
3590
3531
                    dir=os.path.dirname(stored_state_path),
3591
3532
                    delete=False) as stored_state:
3592
3533
                pickle.dump((clients, client_settings), stored_state,
3656
3597
                sys.exit(1)
3657
3598
            # End of Avahi example code
3658
3599
 
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))
 
3600
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3601
                          lambda *args, **kwargs:
 
3602
                          (tcp_server.handle_request
 
3603
                           (*args[2:], **kwargs) or True))
3664
3604
 
3665
3605
        logger.debug("Starting main loop")
3666
3606
        main_loop.run()
3676
3616
    # Must run before the D-Bus bus name gets deregistered
3677
3617
    cleanup()
3678
3618
 
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()
 
3619
 
 
3620
if __name__ == '__main__':
 
3621
    main()