/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: 2023-02-07 19:18:35 UTC
  • Revision ID: teddy@recompile.se-20230207191835-z1w66f5u6bcugfo8
Suppress warnings about writing into an ievent struct

* dracut-module/password-agent.c (read_inotify_event(),
  test_read_inotify_event_IN_CLOSE_WRITE(),
  test_read_inotify_event_IN_MOVED_TO(),
  test_read_inotify_event_IN_MOVED_FROM(),
  test_read_inotify_event_IN_DELETE(),
  test_read_inotify_event_IN_CLOSE_WRITE_badname(),
  test_read_inotify_event_IN_MOVED_TO_badname(),
  test_read_inotify_event_IN_MOVED_FROM_badname()): When writing into
  a struct ievent, suppress "-Wstringop-overread".

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python
2
 
# -*- mode: python; coding: utf-8 -*-
 
1
#!/usr/bin/python3 -bI
 
2
# -*- coding: utf-8; lexical-binding: t -*-
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-2019 Teddy Hogeborn
15
 
# Copyright © 2008-2019 Björn Påhlsson
 
14
# Copyright © 2008-2022 Teddy Hogeborn
 
15
# Copyright © 2008-2022 Björn Påhlsson
16
16
#
17
17
# This file is part of Mandos.
18
18
#
31
31
#
32
32
# Contact the authors at <mandos@recompile.se>.
33
33
#
34
 
 
35
34
from __future__ import (division, absolute_import, print_function,
36
35
                        unicode_literals)
37
36
 
40
39
except ImportError:
41
40
    pass
42
41
 
 
42
import sys
 
43
import unittest
 
44
import argparse
 
45
import logging
 
46
import os
43
47
try:
44
48
    import SocketServer as socketserver
45
49
except ImportError:
46
50
    import socketserver
47
51
import socket
48
 
import argparse
49
52
import datetime
50
53
import errno
51
54
try:
52
55
    import ConfigParser as configparser
53
56
except ImportError:
54
57
    import configparser
55
 
import sys
56
58
import re
57
 
import os
58
59
import signal
59
60
import subprocess
60
61
import atexit
61
62
import stat
62
 
import logging
63
63
import logging.handlers
64
64
import pwd
65
65
import contextlib
77
77
import itertools
78
78
import collections
79
79
import codecs
 
80
import random
 
81
import shlex
80
82
 
81
83
import dbus
82
84
import dbus.service
90
92
 
91
93
if sys.version_info.major == 2:
92
94
    __metaclass__ = type
 
95
    str = unicode
 
96
    input = raw_input
 
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")
93
117
 
94
118
# Try to find the value of SO_BINDTODEVICE:
95
119
try:
116
140
            # No value found
117
141
            SO_BINDTODEVICE = None
118
142
 
119
 
if sys.version_info.major == 2:
120
 
    str = unicode
121
 
 
122
143
if sys.version_info < (3, 2):
123
144
    configparser.Configparser = configparser.SafeConfigParser
124
145
 
125
 
version = "1.8.7"
 
146
version = "1.8.15"
126
147
stored_state_file = "clients.pickle"
127
148
 
128
 
logger = logging.getLogger()
 
149
log = logging.getLogger(os.path.basename(sys.argv[0]))
 
150
logging.captureWarnings(True)   # Show warnings via the logging system
129
151
syslogger = None
130
152
 
131
153
try:
167
189
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
168
190
        address="/dev/log"))
169
191
    syslogger.setFormatter(logging.Formatter
170
 
                           ('Mandos [%(process)d]: %(levelname)s:'
171
 
                            ' %(message)s'))
172
 
    logger.addHandler(syslogger)
 
192
                           ("Mandos [%(process)d]: %(levelname)s:"
 
193
                            " %(message)s"))
 
194
    log.addHandler(syslogger)
173
195
 
174
196
    if debug:
175
197
        console = logging.StreamHandler()
176
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
177
 
                                               ' [%(process)d]:'
178
 
                                               ' %(levelname)s:'
179
 
                                               ' %(message)s'))
180
 
        logger.addHandler(console)
181
 
    logger.setLevel(level)
 
198
        console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
 
199
                                               " [%(process)d]:"
 
200
                                               " %(levelname)s:"
 
201
                                               " %(message)s"))
 
202
        log.addHandler(console)
 
203
    log.setLevel(level)
182
204
 
183
205
 
184
206
class PGPError(Exception):
196
218
            output = subprocess.check_output(["gpgconf"])
197
219
            for line in output.splitlines():
198
220
                name, text, path = line.split(b":")
199
 
                if name == "gpg":
 
221
                if name == b"gpg":
200
222
                    self.gpg = path
201
223
                    break
202
224
        except OSError as e:
203
225
            if e.errno != errno.ENOENT:
204
226
                raise
205
 
        self.gnupgargs = ['--batch',
206
 
                          '--homedir', self.tempdir,
207
 
                          '--force-mdc',
208
 
                          '--quiet']
 
227
        self.gnupgargs = ["--batch",
 
228
                          "--homedir", self.tempdir,
 
229
                          "--force-mdc",
 
230
                          "--quiet"]
209
231
        # Only GPG version 1 has the --no-use-agent option.
210
 
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
 
232
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
211
233
            self.gnupgargs.append("--no-use-agent")
212
234
 
213
235
    def __enter__(self):
250
272
                dir=self.tempdir) as passfile:
251
273
            passfile.write(passphrase)
252
274
            passfile.flush()
253
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
254
 
                                     '--passphrase-file',
 
275
            proc = subprocess.Popen([self.gpg, "--symmetric",
 
276
                                     "--passphrase-file",
255
277
                                     passfile.name]
256
278
                                    + self.gnupgargs,
257
279
                                    stdin=subprocess.PIPE,
268
290
                dir=self.tempdir) as passfile:
269
291
            passfile.write(passphrase)
270
292
            passfile.flush()
271
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
272
 
                                     '--passphrase-file',
 
293
            proc = subprocess.Popen([self.gpg, "--decrypt",
 
294
                                     "--passphrase-file",
273
295
                                     passfile.name]
274
296
                                    + self.gnupgargs,
275
297
                                    stdin=subprocess.PIPE,
328
350
    Attributes:
329
351
    interface: integer; avahi.IF_UNSPEC or an interface index.
330
352
               Used to optionally bind to the specified interface.
331
 
    name: string; Example: 'Mandos'
332
 
    type: string; Example: '_mandos._tcp'.
 
353
    name: string; Example: "Mandos"
 
354
    type: string; Example: "_mandos._tcp".
333
355
     See <https://www.iana.org/assignments/service-names-port-numbers>
334
356
    port: integer; what port to announce
335
357
    TXT: list of strings; TXT record for the service
372
394
    def rename(self, remove=True):
373
395
        """Derived from the Avahi example code"""
374
396
        if self.rename_count >= self.max_renames:
375
 
            logger.critical("No suitable Zeroconf service name found"
376
 
                            " after %i retries, exiting.",
377
 
                            self.rename_count)
 
397
            log.critical("No suitable Zeroconf service name found"
 
398
                         " after %i retries, exiting.",
 
399
                         self.rename_count)
378
400
            raise AvahiServiceError("Too many renames")
379
401
        self.name = str(
380
402
            self.server.GetAlternativeServiceName(self.name))
381
403
        self.rename_count += 1
382
 
        logger.info("Changing Zeroconf service name to %r ...",
383
 
                    self.name)
 
404
        log.info("Changing Zeroconf service name to %r ...",
 
405
                 self.name)
384
406
        if remove:
385
407
            self.remove()
386
408
        try:
388
410
        except dbus.exceptions.DBusException as error:
389
411
            if (error.get_dbus_name()
390
412
                == "org.freedesktop.Avahi.CollisionError"):
391
 
                logger.info("Local Zeroconf service name collision.")
 
413
                log.info("Local Zeroconf service name collision.")
392
414
                return self.rename(remove=False)
393
415
            else:
394
 
                logger.critical("D-Bus Exception", exc_info=error)
 
416
                log.critical("D-Bus Exception", exc_info=error)
395
417
                self.cleanup()
396
418
                os._exit(1)
397
419
 
413
435
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
414
436
        self.entry_group_state_changed_match = (
415
437
            self.group.connect_to_signal(
416
 
                'StateChanged', self.entry_group_state_changed))
417
 
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
418
 
                     self.name, self.type)
 
438
                "StateChanged", self.entry_group_state_changed))
 
439
        log.debug("Adding Zeroconf service '%s' of type '%s' ...",
 
440
                  self.name, self.type)
419
441
        self.group.AddService(
420
442
            self.interface,
421
443
            self.protocol,
428
450
 
429
451
    def entry_group_state_changed(self, state, error):
430
452
        """Derived from the Avahi example code"""
431
 
        logger.debug("Avahi entry group state change: %i", state)
 
453
        log.debug("Avahi entry group state change: %i", state)
432
454
 
433
455
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
434
 
            logger.debug("Zeroconf service established.")
 
456
            log.debug("Zeroconf service established.")
435
457
        elif state == avahi.ENTRY_GROUP_COLLISION:
436
 
            logger.info("Zeroconf service name collision.")
 
458
            log.info("Zeroconf service name collision.")
437
459
            self.rename()
438
460
        elif state == avahi.ENTRY_GROUP_FAILURE:
439
 
            logger.critical("Avahi: Error in group state changed %s",
440
 
                            str(error))
 
461
            log.critical("Avahi: Error in group state changed %s",
 
462
                         str(error))
441
463
            raise AvahiGroupError("State changed: {!s}".format(error))
442
464
 
443
465
    def cleanup(self):
453
475
 
454
476
    def server_state_changed(self, state, error=None):
455
477
        """Derived from the Avahi example code"""
456
 
        logger.debug("Avahi server state change: %i", state)
 
478
        log.debug("Avahi server state change: %i", state)
457
479
        bad_states = {
458
480
            avahi.SERVER_INVALID: "Zeroconf server invalid",
459
481
            avahi.SERVER_REGISTERING: None,
463
485
        if state in bad_states:
464
486
            if bad_states[state] is not None:
465
487
                if error is None:
466
 
                    logger.error(bad_states[state])
 
488
                    log.error(bad_states[state])
467
489
                else:
468
 
                    logger.error(bad_states[state] + ": %r", error)
 
490
                    log.error(bad_states[state] + ": %r", error)
469
491
            self.cleanup()
470
492
        elif state == avahi.SERVER_RUNNING:
471
493
            try:
473
495
            except dbus.exceptions.DBusException as error:
474
496
                if (error.get_dbus_name()
475
497
                    == "org.freedesktop.Avahi.CollisionError"):
476
 
                    logger.info("Local Zeroconf service name"
477
 
                                " collision.")
 
498
                    log.info("Local Zeroconf service name collision.")
478
499
                    return self.rename(remove=False)
479
500
                else:
480
 
                    logger.critical("D-Bus Exception", exc_info=error)
 
501
                    log.critical("D-Bus Exception", exc_info=error)
481
502
                    self.cleanup()
482
503
                    os._exit(1)
483
504
        else:
484
505
            if error is None:
485
 
                logger.debug("Unknown state: %r", state)
 
506
                log.debug("Unknown state: %r", state)
486
507
            else:
487
 
                logger.debug("Unknown state: %r: %r", state, error)
 
508
                log.debug("Unknown state: %r: %r", state, error)
488
509
 
489
510
    def activate(self):
490
511
        """Derived from the Avahi example code"""
502
523
class AvahiServiceToSyslog(AvahiService):
503
524
    def rename(self, *args, **kwargs):
504
525
        """Add the new name to the syslog messages"""
505
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
526
        ret = super(AvahiServiceToSyslog, self).rename(*args,
 
527
                                                       **kwargs)
506
528
        syslogger.setFormatter(logging.Formatter(
507
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
529
            "Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
508
530
            .format(self.name)))
509
531
        return ret
510
532
 
540
562
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
541
563
 
542
564
    # Types
543
 
    class session_int(ctypes.Structure):
 
565
    class _session_int(ctypes.Structure):
544
566
        _fields_ = []
545
 
    session_t = ctypes.POINTER(session_int)
 
567
    session_t = ctypes.POINTER(_session_int)
546
568
 
547
569
    class certificate_credentials_st(ctypes.Structure):
548
570
        _fields_ = []
551
573
    certificate_type_t = ctypes.c_int
552
574
 
553
575
    class datum_t(ctypes.Structure):
554
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
555
 
                    ('size', ctypes.c_uint)]
 
576
        _fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
 
577
                    ("size", ctypes.c_uint)]
556
578
 
557
 
    class openpgp_crt_int(ctypes.Structure):
 
579
    class _openpgp_crt_int(ctypes.Structure):
558
580
        _fields_ = []
559
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
581
    openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
560
582
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
561
583
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
562
584
    credentials_type_t = ctypes.c_int
571
593
            # gnutls.strerror()
572
594
            self.code = code
573
595
            if message is None and code is not None:
574
 
                message = gnutls.strerror(code)
 
596
                message = gnutls.strerror(code).decode(
 
597
                    "utf-8", errors="replace")
575
598
            return super(gnutls.Error, self).__init__(
576
599
                message, *args)
577
600
 
578
601
    class CertificateSecurityError(Error):
579
602
        pass
580
603
 
 
604
    class PointerTo:
 
605
        def __init__(self, cls):
 
606
            self.cls = cls
 
607
 
 
608
        def from_param(self, obj):
 
609
            if not isinstance(obj, self.cls):
 
610
                raise TypeError("Not of type {}: {!r}"
 
611
                                .format(self.cls.__name__, obj))
 
612
            return ctypes.byref(obj.from_param(obj))
 
613
 
 
614
    class CastToVoidPointer:
 
615
        def __init__(self, cls):
 
616
            self.cls = cls
 
617
 
 
618
        def from_param(self, obj):
 
619
            if not isinstance(obj, self.cls):
 
620
                raise TypeError("Not of type {}: {!r}"
 
621
                                .format(self.cls.__name__, obj))
 
622
            return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
 
623
 
 
624
    class With_from_param:
 
625
        @classmethod
 
626
        def from_param(cls, obj):
 
627
            return obj._as_parameter_
 
628
 
581
629
    # Classes
582
 
    class Credentials:
 
630
    class Credentials(With_from_param):
583
631
        def __init__(self):
584
 
            self._c_object = gnutls.certificate_credentials_t()
585
 
            gnutls.certificate_allocate_credentials(
586
 
                ctypes.byref(self._c_object))
 
632
            self._as_parameter_ = gnutls.certificate_credentials_t()
 
633
            gnutls.certificate_allocate_credentials(self)
587
634
            self.type = gnutls.CRD_CERTIFICATE
588
635
 
589
636
        def __del__(self):
590
 
            gnutls.certificate_free_credentials(self._c_object)
 
637
            gnutls.certificate_free_credentials(self)
591
638
 
592
 
    class ClientSession:
 
639
    class ClientSession(With_from_param):
593
640
        def __init__(self, socket, credentials=None):
594
 
            self._c_object = gnutls.session_t()
 
641
            self._as_parameter_ = gnutls.session_t()
595
642
            gnutls_flags = gnutls.CLIENT
596
643
            if gnutls.check_version(b"3.5.6"):
597
644
                gnutls_flags |= gnutls.NO_TICKETS
598
645
            if gnutls.has_rawpk:
599
646
                gnutls_flags |= gnutls.ENABLE_RAWPK
600
 
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
647
            gnutls.init(self, gnutls_flags)
601
648
            del gnutls_flags
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)
 
649
            gnutls.set_default_priority(self)
 
650
            gnutls.transport_set_ptr(self, socket.fileno())
 
651
            gnutls.handshake_set_private_extensions(self, True)
606
652
            self.socket = socket
607
653
            if credentials is None:
608
654
                credentials = gnutls.Credentials()
609
 
            gnutls.credentials_set(self._c_object, credentials.type,
610
 
                                   ctypes.cast(credentials._c_object,
611
 
                                               ctypes.c_void_p))
 
655
            gnutls.credentials_set(self, credentials.type,
 
656
                                   credentials)
612
657
            self.credentials = credentials
613
658
 
614
659
        def __del__(self):
615
 
            gnutls.deinit(self._c_object)
 
660
            gnutls.deinit(self)
616
661
 
617
662
        def handshake(self):
618
 
            return gnutls.handshake(self._c_object)
 
663
            return gnutls.handshake(self)
619
664
 
620
665
        def send(self, data):
621
666
            data = bytes(data)
622
667
            data_len = len(data)
623
668
            while data_len > 0:
624
 
                data_len -= gnutls.record_send(self._c_object,
625
 
                                               data[-data_len:],
 
669
                data_len -= gnutls.record_send(self, data[-data_len:],
626
670
                                               data_len)
627
671
 
628
672
        def bye(self):
629
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
673
            return gnutls.bye(self, gnutls.SHUT_RDWR)
630
674
 
631
675
    # Error handling functions
632
676
    def _error_code(result):
633
677
        """A function to raise exceptions on errors, suitable
634
 
        for the 'restype' attribute on ctypes functions"""
635
 
        if result >= 0:
 
678
        for the "restype" attribute on ctypes functions"""
 
679
        if result >= gnutls.E_SUCCESS:
636
680
            return result
637
681
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
638
682
            raise gnutls.CertificateSecurityError(code=result)
639
683
        raise gnutls.Error(code=result)
640
684
 
641
 
    def _retry_on_error(result, func, arguments):
 
685
    def _retry_on_error(result, func, arguments,
 
686
                        _error_code=_error_code):
642
687
        """A function to retry on some errors, suitable
643
 
        for the 'errcheck' attribute on ctypes functions"""
644
 
        while result < 0:
 
688
        for the "errcheck" attribute on ctypes functions"""
 
689
        while result < gnutls.E_SUCCESS:
645
690
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
646
691
                return _error_code(result)
647
692
            result = func(*arguments)
652
697
 
653
698
    # Functions
654
699
    priority_set_direct = _library.gnutls_priority_set_direct
655
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
700
    priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
656
701
                                    ctypes.POINTER(ctypes.c_char_p)]
657
702
    priority_set_direct.restype = _error_code
658
703
 
659
704
    init = _library.gnutls_init
660
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
705
    init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
661
706
    init.restype = _error_code
662
707
 
663
708
    set_default_priority = _library.gnutls_set_default_priority
664
 
    set_default_priority.argtypes = [session_t]
 
709
    set_default_priority.argtypes = [ClientSession]
665
710
    set_default_priority.restype = _error_code
666
711
 
667
712
    record_send = _library.gnutls_record_send
668
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
713
    record_send.argtypes = [ClientSession, ctypes.c_void_p,
669
714
                            ctypes.c_size_t]
670
715
    record_send.restype = ctypes.c_ssize_t
671
716
    record_send.errcheck = _retry_on_error
673
718
    certificate_allocate_credentials = (
674
719
        _library.gnutls_certificate_allocate_credentials)
675
720
    certificate_allocate_credentials.argtypes = [
676
 
        ctypes.POINTER(certificate_credentials_t)]
 
721
        PointerTo(Credentials)]
677
722
    certificate_allocate_credentials.restype = _error_code
678
723
 
679
724
    certificate_free_credentials = (
680
725
        _library.gnutls_certificate_free_credentials)
681
 
    certificate_free_credentials.argtypes = [
682
 
        certificate_credentials_t]
 
726
    certificate_free_credentials.argtypes = [Credentials]
683
727
    certificate_free_credentials.restype = None
684
728
 
685
729
    handshake_set_private_extensions = (
686
730
        _library.gnutls_handshake_set_private_extensions)
687
 
    handshake_set_private_extensions.argtypes = [session_t,
 
731
    handshake_set_private_extensions.argtypes = [ClientSession,
688
732
                                                 ctypes.c_int]
689
733
    handshake_set_private_extensions.restype = None
690
734
 
691
735
    credentials_set = _library.gnutls_credentials_set
692
 
    credentials_set.argtypes = [session_t, credentials_type_t,
693
 
                                ctypes.c_void_p]
 
736
    credentials_set.argtypes = [ClientSession, credentials_type_t,
 
737
                                CastToVoidPointer(Credentials)]
694
738
    credentials_set.restype = _error_code
695
739
 
696
740
    strerror = _library.gnutls_strerror
698
742
    strerror.restype = ctypes.c_char_p
699
743
 
700
744
    certificate_type_get = _library.gnutls_certificate_type_get
701
 
    certificate_type_get.argtypes = [session_t]
 
745
    certificate_type_get.argtypes = [ClientSession]
702
746
    certificate_type_get.restype = _error_code
703
747
 
704
748
    certificate_get_peers = _library.gnutls_certificate_get_peers
705
 
    certificate_get_peers.argtypes = [session_t,
 
749
    certificate_get_peers.argtypes = [ClientSession,
706
750
                                      ctypes.POINTER(ctypes.c_uint)]
707
751
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
708
752
 
715
759
    global_set_log_function.restype = None
716
760
 
717
761
    deinit = _library.gnutls_deinit
718
 
    deinit.argtypes = [session_t]
 
762
    deinit.argtypes = [ClientSession]
719
763
    deinit.restype = None
720
764
 
721
765
    handshake = _library.gnutls_handshake
722
 
    handshake.argtypes = [session_t]
723
 
    handshake.restype = _error_code
 
766
    handshake.argtypes = [ClientSession]
 
767
    handshake.restype = ctypes.c_int
724
768
    handshake.errcheck = _retry_on_error
725
769
 
726
770
    transport_set_ptr = _library.gnutls_transport_set_ptr
727
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
771
    transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
728
772
    transport_set_ptr.restype = None
729
773
 
730
774
    bye = _library.gnutls_bye
731
 
    bye.argtypes = [session_t, close_request_t]
732
 
    bye.restype = _error_code
 
775
    bye.argtypes = [ClientSession, close_request_t]
 
776
    bye.restype = ctypes.c_int
733
777
    bye.errcheck = _retry_on_error
734
778
 
735
779
    check_version = _library.gnutls_check_version
752
796
 
753
797
        x509_crt_fmt_t = ctypes.c_int
754
798
 
755
 
        # All the function declarations below are from gnutls/abstract.h
 
799
        # All the function declarations below are from
 
800
        # gnutls/abstract.h
756
801
        pubkey_init = _library.gnutls_pubkey_init
757
802
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
758
803
        pubkey_init.restype = _error_code
772
817
        pubkey_deinit.argtypes = [pubkey_t]
773
818
        pubkey_deinit.restype = None
774
819
    else:
775
 
        # All the function declarations below are from gnutls/openpgp.h
 
820
        # All the function declarations below are from
 
821
        # gnutls/openpgp.h
776
822
 
777
823
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
778
824
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
784
830
                                       openpgp_crt_fmt_t]
785
831
        openpgp_crt_import.restype = _error_code
786
832
 
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)]
 
833
        openpgp_crt_verify_self = \
 
834
            _library.gnutls_openpgp_crt_verify_self
 
835
        openpgp_crt_verify_self.argtypes = [
 
836
            openpgp_crt_t,
 
837
            ctypes.c_uint,
 
838
            ctypes.POINTER(ctypes.c_uint),
 
839
        ]
790
840
        openpgp_crt_verify_self.restype = _error_code
791
841
 
792
842
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
803
853
 
804
854
    if check_version(b"3.6.4"):
805
855
        certificate_type_get2 = _library.gnutls_certificate_type_get2
806
 
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
856
        certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
807
857
        certificate_type_get2.restype = _error_code
808
858
 
809
859
    # Remove non-public functions
825
875
    """A representation of a client host served by this server.
826
876
 
827
877
    Attributes:
828
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
878
    approved:   bool(); None if not yet approved/disapproved
829
879
    approval_delay: datetime.timedelta(); Time to wait for approval
830
880
    approval_duration: datetime.timedelta(); Duration of one approval
831
881
    checker: multiprocessing.Process(); a running checker process used
832
 
             to see if the client lives. 'None' if no process is
 
882
             to see if the client lives. None if no process is
833
883
             running.
834
884
    checker_callback_tag: a GLib event source tag, or None
835
885
    checker_command: string; External command which is run to check
959
1009
            self.last_enabled = None
960
1010
            self.expires = None
961
1011
 
962
 
        logger.debug("Creating client %r", self.name)
963
 
        logger.debug("  Key ID: %s", self.key_id)
964
 
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
1012
        log.debug("Creating client %r", self.name)
 
1013
        log.debug("  Key ID: %s", self.key_id)
 
1014
        log.debug("  Fingerprint: %s", self.fingerprint)
965
1015
        self.created = settings.get("created",
966
1016
                                    datetime.datetime.utcnow())
967
1017
 
1006
1056
        if not getattr(self, "enabled", False):
1007
1057
            return False
1008
1058
        if not quiet:
1009
 
            logger.info("Disabling client %s", self.name)
 
1059
            log.info("Disabling client %s", self.name)
1010
1060
        if getattr(self, "disable_initiator_tag", None) is not None:
1011
1061
            GLib.source_remove(self.disable_initiator_tag)
1012
1062
            self.disable_initiator_tag = None
1030
1080
        if self.checker_initiator_tag is not None:
1031
1081
            GLib.source_remove(self.checker_initiator_tag)
1032
1082
        self.checker_initiator_tag = GLib.timeout_add(
1033
 
            int(self.interval.total_seconds() * 1000),
 
1083
            random.randrange(int(self.interval.total_seconds() * 1000
 
1084
                                 + 1)),
1034
1085
            self.start_checker)
1035
1086
        # Schedule a disable() when 'timeout' has passed
1036
1087
        if self.disable_initiator_tag is not None:
1046
1097
        # Read return code from connection (see call_pipe)
1047
1098
        returncode = connection.recv()
1048
1099
        connection.close()
1049
 
        self.checker.join()
 
1100
        if self.checker is not None:
 
1101
            self.checker.join()
1050
1102
        self.checker_callback_tag = None
1051
1103
        self.checker = None
1052
1104
 
1054
1106
            self.last_checker_status = returncode
1055
1107
            self.last_checker_signal = None
1056
1108
            if self.last_checker_status == 0:
1057
 
                logger.info("Checker for %(name)s succeeded",
1058
 
                            vars(self))
 
1109
                log.info("Checker for %(name)s succeeded", vars(self))
1059
1110
                self.checked_ok()
1060
1111
            else:
1061
 
                logger.info("Checker for %(name)s failed", vars(self))
 
1112
                log.info("Checker for %(name)s failed", vars(self))
1062
1113
        else:
1063
1114
            self.last_checker_status = -1
1064
1115
            self.last_checker_signal = -returncode
1065
 
            logger.warning("Checker for %(name)s crashed?",
1066
 
                           vars(self))
 
1116
            log.warning("Checker for %(name)s crashed?", vars(self))
1067
1117
        return False
1068
1118
 
1069
1119
    def checked_ok(self):
1103
1153
        # should be.
1104
1154
 
1105
1155
        if self.checker is not None and not self.checker.is_alive():
1106
 
            logger.warning("Checker was not alive; joining")
 
1156
            log.warning("Checker was not alive; joining")
1107
1157
            self.checker.join()
1108
1158
            self.checker = None
1109
1159
        # Start a new checker if needed
1110
1160
        if self.checker is None:
1111
1161
            # Escape attributes for the shell
1112
1162
            escaped_attrs = {
1113
 
                attr: re.escape(str(getattr(self, attr)))
 
1163
                attr: shlex.quote(str(getattr(self, attr)))
1114
1164
                for attr in self.runtime_expansions}
1115
1165
            try:
1116
1166
                command = self.checker_command % escaped_attrs
1117
1167
            except TypeError as error:
1118
 
                logger.error('Could not format string "%s"',
1119
 
                             self.checker_command,
1120
 
                             exc_info=error)
 
1168
                log.error('Could not format string "%s"',
 
1169
                          self.checker_command, exc_info=error)
1121
1170
                return True     # Try again later
1122
1171
            self.current_checker_command = command
1123
 
            logger.info("Starting checker %r for %s", command,
1124
 
                        self.name)
 
1172
            log.info("Starting checker %r for %s", command, self.name)
1125
1173
            # We don't need to redirect stdout and stderr, since
1126
1174
            # in normal mode, that is already done by daemon(),
1127
1175
            # and in debug mode we don't want to.  (Stdin is
1143
1191
                kwargs=popen_args)
1144
1192
            self.checker.start()
1145
1193
            self.checker_callback_tag = GLib.io_add_watch(
1146
 
                pipe[0].fileno(), GLib.IO_IN,
 
1194
                GLib.IOChannel.unix_new(pipe[0].fileno()),
 
1195
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1147
1196
                self.checker_callback, pipe[0], command)
1148
1197
        # Re-run this periodically if run by GLib.timeout_add
1149
1198
        return True
1155
1204
            self.checker_callback_tag = None
1156
1205
        if getattr(self, "checker", None) is None:
1157
1206
            return
1158
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
1207
        log.debug("Stopping checker for %(name)s", vars(self))
1159
1208
        self.checker.terminate()
1160
1209
        self.checker = None
1161
1210
 
1188
1237
        func._dbus_name = func.__name__
1189
1238
        if func._dbus_name.endswith("_dbus_property"):
1190
1239
            func._dbus_name = func._dbus_name[:-14]
1191
 
        func._dbus_get_args_options = {'byte_arrays': byte_arrays}
 
1240
        func._dbus_get_args_options = {"byte_arrays": byte_arrays}
1192
1241
        return func
1193
1242
 
1194
1243
    return decorator
1283
1332
 
1284
1333
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1285
1334
                         out_signature="s",
1286
 
                         path_keyword='object_path',
1287
 
                         connection_keyword='connection')
 
1335
                         path_keyword="object_path",
 
1336
                         connection_keyword="connection")
1288
1337
    def Introspect(self, object_path, connection):
1289
1338
        """Overloading of standard D-Bus method.
1290
1339
 
1339
1388
            document.unlink()
1340
1389
        except (AttributeError, xml.dom.DOMException,
1341
1390
                xml.parsers.expat.ExpatError) as error:
1342
 
            logger.error("Failed to override Introspection method",
1343
 
                         exc_info=error)
 
1391
            log.error("Failed to override Introspection method",
 
1392
                      exc_info=error)
1344
1393
        return xmlstring
1345
1394
 
1346
1395
 
1404
1453
                raise ValueError("Byte arrays not supported for non-"
1405
1454
                                 "'ay' signature {!r}"
1406
1455
                                 .format(prop._dbus_signature))
1407
 
            value = dbus.ByteArray(b''.join(chr(byte)
1408
 
                                            for byte in value))
 
1456
            value = dbus.ByteArray(bytes(value))
1409
1457
        prop(value)
1410
1458
 
1411
1459
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1444
1492
 
1445
1493
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1446
1494
                         out_signature="s",
1447
 
                         path_keyword='object_path',
1448
 
                         connection_keyword='connection')
 
1495
                         path_keyword="object_path",
 
1496
                         connection_keyword="connection")
1449
1497
    def Introspect(self, object_path, connection):
1450
1498
        """Overloading of standard D-Bus method.
1451
1499
 
1507
1555
            document.unlink()
1508
1556
        except (AttributeError, xml.dom.DOMException,
1509
1557
                xml.parsers.expat.ExpatError) as error:
1510
 
            logger.error("Failed to override Introspection method",
1511
 
                         exc_info=error)
 
1558
            log.error("Failed to override Introspection method",
 
1559
                      exc_info=error)
1512
1560
        return xmlstring
1513
1561
 
1514
1562
 
1546
1594
 
1547
1595
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1548
1596
                         out_signature="s",
1549
 
                         path_keyword='object_path',
1550
 
                         connection_keyword='connection')
 
1597
                         path_keyword="object_path",
 
1598
                         connection_keyword="connection")
1551
1599
    def Introspect(self, object_path, connection):
1552
1600
        """Overloading of standard D-Bus method.
1553
1601
 
1578
1626
            document.unlink()
1579
1627
        except (AttributeError, xml.dom.DOMException,
1580
1628
                xml.parsers.expat.ExpatError) as error:
1581
 
            logger.error("Failed to override Introspection method",
1582
 
                         exc_info=error)
 
1629
            log.error("Failed to override Introspection method",
 
1630
                      exc_info=error)
1583
1631
        return xmlstring
1584
1632
 
1585
1633
 
2219
2267
class ProxyClient:
2220
2268
    def __init__(self, child_pipe, key_id, fpr, address):
2221
2269
        self._pipe = child_pipe
2222
 
        self._pipe.send(('init', key_id, fpr, address))
 
2270
        self._pipe.send(("init", key_id, fpr, address))
2223
2271
        if not self._pipe.recv():
2224
2272
            raise KeyError(key_id or fpr)
2225
2273
 
2226
2274
    def __getattribute__(self, name):
2227
 
        if name == '_pipe':
 
2275
        if name == "_pipe":
2228
2276
            return super(ProxyClient, self).__getattribute__(name)
2229
 
        self._pipe.send(('getattr', name))
 
2277
        self._pipe.send(("getattr", name))
2230
2278
        data = self._pipe.recv()
2231
 
        if data[0] == 'data':
 
2279
        if data[0] == "data":
2232
2280
            return data[1]
2233
 
        if data[0] == 'function':
 
2281
        if data[0] == "function":
2234
2282
 
2235
2283
            def func(*args, **kwargs):
2236
 
                self._pipe.send(('funcall', name, args, kwargs))
 
2284
                self._pipe.send(("funcall", name, args, kwargs))
2237
2285
                return self._pipe.recv()[1]
2238
2286
 
2239
2287
            return func
2240
2288
 
2241
2289
    def __setattr__(self, name, value):
2242
 
        if name == '_pipe':
 
2290
        if name == "_pipe":
2243
2291
            return super(ProxyClient, self).__setattr__(name, value)
2244
 
        self._pipe.send(('setattr', name, value))
 
2292
        self._pipe.send(("setattr", name, value))
2245
2293
 
2246
2294
 
2247
2295
class ClientHandler(socketserver.BaseRequestHandler, object):
2252
2300
 
2253
2301
    def handle(self):
2254
2302
        with contextlib.closing(self.server.child_pipe) as child_pipe:
2255
 
            logger.info("TCP connection from: %s",
2256
 
                        str(self.client_address))
2257
 
            logger.debug("Pipe FD: %d",
2258
 
                         self.server.child_pipe.fileno())
 
2303
            log.info("TCP connection from: %s",
 
2304
                     str(self.client_address))
 
2305
            log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2259
2306
 
2260
2307
            session = gnutls.ClientSession(self.request)
2261
2308
 
2262
 
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
2309
            # priority = ":".join(("NONE", "+VERS-TLS1.1",
2263
2310
            #                       "+AES-256-CBC", "+SHA1",
2264
2311
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
2265
2312
            #                       "+DHE-DSS"))
2267
2314
            priority = self.server.gnutls_priority
2268
2315
            if priority is None:
2269
2316
                priority = "NORMAL"
2270
 
            gnutls.priority_set_direct(session._c_object,
2271
 
                                       priority.encode("utf-8"),
2272
 
                                       None)
 
2317
            gnutls.priority_set_direct(session,
 
2318
                                       priority.encode("utf-8"), None)
2273
2319
 
2274
2320
            # Start communication using the Mandos protocol
2275
2321
            # Get protocol number
2276
2322
            line = self.request.makefile().readline()
2277
 
            logger.debug("Protocol version: %r", line)
 
2323
            log.debug("Protocol version: %r", line)
2278
2324
            try:
2279
2325
                if int(line.strip().split()[0]) > 1:
2280
2326
                    raise RuntimeError(line)
2281
2327
            except (ValueError, IndexError, RuntimeError) as error:
2282
 
                logger.error("Unknown protocol version: %s", error)
 
2328
                log.error("Unknown protocol version: %s", error)
2283
2329
                return
2284
2330
 
2285
2331
            # Start GnuTLS connection
2286
2332
            try:
2287
2333
                session.handshake()
2288
2334
            except gnutls.Error as error:
2289
 
                logger.warning("Handshake failed: %s", error)
 
2335
                log.warning("Handshake failed: %s", error)
2290
2336
                # Do not run session.bye() here: the session is not
2291
2337
                # established.  Just abandon the request.
2292
2338
                return
2293
 
            logger.debug("Handshake succeeded")
 
2339
            log.debug("Handshake succeeded")
2294
2340
 
2295
2341
            approval_required = False
2296
2342
            try:
2300
2346
                        key_id = self.key_id(
2301
2347
                            self.peer_certificate(session))
2302
2348
                    except (TypeError, gnutls.Error) as error:
2303
 
                        logger.warning("Bad certificate: %s", error)
 
2349
                        log.warning("Bad certificate: %s", error)
2304
2350
                        return
2305
 
                    logger.debug("Key ID: %s", key_id)
 
2351
                    log.debug("Key ID: %s",
 
2352
                              key_id.decode("utf-8",
 
2353
                                            errors="replace"))
2306
2354
 
2307
2355
                else:
2308
2356
                    key_id = b""
2310
2358
                        fpr = self.fingerprint(
2311
2359
                            self.peer_certificate(session))
2312
2360
                    except (TypeError, gnutls.Error) as error:
2313
 
                        logger.warning("Bad certificate: %s", error)
 
2361
                        log.warning("Bad certificate: %s", error)
2314
2362
                        return
2315
 
                    logger.debug("Fingerprint: %s", fpr)
 
2363
                    log.debug("Fingerprint: %s", fpr)
2316
2364
 
2317
2365
                try:
2318
2366
                    client = ProxyClient(child_pipe, key_id, fpr,
2327
2375
 
2328
2376
                while True:
2329
2377
                    if not client.enabled:
2330
 
                        logger.info("Client %s is disabled",
2331
 
                                    client.name)
 
2378
                        log.info("Client %s is disabled", client.name)
2332
2379
                        if self.server.use_dbus:
2333
2380
                            # Emit D-Bus signal
2334
2381
                            client.Rejected("Disabled")
2338
2385
                        # We are approved or approval is disabled
2339
2386
                        break
2340
2387
                    elif client.approved is None:
2341
 
                        logger.info("Client %s needs approval",
2342
 
                                    client.name)
 
2388
                        log.info("Client %s needs approval",
 
2389
                                 client.name)
2343
2390
                        if self.server.use_dbus:
2344
2391
                            # Emit D-Bus signal
2345
2392
                            client.NeedApproval(
2346
2393
                                client.approval_delay.total_seconds()
2347
2394
                                * 1000, client.approved_by_default)
2348
2395
                    else:
2349
 
                        logger.warning("Client %s was not approved",
2350
 
                                       client.name)
 
2396
                        log.warning("Client %s was not approved",
 
2397
                                    client.name)
2351
2398
                        if self.server.use_dbus:
2352
2399
                            # Emit D-Bus signal
2353
2400
                            client.Rejected("Denied")
2361
2408
                    time2 = datetime.datetime.now()
2362
2409
                    if (time2 - time) >= delay:
2363
2410
                        if not client.approved_by_default:
2364
 
                            logger.warning("Client %s timed out while"
2365
 
                                           " waiting for approval",
2366
 
                                           client.name)
 
2411
                            log.warning("Client %s timed out while"
 
2412
                                        " waiting for approval",
 
2413
                                        client.name)
2367
2414
                            if self.server.use_dbus:
2368
2415
                                # Emit D-Bus signal
2369
2416
                                client.Rejected("Approval timed out")
2376
2423
                try:
2377
2424
                    session.send(client.secret)
2378
2425
                except gnutls.Error as error:
2379
 
                    logger.warning("gnutls send failed",
2380
 
                                   exc_info=error)
 
2426
                    log.warning("gnutls send failed", exc_info=error)
2381
2427
                    return
2382
2428
 
2383
 
                logger.info("Sending secret to %s", client.name)
 
2429
                log.info("Sending secret to %s", client.name)
2384
2430
                # bump the timeout using extended_timeout
2385
2431
                client.bump_timeout(client.extended_timeout)
2386
2432
                if self.server.use_dbus:
2393
2439
                try:
2394
2440
                    session.bye()
2395
2441
                except gnutls.Error as error:
2396
 
                    logger.warning("GnuTLS bye failed",
2397
 
                                   exc_info=error)
 
2442
                    log.warning("GnuTLS bye failed", exc_info=error)
2398
2443
 
2399
2444
    @staticmethod
2400
2445
    def peer_certificate(session):
2401
2446
        "Return the peer's certificate as a bytestring"
2402
2447
        try:
2403
 
            cert_type = gnutls.certificate_type_get2(session._c_object,
2404
 
                                                     gnutls.CTYPE_PEERS)
 
2448
            cert_type = gnutls.certificate_type_get2(
 
2449
                session, gnutls.CTYPE_PEERS)
2405
2450
        except AttributeError:
2406
 
            cert_type = gnutls.certificate_type_get(session._c_object)
 
2451
            cert_type = gnutls.certificate_type_get(session)
2407
2452
        if gnutls.has_rawpk:
2408
2453
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2409
2454
        else:
2410
2455
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2411
2456
        # If not a valid certificate type...
2412
2457
        if cert_type not in valid_cert_types:
2413
 
            logger.info("Cert type %r not in %r", cert_type,
2414
 
                        valid_cert_types)
 
2458
            log.info("Cert type %r not in %r", cert_type,
 
2459
                     valid_cert_types)
2415
2460
            # ...return invalid data
2416
2461
            return b""
2417
2462
        list_size = ctypes.c_uint(1)
2418
2463
        cert_list = (gnutls.certificate_get_peers
2419
 
                     (session._c_object, ctypes.byref(list_size)))
 
2464
                     (session, ctypes.byref(list_size)))
2420
2465
        if not bool(cert_list) and list_size.value != 0:
2421
2466
            raise gnutls.Error("error getting peer certificate")
2422
2467
        if list_size.value == 0:
2444
2489
        buf = ctypes.create_string_buffer(32)
2445
2490
        buf_len = ctypes.c_size_t(len(buf))
2446
2491
        # Get the key ID from the raw public key into the buffer
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))
 
2492
        gnutls.pubkey_get_key_id(
 
2493
            pubkey,
 
2494
            gnutls.KEYID_USE_SHA256,
 
2495
            ctypes.cast(ctypes.byref(buf),
 
2496
                        ctypes.POINTER(ctypes.c_ubyte)),
 
2497
            ctypes.byref(buf_len))
2452
2498
        # Deinit the certificate
2453
2499
        gnutls.pubkey_deinit(pubkey)
2454
2500
 
2535
2581
 
2536
2582
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2537
2583
                     socketserver.TCPServer):
2538
 
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
2584
    """IPv6-capable TCP server.  Accepts None as address and/or port
2539
2585
 
2540
2586
    Attributes:
2541
2587
        enabled:        Boolean; whether this server is activated yet
2592
2638
            if SO_BINDTODEVICE is None:
2593
2639
                # Fall back to a hard-coded value which seems to be
2594
2640
                # common enough.
2595
 
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
2641
                log.warning("SO_BINDTODEVICE not found, trying 25")
2596
2642
                SO_BINDTODEVICE = 25
2597
2643
            try:
2598
2644
                self.socket.setsockopt(
2600
2646
                    (self.interface + "\0").encode("utf-8"))
2601
2647
            except socket.error as error:
2602
2648
                if error.errno == errno.EPERM:
2603
 
                    logger.error("No permission to bind to"
2604
 
                                 " interface %s", self.interface)
 
2649
                    log.error("No permission to bind to interface %s",
 
2650
                              self.interface)
2605
2651
                elif error.errno == errno.ENOPROTOOPT:
2606
 
                    logger.error("SO_BINDTODEVICE not available;"
2607
 
                                 " cannot bind to interface %s",
2608
 
                                 self.interface)
 
2652
                    log.error("SO_BINDTODEVICE not available; cannot"
 
2653
                              " bind to interface %s", self.interface)
2609
2654
                elif error.errno == errno.ENODEV:
2610
 
                    logger.error("Interface %s does not exist,"
2611
 
                                 " cannot bind", self.interface)
 
2655
                    log.error("Interface %s does not exist, cannot"
 
2656
                              " bind", self.interface)
2612
2657
                else:
2613
2658
                    raise
2614
2659
        # Only bind(2) the socket if we really need to.
2673
2718
    def add_pipe(self, parent_pipe, proc):
2674
2719
        # Call "handle_ipc" for both data and EOF events
2675
2720
        GLib.io_add_watch(
2676
 
            parent_pipe.fileno(),
2677
 
            GLib.IO_IN | GLib.IO_HUP,
 
2721
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2722
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2678
2723
            functools.partial(self.handle_ipc,
2679
2724
                              parent_pipe=parent_pipe,
2680
2725
                              proc=proc))
2693
2738
        request = parent_pipe.recv()
2694
2739
        command = request[0]
2695
2740
 
2696
 
        if command == 'init':
 
2741
        if command == "init":
2697
2742
            key_id = request[1].decode("ascii")
2698
2743
            fpr = request[2].decode("ascii")
2699
2744
            address = request[3]
2700
2745
 
2701
2746
            for c in self.clients.values():
2702
 
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
2747
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
 
2748
                              "27AE41E4649B934CA495991B7852B855"):
2703
2749
                    continue
2704
2750
                if key_id and c.key_id == key_id:
2705
2751
                    client = c
2708
2754
                    client = c
2709
2755
                    break
2710
2756
            else:
2711
 
                logger.info("Client not found for key ID: %s, address"
2712
 
                            ": %s", key_id or fpr, address)
 
2757
                log.info("Client not found for key ID: %s, address:"
 
2758
                         " %s", key_id or fpr, address)
2713
2759
                if self.use_dbus:
2714
2760
                    # Emit D-Bus signal
2715
2761
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
2718
2764
                return False
2719
2765
 
2720
2766
            GLib.io_add_watch(
2721
 
                parent_pipe.fileno(),
2722
 
                GLib.IO_IN | GLib.IO_HUP,
 
2767
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
 
2768
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2723
2769
                functools.partial(self.handle_ipc,
2724
2770
                                  parent_pipe=parent_pipe,
2725
2771
                                  proc=proc,
2728
2774
            # remove the old hook in favor of the new above hook on
2729
2775
            # same fileno
2730
2776
            return False
2731
 
        if command == 'funcall':
 
2777
        if command == "funcall":
2732
2778
            funcname = request[1]
2733
2779
            args = request[2]
2734
2780
            kwargs = request[3]
2735
2781
 
2736
 
            parent_pipe.send(('data', getattr(client_object,
 
2782
            parent_pipe.send(("data", getattr(client_object,
2737
2783
                                              funcname)(*args,
2738
2784
                                                        **kwargs)))
2739
2785
 
2740
 
        if command == 'getattr':
 
2786
        if command == "getattr":
2741
2787
            attrname = request[1]
2742
2788
            if isinstance(client_object.__getattribute__(attrname),
2743
 
                          collections.Callable):
2744
 
                parent_pipe.send(('function', ))
 
2789
                          collections.abc.Callable):
 
2790
                parent_pipe.send(("function", ))
2745
2791
            else:
2746
2792
                parent_pipe.send((
2747
 
                    'data', client_object.__getattribute__(attrname)))
 
2793
                    "data", client_object.__getattribute__(attrname)))
2748
2794
 
2749
 
        if command == 'setattr':
 
2795
        if command == "setattr":
2750
2796
            attrname = request[1]
2751
2797
            value = request[2]
2752
2798
            setattr(client_object, attrname, value)
2757
2803
def rfc3339_duration_to_delta(duration):
2758
2804
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2759
2805
 
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)
 
2806
    >>> timedelta = datetime.timedelta
 
2807
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
 
2808
    True
 
2809
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
 
2810
    True
 
2811
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
 
2812
    True
 
2813
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
 
2814
    True
 
2815
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
 
2816
    True
 
2817
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
 
2818
    True
 
2819
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
 
2820
    True
 
2821
    >>> del timedelta
2774
2822
    """
2775
2823
 
2776
2824
    # Parsing an RFC 3339 duration with regular expressions is not
2856
2904
def string_to_delta(interval):
2857
2905
    """Parse a string and return a datetime.timedelta
2858
2906
 
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)
 
2907
    >>> string_to_delta("7d") == datetime.timedelta(7)
 
2908
    True
 
2909
    >>> string_to_delta("60s") == datetime.timedelta(0, 60)
 
2910
    True
 
2911
    >>> string_to_delta("60m") == datetime.timedelta(0, 3600)
 
2912
    True
 
2913
    >>> string_to_delta("24h") == datetime.timedelta(1)
 
2914
    True
 
2915
    >>> string_to_delta("1w") == datetime.timedelta(7)
 
2916
    True
 
2917
    >>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
 
2918
    True
2871
2919
    """
2872
2920
 
2873
2921
    try:
2975
3023
 
2976
3024
    options = parser.parse_args()
2977
3025
 
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
 
 
2983
3026
    # Default values for config file for server-global settings
2984
3027
    if gnutls.has_rawpk:
2985
3028
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3081
3124
 
3082
3125
    if server_settings["servicename"] != "Mandos":
3083
3126
        syslogger.setFormatter(
3084
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
3085
 
                              ' %(levelname)s: %(message)s'.format(
 
3127
            logging.Formatter("Mandos ({}) [%(process)d]:"
 
3128
                              " %(levelname)s: %(message)s".format(
3086
3129
                                  server_settings["servicename"])))
3087
3130
 
3088
3131
    # Parse config file with clients
3112
3155
        try:
3113
3156
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3114
3157
        except IOError as e:
3115
 
            logger.error("Could not open file %r", pidfilename,
3116
 
                         exc_info=e)
 
3158
            log.error("Could not open file %r", pidfilename,
 
3159
                      exc_info=e)
3117
3160
 
3118
3161
    for name, group in (("_mandos", "_mandos"),
3119
3162
                        ("mandos", "mandos"),
3130
3173
    try:
3131
3174
        os.setgid(gid)
3132
3175
        os.setuid(uid)
3133
 
        if debug:
3134
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
3135
 
                                                             gid))
 
3176
        log.debug("Did setuid/setgid to %s:%s", uid, gid)
3136
3177
    except OSError as error:
3137
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
3138
 
                       .format(uid, gid, os.strerror(error.errno)))
 
3178
        log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
 
3179
                    os.strerror(error.errno))
3139
3180
        if error.errno != errno.EPERM:
3140
3181
            raise
3141
3182
 
3148
3189
 
3149
3190
        @gnutls.log_func
3150
3191
        def debug_gnutls(level, string):
3151
 
            logger.debug("GnuTLS: %s", string[:-1])
 
3192
            log.debug("GnuTLS: %s",
 
3193
                      string[:-1].decode("utf-8", errors="replace"))
3152
3194
 
3153
3195
        gnutls.global_set_log_function(debug_gnutls)
3154
3196
 
3183
3225
                "se.bsnet.fukt.Mandos", bus,
3184
3226
                do_not_queue=True)
3185
3227
        except dbus.exceptions.DBusException as e:
3186
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
3228
            log.error("Disabling D-Bus:", exc_info=e)
3187
3229
            use_dbus = False
3188
3230
            server_settings["use_dbus"] = False
3189
3231
            tcp_server.use_dbus = False
3248
3290
                             if isinstance(s, bytes)
3249
3291
                             else s) for s in
3250
3292
                            value["client_structure"]]
3251
 
                        # .name & .host
3252
 
                        for k in ("name", "host"):
 
3293
                        # .name, .host, and .checker_command
 
3294
                        for k in ("name", "host", "checker_command"):
3253
3295
                            if isinstance(value[k], bytes):
3254
3296
                                value[k] = value[k].decode("utf-8")
3255
3297
                        if "key_id" not in value:
3265
3307
                        for key, value in
3266
3308
                        bytes_old_client_settings.items()}
3267
3309
                    del bytes_old_client_settings
3268
 
                    # .host
 
3310
                    # .host and .checker_command
3269
3311
                    for value in old_client_settings.values():
3270
 
                        if isinstance(value["host"], bytes):
3271
 
                            value["host"] = (value["host"]
3272
 
                                             .decode("utf-8"))
 
3312
                        for attribute in ("host", "checker_command"):
 
3313
                            if isinstance(value[attribute], bytes):
 
3314
                                value[attribute] = (value[attribute]
 
3315
                                                    .decode("utf-8"))
3273
3316
            os.remove(stored_state_path)
3274
3317
        except IOError as e:
3275
3318
            if e.errno == errno.ENOENT:
3276
 
                logger.warning("Could not load persistent state:"
3277
 
                               " {}".format(os.strerror(e.errno)))
 
3319
                log.warning("Could not load persistent state:"
 
3320
                            " %s", os.strerror(e.errno))
3278
3321
            else:
3279
 
                logger.critical("Could not load persistent state:",
3280
 
                                exc_info=e)
 
3322
                log.critical("Could not load persistent state:",
 
3323
                             exc_info=e)
3281
3324
                raise
3282
3325
        except EOFError as e:
3283
 
            logger.warning("Could not load persistent state: "
3284
 
                           "EOFError:",
3285
 
                           exc_info=e)
 
3326
            log.warning("Could not load persistent state: EOFError:",
 
3327
                        exc_info=e)
3286
3328
 
3287
3329
    with PGPEngine() as pgp:
3288
3330
        for client_name, client in clients_data.items():
3315
3357
            if client["enabled"]:
3316
3358
                if datetime.datetime.utcnow() >= client["expires"]:
3317
3359
                    if not client["last_checked_ok"]:
3318
 
                        logger.warning(
3319
 
                            "disabling client {} - Client never "
3320
 
                            "performed a successful checker".format(
3321
 
                                client_name))
 
3360
                        log.warning("disabling client %s - Client"
 
3361
                                    " never performed a successful"
 
3362
                                    " checker", client_name)
3322
3363
                        client["enabled"] = False
3323
3364
                    elif client["last_checker_status"] != 0:
3324
 
                        logger.warning(
3325
 
                            "disabling client {} - Client last"
3326
 
                            " checker failed with error code"
3327
 
                            " {}".format(
3328
 
                                client_name,
3329
 
                                client["last_checker_status"]))
 
3365
                        log.warning("disabling client %s - Client"
 
3366
                                    " last checker failed with error"
 
3367
                                    " code %s", client_name,
 
3368
                                    client["last_checker_status"])
3330
3369
                        client["enabled"] = False
3331
3370
                    else:
3332
3371
                        client["expires"] = (
3333
3372
                            datetime.datetime.utcnow()
3334
3373
                            + client["timeout"])
3335
 
                        logger.debug("Last checker succeeded,"
3336
 
                                     " keeping {} enabled".format(
3337
 
                                         client_name))
 
3374
                        log.debug("Last checker succeeded, keeping %s"
 
3375
                                  " enabled", client_name)
3338
3376
            try:
3339
3377
                client["secret"] = pgp.decrypt(
3340
3378
                    client["encrypted_secret"],
3341
3379
                    client_settings[client_name]["secret"])
3342
3380
            except PGPError:
3343
3381
                # If decryption fails, we use secret from new settings
3344
 
                logger.debug("Failed to decrypt {} old secret".format(
3345
 
                    client_name))
 
3382
                log.debug("Failed to decrypt %s old secret",
 
3383
                          client_name)
3346
3384
                client["secret"] = (client_settings[client_name]
3347
3385
                                    ["secret"])
3348
3386
 
3362
3400
            server_settings=server_settings)
3363
3401
 
3364
3402
    if not tcp_server.clients:
3365
 
        logger.warning("No clients defined")
 
3403
        log.warning("No clients defined")
3366
3404
 
3367
3405
    if not foreground:
3368
3406
        if pidfile is not None:
3371
3409
                with pidfile:
3372
3410
                    print(pid, file=pidfile)
3373
3411
            except IOError:
3374
 
                logger.error("Could not write to file %r with PID %d",
3375
 
                             pidfilename, pid)
 
3412
                log.error("Could not write to file %r with PID %d",
 
3413
                          pidfilename, pid)
3376
3414
        del pidfile
3377
3415
        del pidfilename
3378
3416
 
3528
3566
 
3529
3567
        try:
3530
3568
            with tempfile.NamedTemporaryFile(
3531
 
                    mode='wb',
 
3569
                    mode="wb",
3532
3570
                    suffix=".pickle",
3533
 
                    prefix='clients-',
 
3571
                    prefix="clients-",
3534
3572
                    dir=os.path.dirname(stored_state_path),
3535
3573
                    delete=False) as stored_state:
3536
3574
                pickle.dump((clients, client_settings), stored_state,
3544
3582
                except NameError:
3545
3583
                    pass
3546
3584
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3547
 
                logger.warning("Could not save persistent state: {}"
3548
 
                               .format(os.strerror(e.errno)))
 
3585
                log.warning("Could not save persistent state: %s",
 
3586
                            os.strerror(e.errno))
3549
3587
            else:
3550
 
                logger.warning("Could not save persistent state:",
3551
 
                               exc_info=e)
 
3588
                log.warning("Could not save persistent state:",
 
3589
                            exc_info=e)
3552
3590
                raise
3553
3591
 
3554
3592
        # Delete all clients, and settings from config
3580
3618
    if zeroconf:
3581
3619
        service.port = tcp_server.socket.getsockname()[1]
3582
3620
    if use_ipv6:
3583
 
        logger.info("Now listening on address %r, port %d,"
3584
 
                    " flowinfo %d, scope_id %d",
3585
 
                    *tcp_server.socket.getsockname())
 
3621
        log.info("Now listening on address %r, port %d, flowinfo %d,"
 
3622
                 " scope_id %d", *tcp_server.socket.getsockname())
3586
3623
    else:                       # IPv4
3587
 
        logger.info("Now listening on address %r, port %d",
3588
 
                    *tcp_server.socket.getsockname())
 
3624
        log.info("Now listening on address %r, port %d",
 
3625
                 *tcp_server.socket.getsockname())
3589
3626
 
3590
3627
    # service.interface = tcp_server.socket.getsockname()[3]
3591
3628
 
3595
3632
            try:
3596
3633
                service.activate()
3597
3634
            except dbus.exceptions.DBusException as error:
3598
 
                logger.critical("D-Bus Exception", exc_info=error)
 
3635
                log.critical("D-Bus Exception", exc_info=error)
3599
3636
                cleanup()
3600
3637
                sys.exit(1)
3601
3638
            # End of Avahi example code
3602
3639
 
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))
 
3640
        GLib.io_add_watch(
 
3641
            GLib.IOChannel.unix_new(tcp_server.fileno()),
 
3642
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
3643
            lambda *args, **kwargs: (tcp_server.handle_request
 
3644
                                     (*args[2:], **kwargs) or True))
3607
3645
 
3608
 
        logger.debug("Starting main loop")
 
3646
        log.debug("Starting main loop")
3609
3647
        main_loop.run()
3610
3648
    except AvahiError as error:
3611
 
        logger.critical("Avahi Error", exc_info=error)
 
3649
        log.critical("Avahi Error", exc_info=error)
3612
3650
        cleanup()
3613
3651
        sys.exit(1)
3614
3652
    except KeyboardInterrupt:
3615
3653
        if debug:
3616
3654
            print("", file=sys.stderr)
3617
 
        logger.debug("Server received KeyboardInterrupt")
3618
 
    logger.debug("Server exiting")
 
3655
        log.debug("Server received KeyboardInterrupt")
 
3656
    log.debug("Server exiting")
3619
3657
    # Must run before the D-Bus bus name gets deregistered
3620
3658
    cleanup()
3621
3659
 
3622
 
 
3623
 
if __name__ == '__main__':
3624
 
    main()
 
3660
 
 
3661
def parse_test_args():
 
3662
    # type: () -> argparse.Namespace
 
3663
    parser = argparse.ArgumentParser(add_help=False)
 
3664
    parser.add_argument("--check", action="store_true")
 
3665
    parser.add_argument("--prefix", )
 
3666
    args, unknown_args = parser.parse_known_args()
 
3667
    if args.check:
 
3668
        # Remove test options from sys.argv
 
3669
        sys.argv[1:] = unknown_args
 
3670
    return args
 
3671
 
 
3672
# Add all tests from doctest strings
 
3673
def load_tests(loader, tests, none):
 
3674
    import doctest
 
3675
    tests.addTests(doctest.DocTestSuite())
 
3676
    return tests
 
3677
 
 
3678
if __name__ == "__main__":
 
3679
    options = parse_test_args()
 
3680
    try:
 
3681
        if options.check:
 
3682
            extra_test_prefix = options.prefix
 
3683
            if extra_test_prefix is not None:
 
3684
                if not (unittest.main(argv=[""], exit=False)
 
3685
                        .result.wasSuccessful()):
 
3686
                    sys.exit(1)
 
3687
                class ExtraTestLoader(unittest.TestLoader):
 
3688
                    testMethodPrefix = extra_test_prefix
 
3689
                # Call using ./scriptname --test [--verbose]
 
3690
                unittest.main(argv=[""], testLoader=ExtraTestLoader())
 
3691
            else:
 
3692
                unittest.main(argv=[""])
 
3693
        else:
 
3694
            main()
 
3695
    finally:
 
3696
        logging.shutdown()
 
3697
 
 
3698
# Local Variables:
 
3699
# run-tests:
 
3700
# (lambda (&optional extra)
 
3701
#   (if (not (funcall run-tests-in-test-buffer default-directory
 
3702
#             extra))
 
3703
#       (funcall show-test-buffer-in-test-window)
 
3704
#     (funcall remove-test-window)
 
3705
#     (if extra (message "Extra tests run successfully!"))))
 
3706
# run-tests-in-test-buffer:
 
3707
# (lambda (dir &optional extra)
 
3708
#   (with-current-buffer (get-buffer-create "*Test*")
 
3709
#     (setq buffer-read-only nil
 
3710
#           default-directory dir)
 
3711
#     (erase-buffer)
 
3712
#     (compilation-mode))
 
3713
#   (let ((process-result
 
3714
#          (let ((inhibit-read-only t))
 
3715
#            (process-file-shell-command
 
3716
#             (funcall get-command-line extra) nil "*Test*"))))
 
3717
#     (and (numberp process-result)
 
3718
#          (= process-result 0))))
 
3719
# get-command-line:
 
3720
# (lambda (&optional extra)
 
3721
#   (let ((quoted-script
 
3722
#          (shell-quote-argument (funcall get-script-name))))
 
3723
#     (format
 
3724
#      (concat "%s --check" (if extra " --prefix=atest" ""))
 
3725
#      quoted-script)))
 
3726
# get-script-name:
 
3727
# (lambda ()
 
3728
#   (if (fboundp 'file-local-name)
 
3729
#       (file-local-name (buffer-file-name))
 
3730
#     (or (file-remote-p (buffer-file-name) 'localname)
 
3731
#         (buffer-file-name))))
 
3732
# remove-test-window:
 
3733
# (lambda ()
 
3734
#   (let ((test-window (get-buffer-window "*Test*")))
 
3735
#     (if test-window (delete-window test-window))))
 
3736
# show-test-buffer-in-test-window:
 
3737
# (lambda ()
 
3738
#   (when (not (get-buffer-window-list "*Test*"))
 
3739
#     (setq next-error-last-buffer (get-buffer "*Test*"))
 
3740
#     (let* ((side (if (>= (window-width) 146) 'right 'bottom))
 
3741
#            (display-buffer-overriding-action
 
3742
#             `((display-buffer-in-side-window) (side . ,side)
 
3743
#               (window-height . fit-window-to-buffer)
 
3744
#               (window-width . fit-window-to-buffer))))
 
3745
#       (display-buffer "*Test*"))))
 
3746
# eval:
 
3747
# (progn
 
3748
#   (let* ((run-extra-tests (lambda () (interactive)
 
3749
#                             (funcall run-tests t)))
 
3750
#          (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
 
3751
#          (outer-keymap `(keymap (3 . ,inner-keymap))))     ; C-c
 
3752
#     (setq minor-mode-overriding-map-alist
 
3753
#           (cons `(run-tests . ,outer-keymap)
 
3754
#                 minor-mode-overriding-map-alist)))
 
3755
#   (add-hook 'after-save-hook run-tests 90 t))
 
3756
# End: