/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 at recompile
  • Date: 2020-02-05 21:39:28 UTC
  • Revision ID: teddy@recompile.se-20200205213928-vpvt0fwfg47ikv6f
Allow users to alter ask-password-mandos.service

If a user uses dracut with systemd and wishes to modify the options
passed to password-agent(8mandos) or mandos-client(8mandos), they
should be able to do so by simply creating a file
/etc/systemd/system/ask-password-mandos.service.d/override.conf,
containing, for instance:

[Service]
Environment=MANDOS_CLIENT_OPTIONS=--debug

Adding PASSWORD_AGENT_OPTIONS should also be possible (but should not
normally be needed).

* dracut-module/ask-password-mandos.service ([Service]/ExecStart): Add
  $PASSWORD_AGENT_OPTIONS before "--" and "$MANDOS_CLIENT_OPTIONS" to
  end of line.
* dracut-module/module-setup.sh (install): Install all files named
  /etc/systemd/system/ask-password-mandos.service.d/*.conf if any
  exists.  Also add --dh-params before $MANDOS_CLIENT_OPTIONS instead
  of at end of line.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#!/usr/bin/python3 -bI
2
 
# -*- coding: utf-8; lexical-binding: t -*-
 
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 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
5
5
#
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
 
# Copyright © 2008-2020 Teddy Hogeborn
15
 
# Copyright © 2008-2020 Björn Påhlsson
 
14
# Copyright © 2008-2019 Teddy Hogeborn
 
15
# Copyright © 2008-2019 Björn Påhlsson
16
16
#
17
17
# This file is part of Mandos.
18
18
#
31
31
#
32
32
# Contact the authors at <mandos@recompile.se>.
33
33
#
 
34
 
34
35
from __future__ import (division, absolute_import, print_function,
35
36
                        unicode_literals)
36
37
 
39
40
except ImportError:
40
41
    pass
41
42
 
42
 
import sys
43
 
import unittest
44
 
import argparse
45
 
import logging
46
 
import os
47
43
try:
48
44
    import SocketServer as socketserver
49
45
except ImportError:
50
46
    import socketserver
51
47
import socket
 
48
import argparse
52
49
import datetime
53
50
import errno
54
51
try:
55
52
    import ConfigParser as configparser
56
53
except ImportError:
57
54
    import configparser
 
55
import sys
58
56
import re
 
57
import os
59
58
import signal
60
59
import subprocess
61
60
import atexit
62
61
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
80
81
import random
81
 
import shlex
82
82
 
83
83
import dbus
84
84
import dbus.service
93
93
if sys.version_info.major == 2:
94
94
    __metaclass__ = type
95
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
96
 
113
97
# Show warnings by default
114
98
if not sys.warnoptions:
143
127
if sys.version_info < (3, 2):
144
128
    configparser.Configparser = configparser.SafeConfigParser
145
129
 
146
 
version = "1.8.14"
 
130
version = "1.8.9"
147
131
stored_state_file = "clients.pickle"
148
132
 
149
 
log = logging.getLogger(os.path.basename(sys.argv[0]))
 
133
logger = logging.getLogger()
150
134
logging.captureWarnings(True)   # Show warnings via the logging system
151
135
syslogger = None
152
136
 
189
173
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
190
174
        address="/dev/log"))
191
175
    syslogger.setFormatter(logging.Formatter
192
 
                           ("Mandos [%(process)d]: %(levelname)s:"
193
 
                            " %(message)s"))
194
 
    log.addHandler(syslogger)
 
176
                           ('Mandos [%(process)d]: %(levelname)s:'
 
177
                            ' %(message)s'))
 
178
    logger.addHandler(syslogger)
195
179
 
196
180
    if debug:
197
181
        console = logging.StreamHandler()
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
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
183
                                               ' [%(process)d]:'
 
184
                                               ' %(levelname)s:'
 
185
                                               ' %(message)s'))
 
186
        logger.addHandler(console)
 
187
    logger.setLevel(level)
204
188
 
205
189
 
206
190
class PGPError(Exception):
224
208
        except OSError as e:
225
209
            if e.errno != errno.ENOENT:
226
210
                raise
227
 
        self.gnupgargs = ["--batch",
228
 
                          "--homedir", self.tempdir,
229
 
                          "--force-mdc",
230
 
                          "--quiet"]
 
211
        self.gnupgargs = ['--batch',
 
212
                          '--homedir', self.tempdir,
 
213
                          '--force-mdc',
 
214
                          '--quiet']
231
215
        # Only GPG version 1 has the --no-use-agent option.
232
216
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
233
217
            self.gnupgargs.append("--no-use-agent")
272
256
                dir=self.tempdir) as passfile:
273
257
            passfile.write(passphrase)
274
258
            passfile.flush()
275
 
            proc = subprocess.Popen([self.gpg, "--symmetric",
276
 
                                     "--passphrase-file",
 
259
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
260
                                     '--passphrase-file',
277
261
                                     passfile.name]
278
262
                                    + self.gnupgargs,
279
263
                                    stdin=subprocess.PIPE,
290
274
                dir=self.tempdir) as passfile:
291
275
            passfile.write(passphrase)
292
276
            passfile.flush()
293
 
            proc = subprocess.Popen([self.gpg, "--decrypt",
294
 
                                     "--passphrase-file",
 
277
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
278
                                     '--passphrase-file',
295
279
                                     passfile.name]
296
280
                                    + self.gnupgargs,
297
281
                                    stdin=subprocess.PIPE,
350
334
    Attributes:
351
335
    interface: integer; avahi.IF_UNSPEC or an interface index.
352
336
               Used to optionally bind to the specified interface.
353
 
    name: string; Example: "Mandos"
354
 
    type: string; Example: "_mandos._tcp".
 
337
    name: string; Example: 'Mandos'
 
338
    type: string; Example: '_mandos._tcp'.
355
339
     See <https://www.iana.org/assignments/service-names-port-numbers>
356
340
    port: integer; what port to announce
357
341
    TXT: list of strings; TXT record for the service
394
378
    def rename(self, remove=True):
395
379
        """Derived from the Avahi example code"""
396
380
        if self.rename_count >= self.max_renames:
397
 
            log.critical("No suitable Zeroconf service name found"
398
 
                         " after %i retries, exiting.",
399
 
                         self.rename_count)
 
381
            logger.critical("No suitable Zeroconf service name found"
 
382
                            " after %i retries, exiting.",
 
383
                            self.rename_count)
400
384
            raise AvahiServiceError("Too many renames")
401
385
        self.name = str(
402
386
            self.server.GetAlternativeServiceName(self.name))
403
387
        self.rename_count += 1
404
 
        log.info("Changing Zeroconf service name to %r ...",
405
 
                 self.name)
 
388
        logger.info("Changing Zeroconf service name to %r ...",
 
389
                    self.name)
406
390
        if remove:
407
391
            self.remove()
408
392
        try:
410
394
        except dbus.exceptions.DBusException as error:
411
395
            if (error.get_dbus_name()
412
396
                == "org.freedesktop.Avahi.CollisionError"):
413
 
                log.info("Local Zeroconf service name collision.")
 
397
                logger.info("Local Zeroconf service name collision.")
414
398
                return self.rename(remove=False)
415
399
            else:
416
 
                log.critical("D-Bus Exception", exc_info=error)
 
400
                logger.critical("D-Bus Exception", exc_info=error)
417
401
                self.cleanup()
418
402
                os._exit(1)
419
403
 
435
419
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
436
420
        self.entry_group_state_changed_match = (
437
421
            self.group.connect_to_signal(
438
 
                "StateChanged", self.entry_group_state_changed))
439
 
        log.debug("Adding Zeroconf service '%s' of type '%s' ...",
440
 
                  self.name, self.type)
 
422
                'StateChanged', self.entry_group_state_changed))
 
423
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
 
424
                     self.name, self.type)
441
425
        self.group.AddService(
442
426
            self.interface,
443
427
            self.protocol,
450
434
 
451
435
    def entry_group_state_changed(self, state, error):
452
436
        """Derived from the Avahi example code"""
453
 
        log.debug("Avahi entry group state change: %i", state)
 
437
        logger.debug("Avahi entry group state change: %i", state)
454
438
 
455
439
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
456
 
            log.debug("Zeroconf service established.")
 
440
            logger.debug("Zeroconf service established.")
457
441
        elif state == avahi.ENTRY_GROUP_COLLISION:
458
 
            log.info("Zeroconf service name collision.")
 
442
            logger.info("Zeroconf service name collision.")
459
443
            self.rename()
460
444
        elif state == avahi.ENTRY_GROUP_FAILURE:
461
 
            log.critical("Avahi: Error in group state changed %s",
462
 
                         str(error))
 
445
            logger.critical("Avahi: Error in group state changed %s",
 
446
                            str(error))
463
447
            raise AvahiGroupError("State changed: {!s}".format(error))
464
448
 
465
449
    def cleanup(self):
475
459
 
476
460
    def server_state_changed(self, state, error=None):
477
461
        """Derived from the Avahi example code"""
478
 
        log.debug("Avahi server state change: %i", state)
 
462
        logger.debug("Avahi server state change: %i", state)
479
463
        bad_states = {
480
464
            avahi.SERVER_INVALID: "Zeroconf server invalid",
481
465
            avahi.SERVER_REGISTERING: None,
485
469
        if state in bad_states:
486
470
            if bad_states[state] is not None:
487
471
                if error is None:
488
 
                    log.error(bad_states[state])
 
472
                    logger.error(bad_states[state])
489
473
                else:
490
 
                    log.error(bad_states[state] + ": %r", error)
 
474
                    logger.error(bad_states[state] + ": %r", error)
491
475
            self.cleanup()
492
476
        elif state == avahi.SERVER_RUNNING:
493
477
            try:
495
479
            except dbus.exceptions.DBusException as error:
496
480
                if (error.get_dbus_name()
497
481
                    == "org.freedesktop.Avahi.CollisionError"):
498
 
                    log.info("Local Zeroconf service name collision.")
 
482
                    logger.info("Local Zeroconf service name"
 
483
                                " collision.")
499
484
                    return self.rename(remove=False)
500
485
                else:
501
 
                    log.critical("D-Bus Exception", exc_info=error)
 
486
                    logger.critical("D-Bus Exception", exc_info=error)
502
487
                    self.cleanup()
503
488
                    os._exit(1)
504
489
        else:
505
490
            if error is None:
506
 
                log.debug("Unknown state: %r", state)
 
491
                logger.debug("Unknown state: %r", state)
507
492
            else:
508
 
                log.debug("Unknown state: %r: %r", state, error)
 
493
                logger.debug("Unknown state: %r: %r", state, error)
509
494
 
510
495
    def activate(self):
511
496
        """Derived from the Avahi example code"""
523
508
class AvahiServiceToSyslog(AvahiService):
524
509
    def rename(self, *args, **kwargs):
525
510
        """Add the new name to the syslog messages"""
526
 
        ret = super(AvahiServiceToSyslog, self).rename(*args,
527
 
                                                       **kwargs)
 
511
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
528
512
        syslogger.setFormatter(logging.Formatter(
529
 
            "Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
 
513
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
530
514
            .format(self.name)))
531
515
        return ret
532
516
 
562
546
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
563
547
 
564
548
    # Types
565
 
    class _session_int(ctypes.Structure):
 
549
    class session_int(ctypes.Structure):
566
550
        _fields_ = []
567
 
    session_t = ctypes.POINTER(_session_int)
 
551
    session_t = ctypes.POINTER(session_int)
568
552
 
569
553
    class certificate_credentials_st(ctypes.Structure):
570
554
        _fields_ = []
573
557
    certificate_type_t = ctypes.c_int
574
558
 
575
559
    class datum_t(ctypes.Structure):
576
 
        _fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
577
 
                    ("size", ctypes.c_uint)]
 
560
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
561
                    ('size', ctypes.c_uint)]
578
562
 
579
 
    class _openpgp_crt_int(ctypes.Structure):
 
563
    class openpgp_crt_int(ctypes.Structure):
580
564
        _fields_ = []
581
 
    openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
 
565
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
582
566
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
583
567
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
584
568
    credentials_type_t = ctypes.c_int
593
577
            # gnutls.strerror()
594
578
            self.code = code
595
579
            if message is None and code is not None:
596
 
                message = gnutls.strerror(code).decode(
597
 
                    "utf-8", errors="replace")
 
580
                message = gnutls.strerror(code)
598
581
            return super(gnutls.Error, self).__init__(
599
582
                message, *args)
600
583
 
601
584
    class CertificateSecurityError(Error):
602
585
        pass
603
586
 
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
 
 
629
587
    # Classes
630
 
    class Credentials(With_from_param):
 
588
    class Credentials:
631
589
        def __init__(self):
632
 
            self._as_parameter_ = gnutls.certificate_credentials_t()
633
 
            gnutls.certificate_allocate_credentials(self)
 
590
            self._c_object = gnutls.certificate_credentials_t()
 
591
            gnutls.certificate_allocate_credentials(
 
592
                ctypes.byref(self._c_object))
634
593
            self.type = gnutls.CRD_CERTIFICATE
635
594
 
636
595
        def __del__(self):
637
 
            gnutls.certificate_free_credentials(self)
 
596
            gnutls.certificate_free_credentials(self._c_object)
638
597
 
639
 
    class ClientSession(With_from_param):
 
598
    class ClientSession:
640
599
        def __init__(self, socket, credentials=None):
641
 
            self._as_parameter_ = gnutls.session_t()
 
600
            self._c_object = gnutls.session_t()
642
601
            gnutls_flags = gnutls.CLIENT
643
602
            if gnutls.check_version(b"3.5.6"):
644
603
                gnutls_flags |= gnutls.NO_TICKETS
645
604
            if gnutls.has_rawpk:
646
605
                gnutls_flags |= gnutls.ENABLE_RAWPK
647
 
            gnutls.init(self, gnutls_flags)
 
606
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
648
607
            del gnutls_flags
649
 
            gnutls.set_default_priority(self)
650
 
            gnutls.transport_set_ptr(self, socket.fileno())
651
 
            gnutls.handshake_set_private_extensions(self, True)
 
608
            gnutls.set_default_priority(self._c_object)
 
609
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
610
            gnutls.handshake_set_private_extensions(self._c_object,
 
611
                                                    True)
652
612
            self.socket = socket
653
613
            if credentials is None:
654
614
                credentials = gnutls.Credentials()
655
 
            gnutls.credentials_set(self, credentials.type,
656
 
                                   credentials)
 
615
            gnutls.credentials_set(self._c_object, credentials.type,
 
616
                                   ctypes.cast(credentials._c_object,
 
617
                                               ctypes.c_void_p))
657
618
            self.credentials = credentials
658
619
 
659
620
        def __del__(self):
660
 
            gnutls.deinit(self)
 
621
            gnutls.deinit(self._c_object)
661
622
 
662
623
        def handshake(self):
663
 
            return gnutls.handshake(self)
 
624
            return gnutls.handshake(self._c_object)
664
625
 
665
626
        def send(self, data):
666
627
            data = bytes(data)
667
628
            data_len = len(data)
668
629
            while data_len > 0:
669
 
                data_len -= gnutls.record_send(self, data[-data_len:],
 
630
                data_len -= gnutls.record_send(self._c_object,
 
631
                                               data[-data_len:],
670
632
                                               data_len)
671
633
 
672
634
        def bye(self):
673
 
            return gnutls.bye(self, gnutls.SHUT_RDWR)
 
635
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
674
636
 
675
637
    # Error handling functions
676
638
    def _error_code(result):
677
639
        """A function to raise exceptions on errors, suitable
678
 
        for the "restype" attribute on ctypes functions"""
679
 
        if result >= gnutls.E_SUCCESS:
 
640
        for the 'restype' attribute on ctypes functions"""
 
641
        if result >= 0:
680
642
            return result
681
643
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
682
644
            raise gnutls.CertificateSecurityError(code=result)
683
645
        raise gnutls.Error(code=result)
684
646
 
685
 
    def _retry_on_error(result, func, arguments,
686
 
                        _error_code=_error_code):
 
647
    def _retry_on_error(result, func, arguments):
687
648
        """A function to retry on some errors, suitable
688
 
        for the "errcheck" attribute on ctypes functions"""
689
 
        while result < gnutls.E_SUCCESS:
 
649
        for the 'errcheck' attribute on ctypes functions"""
 
650
        while result < 0:
690
651
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
691
652
                return _error_code(result)
692
653
            result = func(*arguments)
697
658
 
698
659
    # Functions
699
660
    priority_set_direct = _library.gnutls_priority_set_direct
700
 
    priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
 
661
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
701
662
                                    ctypes.POINTER(ctypes.c_char_p)]
702
663
    priority_set_direct.restype = _error_code
703
664
 
704
665
    init = _library.gnutls_init
705
 
    init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
 
666
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
706
667
    init.restype = _error_code
707
668
 
708
669
    set_default_priority = _library.gnutls_set_default_priority
709
 
    set_default_priority.argtypes = [ClientSession]
 
670
    set_default_priority.argtypes = [session_t]
710
671
    set_default_priority.restype = _error_code
711
672
 
712
673
    record_send = _library.gnutls_record_send
713
 
    record_send.argtypes = [ClientSession, ctypes.c_void_p,
 
674
    record_send.argtypes = [session_t, ctypes.c_void_p,
714
675
                            ctypes.c_size_t]
715
676
    record_send.restype = ctypes.c_ssize_t
716
677
    record_send.errcheck = _retry_on_error
718
679
    certificate_allocate_credentials = (
719
680
        _library.gnutls_certificate_allocate_credentials)
720
681
    certificate_allocate_credentials.argtypes = [
721
 
        PointerTo(Credentials)]
 
682
        ctypes.POINTER(certificate_credentials_t)]
722
683
    certificate_allocate_credentials.restype = _error_code
723
684
 
724
685
    certificate_free_credentials = (
725
686
        _library.gnutls_certificate_free_credentials)
726
 
    certificate_free_credentials.argtypes = [Credentials]
 
687
    certificate_free_credentials.argtypes = [
 
688
        certificate_credentials_t]
727
689
    certificate_free_credentials.restype = None
728
690
 
729
691
    handshake_set_private_extensions = (
730
692
        _library.gnutls_handshake_set_private_extensions)
731
 
    handshake_set_private_extensions.argtypes = [ClientSession,
 
693
    handshake_set_private_extensions.argtypes = [session_t,
732
694
                                                 ctypes.c_int]
733
695
    handshake_set_private_extensions.restype = None
734
696
 
735
697
    credentials_set = _library.gnutls_credentials_set
736
 
    credentials_set.argtypes = [ClientSession, credentials_type_t,
737
 
                                CastToVoidPointer(Credentials)]
 
698
    credentials_set.argtypes = [session_t, credentials_type_t,
 
699
                                ctypes.c_void_p]
738
700
    credentials_set.restype = _error_code
739
701
 
740
702
    strerror = _library.gnutls_strerror
742
704
    strerror.restype = ctypes.c_char_p
743
705
 
744
706
    certificate_type_get = _library.gnutls_certificate_type_get
745
 
    certificate_type_get.argtypes = [ClientSession]
 
707
    certificate_type_get.argtypes = [session_t]
746
708
    certificate_type_get.restype = _error_code
747
709
 
748
710
    certificate_get_peers = _library.gnutls_certificate_get_peers
749
 
    certificate_get_peers.argtypes = [ClientSession,
 
711
    certificate_get_peers.argtypes = [session_t,
750
712
                                      ctypes.POINTER(ctypes.c_uint)]
751
713
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
752
714
 
759
721
    global_set_log_function.restype = None
760
722
 
761
723
    deinit = _library.gnutls_deinit
762
 
    deinit.argtypes = [ClientSession]
 
724
    deinit.argtypes = [session_t]
763
725
    deinit.restype = None
764
726
 
765
727
    handshake = _library.gnutls_handshake
766
 
    handshake.argtypes = [ClientSession]
767
 
    handshake.restype = ctypes.c_int
 
728
    handshake.argtypes = [session_t]
 
729
    handshake.restype = _error_code
768
730
    handshake.errcheck = _retry_on_error
769
731
 
770
732
    transport_set_ptr = _library.gnutls_transport_set_ptr
771
 
    transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
 
733
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
772
734
    transport_set_ptr.restype = None
773
735
 
774
736
    bye = _library.gnutls_bye
775
 
    bye.argtypes = [ClientSession, close_request_t]
776
 
    bye.restype = ctypes.c_int
 
737
    bye.argtypes = [session_t, close_request_t]
 
738
    bye.restype = _error_code
777
739
    bye.errcheck = _retry_on_error
778
740
 
779
741
    check_version = _library.gnutls_check_version
796
758
 
797
759
        x509_crt_fmt_t = ctypes.c_int
798
760
 
799
 
        # All the function declarations below are from
800
 
        # gnutls/abstract.h
 
761
        # All the function declarations below are from gnutls/abstract.h
801
762
        pubkey_init = _library.gnutls_pubkey_init
802
763
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
803
764
        pubkey_init.restype = _error_code
817
778
        pubkey_deinit.argtypes = [pubkey_t]
818
779
        pubkey_deinit.restype = None
819
780
    else:
820
 
        # All the function declarations below are from
821
 
        # gnutls/openpgp.h
 
781
        # All the function declarations below are from gnutls/openpgp.h
822
782
 
823
783
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
824
784
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
830
790
                                       openpgp_crt_fmt_t]
831
791
        openpgp_crt_import.restype = _error_code
832
792
 
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
 
        ]
 
793
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
794
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
795
                                            ctypes.POINTER(ctypes.c_uint)]
840
796
        openpgp_crt_verify_self.restype = _error_code
841
797
 
842
798
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
853
809
 
854
810
    if check_version(b"3.6.4"):
855
811
        certificate_type_get2 = _library.gnutls_certificate_type_get2
856
 
        certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
 
812
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
857
813
        certificate_type_get2.restype = _error_code
858
814
 
859
815
    # Remove non-public functions
875
831
    """A representation of a client host served by this server.
876
832
 
877
833
    Attributes:
878
 
    approved:   bool(); None if not yet approved/disapproved
 
834
    approved:   bool(); 'None' if not yet approved/disapproved
879
835
    approval_delay: datetime.timedelta(); Time to wait for approval
880
836
    approval_duration: datetime.timedelta(); Duration of one approval
881
837
    checker: multiprocessing.Process(); a running checker process used
882
 
             to see if the client lives. None if no process is
 
838
             to see if the client lives. 'None' if no process is
883
839
             running.
884
840
    checker_callback_tag: a GLib event source tag, or None
885
841
    checker_command: string; External command which is run to check
1009
965
            self.last_enabled = None
1010
966
            self.expires = None
1011
967
 
1012
 
        log.debug("Creating client %r", self.name)
1013
 
        log.debug("  Key ID: %s", self.key_id)
1014
 
        log.debug("  Fingerprint: %s", self.fingerprint)
 
968
        logger.debug("Creating client %r", self.name)
 
969
        logger.debug("  Key ID: %s", self.key_id)
 
970
        logger.debug("  Fingerprint: %s", self.fingerprint)
1015
971
        self.created = settings.get("created",
1016
972
                                    datetime.datetime.utcnow())
1017
973
 
1056
1012
        if not getattr(self, "enabled", False):
1057
1013
            return False
1058
1014
        if not quiet:
1059
 
            log.info("Disabling client %s", self.name)
 
1015
            logger.info("Disabling client %s", self.name)
1060
1016
        if getattr(self, "disable_initiator_tag", None) is not None:
1061
1017
            GLib.source_remove(self.disable_initiator_tag)
1062
1018
            self.disable_initiator_tag = None
1106
1062
            self.last_checker_status = returncode
1107
1063
            self.last_checker_signal = None
1108
1064
            if self.last_checker_status == 0:
1109
 
                log.info("Checker for %(name)s succeeded", vars(self))
 
1065
                logger.info("Checker for %(name)s succeeded",
 
1066
                            vars(self))
1110
1067
                self.checked_ok()
1111
1068
            else:
1112
 
                log.info("Checker for %(name)s failed", vars(self))
 
1069
                logger.info("Checker for %(name)s failed", vars(self))
1113
1070
        else:
1114
1071
            self.last_checker_status = -1
1115
1072
            self.last_checker_signal = -returncode
1116
 
            log.warning("Checker for %(name)s crashed?", vars(self))
 
1073
            logger.warning("Checker for %(name)s crashed?",
 
1074
                           vars(self))
1117
1075
        return False
1118
1076
 
1119
1077
    def checked_ok(self):
1153
1111
        # should be.
1154
1112
 
1155
1113
        if self.checker is not None and not self.checker.is_alive():
1156
 
            log.warning("Checker was not alive; joining")
 
1114
            logger.warning("Checker was not alive; joining")
1157
1115
            self.checker.join()
1158
1116
            self.checker = None
1159
1117
        # Start a new checker if needed
1160
1118
        if self.checker is None:
1161
1119
            # Escape attributes for the shell
1162
1120
            escaped_attrs = {
1163
 
                attr: shlex.quote(str(getattr(self, attr)))
 
1121
                attr: re.escape(str(getattr(self, attr)))
1164
1122
                for attr in self.runtime_expansions}
1165
1123
            try:
1166
1124
                command = self.checker_command % escaped_attrs
1167
1125
            except TypeError as error:
1168
 
                log.error('Could not format string "%s"',
1169
 
                          self.checker_command, exc_info=error)
 
1126
                logger.error('Could not format string "%s"',
 
1127
                             self.checker_command,
 
1128
                             exc_info=error)
1170
1129
                return True     # Try again later
1171
1130
            self.current_checker_command = command
1172
 
            log.info("Starting checker %r for %s", command, self.name)
 
1131
            logger.info("Starting checker %r for %s", command,
 
1132
                        self.name)
1173
1133
            # We don't need to redirect stdout and stderr, since
1174
1134
            # in normal mode, that is already done by daemon(),
1175
1135
            # and in debug mode we don't want to.  (Stdin is
1204
1164
            self.checker_callback_tag = None
1205
1165
        if getattr(self, "checker", None) is None:
1206
1166
            return
1207
 
        log.debug("Stopping checker for %(name)s", vars(self))
 
1167
        logger.debug("Stopping checker for %(name)s", vars(self))
1208
1168
        self.checker.terminate()
1209
1169
        self.checker = None
1210
1170
 
1237
1197
        func._dbus_name = func.__name__
1238
1198
        if func._dbus_name.endswith("_dbus_property"):
1239
1199
            func._dbus_name = func._dbus_name[:-14]
1240
 
        func._dbus_get_args_options = {"byte_arrays": byte_arrays}
 
1200
        func._dbus_get_args_options = {'byte_arrays': byte_arrays}
1241
1201
        return func
1242
1202
 
1243
1203
    return decorator
1332
1292
 
1333
1293
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1334
1294
                         out_signature="s",
1335
 
                         path_keyword="object_path",
1336
 
                         connection_keyword="connection")
 
1295
                         path_keyword='object_path',
 
1296
                         connection_keyword='connection')
1337
1297
    def Introspect(self, object_path, connection):
1338
1298
        """Overloading of standard D-Bus method.
1339
1299
 
1388
1348
            document.unlink()
1389
1349
        except (AttributeError, xml.dom.DOMException,
1390
1350
                xml.parsers.expat.ExpatError) as error:
1391
 
            log.error("Failed to override Introspection method",
1392
 
                      exc_info=error)
 
1351
            logger.error("Failed to override Introspection method",
 
1352
                         exc_info=error)
1393
1353
        return xmlstring
1394
1354
 
1395
1355
 
1492
1452
 
1493
1453
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1494
1454
                         out_signature="s",
1495
 
                         path_keyword="object_path",
1496
 
                         connection_keyword="connection")
 
1455
                         path_keyword='object_path',
 
1456
                         connection_keyword='connection')
1497
1457
    def Introspect(self, object_path, connection):
1498
1458
        """Overloading of standard D-Bus method.
1499
1459
 
1555
1515
            document.unlink()
1556
1516
        except (AttributeError, xml.dom.DOMException,
1557
1517
                xml.parsers.expat.ExpatError) as error:
1558
 
            log.error("Failed to override Introspection method",
1559
 
                      exc_info=error)
 
1518
            logger.error("Failed to override Introspection method",
 
1519
                         exc_info=error)
1560
1520
        return xmlstring
1561
1521
 
1562
1522
 
1594
1554
 
1595
1555
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1596
1556
                         out_signature="s",
1597
 
                         path_keyword="object_path",
1598
 
                         connection_keyword="connection")
 
1557
                         path_keyword='object_path',
 
1558
                         connection_keyword='connection')
1599
1559
    def Introspect(self, object_path, connection):
1600
1560
        """Overloading of standard D-Bus method.
1601
1561
 
1626
1586
            document.unlink()
1627
1587
        except (AttributeError, xml.dom.DOMException,
1628
1588
                xml.parsers.expat.ExpatError) as error:
1629
 
            log.error("Failed to override Introspection method",
1630
 
                      exc_info=error)
 
1589
            logger.error("Failed to override Introspection method",
 
1590
                         exc_info=error)
1631
1591
        return xmlstring
1632
1592
 
1633
1593
 
2267
2227
class ProxyClient:
2268
2228
    def __init__(self, child_pipe, key_id, fpr, address):
2269
2229
        self._pipe = child_pipe
2270
 
        self._pipe.send(("init", key_id, fpr, address))
 
2230
        self._pipe.send(('init', key_id, fpr, address))
2271
2231
        if not self._pipe.recv():
2272
2232
            raise KeyError(key_id or fpr)
2273
2233
 
2274
2234
    def __getattribute__(self, name):
2275
 
        if name == "_pipe":
 
2235
        if name == '_pipe':
2276
2236
            return super(ProxyClient, self).__getattribute__(name)
2277
 
        self._pipe.send(("getattr", name))
 
2237
        self._pipe.send(('getattr', name))
2278
2238
        data = self._pipe.recv()
2279
 
        if data[0] == "data":
 
2239
        if data[0] == 'data':
2280
2240
            return data[1]
2281
 
        if data[0] == "function":
 
2241
        if data[0] == 'function':
2282
2242
 
2283
2243
            def func(*args, **kwargs):
2284
 
                self._pipe.send(("funcall", name, args, kwargs))
 
2244
                self._pipe.send(('funcall', name, args, kwargs))
2285
2245
                return self._pipe.recv()[1]
2286
2246
 
2287
2247
            return func
2288
2248
 
2289
2249
    def __setattr__(self, name, value):
2290
 
        if name == "_pipe":
 
2250
        if name == '_pipe':
2291
2251
            return super(ProxyClient, self).__setattr__(name, value)
2292
 
        self._pipe.send(("setattr", name, value))
 
2252
        self._pipe.send(('setattr', name, value))
2293
2253
 
2294
2254
 
2295
2255
class ClientHandler(socketserver.BaseRequestHandler, object):
2300
2260
 
2301
2261
    def handle(self):
2302
2262
        with contextlib.closing(self.server.child_pipe) as child_pipe:
2303
 
            log.info("TCP connection from: %s",
2304
 
                     str(self.client_address))
2305
 
            log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
 
2263
            logger.info("TCP connection from: %s",
 
2264
                        str(self.client_address))
 
2265
            logger.debug("Pipe FD: %d",
 
2266
                         self.server.child_pipe.fileno())
2306
2267
 
2307
2268
            session = gnutls.ClientSession(self.request)
2308
2269
 
2309
 
            # priority = ":".join(("NONE", "+VERS-TLS1.1",
 
2270
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
2310
2271
            #                       "+AES-256-CBC", "+SHA1",
2311
2272
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
2312
2273
            #                       "+DHE-DSS"))
2314
2275
            priority = self.server.gnutls_priority
2315
2276
            if priority is None:
2316
2277
                priority = "NORMAL"
2317
 
            gnutls.priority_set_direct(session,
2318
 
                                       priority.encode("utf-8"), None)
 
2278
            gnutls.priority_set_direct(session._c_object,
 
2279
                                       priority.encode("utf-8"),
 
2280
                                       None)
2319
2281
 
2320
2282
            # Start communication using the Mandos protocol
2321
2283
            # Get protocol number
2322
2284
            line = self.request.makefile().readline()
2323
 
            log.debug("Protocol version: %r", line)
 
2285
            logger.debug("Protocol version: %r", line)
2324
2286
            try:
2325
2287
                if int(line.strip().split()[0]) > 1:
2326
2288
                    raise RuntimeError(line)
2327
2289
            except (ValueError, IndexError, RuntimeError) as error:
2328
 
                log.error("Unknown protocol version: %s", error)
 
2290
                logger.error("Unknown protocol version: %s", error)
2329
2291
                return
2330
2292
 
2331
2293
            # Start GnuTLS connection
2332
2294
            try:
2333
2295
                session.handshake()
2334
2296
            except gnutls.Error as error:
2335
 
                log.warning("Handshake failed: %s", error)
 
2297
                logger.warning("Handshake failed: %s", error)
2336
2298
                # Do not run session.bye() here: the session is not
2337
2299
                # established.  Just abandon the request.
2338
2300
                return
2339
 
            log.debug("Handshake succeeded")
 
2301
            logger.debug("Handshake succeeded")
2340
2302
 
2341
2303
            approval_required = False
2342
2304
            try:
2346
2308
                        key_id = self.key_id(
2347
2309
                            self.peer_certificate(session))
2348
2310
                    except (TypeError, gnutls.Error) as error:
2349
 
                        log.warning("Bad certificate: %s", error)
 
2311
                        logger.warning("Bad certificate: %s", error)
2350
2312
                        return
2351
 
                    log.debug("Key ID: %s",
2352
 
                              key_id.decode("utf-8",
2353
 
                                            errors="replace"))
 
2313
                    logger.debug("Key ID: %s", key_id)
2354
2314
 
2355
2315
                else:
2356
2316
                    key_id = b""
2358
2318
                        fpr = self.fingerprint(
2359
2319
                            self.peer_certificate(session))
2360
2320
                    except (TypeError, gnutls.Error) as error:
2361
 
                        log.warning("Bad certificate: %s", error)
 
2321
                        logger.warning("Bad certificate: %s", error)
2362
2322
                        return
2363
 
                    log.debug("Fingerprint: %s", fpr)
 
2323
                    logger.debug("Fingerprint: %s", fpr)
2364
2324
 
2365
2325
                try:
2366
2326
                    client = ProxyClient(child_pipe, key_id, fpr,
2375
2335
 
2376
2336
                while True:
2377
2337
                    if not client.enabled:
2378
 
                        log.info("Client %s is disabled", client.name)
 
2338
                        logger.info("Client %s is disabled",
 
2339
                                    client.name)
2379
2340
                        if self.server.use_dbus:
2380
2341
                            # Emit D-Bus signal
2381
2342
                            client.Rejected("Disabled")
2385
2346
                        # We are approved or approval is disabled
2386
2347
                        break
2387
2348
                    elif client.approved is None:
2388
 
                        log.info("Client %s needs approval",
2389
 
                                 client.name)
 
2349
                        logger.info("Client %s needs approval",
 
2350
                                    client.name)
2390
2351
                        if self.server.use_dbus:
2391
2352
                            # Emit D-Bus signal
2392
2353
                            client.NeedApproval(
2393
2354
                                client.approval_delay.total_seconds()
2394
2355
                                * 1000, client.approved_by_default)
2395
2356
                    else:
2396
 
                        log.warning("Client %s was not approved",
2397
 
                                    client.name)
 
2357
                        logger.warning("Client %s was not approved",
 
2358
                                       client.name)
2398
2359
                        if self.server.use_dbus:
2399
2360
                            # Emit D-Bus signal
2400
2361
                            client.Rejected("Denied")
2408
2369
                    time2 = datetime.datetime.now()
2409
2370
                    if (time2 - time) >= delay:
2410
2371
                        if not client.approved_by_default:
2411
 
                            log.warning("Client %s timed out while"
2412
 
                                        " waiting for approval",
2413
 
                                        client.name)
 
2372
                            logger.warning("Client %s timed out while"
 
2373
                                           " waiting for approval",
 
2374
                                           client.name)
2414
2375
                            if self.server.use_dbus:
2415
2376
                                # Emit D-Bus signal
2416
2377
                                client.Rejected("Approval timed out")
2423
2384
                try:
2424
2385
                    session.send(client.secret)
2425
2386
                except gnutls.Error as error:
2426
 
                    log.warning("gnutls send failed", exc_info=error)
 
2387
                    logger.warning("gnutls send failed",
 
2388
                                   exc_info=error)
2427
2389
                    return
2428
2390
 
2429
 
                log.info("Sending secret to %s", client.name)
 
2391
                logger.info("Sending secret to %s", client.name)
2430
2392
                # bump the timeout using extended_timeout
2431
2393
                client.bump_timeout(client.extended_timeout)
2432
2394
                if self.server.use_dbus:
2439
2401
                try:
2440
2402
                    session.bye()
2441
2403
                except gnutls.Error as error:
2442
 
                    log.warning("GnuTLS bye failed", exc_info=error)
 
2404
                    logger.warning("GnuTLS bye failed",
 
2405
                                   exc_info=error)
2443
2406
 
2444
2407
    @staticmethod
2445
2408
    def peer_certificate(session):
2446
2409
        "Return the peer's certificate as a bytestring"
2447
2410
        try:
2448
 
            cert_type = gnutls.certificate_type_get2(
2449
 
                session, gnutls.CTYPE_PEERS)
 
2411
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
2412
                                                     gnutls.CTYPE_PEERS)
2450
2413
        except AttributeError:
2451
 
            cert_type = gnutls.certificate_type_get(session)
 
2414
            cert_type = gnutls.certificate_type_get(session._c_object)
2452
2415
        if gnutls.has_rawpk:
2453
2416
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2454
2417
        else:
2455
2418
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2456
2419
        # If not a valid certificate type...
2457
2420
        if cert_type not in valid_cert_types:
2458
 
            log.info("Cert type %r not in %r", cert_type,
2459
 
                     valid_cert_types)
 
2421
            logger.info("Cert type %r not in %r", cert_type,
 
2422
                        valid_cert_types)
2460
2423
            # ...return invalid data
2461
2424
            return b""
2462
2425
        list_size = ctypes.c_uint(1)
2463
2426
        cert_list = (gnutls.certificate_get_peers
2464
 
                     (session, ctypes.byref(list_size)))
 
2427
                     (session._c_object, ctypes.byref(list_size)))
2465
2428
        if not bool(cert_list) and list_size.value != 0:
2466
2429
            raise gnutls.Error("error getting peer certificate")
2467
2430
        if list_size.value == 0:
2489
2452
        buf = ctypes.create_string_buffer(32)
2490
2453
        buf_len = ctypes.c_size_t(len(buf))
2491
2454
        # Get the key ID from the raw public key into the buffer
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))
 
2455
        gnutls.pubkey_get_key_id(pubkey,
 
2456
                                 gnutls.KEYID_USE_SHA256,
 
2457
                                 ctypes.cast(ctypes.byref(buf),
 
2458
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
2459
                                 ctypes.byref(buf_len))
2498
2460
        # Deinit the certificate
2499
2461
        gnutls.pubkey_deinit(pubkey)
2500
2462
 
2581
2543
 
2582
2544
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2583
2545
                     socketserver.TCPServer):
2584
 
    """IPv6-capable TCP server.  Accepts None as address and/or port
 
2546
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2585
2547
 
2586
2548
    Attributes:
2587
2549
        enabled:        Boolean; whether this server is activated yet
2638
2600
            if SO_BINDTODEVICE is None:
2639
2601
                # Fall back to a hard-coded value which seems to be
2640
2602
                # common enough.
2641
 
                log.warning("SO_BINDTODEVICE not found, trying 25")
 
2603
                logger.warning("SO_BINDTODEVICE not found, trying 25")
2642
2604
                SO_BINDTODEVICE = 25
2643
2605
            try:
2644
2606
                self.socket.setsockopt(
2646
2608
                    (self.interface + "\0").encode("utf-8"))
2647
2609
            except socket.error as error:
2648
2610
                if error.errno == errno.EPERM:
2649
 
                    log.error("No permission to bind to interface %s",
2650
 
                              self.interface)
 
2611
                    logger.error("No permission to bind to"
 
2612
                                 " interface %s", self.interface)
2651
2613
                elif error.errno == errno.ENOPROTOOPT:
2652
 
                    log.error("SO_BINDTODEVICE not available; cannot"
2653
 
                              " bind to interface %s", self.interface)
 
2614
                    logger.error("SO_BINDTODEVICE not available;"
 
2615
                                 " cannot bind to interface %s",
 
2616
                                 self.interface)
2654
2617
                elif error.errno == errno.ENODEV:
2655
 
                    log.error("Interface %s does not exist, cannot"
2656
 
                              " bind", self.interface)
 
2618
                    logger.error("Interface %s does not exist,"
 
2619
                                 " cannot bind", self.interface)
2657
2620
                else:
2658
2621
                    raise
2659
2622
        # Only bind(2) the socket if we really need to.
2738
2701
        request = parent_pipe.recv()
2739
2702
        command = request[0]
2740
2703
 
2741
 
        if command == "init":
 
2704
        if command == 'init':
2742
2705
            key_id = request[1].decode("ascii")
2743
2706
            fpr = request[2].decode("ascii")
2744
2707
            address = request[3]
2745
2708
 
2746
2709
            for c in self.clients.values():
2747
 
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2748
 
                              "27AE41E4649B934CA495991B7852B855"):
 
2710
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2749
2711
                    continue
2750
2712
                if key_id and c.key_id == key_id:
2751
2713
                    client = c
2754
2716
                    client = c
2755
2717
                    break
2756
2718
            else:
2757
 
                log.info("Client not found for key ID: %s, address:"
2758
 
                         " %s", key_id or fpr, address)
 
2719
                logger.info("Client not found for key ID: %s, address"
 
2720
                            ": %s", key_id or fpr, address)
2759
2721
                if self.use_dbus:
2760
2722
                    # Emit D-Bus signal
2761
2723
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
2774
2736
            # remove the old hook in favor of the new above hook on
2775
2737
            # same fileno
2776
2738
            return False
2777
 
        if command == "funcall":
 
2739
        if command == 'funcall':
2778
2740
            funcname = request[1]
2779
2741
            args = request[2]
2780
2742
            kwargs = request[3]
2781
2743
 
2782
 
            parent_pipe.send(("data", getattr(client_object,
 
2744
            parent_pipe.send(('data', getattr(client_object,
2783
2745
                                              funcname)(*args,
2784
2746
                                                        **kwargs)))
2785
2747
 
2786
 
        if command == "getattr":
 
2748
        if command == 'getattr':
2787
2749
            attrname = request[1]
2788
2750
            if isinstance(client_object.__getattribute__(attrname),
2789
 
                          collections.abc.Callable):
2790
 
                parent_pipe.send(("function", ))
 
2751
                          collections.Callable):
 
2752
                parent_pipe.send(('function', ))
2791
2753
            else:
2792
2754
                parent_pipe.send((
2793
 
                    "data", client_object.__getattribute__(attrname)))
 
2755
                    'data', client_object.__getattribute__(attrname)))
2794
2756
 
2795
 
        if command == "setattr":
 
2757
        if command == 'setattr':
2796
2758
            attrname = request[1]
2797
2759
            value = request[2]
2798
2760
            setattr(client_object, attrname, value)
2803
2765
def rfc3339_duration_to_delta(duration):
2804
2766
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2805
2767
 
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
 
2768
    >>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
 
2769
    True
 
2770
    >>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
 
2771
    True
 
2772
    >>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
 
2773
    True
 
2774
    >>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
 
2775
    True
 
2776
    >>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
 
2777
    True
 
2778
    >>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
 
2779
    True
 
2780
    >>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
 
2781
    True
2822
2782
    """
2823
2783
 
2824
2784
    # Parsing an RFC 3339 duration with regular expressions is not
2904
2864
def string_to_delta(interval):
2905
2865
    """Parse a string and return a datetime.timedelta
2906
2866
 
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)
 
2867
    >>> string_to_delta('7d') == datetime.timedelta(7)
 
2868
    True
 
2869
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
 
2870
    True
 
2871
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
 
2872
    True
 
2873
    >>> string_to_delta('24h') == datetime.timedelta(1)
 
2874
    True
 
2875
    >>> string_to_delta('1w') == datetime.timedelta(7)
 
2876
    True
 
2877
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
2918
2878
    True
2919
2879
    """
2920
2880
 
3124
3084
 
3125
3085
    if server_settings["servicename"] != "Mandos":
3126
3086
        syslogger.setFormatter(
3127
 
            logging.Formatter("Mandos ({}) [%(process)d]:"
3128
 
                              " %(levelname)s: %(message)s".format(
 
3087
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
3088
                              ' %(levelname)s: %(message)s'.format(
3129
3089
                                  server_settings["servicename"])))
3130
3090
 
3131
3091
    # Parse config file with clients
3155
3115
        try:
3156
3116
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3157
3117
        except IOError as e:
3158
 
            log.error("Could not open file %r", pidfilename,
3159
 
                      exc_info=e)
 
3118
            logger.error("Could not open file %r", pidfilename,
 
3119
                         exc_info=e)
3160
3120
 
3161
3121
    for name, group in (("_mandos", "_mandos"),
3162
3122
                        ("mandos", "mandos"),
3173
3133
    try:
3174
3134
        os.setgid(gid)
3175
3135
        os.setuid(uid)
3176
 
        log.debug("Did setuid/setgid to %s:%s", uid, gid)
 
3136
        if debug:
 
3137
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
3138
                                                             gid))
3177
3139
    except OSError as error:
3178
 
        log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
3179
 
                    os.strerror(error.errno))
 
3140
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
3141
                       .format(uid, gid, os.strerror(error.errno)))
3180
3142
        if error.errno != errno.EPERM:
3181
3143
            raise
3182
3144
 
3189
3151
 
3190
3152
        @gnutls.log_func
3191
3153
        def debug_gnutls(level, string):
3192
 
            log.debug("GnuTLS: %s",
3193
 
                      string[:-1].decode("utf-8", errors="replace"))
 
3154
            logger.debug("GnuTLS: %s", string[:-1])
3194
3155
 
3195
3156
        gnutls.global_set_log_function(debug_gnutls)
3196
3157
 
3225
3186
                "se.bsnet.fukt.Mandos", bus,
3226
3187
                do_not_queue=True)
3227
3188
        except dbus.exceptions.DBusException as e:
3228
 
            log.error("Disabling D-Bus:", exc_info=e)
 
3189
            logger.error("Disabling D-Bus:", exc_info=e)
3229
3190
            use_dbus = False
3230
3191
            server_settings["use_dbus"] = False
3231
3192
            tcp_server.use_dbus = False
3316
3277
            os.remove(stored_state_path)
3317
3278
        except IOError as e:
3318
3279
            if e.errno == errno.ENOENT:
3319
 
                log.warning("Could not load persistent state:"
3320
 
                            " %s", os.strerror(e.errno))
 
3280
                logger.warning("Could not load persistent state:"
 
3281
                               " {}".format(os.strerror(e.errno)))
3321
3282
            else:
3322
 
                log.critical("Could not load persistent state:",
3323
 
                             exc_info=e)
 
3283
                logger.critical("Could not load persistent state:",
 
3284
                                exc_info=e)
3324
3285
                raise
3325
3286
        except EOFError as e:
3326
 
            log.warning("Could not load persistent state: EOFError:",
3327
 
                        exc_info=e)
 
3287
            logger.warning("Could not load persistent state: "
 
3288
                           "EOFError:",
 
3289
                           exc_info=e)
3328
3290
 
3329
3291
    with PGPEngine() as pgp:
3330
3292
        for client_name, client in clients_data.items():
3357
3319
            if client["enabled"]:
3358
3320
                if datetime.datetime.utcnow() >= client["expires"]:
3359
3321
                    if not client["last_checked_ok"]:
3360
 
                        log.warning("disabling client %s - Client"
3361
 
                                    " never performed a successful"
3362
 
                                    " checker", client_name)
 
3322
                        logger.warning(
 
3323
                            "disabling client {} - Client never "
 
3324
                            "performed a successful checker".format(
 
3325
                                client_name))
3363
3326
                        client["enabled"] = False
3364
3327
                    elif client["last_checker_status"] != 0:
3365
 
                        log.warning("disabling client %s - Client"
3366
 
                                    " last checker failed with error"
3367
 
                                    " code %s", client_name,
3368
 
                                    client["last_checker_status"])
 
3328
                        logger.warning(
 
3329
                            "disabling client {} - Client last"
 
3330
                            " checker failed with error code"
 
3331
                            " {}".format(
 
3332
                                client_name,
 
3333
                                client["last_checker_status"]))
3369
3334
                        client["enabled"] = False
3370
3335
                    else:
3371
3336
                        client["expires"] = (
3372
3337
                            datetime.datetime.utcnow()
3373
3338
                            + client["timeout"])
3374
 
                        log.debug("Last checker succeeded, keeping %s"
3375
 
                                  " enabled", client_name)
 
3339
                        logger.debug("Last checker succeeded,"
 
3340
                                     " keeping {} enabled".format(
 
3341
                                         client_name))
3376
3342
            try:
3377
3343
                client["secret"] = pgp.decrypt(
3378
3344
                    client["encrypted_secret"],
3379
3345
                    client_settings[client_name]["secret"])
3380
3346
            except PGPError:
3381
3347
                # If decryption fails, we use secret from new settings
3382
 
                log.debug("Failed to decrypt %s old secret",
3383
 
                          client_name)
 
3348
                logger.debug("Failed to decrypt {} old secret".format(
 
3349
                    client_name))
3384
3350
                client["secret"] = (client_settings[client_name]
3385
3351
                                    ["secret"])
3386
3352
 
3400
3366
            server_settings=server_settings)
3401
3367
 
3402
3368
    if not tcp_server.clients:
3403
 
        log.warning("No clients defined")
 
3369
        logger.warning("No clients defined")
3404
3370
 
3405
3371
    if not foreground:
3406
3372
        if pidfile is not None:
3409
3375
                with pidfile:
3410
3376
                    print(pid, file=pidfile)
3411
3377
            except IOError:
3412
 
                log.error("Could not write to file %r with PID %d",
3413
 
                          pidfilename, pid)
 
3378
                logger.error("Could not write to file %r with PID %d",
 
3379
                             pidfilename, pid)
3414
3380
        del pidfile
3415
3381
        del pidfilename
3416
3382
 
3566
3532
 
3567
3533
        try:
3568
3534
            with tempfile.NamedTemporaryFile(
3569
 
                    mode="wb",
 
3535
                    mode='wb',
3570
3536
                    suffix=".pickle",
3571
 
                    prefix="clients-",
 
3537
                    prefix='clients-',
3572
3538
                    dir=os.path.dirname(stored_state_path),
3573
3539
                    delete=False) as stored_state:
3574
3540
                pickle.dump((clients, client_settings), stored_state,
3582
3548
                except NameError:
3583
3549
                    pass
3584
3550
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3585
 
                log.warning("Could not save persistent state: %s",
3586
 
                            os.strerror(e.errno))
 
3551
                logger.warning("Could not save persistent state: {}"
 
3552
                               .format(os.strerror(e.errno)))
3587
3553
            else:
3588
 
                log.warning("Could not save persistent state:",
3589
 
                            exc_info=e)
 
3554
                logger.warning("Could not save persistent state:",
 
3555
                               exc_info=e)
3590
3556
                raise
3591
3557
 
3592
3558
        # Delete all clients, and settings from config
3618
3584
    if zeroconf:
3619
3585
        service.port = tcp_server.socket.getsockname()[1]
3620
3586
    if use_ipv6:
3621
 
        log.info("Now listening on address %r, port %d, flowinfo %d,"
3622
 
                 " scope_id %d", *tcp_server.socket.getsockname())
 
3587
        logger.info("Now listening on address %r, port %d,"
 
3588
                    " flowinfo %d, scope_id %d",
 
3589
                    *tcp_server.socket.getsockname())
3623
3590
    else:                       # IPv4
3624
 
        log.info("Now listening on address %r, port %d",
3625
 
                 *tcp_server.socket.getsockname())
 
3591
        logger.info("Now listening on address %r, port %d",
 
3592
                    *tcp_server.socket.getsockname())
3626
3593
 
3627
3594
    # service.interface = tcp_server.socket.getsockname()[3]
3628
3595
 
3632
3599
            try:
3633
3600
                service.activate()
3634
3601
            except dbus.exceptions.DBusException as error:
3635
 
                log.critical("D-Bus Exception", exc_info=error)
 
3602
                logger.critical("D-Bus Exception", exc_info=error)
3636
3603
                cleanup()
3637
3604
                sys.exit(1)
3638
3605
            # End of Avahi example code
3643
3610
            lambda *args, **kwargs: (tcp_server.handle_request
3644
3611
                                     (*args[2:], **kwargs) or True))
3645
3612
 
3646
 
        log.debug("Starting main loop")
 
3613
        logger.debug("Starting main loop")
3647
3614
        main_loop.run()
3648
3615
    except AvahiError as error:
3649
 
        log.critical("Avahi Error", exc_info=error)
 
3616
        logger.critical("Avahi Error", exc_info=error)
3650
3617
        cleanup()
3651
3618
        sys.exit(1)
3652
3619
    except KeyboardInterrupt:
3653
3620
        if debug:
3654
3621
            print("", file=sys.stderr)
3655
 
        log.debug("Server received KeyboardInterrupt")
3656
 
    log.debug("Server exiting")
 
3622
        logger.debug("Server received KeyboardInterrupt")
 
3623
    logger.debug("Server exiting")
3657
3624
    # Must run before the D-Bus bus name gets deregistered
3658
3625
    cleanup()
3659
3626
 
3660
3627
 
3661
 
def parse_test_args():
3662
 
    # type: () -> argparse.Namespace
 
3628
def should_only_run_tests():
3663
3629
    parser = argparse.ArgumentParser(add_help=False)
3664
 
    parser.add_argument("--check", action="store_true")
3665
 
    parser.add_argument("--prefix", )
 
3630
    parser.add_argument("--check", action='store_true')
3666
3631
    args, unknown_args = parser.parse_known_args()
3667
 
    if args.check:
3668
 
        # Remove test options from sys.argv
 
3632
    run_tests = args.check
 
3633
    if run_tests:
 
3634
        # Remove --check argument from sys.argv
3669
3635
        sys.argv[1:] = unknown_args
3670
 
    return args
 
3636
    return run_tests
3671
3637
 
3672
3638
# Add all tests from doctest strings
3673
3639
def load_tests(loader, tests, none):
3675
3641
    tests.addTests(doctest.DocTestSuite())
3676
3642
    return tests
3677
3643
 
3678
 
if __name__ == "__main__":
3679
 
    options = parse_test_args()
 
3644
if __name__ == '__main__':
3680
3645
    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=[""])
 
3646
        if should_only_run_tests():
 
3647
            # Call using ./mandos --check [--verbose]
 
3648
            unittest.main()
3693
3649
        else:
3694
3650
            main()
3695
3651
    finally:
3696
3652
        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 ((inhibit-read-only t))
3714
 
#     (= (process-file-shell-command
3715
 
#         (funcall get-command-line extra)
3716
 
#         nil "*Test*") 0)))
3717
 
# get-command-line:
3718
 
# (lambda (&optional extra)
3719
 
#   (let ((quoted-script
3720
 
#          (shell-quote-argument (funcall get-script-name))))
3721
 
#     (format
3722
 
#      (concat "%s --check" (if extra " --prefix=atest" ""))
3723
 
#      quoted-script)))
3724
 
# get-script-name:
3725
 
# (lambda ()
3726
 
#   (if (fboundp 'file-local-name)
3727
 
#       (file-local-name (buffer-file-name))
3728
 
#     (or (file-remote-p (buffer-file-name) 'localname)
3729
 
#         (buffer-file-name))))
3730
 
# remove-test-window:
3731
 
# (lambda ()
3732
 
#   (let ((test-window (get-buffer-window "*Test*")))
3733
 
#     (if test-window (delete-window test-window))))
3734
 
# show-test-buffer-in-test-window:
3735
 
# (lambda ()
3736
 
#   (when (not (get-buffer-window-list "*Test*"))
3737
 
#     (setq next-error-last-buffer (get-buffer "*Test*"))
3738
 
#     (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3739
 
#            (display-buffer-overriding-action
3740
 
#             `((display-buffer-in-side-window) (side . ,side)
3741
 
#               (window-height . fit-window-to-buffer)
3742
 
#               (window-width . fit-window-to-buffer))))
3743
 
#       (display-buffer "*Test*"))))
3744
 
# eval:
3745
 
# (progn
3746
 
#   (let* ((run-extra-tests (lambda () (interactive)
3747
 
#                             (funcall run-tests t)))
3748
 
#          (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3749
 
#          (outer-keymap `(keymap (3 . ,inner-keymap))))     ; C-c
3750
 
#     (setq minor-mode-overriding-map-alist
3751
 
#           (cons `(run-tests . ,outer-keymap)
3752
 
#                 minor-mode-overriding-map-alist)))
3753
 
#   (add-hook 'after-save-hook run-tests 90 t))
3754
 
# End: