/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-18 00:42:22 UTC
  • Revision ID: teddy@recompile.se-20190818004222-lfrgtnmqz766a08e
Client: Use the systemd sysusers.d mechanism, if present

* Makefile (install-client-nokey): Also install sysusers.d file, if
                                   $(SYSUSERS) exists.
* sysusers.d-mandos.conf: Adjust comment to match reality.

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