/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: 2022-04-25 18:28:52 UTC
  • Revision ID: teddy@recompile.se-20220425182852-5y9a2b9oy9rm1ipf
From: Camaleón <noelamac@gmail.com>

Add Spanish debconf translation

* debian/po/es.po: New

Acked-by: Teddy Hogeborn <teddy@recompile.se>

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
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 -*-
 
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 unittest
81
80
import random
82
81
import shlex
83
82
 
94
93
if sys.version_info.major == 2:
95
94
    __metaclass__ = type
96
95
    str = unicode
 
96
    input = raw_input
97
97
 
98
98
# Add collections.abc.Callable if it does not exist
99
99
try:
143
143
if sys.version_info < (3, 2):
144
144
    configparser.Configparser = configparser.SafeConfigParser
145
145
 
146
 
version = "1.8.11"
 
146
version = "1.8.14"
147
147
stored_state_file = "clients.pickle"
148
148
 
149
 
logger = logging.getLogger()
 
149
log = logging.getLogger(os.path.basename(sys.argv[0]))
150
150
logging.captureWarnings(True)   # Show warnings via the logging system
151
151
syslogger = None
152
152
 
189
189
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
190
190
        address="/dev/log"))
191
191
    syslogger.setFormatter(logging.Formatter
192
 
                           ('Mandos [%(process)d]: %(levelname)s:'
193
 
                            ' %(message)s'))
194
 
    logger.addHandler(syslogger)
 
192
                           ("Mandos [%(process)d]: %(levelname)s:"
 
193
                            " %(message)s"))
 
194
    log.addHandler(syslogger)
195
195
 
196
196
    if debug:
197
197
        console = logging.StreamHandler()
198
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
199
 
                                               ' [%(process)d]:'
200
 
                                               ' %(levelname)s:'
201
 
                                               ' %(message)s'))
202
 
        logger.addHandler(console)
203
 
    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)
204
204
 
205
205
 
206
206
class PGPError(Exception):
224
224
        except OSError as e:
225
225
            if e.errno != errno.ENOENT:
226
226
                raise
227
 
        self.gnupgargs = ['--batch',
228
 
                          '--homedir', self.tempdir,
229
 
                          '--force-mdc',
230
 
                          '--quiet']
 
227
        self.gnupgargs = ["--batch",
 
228
                          "--homedir", self.tempdir,
 
229
                          "--force-mdc",
 
230
                          "--quiet"]
231
231
        # Only GPG version 1 has the --no-use-agent option.
232
232
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
233
233
            self.gnupgargs.append("--no-use-agent")
272
272
                dir=self.tempdir) as passfile:
273
273
            passfile.write(passphrase)
274
274
            passfile.flush()
275
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
276
 
                                     '--passphrase-file',
 
275
            proc = subprocess.Popen([self.gpg, "--symmetric",
 
276
                                     "--passphrase-file",
277
277
                                     passfile.name]
278
278
                                    + self.gnupgargs,
279
279
                                    stdin=subprocess.PIPE,
290
290
                dir=self.tempdir) as passfile:
291
291
            passfile.write(passphrase)
292
292
            passfile.flush()
293
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
294
 
                                     '--passphrase-file',
 
293
            proc = subprocess.Popen([self.gpg, "--decrypt",
 
294
                                     "--passphrase-file",
295
295
                                     passfile.name]
296
296
                                    + self.gnupgargs,
297
297
                                    stdin=subprocess.PIPE,
350
350
    Attributes:
351
351
    interface: integer; avahi.IF_UNSPEC or an interface index.
352
352
               Used to optionally bind to the specified interface.
353
 
    name: string; Example: 'Mandos'
354
 
    type: string; Example: '_mandos._tcp'.
 
353
    name: string; Example: "Mandos"
 
354
    type: string; Example: "_mandos._tcp".
355
355
     See <https://www.iana.org/assignments/service-names-port-numbers>
356
356
    port: integer; what port to announce
357
357
    TXT: list of strings; TXT record for the service
394
394
    def rename(self, remove=True):
395
395
        """Derived from the Avahi example code"""
396
396
        if self.rename_count >= self.max_renames:
397
 
            logger.critical("No suitable Zeroconf service name found"
398
 
                            " after %i retries, exiting.",
399
 
                            self.rename_count)
 
397
            log.critical("No suitable Zeroconf service name found"
 
398
                         " after %i retries, exiting.",
 
399
                         self.rename_count)
400
400
            raise AvahiServiceError("Too many renames")
401
401
        self.name = str(
402
402
            self.server.GetAlternativeServiceName(self.name))
403
403
        self.rename_count += 1
404
 
        logger.info("Changing Zeroconf service name to %r ...",
405
 
                    self.name)
 
404
        log.info("Changing Zeroconf service name to %r ...",
 
405
                 self.name)
406
406
        if remove:
407
407
            self.remove()
408
408
        try:
410
410
        except dbus.exceptions.DBusException as error:
411
411
            if (error.get_dbus_name()
412
412
                == "org.freedesktop.Avahi.CollisionError"):
413
 
                logger.info("Local Zeroconf service name collision.")
 
413
                log.info("Local Zeroconf service name collision.")
414
414
                return self.rename(remove=False)
415
415
            else:
416
 
                logger.critical("D-Bus Exception", exc_info=error)
 
416
                log.critical("D-Bus Exception", exc_info=error)
417
417
                self.cleanup()
418
418
                os._exit(1)
419
419
 
435
435
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
436
436
        self.entry_group_state_changed_match = (
437
437
            self.group.connect_to_signal(
438
 
                'StateChanged', self.entry_group_state_changed))
439
 
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
440
 
                     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)
441
441
        self.group.AddService(
442
442
            self.interface,
443
443
            self.protocol,
450
450
 
451
451
    def entry_group_state_changed(self, state, error):
452
452
        """Derived from the Avahi example code"""
453
 
        logger.debug("Avahi entry group state change: %i", state)
 
453
        log.debug("Avahi entry group state change: %i", state)
454
454
 
455
455
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
456
 
            logger.debug("Zeroconf service established.")
 
456
            log.debug("Zeroconf service established.")
457
457
        elif state == avahi.ENTRY_GROUP_COLLISION:
458
 
            logger.info("Zeroconf service name collision.")
 
458
            log.info("Zeroconf service name collision.")
459
459
            self.rename()
460
460
        elif state == avahi.ENTRY_GROUP_FAILURE:
461
 
            logger.critical("Avahi: Error in group state changed %s",
462
 
                            str(error))
 
461
            log.critical("Avahi: Error in group state changed %s",
 
462
                         str(error))
463
463
            raise AvahiGroupError("State changed: {!s}".format(error))
464
464
 
465
465
    def cleanup(self):
475
475
 
476
476
    def server_state_changed(self, state, error=None):
477
477
        """Derived from the Avahi example code"""
478
 
        logger.debug("Avahi server state change: %i", state)
 
478
        log.debug("Avahi server state change: %i", state)
479
479
        bad_states = {
480
480
            avahi.SERVER_INVALID: "Zeroconf server invalid",
481
481
            avahi.SERVER_REGISTERING: None,
485
485
        if state in bad_states:
486
486
            if bad_states[state] is not None:
487
487
                if error is None:
488
 
                    logger.error(bad_states[state])
 
488
                    log.error(bad_states[state])
489
489
                else:
490
 
                    logger.error(bad_states[state] + ": %r", error)
 
490
                    log.error(bad_states[state] + ": %r", error)
491
491
            self.cleanup()
492
492
        elif state == avahi.SERVER_RUNNING:
493
493
            try:
495
495
            except dbus.exceptions.DBusException as error:
496
496
                if (error.get_dbus_name()
497
497
                    == "org.freedesktop.Avahi.CollisionError"):
498
 
                    logger.info("Local Zeroconf service name"
499
 
                                " collision.")
 
498
                    log.info("Local Zeroconf service name collision.")
500
499
                    return self.rename(remove=False)
501
500
                else:
502
 
                    logger.critical("D-Bus Exception", exc_info=error)
 
501
                    log.critical("D-Bus Exception", exc_info=error)
503
502
                    self.cleanup()
504
503
                    os._exit(1)
505
504
        else:
506
505
            if error is None:
507
 
                logger.debug("Unknown state: %r", state)
 
506
                log.debug("Unknown state: %r", state)
508
507
            else:
509
 
                logger.debug("Unknown state: %r: %r", state, error)
 
508
                log.debug("Unknown state: %r: %r", state, error)
510
509
 
511
510
    def activate(self):
512
511
        """Derived from the Avahi example code"""
524
523
class AvahiServiceToSyslog(AvahiService):
525
524
    def rename(self, *args, **kwargs):
526
525
        """Add the new name to the syslog messages"""
527
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
526
        ret = super(AvahiServiceToSyslog, self).rename(*args,
 
527
                                                       **kwargs)
528
528
        syslogger.setFormatter(logging.Formatter(
529
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
529
            "Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
530
530
            .format(self.name)))
531
531
        return ret
532
532
 
562
562
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
563
563
 
564
564
    # Types
565
 
    class session_int(ctypes.Structure):
 
565
    class _session_int(ctypes.Structure):
566
566
        _fields_ = []
567
 
    session_t = ctypes.POINTER(session_int)
 
567
    session_t = ctypes.POINTER(_session_int)
568
568
 
569
569
    class certificate_credentials_st(ctypes.Structure):
570
570
        _fields_ = []
573
573
    certificate_type_t = ctypes.c_int
574
574
 
575
575
    class datum_t(ctypes.Structure):
576
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
577
 
                    ('size', ctypes.c_uint)]
 
576
        _fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
 
577
                    ("size", ctypes.c_uint)]
578
578
 
579
 
    class openpgp_crt_int(ctypes.Structure):
 
579
    class _openpgp_crt_int(ctypes.Structure):
580
580
        _fields_ = []
581
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
 
581
    openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
582
582
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
583
583
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
584
584
    credentials_type_t = ctypes.c_int
593
593
            # gnutls.strerror()
594
594
            self.code = code
595
595
            if message is None and code is not None:
596
 
                message = gnutls.strerror(code)
 
596
                message = gnutls.strerror(code).decode(
 
597
                    "utf-8", errors="replace")
597
598
            return super(gnutls.Error, self).__init__(
598
599
                message, *args)
599
600
 
600
601
    class CertificateSecurityError(Error):
601
602
        pass
602
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
 
603
629
    # Classes
604
 
    class Credentials:
 
630
    class Credentials(With_from_param):
605
631
        def __init__(self):
606
 
            self._c_object = gnutls.certificate_credentials_t()
607
 
            gnutls.certificate_allocate_credentials(
608
 
                ctypes.byref(self._c_object))
 
632
            self._as_parameter_ = gnutls.certificate_credentials_t()
 
633
            gnutls.certificate_allocate_credentials(self)
609
634
            self.type = gnutls.CRD_CERTIFICATE
610
635
 
611
636
        def __del__(self):
612
 
            gnutls.certificate_free_credentials(self._c_object)
 
637
            gnutls.certificate_free_credentials(self)
613
638
 
614
 
    class ClientSession:
 
639
    class ClientSession(With_from_param):
615
640
        def __init__(self, socket, credentials=None):
616
 
            self._c_object = gnutls.session_t()
 
641
            self._as_parameter_ = gnutls.session_t()
617
642
            gnutls_flags = gnutls.CLIENT
618
643
            if gnutls.check_version(b"3.5.6"):
619
644
                gnutls_flags |= gnutls.NO_TICKETS
620
645
            if gnutls.has_rawpk:
621
646
                gnutls_flags |= gnutls.ENABLE_RAWPK
622
 
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
 
647
            gnutls.init(self, gnutls_flags)
623
648
            del gnutls_flags
624
 
            gnutls.set_default_priority(self._c_object)
625
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
626
 
            gnutls.handshake_set_private_extensions(self._c_object,
627
 
                                                    True)
 
649
            gnutls.set_default_priority(self)
 
650
            gnutls.transport_set_ptr(self, socket.fileno())
 
651
            gnutls.handshake_set_private_extensions(self, True)
628
652
            self.socket = socket
629
653
            if credentials is None:
630
654
                credentials = gnutls.Credentials()
631
 
            gnutls.credentials_set(self._c_object, credentials.type,
632
 
                                   ctypes.cast(credentials._c_object,
633
 
                                               ctypes.c_void_p))
 
655
            gnutls.credentials_set(self, credentials.type,
 
656
                                   credentials)
634
657
            self.credentials = credentials
635
658
 
636
659
        def __del__(self):
637
 
            gnutls.deinit(self._c_object)
 
660
            gnutls.deinit(self)
638
661
 
639
662
        def handshake(self):
640
 
            return gnutls.handshake(self._c_object)
 
663
            return gnutls.handshake(self)
641
664
 
642
665
        def send(self, data):
643
666
            data = bytes(data)
644
667
            data_len = len(data)
645
668
            while data_len > 0:
646
 
                data_len -= gnutls.record_send(self._c_object,
647
 
                                               data[-data_len:],
 
669
                data_len -= gnutls.record_send(self, data[-data_len:],
648
670
                                               data_len)
649
671
 
650
672
        def bye(self):
651
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
 
673
            return gnutls.bye(self, gnutls.SHUT_RDWR)
652
674
 
653
675
    # Error handling functions
654
676
    def _error_code(result):
655
677
        """A function to raise exceptions on errors, suitable
656
 
        for the 'restype' attribute on ctypes functions"""
657
 
        if result >= 0:
 
678
        for the "restype" attribute on ctypes functions"""
 
679
        if result >= gnutls.E_SUCCESS:
658
680
            return result
659
681
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
660
682
            raise gnutls.CertificateSecurityError(code=result)
661
683
        raise gnutls.Error(code=result)
662
684
 
663
 
    def _retry_on_error(result, func, arguments):
 
685
    def _retry_on_error(result, func, arguments,
 
686
                        _error_code=_error_code):
664
687
        """A function to retry on some errors, suitable
665
 
        for the 'errcheck' attribute on ctypes functions"""
666
 
        while result < 0:
 
688
        for the "errcheck" attribute on ctypes functions"""
 
689
        while result < gnutls.E_SUCCESS:
667
690
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
668
691
                return _error_code(result)
669
692
            result = func(*arguments)
674
697
 
675
698
    # Functions
676
699
    priority_set_direct = _library.gnutls_priority_set_direct
677
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
 
700
    priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
678
701
                                    ctypes.POINTER(ctypes.c_char_p)]
679
702
    priority_set_direct.restype = _error_code
680
703
 
681
704
    init = _library.gnutls_init
682
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
 
705
    init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
683
706
    init.restype = _error_code
684
707
 
685
708
    set_default_priority = _library.gnutls_set_default_priority
686
 
    set_default_priority.argtypes = [session_t]
 
709
    set_default_priority.argtypes = [ClientSession]
687
710
    set_default_priority.restype = _error_code
688
711
 
689
712
    record_send = _library.gnutls_record_send
690
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
 
713
    record_send.argtypes = [ClientSession, ctypes.c_void_p,
691
714
                            ctypes.c_size_t]
692
715
    record_send.restype = ctypes.c_ssize_t
693
716
    record_send.errcheck = _retry_on_error
695
718
    certificate_allocate_credentials = (
696
719
        _library.gnutls_certificate_allocate_credentials)
697
720
    certificate_allocate_credentials.argtypes = [
698
 
        ctypes.POINTER(certificate_credentials_t)]
 
721
        PointerTo(Credentials)]
699
722
    certificate_allocate_credentials.restype = _error_code
700
723
 
701
724
    certificate_free_credentials = (
702
725
        _library.gnutls_certificate_free_credentials)
703
 
    certificate_free_credentials.argtypes = [
704
 
        certificate_credentials_t]
 
726
    certificate_free_credentials.argtypes = [Credentials]
705
727
    certificate_free_credentials.restype = None
706
728
 
707
729
    handshake_set_private_extensions = (
708
730
        _library.gnutls_handshake_set_private_extensions)
709
 
    handshake_set_private_extensions.argtypes = [session_t,
 
731
    handshake_set_private_extensions.argtypes = [ClientSession,
710
732
                                                 ctypes.c_int]
711
733
    handshake_set_private_extensions.restype = None
712
734
 
713
735
    credentials_set = _library.gnutls_credentials_set
714
 
    credentials_set.argtypes = [session_t, credentials_type_t,
715
 
                                ctypes.c_void_p]
 
736
    credentials_set.argtypes = [ClientSession, credentials_type_t,
 
737
                                CastToVoidPointer(Credentials)]
716
738
    credentials_set.restype = _error_code
717
739
 
718
740
    strerror = _library.gnutls_strerror
720
742
    strerror.restype = ctypes.c_char_p
721
743
 
722
744
    certificate_type_get = _library.gnutls_certificate_type_get
723
 
    certificate_type_get.argtypes = [session_t]
 
745
    certificate_type_get.argtypes = [ClientSession]
724
746
    certificate_type_get.restype = _error_code
725
747
 
726
748
    certificate_get_peers = _library.gnutls_certificate_get_peers
727
 
    certificate_get_peers.argtypes = [session_t,
 
749
    certificate_get_peers.argtypes = [ClientSession,
728
750
                                      ctypes.POINTER(ctypes.c_uint)]
729
751
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
730
752
 
737
759
    global_set_log_function.restype = None
738
760
 
739
761
    deinit = _library.gnutls_deinit
740
 
    deinit.argtypes = [session_t]
 
762
    deinit.argtypes = [ClientSession]
741
763
    deinit.restype = None
742
764
 
743
765
    handshake = _library.gnutls_handshake
744
 
    handshake.argtypes = [session_t]
745
 
    handshake.restype = _error_code
 
766
    handshake.argtypes = [ClientSession]
 
767
    handshake.restype = ctypes.c_int
746
768
    handshake.errcheck = _retry_on_error
747
769
 
748
770
    transport_set_ptr = _library.gnutls_transport_set_ptr
749
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
 
771
    transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
750
772
    transport_set_ptr.restype = None
751
773
 
752
774
    bye = _library.gnutls_bye
753
 
    bye.argtypes = [session_t, close_request_t]
754
 
    bye.restype = _error_code
 
775
    bye.argtypes = [ClientSession, close_request_t]
 
776
    bye.restype = ctypes.c_int
755
777
    bye.errcheck = _retry_on_error
756
778
 
757
779
    check_version = _library.gnutls_check_version
774
796
 
775
797
        x509_crt_fmt_t = ctypes.c_int
776
798
 
777
 
        # All the function declarations below are from gnutls/abstract.h
 
799
        # All the function declarations below are from
 
800
        # gnutls/abstract.h
778
801
        pubkey_init = _library.gnutls_pubkey_init
779
802
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
780
803
        pubkey_init.restype = _error_code
794
817
        pubkey_deinit.argtypes = [pubkey_t]
795
818
        pubkey_deinit.restype = None
796
819
    else:
797
 
        # All the function declarations below are from gnutls/openpgp.h
 
820
        # All the function declarations below are from
 
821
        # gnutls/openpgp.h
798
822
 
799
823
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
800
824
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
806
830
                                       openpgp_crt_fmt_t]
807
831
        openpgp_crt_import.restype = _error_code
808
832
 
809
 
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
810
 
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
811
 
                                            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
        ]
812
840
        openpgp_crt_verify_self.restype = _error_code
813
841
 
814
842
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
825
853
 
826
854
    if check_version(b"3.6.4"):
827
855
        certificate_type_get2 = _library.gnutls_certificate_type_get2
828
 
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
 
856
        certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
829
857
        certificate_type_get2.restype = _error_code
830
858
 
831
859
    # Remove non-public functions
847
875
    """A representation of a client host served by this server.
848
876
 
849
877
    Attributes:
850
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
878
    approved:   bool(); None if not yet approved/disapproved
851
879
    approval_delay: datetime.timedelta(); Time to wait for approval
852
880
    approval_duration: datetime.timedelta(); Duration of one approval
853
881
    checker: multiprocessing.Process(); a running checker process used
854
 
             to see if the client lives. 'None' if no process is
 
882
             to see if the client lives. None if no process is
855
883
             running.
856
884
    checker_callback_tag: a GLib event source tag, or None
857
885
    checker_command: string; External command which is run to check
981
1009
            self.last_enabled = None
982
1010
            self.expires = None
983
1011
 
984
 
        logger.debug("Creating client %r", self.name)
985
 
        logger.debug("  Key ID: %s", self.key_id)
986
 
        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)
987
1015
        self.created = settings.get("created",
988
1016
                                    datetime.datetime.utcnow())
989
1017
 
1028
1056
        if not getattr(self, "enabled", False):
1029
1057
            return False
1030
1058
        if not quiet:
1031
 
            logger.info("Disabling client %s", self.name)
 
1059
            log.info("Disabling client %s", self.name)
1032
1060
        if getattr(self, "disable_initiator_tag", None) is not None:
1033
1061
            GLib.source_remove(self.disable_initiator_tag)
1034
1062
            self.disable_initiator_tag = None
1078
1106
            self.last_checker_status = returncode
1079
1107
            self.last_checker_signal = None
1080
1108
            if self.last_checker_status == 0:
1081
 
                logger.info("Checker for %(name)s succeeded",
1082
 
                            vars(self))
 
1109
                log.info("Checker for %(name)s succeeded", vars(self))
1083
1110
                self.checked_ok()
1084
1111
            else:
1085
 
                logger.info("Checker for %(name)s failed", vars(self))
 
1112
                log.info("Checker for %(name)s failed", vars(self))
1086
1113
        else:
1087
1114
            self.last_checker_status = -1
1088
1115
            self.last_checker_signal = -returncode
1089
 
            logger.warning("Checker for %(name)s crashed?",
1090
 
                           vars(self))
 
1116
            log.warning("Checker for %(name)s crashed?", vars(self))
1091
1117
        return False
1092
1118
 
1093
1119
    def checked_ok(self):
1127
1153
        # should be.
1128
1154
 
1129
1155
        if self.checker is not None and not self.checker.is_alive():
1130
 
            logger.warning("Checker was not alive; joining")
 
1156
            log.warning("Checker was not alive; joining")
1131
1157
            self.checker.join()
1132
1158
            self.checker = None
1133
1159
        # Start a new checker if needed
1139
1165
            try:
1140
1166
                command = self.checker_command % escaped_attrs
1141
1167
            except TypeError as error:
1142
 
                logger.error('Could not format string "%s"',
1143
 
                             self.checker_command,
1144
 
                             exc_info=error)
 
1168
                log.error('Could not format string "%s"',
 
1169
                          self.checker_command, exc_info=error)
1145
1170
                return True     # Try again later
1146
1171
            self.current_checker_command = command
1147
 
            logger.info("Starting checker %r for %s", command,
1148
 
                        self.name)
 
1172
            log.info("Starting checker %r for %s", command, self.name)
1149
1173
            # We don't need to redirect stdout and stderr, since
1150
1174
            # in normal mode, that is already done by daemon(),
1151
1175
            # and in debug mode we don't want to.  (Stdin is
1180
1204
            self.checker_callback_tag = None
1181
1205
        if getattr(self, "checker", None) is None:
1182
1206
            return
1183
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
1207
        log.debug("Stopping checker for %(name)s", vars(self))
1184
1208
        self.checker.terminate()
1185
1209
        self.checker = None
1186
1210
 
1213
1237
        func._dbus_name = func.__name__
1214
1238
        if func._dbus_name.endswith("_dbus_property"):
1215
1239
            func._dbus_name = func._dbus_name[:-14]
1216
 
        func._dbus_get_args_options = {'byte_arrays': byte_arrays}
 
1240
        func._dbus_get_args_options = {"byte_arrays": byte_arrays}
1217
1241
        return func
1218
1242
 
1219
1243
    return decorator
1308
1332
 
1309
1333
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1310
1334
                         out_signature="s",
1311
 
                         path_keyword='object_path',
1312
 
                         connection_keyword='connection')
 
1335
                         path_keyword="object_path",
 
1336
                         connection_keyword="connection")
1313
1337
    def Introspect(self, object_path, connection):
1314
1338
        """Overloading of standard D-Bus method.
1315
1339
 
1364
1388
            document.unlink()
1365
1389
        except (AttributeError, xml.dom.DOMException,
1366
1390
                xml.parsers.expat.ExpatError) as error:
1367
 
            logger.error("Failed to override Introspection method",
1368
 
                         exc_info=error)
 
1391
            log.error("Failed to override Introspection method",
 
1392
                      exc_info=error)
1369
1393
        return xmlstring
1370
1394
 
1371
1395
 
1468
1492
 
1469
1493
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1470
1494
                         out_signature="s",
1471
 
                         path_keyword='object_path',
1472
 
                         connection_keyword='connection')
 
1495
                         path_keyword="object_path",
 
1496
                         connection_keyword="connection")
1473
1497
    def Introspect(self, object_path, connection):
1474
1498
        """Overloading of standard D-Bus method.
1475
1499
 
1531
1555
            document.unlink()
1532
1556
        except (AttributeError, xml.dom.DOMException,
1533
1557
                xml.parsers.expat.ExpatError) as error:
1534
 
            logger.error("Failed to override Introspection method",
1535
 
                         exc_info=error)
 
1558
            log.error("Failed to override Introspection method",
 
1559
                      exc_info=error)
1536
1560
        return xmlstring
1537
1561
 
1538
1562
 
1570
1594
 
1571
1595
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1572
1596
                         out_signature="s",
1573
 
                         path_keyword='object_path',
1574
 
                         connection_keyword='connection')
 
1597
                         path_keyword="object_path",
 
1598
                         connection_keyword="connection")
1575
1599
    def Introspect(self, object_path, connection):
1576
1600
        """Overloading of standard D-Bus method.
1577
1601
 
1602
1626
            document.unlink()
1603
1627
        except (AttributeError, xml.dom.DOMException,
1604
1628
                xml.parsers.expat.ExpatError) as error:
1605
 
            logger.error("Failed to override Introspection method",
1606
 
                         exc_info=error)
 
1629
            log.error("Failed to override Introspection method",
 
1630
                      exc_info=error)
1607
1631
        return xmlstring
1608
1632
 
1609
1633
 
2243
2267
class ProxyClient:
2244
2268
    def __init__(self, child_pipe, key_id, fpr, address):
2245
2269
        self._pipe = child_pipe
2246
 
        self._pipe.send(('init', key_id, fpr, address))
 
2270
        self._pipe.send(("init", key_id, fpr, address))
2247
2271
        if not self._pipe.recv():
2248
2272
            raise KeyError(key_id or fpr)
2249
2273
 
2250
2274
    def __getattribute__(self, name):
2251
 
        if name == '_pipe':
 
2275
        if name == "_pipe":
2252
2276
            return super(ProxyClient, self).__getattribute__(name)
2253
 
        self._pipe.send(('getattr', name))
 
2277
        self._pipe.send(("getattr", name))
2254
2278
        data = self._pipe.recv()
2255
 
        if data[0] == 'data':
 
2279
        if data[0] == "data":
2256
2280
            return data[1]
2257
 
        if data[0] == 'function':
 
2281
        if data[0] == "function":
2258
2282
 
2259
2283
            def func(*args, **kwargs):
2260
 
                self._pipe.send(('funcall', name, args, kwargs))
 
2284
                self._pipe.send(("funcall", name, args, kwargs))
2261
2285
                return self._pipe.recv()[1]
2262
2286
 
2263
2287
            return func
2264
2288
 
2265
2289
    def __setattr__(self, name, value):
2266
 
        if name == '_pipe':
 
2290
        if name == "_pipe":
2267
2291
            return super(ProxyClient, self).__setattr__(name, value)
2268
 
        self._pipe.send(('setattr', name, value))
 
2292
        self._pipe.send(("setattr", name, value))
2269
2293
 
2270
2294
 
2271
2295
class ClientHandler(socketserver.BaseRequestHandler, object):
2276
2300
 
2277
2301
    def handle(self):
2278
2302
        with contextlib.closing(self.server.child_pipe) as child_pipe:
2279
 
            logger.info("TCP connection from: %s",
2280
 
                        str(self.client_address))
2281
 
            logger.debug("Pipe FD: %d",
2282
 
                         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())
2283
2306
 
2284
2307
            session = gnutls.ClientSession(self.request)
2285
2308
 
2286
 
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
2309
            # priority = ":".join(("NONE", "+VERS-TLS1.1",
2287
2310
            #                       "+AES-256-CBC", "+SHA1",
2288
2311
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
2289
2312
            #                       "+DHE-DSS"))
2291
2314
            priority = self.server.gnutls_priority
2292
2315
            if priority is None:
2293
2316
                priority = "NORMAL"
2294
 
            gnutls.priority_set_direct(session._c_object,
2295
 
                                       priority.encode("utf-8"),
2296
 
                                       None)
 
2317
            gnutls.priority_set_direct(session,
 
2318
                                       priority.encode("utf-8"), None)
2297
2319
 
2298
2320
            # Start communication using the Mandos protocol
2299
2321
            # Get protocol number
2300
2322
            line = self.request.makefile().readline()
2301
 
            logger.debug("Protocol version: %r", line)
 
2323
            log.debug("Protocol version: %r", line)
2302
2324
            try:
2303
2325
                if int(line.strip().split()[0]) > 1:
2304
2326
                    raise RuntimeError(line)
2305
2327
            except (ValueError, IndexError, RuntimeError) as error:
2306
 
                logger.error("Unknown protocol version: %s", error)
 
2328
                log.error("Unknown protocol version: %s", error)
2307
2329
                return
2308
2330
 
2309
2331
            # Start GnuTLS connection
2310
2332
            try:
2311
2333
                session.handshake()
2312
2334
            except gnutls.Error as error:
2313
 
                logger.warning("Handshake failed: %s", error)
 
2335
                log.warning("Handshake failed: %s", error)
2314
2336
                # Do not run session.bye() here: the session is not
2315
2337
                # established.  Just abandon the request.
2316
2338
                return
2317
 
            logger.debug("Handshake succeeded")
 
2339
            log.debug("Handshake succeeded")
2318
2340
 
2319
2341
            approval_required = False
2320
2342
            try:
2324
2346
                        key_id = self.key_id(
2325
2347
                            self.peer_certificate(session))
2326
2348
                    except (TypeError, gnutls.Error) as error:
2327
 
                        logger.warning("Bad certificate: %s", error)
 
2349
                        log.warning("Bad certificate: %s", error)
2328
2350
                        return
2329
 
                    logger.debug("Key ID: %s", key_id)
 
2351
                    log.debug("Key ID: %s",
 
2352
                              key_id.decode("utf-8",
 
2353
                                            errors="replace"))
2330
2354
 
2331
2355
                else:
2332
2356
                    key_id = b""
2334
2358
                        fpr = self.fingerprint(
2335
2359
                            self.peer_certificate(session))
2336
2360
                    except (TypeError, gnutls.Error) as error:
2337
 
                        logger.warning("Bad certificate: %s", error)
 
2361
                        log.warning("Bad certificate: %s", error)
2338
2362
                        return
2339
 
                    logger.debug("Fingerprint: %s", fpr)
 
2363
                    log.debug("Fingerprint: %s", fpr)
2340
2364
 
2341
2365
                try:
2342
2366
                    client = ProxyClient(child_pipe, key_id, fpr,
2351
2375
 
2352
2376
                while True:
2353
2377
                    if not client.enabled:
2354
 
                        logger.info("Client %s is disabled",
2355
 
                                    client.name)
 
2378
                        log.info("Client %s is disabled", client.name)
2356
2379
                        if self.server.use_dbus:
2357
2380
                            # Emit D-Bus signal
2358
2381
                            client.Rejected("Disabled")
2362
2385
                        # We are approved or approval is disabled
2363
2386
                        break
2364
2387
                    elif client.approved is None:
2365
 
                        logger.info("Client %s needs approval",
2366
 
                                    client.name)
 
2388
                        log.info("Client %s needs approval",
 
2389
                                 client.name)
2367
2390
                        if self.server.use_dbus:
2368
2391
                            # Emit D-Bus signal
2369
2392
                            client.NeedApproval(
2370
2393
                                client.approval_delay.total_seconds()
2371
2394
                                * 1000, client.approved_by_default)
2372
2395
                    else:
2373
 
                        logger.warning("Client %s was not approved",
2374
 
                                       client.name)
 
2396
                        log.warning("Client %s was not approved",
 
2397
                                    client.name)
2375
2398
                        if self.server.use_dbus:
2376
2399
                            # Emit D-Bus signal
2377
2400
                            client.Rejected("Denied")
2385
2408
                    time2 = datetime.datetime.now()
2386
2409
                    if (time2 - time) >= delay:
2387
2410
                        if not client.approved_by_default:
2388
 
                            logger.warning("Client %s timed out while"
2389
 
                                           " waiting for approval",
2390
 
                                           client.name)
 
2411
                            log.warning("Client %s timed out while"
 
2412
                                        " waiting for approval",
 
2413
                                        client.name)
2391
2414
                            if self.server.use_dbus:
2392
2415
                                # Emit D-Bus signal
2393
2416
                                client.Rejected("Approval timed out")
2400
2423
                try:
2401
2424
                    session.send(client.secret)
2402
2425
                except gnutls.Error as error:
2403
 
                    logger.warning("gnutls send failed",
2404
 
                                   exc_info=error)
 
2426
                    log.warning("gnutls send failed", exc_info=error)
2405
2427
                    return
2406
2428
 
2407
 
                logger.info("Sending secret to %s", client.name)
 
2429
                log.info("Sending secret to %s", client.name)
2408
2430
                # bump the timeout using extended_timeout
2409
2431
                client.bump_timeout(client.extended_timeout)
2410
2432
                if self.server.use_dbus:
2417
2439
                try:
2418
2440
                    session.bye()
2419
2441
                except gnutls.Error as error:
2420
 
                    logger.warning("GnuTLS bye failed",
2421
 
                                   exc_info=error)
 
2442
                    log.warning("GnuTLS bye failed", exc_info=error)
2422
2443
 
2423
2444
    @staticmethod
2424
2445
    def peer_certificate(session):
2425
2446
        "Return the peer's certificate as a bytestring"
2426
2447
        try:
2427
 
            cert_type = gnutls.certificate_type_get2(session._c_object,
2428
 
                                                     gnutls.CTYPE_PEERS)
 
2448
            cert_type = gnutls.certificate_type_get2(
 
2449
                session, gnutls.CTYPE_PEERS)
2429
2450
        except AttributeError:
2430
 
            cert_type = gnutls.certificate_type_get(session._c_object)
 
2451
            cert_type = gnutls.certificate_type_get(session)
2431
2452
        if gnutls.has_rawpk:
2432
2453
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2433
2454
        else:
2434
2455
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2435
2456
        # If not a valid certificate type...
2436
2457
        if cert_type not in valid_cert_types:
2437
 
            logger.info("Cert type %r not in %r", cert_type,
2438
 
                        valid_cert_types)
 
2458
            log.info("Cert type %r not in %r", cert_type,
 
2459
                     valid_cert_types)
2439
2460
            # ...return invalid data
2440
2461
            return b""
2441
2462
        list_size = ctypes.c_uint(1)
2442
2463
        cert_list = (gnutls.certificate_get_peers
2443
 
                     (session._c_object, ctypes.byref(list_size)))
 
2464
                     (session, ctypes.byref(list_size)))
2444
2465
        if not bool(cert_list) and list_size.value != 0:
2445
2466
            raise gnutls.Error("error getting peer certificate")
2446
2467
        if list_size.value == 0:
2468
2489
        buf = ctypes.create_string_buffer(32)
2469
2490
        buf_len = ctypes.c_size_t(len(buf))
2470
2491
        # Get the key ID from the raw public key into the buffer
2471
 
        gnutls.pubkey_get_key_id(pubkey,
2472
 
                                 gnutls.KEYID_USE_SHA256,
2473
 
                                 ctypes.cast(ctypes.byref(buf),
2474
 
                                             ctypes.POINTER(ctypes.c_ubyte)),
2475
 
                                 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))
2476
2498
        # Deinit the certificate
2477
2499
        gnutls.pubkey_deinit(pubkey)
2478
2500
 
2559
2581
 
2560
2582
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2561
2583
                     socketserver.TCPServer):
2562
 
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
2584
    """IPv6-capable TCP server.  Accepts None as address and/or port
2563
2585
 
2564
2586
    Attributes:
2565
2587
        enabled:        Boolean; whether this server is activated yet
2616
2638
            if SO_BINDTODEVICE is None:
2617
2639
                # Fall back to a hard-coded value which seems to be
2618
2640
                # common enough.
2619
 
                logger.warning("SO_BINDTODEVICE not found, trying 25")
 
2641
                log.warning("SO_BINDTODEVICE not found, trying 25")
2620
2642
                SO_BINDTODEVICE = 25
2621
2643
            try:
2622
2644
                self.socket.setsockopt(
2624
2646
                    (self.interface + "\0").encode("utf-8"))
2625
2647
            except socket.error as error:
2626
2648
                if error.errno == errno.EPERM:
2627
 
                    logger.error("No permission to bind to"
2628
 
                                 " interface %s", self.interface)
 
2649
                    log.error("No permission to bind to interface %s",
 
2650
                              self.interface)
2629
2651
                elif error.errno == errno.ENOPROTOOPT:
2630
 
                    logger.error("SO_BINDTODEVICE not available;"
2631
 
                                 " cannot bind to interface %s",
2632
 
                                 self.interface)
 
2652
                    log.error("SO_BINDTODEVICE not available; cannot"
 
2653
                              " bind to interface %s", self.interface)
2633
2654
                elif error.errno == errno.ENODEV:
2634
 
                    logger.error("Interface %s does not exist,"
2635
 
                                 " cannot bind", self.interface)
 
2655
                    log.error("Interface %s does not exist, cannot"
 
2656
                              " bind", self.interface)
2636
2657
                else:
2637
2658
                    raise
2638
2659
        # Only bind(2) the socket if we really need to.
2717
2738
        request = parent_pipe.recv()
2718
2739
        command = request[0]
2719
2740
 
2720
 
        if command == 'init':
 
2741
        if command == "init":
2721
2742
            key_id = request[1].decode("ascii")
2722
2743
            fpr = request[2].decode("ascii")
2723
2744
            address = request[3]
2724
2745
 
2725
2746
            for c in self.clients.values():
2726
 
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
 
2747
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
 
2748
                              "27AE41E4649B934CA495991B7852B855"):
2727
2749
                    continue
2728
2750
                if key_id and c.key_id == key_id:
2729
2751
                    client = c
2732
2754
                    client = c
2733
2755
                    break
2734
2756
            else:
2735
 
                logger.info("Client not found for key ID: %s, address"
2736
 
                            ": %s", key_id or fpr, address)
 
2757
                log.info("Client not found for key ID: %s, address:"
 
2758
                         " %s", key_id or fpr, address)
2737
2759
                if self.use_dbus:
2738
2760
                    # Emit D-Bus signal
2739
2761
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
2752
2774
            # remove the old hook in favor of the new above hook on
2753
2775
            # same fileno
2754
2776
            return False
2755
 
        if command == 'funcall':
 
2777
        if command == "funcall":
2756
2778
            funcname = request[1]
2757
2779
            args = request[2]
2758
2780
            kwargs = request[3]
2759
2781
 
2760
 
            parent_pipe.send(('data', getattr(client_object,
 
2782
            parent_pipe.send(("data", getattr(client_object,
2761
2783
                                              funcname)(*args,
2762
2784
                                                        **kwargs)))
2763
2785
 
2764
 
        if command == 'getattr':
 
2786
        if command == "getattr":
2765
2787
            attrname = request[1]
2766
2788
            if isinstance(client_object.__getattribute__(attrname),
2767
2789
                          collections.abc.Callable):
2768
 
                parent_pipe.send(('function', ))
 
2790
                parent_pipe.send(("function", ))
2769
2791
            else:
2770
2792
                parent_pipe.send((
2771
 
                    'data', client_object.__getattribute__(attrname)))
 
2793
                    "data", client_object.__getattribute__(attrname)))
2772
2794
 
2773
 
        if command == 'setattr':
 
2795
        if command == "setattr":
2774
2796
            attrname = request[1]
2775
2797
            value = request[2]
2776
2798
            setattr(client_object, attrname, value)
2781
2803
def rfc3339_duration_to_delta(duration):
2782
2804
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2783
2805
 
2784
 
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2785
 
    True
2786
 
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2787
 
    True
2788
 
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2789
 
    True
2790
 
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2791
 
    True
2792
 
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2793
 
    True
2794
 
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2795
 
    True
2796
 
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2797
 
    True
 
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
2798
2822
    """
2799
2823
 
2800
2824
    # Parsing an RFC 3339 duration with regular expressions is not
2880
2904
def string_to_delta(interval):
2881
2905
    """Parse a string and return a datetime.timedelta
2882
2906
 
2883
 
    >>> string_to_delta('7d') == datetime.timedelta(7)
2884
 
    True
2885
 
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
2886
 
    True
2887
 
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2888
 
    True
2889
 
    >>> string_to_delta('24h') == datetime.timedelta(1)
2890
 
    True
2891
 
    >>> string_to_delta('1w') == datetime.timedelta(7)
2892
 
    True
2893
 
    >>> string_to_delta('5m 30s') == 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)
2894
2918
    True
2895
2919
    """
2896
2920
 
3100
3124
 
3101
3125
    if server_settings["servicename"] != "Mandos":
3102
3126
        syslogger.setFormatter(
3103
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
3104
 
                              ' %(levelname)s: %(message)s'.format(
 
3127
            logging.Formatter("Mandos ({}) [%(process)d]:"
 
3128
                              " %(levelname)s: %(message)s".format(
3105
3129
                                  server_settings["servicename"])))
3106
3130
 
3107
3131
    # Parse config file with clients
3131
3155
        try:
3132
3156
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3133
3157
        except IOError as e:
3134
 
            logger.error("Could not open file %r", pidfilename,
3135
 
                         exc_info=e)
 
3158
            log.error("Could not open file %r", pidfilename,
 
3159
                      exc_info=e)
3136
3160
 
3137
3161
    for name, group in (("_mandos", "_mandos"),
3138
3162
                        ("mandos", "mandos"),
3149
3173
    try:
3150
3174
        os.setgid(gid)
3151
3175
        os.setuid(uid)
3152
 
        if debug:
3153
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
3154
 
                                                             gid))
 
3176
        log.debug("Did setuid/setgid to %s:%s", uid, gid)
3155
3177
    except OSError as error:
3156
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
3157
 
                       .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))
3158
3180
        if error.errno != errno.EPERM:
3159
3181
            raise
3160
3182
 
3167
3189
 
3168
3190
        @gnutls.log_func
3169
3191
        def debug_gnutls(level, string):
3170
 
            logger.debug("GnuTLS: %s", string[:-1])
 
3192
            log.debug("GnuTLS: %s",
 
3193
                      string[:-1].decode("utf-8", errors="replace"))
3171
3194
 
3172
3195
        gnutls.global_set_log_function(debug_gnutls)
3173
3196
 
3202
3225
                "se.bsnet.fukt.Mandos", bus,
3203
3226
                do_not_queue=True)
3204
3227
        except dbus.exceptions.DBusException as e:
3205
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
3228
            log.error("Disabling D-Bus:", exc_info=e)
3206
3229
            use_dbus = False
3207
3230
            server_settings["use_dbus"] = False
3208
3231
            tcp_server.use_dbus = False
3293
3316
            os.remove(stored_state_path)
3294
3317
        except IOError as e:
3295
3318
            if e.errno == errno.ENOENT:
3296
 
                logger.warning("Could not load persistent state:"
3297
 
                               " {}".format(os.strerror(e.errno)))
 
3319
                log.warning("Could not load persistent state:"
 
3320
                            " %s", os.strerror(e.errno))
3298
3321
            else:
3299
 
                logger.critical("Could not load persistent state:",
3300
 
                                exc_info=e)
 
3322
                log.critical("Could not load persistent state:",
 
3323
                             exc_info=e)
3301
3324
                raise
3302
3325
        except EOFError as e:
3303
 
            logger.warning("Could not load persistent state: "
3304
 
                           "EOFError:",
3305
 
                           exc_info=e)
 
3326
            log.warning("Could not load persistent state: EOFError:",
 
3327
                        exc_info=e)
3306
3328
 
3307
3329
    with PGPEngine() as pgp:
3308
3330
        for client_name, client in clients_data.items():
3335
3357
            if client["enabled"]:
3336
3358
                if datetime.datetime.utcnow() >= client["expires"]:
3337
3359
                    if not client["last_checked_ok"]:
3338
 
                        logger.warning(
3339
 
                            "disabling client {} - Client never "
3340
 
                            "performed a successful checker".format(
3341
 
                                client_name))
 
3360
                        log.warning("disabling client %s - Client"
 
3361
                                    " never performed a successful"
 
3362
                                    " checker", client_name)
3342
3363
                        client["enabled"] = False
3343
3364
                    elif client["last_checker_status"] != 0:
3344
 
                        logger.warning(
3345
 
                            "disabling client {} - Client last"
3346
 
                            " checker failed with error code"
3347
 
                            " {}".format(
3348
 
                                client_name,
3349
 
                                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"])
3350
3369
                        client["enabled"] = False
3351
3370
                    else:
3352
3371
                        client["expires"] = (
3353
3372
                            datetime.datetime.utcnow()
3354
3373
                            + client["timeout"])
3355
 
                        logger.debug("Last checker succeeded,"
3356
 
                                     " keeping {} enabled".format(
3357
 
                                         client_name))
 
3374
                        log.debug("Last checker succeeded, keeping %s"
 
3375
                                  " enabled", client_name)
3358
3376
            try:
3359
3377
                client["secret"] = pgp.decrypt(
3360
3378
                    client["encrypted_secret"],
3361
3379
                    client_settings[client_name]["secret"])
3362
3380
            except PGPError:
3363
3381
                # If decryption fails, we use secret from new settings
3364
 
                logger.debug("Failed to decrypt {} old secret".format(
3365
 
                    client_name))
 
3382
                log.debug("Failed to decrypt %s old secret",
 
3383
                          client_name)
3366
3384
                client["secret"] = (client_settings[client_name]
3367
3385
                                    ["secret"])
3368
3386
 
3382
3400
            server_settings=server_settings)
3383
3401
 
3384
3402
    if not tcp_server.clients:
3385
 
        logger.warning("No clients defined")
 
3403
        log.warning("No clients defined")
3386
3404
 
3387
3405
    if not foreground:
3388
3406
        if pidfile is not None:
3391
3409
                with pidfile:
3392
3410
                    print(pid, file=pidfile)
3393
3411
            except IOError:
3394
 
                logger.error("Could not write to file %r with PID %d",
3395
 
                             pidfilename, pid)
 
3412
                log.error("Could not write to file %r with PID %d",
 
3413
                          pidfilename, pid)
3396
3414
        del pidfile
3397
3415
        del pidfilename
3398
3416
 
3548
3566
 
3549
3567
        try:
3550
3568
            with tempfile.NamedTemporaryFile(
3551
 
                    mode='wb',
 
3569
                    mode="wb",
3552
3570
                    suffix=".pickle",
3553
 
                    prefix='clients-',
 
3571
                    prefix="clients-",
3554
3572
                    dir=os.path.dirname(stored_state_path),
3555
3573
                    delete=False) as stored_state:
3556
3574
                pickle.dump((clients, client_settings), stored_state,
3564
3582
                except NameError:
3565
3583
                    pass
3566
3584
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3567
 
                logger.warning("Could not save persistent state: {}"
3568
 
                               .format(os.strerror(e.errno)))
 
3585
                log.warning("Could not save persistent state: %s",
 
3586
                            os.strerror(e.errno))
3569
3587
            else:
3570
 
                logger.warning("Could not save persistent state:",
3571
 
                               exc_info=e)
 
3588
                log.warning("Could not save persistent state:",
 
3589
                            exc_info=e)
3572
3590
                raise
3573
3591
 
3574
3592
        # Delete all clients, and settings from config
3600
3618
    if zeroconf:
3601
3619
        service.port = tcp_server.socket.getsockname()[1]
3602
3620
    if use_ipv6:
3603
 
        logger.info("Now listening on address %r, port %d,"
3604
 
                    " flowinfo %d, scope_id %d",
3605
 
                    *tcp_server.socket.getsockname())
 
3621
        log.info("Now listening on address %r, port %d, flowinfo %d,"
 
3622
                 " scope_id %d", *tcp_server.socket.getsockname())
3606
3623
    else:                       # IPv4
3607
 
        logger.info("Now listening on address %r, port %d",
3608
 
                    *tcp_server.socket.getsockname())
 
3624
        log.info("Now listening on address %r, port %d",
 
3625
                 *tcp_server.socket.getsockname())
3609
3626
 
3610
3627
    # service.interface = tcp_server.socket.getsockname()[3]
3611
3628
 
3615
3632
            try:
3616
3633
                service.activate()
3617
3634
            except dbus.exceptions.DBusException as error:
3618
 
                logger.critical("D-Bus Exception", exc_info=error)
 
3635
                log.critical("D-Bus Exception", exc_info=error)
3619
3636
                cleanup()
3620
3637
                sys.exit(1)
3621
3638
            # End of Avahi example code
3626
3643
            lambda *args, **kwargs: (tcp_server.handle_request
3627
3644
                                     (*args[2:], **kwargs) or True))
3628
3645
 
3629
 
        logger.debug("Starting main loop")
 
3646
        log.debug("Starting main loop")
3630
3647
        main_loop.run()
3631
3648
    except AvahiError as error:
3632
 
        logger.critical("Avahi Error", exc_info=error)
 
3649
        log.critical("Avahi Error", exc_info=error)
3633
3650
        cleanup()
3634
3651
        sys.exit(1)
3635
3652
    except KeyboardInterrupt:
3636
3653
        if debug:
3637
3654
            print("", file=sys.stderr)
3638
 
        logger.debug("Server received KeyboardInterrupt")
3639
 
    logger.debug("Server exiting")
 
3655
        log.debug("Server received KeyboardInterrupt")
 
3656
    log.debug("Server exiting")
3640
3657
    # Must run before the D-Bus bus name gets deregistered
3641
3658
    cleanup()
3642
3659
 
3643
3660
 
3644
 
def should_only_run_tests():
 
3661
def parse_test_args():
 
3662
    # type: () -> argparse.Namespace
3645
3663
    parser = argparse.ArgumentParser(add_help=False)
3646
 
    parser.add_argument("--check", action='store_true')
 
3664
    parser.add_argument("--check", action="store_true")
 
3665
    parser.add_argument("--prefix", )
3647
3666
    args, unknown_args = parser.parse_known_args()
3648
 
    run_tests = args.check
3649
 
    if run_tests:
3650
 
        # Remove --check argument from sys.argv
 
3667
    if args.check:
 
3668
        # Remove test options from sys.argv
3651
3669
        sys.argv[1:] = unknown_args
3652
 
    return run_tests
 
3670
    return args
3653
3671
 
3654
3672
# Add all tests from doctest strings
3655
3673
def load_tests(loader, tests, none):
3657
3675
    tests.addTests(doctest.DocTestSuite())
3658
3676
    return tests
3659
3677
 
3660
 
if __name__ == '__main__':
 
3678
if __name__ == "__main__":
 
3679
    options = parse_test_args()
3661
3680
    try:
3662
 
        if should_only_run_tests():
3663
 
            # Call using ./mandos --check [--verbose]
3664
 
            unittest.main()
 
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=[""])
3665
3693
        else:
3666
3694
            main()
3667
3695
    finally:
3668
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: