/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2019-07-25 21:42:40 UTC
  • mto: This revision was merged to the branch mainline in revision 384.
  • Revision ID: teddy@recompile.se-20190725214240-31i9qehf60xb8yu4
Use hexadecimal unicode character references, not decimal

* mandos-options.xml (priority): Use "​" instead of "​"
  to make it slightly more clear that ZERO WIDTH SPACE is intended.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python3 -bI
2
 
# -*- coding: utf-8; lexical-binding: t -*-
 
1
#!/usr/bin/python
 
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
5
5
#
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
 
# Copyright © 2008-2022 Teddy Hogeborn
15
 
# Copyright © 2008-2022 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 random
81
 
import shlex
82
80
 
83
81
import dbus
84
82
import dbus.service
85
 
import gi
86
83
from gi.repository import GLib
87
84
from dbus.mainloop.glib import DBusGMainLoop
88
85
import ctypes
90
87
import xml.dom.minidom
91
88
import inspect
92
89
 
93
 
if sys.version_info.major == 2:
94
 
    __metaclass__ = type
95
 
    str = unicode
96
 
    input = raw_input
97
 
 
98
 
# Add collections.abc.Callable if it does not exist
99
 
try:
100
 
    collections.abc.Callable
101
 
except AttributeError:
102
 
    class abc:
103
 
        Callable = collections.Callable
104
 
    collections.abc = abc
105
 
    del abc
106
 
 
107
 
# Add shlex.quote if it does not exist
108
 
try:
109
 
    shlex.quote
110
 
except AttributeError:
111
 
    shlex.quote = re.escape
112
 
 
113
 
# Show warnings by default
114
 
if not sys.warnoptions:
115
 
    import warnings
116
 
    warnings.simplefilter("default")
117
 
 
118
90
# Try to find the value of SO_BINDTODEVICE:
119
91
try:
120
92
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
140
112
            # No value found
141
113
            SO_BINDTODEVICE = None
142
114
 
143
 
if sys.version_info < (3, 2):
144
 
    configparser.Configparser = configparser.SafeConfigParser
 
115
if sys.version_info.major == 2:
 
116
    str = unicode
145
117
 
146
 
version = "1.8.17"
 
118
version = "1.8.4"
147
119
stored_state_file = "clients.pickle"
148
120
 
149
 
log = logging.getLogger(os.path.basename(sys.argv[0]))
150
 
logging.captureWarnings(True)   # Show warnings via the logging system
 
121
logger = logging.getLogger()
151
122
syslogger = None
152
123
 
153
124
try:
189
160
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
190
161
        address="/dev/log"))
191
162
    syslogger.setFormatter(logging.Formatter
192
 
                           ("Mandos [%(process)d]: %(levelname)s:"
193
 
                            " %(message)s"))
194
 
    log.addHandler(syslogger)
 
163
                           ('Mandos [%(process)d]: %(levelname)s:'
 
164
                            ' %(message)s'))
 
165
    logger.addHandler(syslogger)
195
166
 
196
167
    if debug:
197
168
        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)
 
169
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
170
                                               ' [%(process)d]:'
 
171
                                               ' %(levelname)s:'
 
172
                                               ' %(message)s'))
 
173
        logger.addHandler(console)
 
174
    logger.setLevel(level)
204
175
 
205
176
 
206
177
class PGPError(Exception):
208
179
    pass
209
180
 
210
181
 
211
 
class PGPEngine:
 
182
class PGPEngine(object):
212
183
    """A simple class for OpenPGP symmetric encryption & decryption"""
213
184
 
214
185
    def __init__(self):
218
189
            output = subprocess.check_output(["gpgconf"])
219
190
            for line in output.splitlines():
220
191
                name, text, path = line.split(b":")
221
 
                if name == b"gpg":
 
192
                if name == "gpg":
222
193
                    self.gpg = path
223
194
                    break
224
195
        except OSError as e:
225
196
            if e.errno != errno.ENOENT:
226
197
                raise
227
 
        self.gnupgargs = ["--batch",
228
 
                          "--homedir", self.tempdir,
229
 
                          "--force-mdc",
230
 
                          "--quiet"]
 
198
        self.gnupgargs = ['--batch',
 
199
                          '--homedir', self.tempdir,
 
200
                          '--force-mdc',
 
201
                          '--quiet']
231
202
        # Only GPG version 1 has the --no-use-agent option.
232
 
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
 
203
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
233
204
            self.gnupgargs.append("--no-use-agent")
234
205
 
235
206
    def __enter__(self):
272
243
                dir=self.tempdir) as passfile:
273
244
            passfile.write(passphrase)
274
245
            passfile.flush()
275
 
            proc = subprocess.Popen([self.gpg, "--symmetric",
276
 
                                     "--passphrase-file",
 
246
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
247
                                     '--passphrase-file',
277
248
                                     passfile.name]
278
249
                                    + self.gnupgargs,
279
250
                                    stdin=subprocess.PIPE,
290
261
                dir=self.tempdir) as passfile:
291
262
            passfile.write(passphrase)
292
263
            passfile.flush()
293
 
            proc = subprocess.Popen([self.gpg, "--decrypt",
294
 
                                     "--passphrase-file",
 
264
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
265
                                     '--passphrase-file',
295
266
                                     passfile.name]
296
267
                                    + self.gnupgargs,
297
268
                                    stdin=subprocess.PIPE,
304
275
 
305
276
 
306
277
# Pretend that we have an Avahi module
307
 
class avahi:
 
278
class avahi(object):
308
279
    """This isn't so much a class as it is a module-like namespace."""
309
280
    IF_UNSPEC = -1               # avahi-common/address.h
310
281
    PROTO_UNSPEC = -1            # avahi-common/address.h
344
315
    pass
345
316
 
346
317
 
347
 
class AvahiService:
 
318
class AvahiService(object):
348
319
    """An Avahi (Zeroconf) service.
349
320
 
350
321
    Attributes:
351
322
    interface: integer; avahi.IF_UNSPEC or an interface index.
352
323
               Used to optionally bind to the specified interface.
353
 
    name: string; Example: "Mandos"
354
 
    type: string; Example: "_mandos._tcp".
 
324
    name: string; Example: 'Mandos'
 
325
    type: string; Example: '_mandos._tcp'.
355
326
     See <https://www.iana.org/assignments/service-names-port-numbers>
356
327
    port: integer; what port to announce
357
328
    TXT: list of strings; TXT record for the service
394
365
    def rename(self, remove=True):
395
366
        """Derived from the Avahi example code"""
396
367
        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)
 
368
            logger.critical("No suitable Zeroconf service name found"
 
369
                            " after %i retries, exiting.",
 
370
                            self.rename_count)
400
371
            raise AvahiServiceError("Too many renames")
401
372
        self.name = str(
402
373
            self.server.GetAlternativeServiceName(self.name))
403
374
        self.rename_count += 1
404
 
        log.info("Changing Zeroconf service name to %r ...",
405
 
                 self.name)
 
375
        logger.info("Changing Zeroconf service name to %r ...",
 
376
                    self.name)
406
377
        if remove:
407
378
            self.remove()
408
379
        try:
410
381
        except dbus.exceptions.DBusException as error:
411
382
            if (error.get_dbus_name()
412
383
                == "org.freedesktop.Avahi.CollisionError"):
413
 
                log.info("Local Zeroconf service name collision.")
 
384
                logger.info("Local Zeroconf service name collision.")
414
385
                return self.rename(remove=False)
415
386
            else:
416
 
                log.critical("D-Bus Exception", exc_info=error)
 
387
                logger.critical("D-Bus Exception", exc_info=error)
417
388
                self.cleanup()
418
389
                os._exit(1)
419
390
 
435
406
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
436
407
        self.entry_group_state_changed_match = (
437
408
            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)
 
409
                'StateChanged', self.entry_group_state_changed))
 
410
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
 
411
                     self.name, self.type)
441
412
        self.group.AddService(
442
413
            self.interface,
443
414
            self.protocol,
450
421
 
451
422
    def entry_group_state_changed(self, state, error):
452
423
        """Derived from the Avahi example code"""
453
 
        log.debug("Avahi entry group state change: %i", state)
 
424
        logger.debug("Avahi entry group state change: %i", state)
454
425
 
455
426
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
456
 
            log.debug("Zeroconf service established.")
 
427
            logger.debug("Zeroconf service established.")
457
428
        elif state == avahi.ENTRY_GROUP_COLLISION:
458
 
            log.info("Zeroconf service name collision.")
 
429
            logger.info("Zeroconf service name collision.")
459
430
            self.rename()
460
431
        elif state == avahi.ENTRY_GROUP_FAILURE:
461
 
            log.critical("Avahi: Error in group state changed %s",
462
 
                         str(error))
 
432
            logger.critical("Avahi: Error in group state changed %s",
 
433
                            str(error))
463
434
            raise AvahiGroupError("State changed: {!s}".format(error))
464
435
 
465
436
    def cleanup(self):
475
446
 
476
447
    def server_state_changed(self, state, error=None):
477
448
        """Derived from the Avahi example code"""
478
 
        log.debug("Avahi server state change: %i", state)
 
449
        logger.debug("Avahi server state change: %i", state)
479
450
        bad_states = {
480
451
            avahi.SERVER_INVALID: "Zeroconf server invalid",
481
452
            avahi.SERVER_REGISTERING: None,
485
456
        if state in bad_states:
486
457
            if bad_states[state] is not None:
487
458
                if error is None:
488
 
                    log.error(bad_states[state])
 
459
                    logger.error(bad_states[state])
489
460
                else:
490
 
                    log.error(bad_states[state] + ": %r", error)
 
461
                    logger.error(bad_states[state] + ": %r", error)
491
462
            self.cleanup()
492
463
        elif state == avahi.SERVER_RUNNING:
493
464
            try:
495
466
            except dbus.exceptions.DBusException as error:
496
467
                if (error.get_dbus_name()
497
468
                    == "org.freedesktop.Avahi.CollisionError"):
498
 
                    log.info("Local Zeroconf service name collision.")
 
469
                    logger.info("Local Zeroconf service name"
 
470
                                " collision.")
499
471
                    return self.rename(remove=False)
500
472
                else:
501
 
                    log.critical("D-Bus Exception", exc_info=error)
 
473
                    logger.critical("D-Bus Exception", exc_info=error)
502
474
                    self.cleanup()
503
475
                    os._exit(1)
504
476
        else:
505
477
            if error is None:
506
 
                log.debug("Unknown state: %r", state)
 
478
                logger.debug("Unknown state: %r", state)
507
479
            else:
508
 
                log.debug("Unknown state: %r: %r", state, error)
 
480
                logger.debug("Unknown state: %r: %r", state, error)
509
481
 
510
482
    def activate(self):
511
483
        """Derived from the Avahi example code"""
523
495
class AvahiServiceToSyslog(AvahiService):
524
496
    def rename(self, *args, **kwargs):
525
497
        """Add the new name to the syslog messages"""
526
 
        ret = super(AvahiServiceToSyslog, self).rename(*args,
527
 
                                                       **kwargs)
 
498
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
528
499
        syslogger.setFormatter(logging.Formatter(
529
 
            "Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
 
500
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
530
501
            .format(self.name)))
531
502
        return ret
532
503
 
533
504
 
534
505
# Pretend that we have a GnuTLS module
535
 
class gnutls:
 
506
class gnutls(object):
536
507
    """This isn't so much a class as it is a module-like namespace."""
537
508
 
538
509
    library = ctypes.util.find_library("gnutls")
562
533
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
563
534
 
564
535
    # Types
565
 
    class _session_int(ctypes.Structure):
 
536
    class session_int(ctypes.Structure):
566
537
        _fields_ = []
567
 
    session_t = ctypes.POINTER(_session_int)
 
538
    session_t = ctypes.POINTER(session_int)
568
539
 
569
540
    class certificate_credentials_st(ctypes.Structure):
570
541
        _fields_ = []
573
544
    certificate_type_t = ctypes.c_int
574
545
 
575
546
    class datum_t(ctypes.Structure):
576
 
        _fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
577
 
                    ("size", ctypes.c_uint)]
 
547
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
548
                    ('size', ctypes.c_uint)]
578
549
 
579
 
    class _openpgp_crt_int(ctypes.Structure):
 
550
    class openpgp_crt_int(ctypes.Structure):
580
551
        _fields_ = []
581
 
    openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
 
552
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
582
553
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
583
554
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
584
555
    credentials_type_t = ctypes.c_int
593
564
            # gnutls.strerror()
594
565
            self.code = code
595
566
            if message is None and code is not None:
596
 
                message = gnutls.strerror(code).decode(
597
 
                    "utf-8", errors="replace")
 
567
                message = gnutls.strerror(code)
598
568
            return super(gnutls.Error, self).__init__(
599
569
                message, *args)
600
570
 
601
571
    class CertificateSecurityError(Error):
602
572
        pass
603
573
 
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
574
    # Classes
630
 
    class Credentials(With_from_param):
 
575
    class Credentials(object):
631
576
        def __init__(self):
632
 
            self._as_parameter_ = gnutls.certificate_credentials_t()
633
 
            gnutls.certificate_allocate_credentials(self)
 
577
            self._c_object = gnutls.certificate_credentials_t()
 
578
            gnutls.certificate_allocate_credentials(
 
579
                ctypes.byref(self._c_object))
634
580
            self.type = gnutls.CRD_CERTIFICATE
635
581
 
636
582
        def __del__(self):
637
 
            gnutls.certificate_free_credentials(self)
 
583
            gnutls.certificate_free_credentials(self._c_object)
638
584
 
639
 
    class ClientSession(With_from_param):
 
585
    class ClientSession(object):
640
586
        def __init__(self, socket, credentials=None):
641
 
            self._as_parameter_ = gnutls.session_t()
 
587
            self._c_object = gnutls.session_t()
642
588
            gnutls_flags = gnutls.CLIENT
643
 
            if gnutls.check_version(b"3.5.6"):
 
589
            if gnutls.check_version("3.5.6"):
644
590
                gnutls_flags |= gnutls.NO_TICKETS
645
591
            if gnutls.has_rawpk:
646
592
                gnutls_flags |= gnutls.ENABLE_RAWPK
647
 
            gnutls.init(self, gnutls_flags)
 
593
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
648
594
            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)
 
595
            gnutls.set_default_priority(self._c_object)
 
596
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
597
            gnutls.handshake_set_private_extensions(self._c_object,
 
598
                                                    True)
652
599
            self.socket = socket
653
600
            if credentials is None:
654
601
                credentials = gnutls.Credentials()
655
 
            gnutls.credentials_set(self, credentials.type,
656
 
                                   credentials)
 
602
            gnutls.credentials_set(self._c_object, credentials.type,
 
603
                                   ctypes.cast(credentials._c_object,
 
604
                                               ctypes.c_void_p))
657
605
            self.credentials = credentials
658
606
 
659
607
        def __del__(self):
660
 
            gnutls.deinit(self)
 
608
            gnutls.deinit(self._c_object)
661
609
 
662
610
        def handshake(self):
663
 
            return gnutls.handshake(self)
 
611
            return gnutls.handshake(self._c_object)
664
612
 
665
613
        def send(self, data):
666
614
            data = bytes(data)
667
615
            data_len = len(data)
668
616
            while data_len > 0:
669
 
                data_len -= gnutls.record_send(self, data[-data_len:],
 
617
                data_len -= gnutls.record_send(self._c_object,
 
618
                                               data[-data_len:],
670
619
                                               data_len)
671
620
 
672
621
        def bye(self):
673
 
            return gnutls.bye(self, gnutls.SHUT_RDWR)
 
622
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
674
623
 
675
624
    # Error handling functions
676
625
    def _error_code(result):
677
626
        """A function to raise exceptions on errors, suitable
678
 
        for the "restype" attribute on ctypes functions"""
679
 
        if result >= gnutls.E_SUCCESS:
 
627
        for the 'restype' attribute on ctypes functions"""
 
628
        if result >= 0:
680
629
            return result
681
630
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
682
631
            raise gnutls.CertificateSecurityError(code=result)
683
632
        raise gnutls.Error(code=result)
684
633
 
685
 
    def _retry_on_error(result, func, arguments,
686
 
                        _error_code=_error_code):
 
634
    def _retry_on_error(result, func, arguments):
687
635
        """A function to retry on some errors, suitable
688
 
        for the "errcheck" attribute on ctypes functions"""
689
 
        while result < gnutls.E_SUCCESS:
 
636
        for the 'errcheck' attribute on ctypes functions"""
 
637
        while result < 0:
690
638
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
691
639
                return _error_code(result)
692
640
            result = func(*arguments)
697
645
 
698
646
    # Functions
699
647
    priority_set_direct = _library.gnutls_priority_set_direct
700
 
    priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
 
648
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
701
649
                                    ctypes.POINTER(ctypes.c_char_p)]
702
650
    priority_set_direct.restype = _error_code
703
651
 
704
652
    init = _library.gnutls_init
705
 
    init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
 
653
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
706
654
    init.restype = _error_code
707
655
 
708
656
    set_default_priority = _library.gnutls_set_default_priority
709
 
    set_default_priority.argtypes = [ClientSession]
 
657
    set_default_priority.argtypes = [session_t]
710
658
    set_default_priority.restype = _error_code
711
659
 
712
660
    record_send = _library.gnutls_record_send
713
 
    record_send.argtypes = [ClientSession, ctypes.c_void_p,
 
661
    record_send.argtypes = [session_t, ctypes.c_void_p,
714
662
                            ctypes.c_size_t]
715
663
    record_send.restype = ctypes.c_ssize_t
716
664
    record_send.errcheck = _retry_on_error
718
666
    certificate_allocate_credentials = (
719
667
        _library.gnutls_certificate_allocate_credentials)
720
668
    certificate_allocate_credentials.argtypes = [
721
 
        PointerTo(Credentials)]
 
669
        ctypes.POINTER(certificate_credentials_t)]
722
670
    certificate_allocate_credentials.restype = _error_code
723
671
 
724
672
    certificate_free_credentials = (
725
673
        _library.gnutls_certificate_free_credentials)
726
 
    certificate_free_credentials.argtypes = [Credentials]
 
674
    certificate_free_credentials.argtypes = [
 
675
        certificate_credentials_t]
727
676
    certificate_free_credentials.restype = None
728
677
 
729
678
    handshake_set_private_extensions = (
730
679
        _library.gnutls_handshake_set_private_extensions)
731
 
    handshake_set_private_extensions.argtypes = [ClientSession,
 
680
    handshake_set_private_extensions.argtypes = [session_t,
732
681
                                                 ctypes.c_int]
733
682
    handshake_set_private_extensions.restype = None
734
683
 
735
684
    credentials_set = _library.gnutls_credentials_set
736
 
    credentials_set.argtypes = [ClientSession, credentials_type_t,
737
 
                                CastToVoidPointer(Credentials)]
 
685
    credentials_set.argtypes = [session_t, credentials_type_t,
 
686
                                ctypes.c_void_p]
738
687
    credentials_set.restype = _error_code
739
688
 
740
689
    strerror = _library.gnutls_strerror
742
691
    strerror.restype = ctypes.c_char_p
743
692
 
744
693
    certificate_type_get = _library.gnutls_certificate_type_get
745
 
    certificate_type_get.argtypes = [ClientSession]
 
694
    certificate_type_get.argtypes = [session_t]
746
695
    certificate_type_get.restype = _error_code
747
696
 
748
697
    certificate_get_peers = _library.gnutls_certificate_get_peers
749
 
    certificate_get_peers.argtypes = [ClientSession,
 
698
    certificate_get_peers.argtypes = [session_t,
750
699
                                      ctypes.POINTER(ctypes.c_uint)]
751
700
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
752
701
 
759
708
    global_set_log_function.restype = None
760
709
 
761
710
    deinit = _library.gnutls_deinit
762
 
    deinit.argtypes = [ClientSession]
 
711
    deinit.argtypes = [session_t]
763
712
    deinit.restype = None
764
713
 
765
714
    handshake = _library.gnutls_handshake
766
 
    handshake.argtypes = [ClientSession]
767
 
    handshake.restype = ctypes.c_int
 
715
    handshake.argtypes = [session_t]
 
716
    handshake.restype = _error_code
768
717
    handshake.errcheck = _retry_on_error
769
718
 
770
719
    transport_set_ptr = _library.gnutls_transport_set_ptr
771
 
    transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
 
720
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
772
721
    transport_set_ptr.restype = None
773
722
 
774
723
    bye = _library.gnutls_bye
775
 
    bye.argtypes = [ClientSession, close_request_t]
776
 
    bye.restype = ctypes.c_int
 
724
    bye.argtypes = [session_t, close_request_t]
 
725
    bye.restype = _error_code
777
726
    bye.errcheck = _retry_on_error
778
727
 
779
728
    check_version = _library.gnutls_check_version
796
745
 
797
746
        x509_crt_fmt_t = ctypes.c_int
798
747
 
799
 
        # All the function declarations below are from
800
 
        # gnutls/abstract.h
 
748
        # All the function declarations below are from gnutls/abstract.h
801
749
        pubkey_init = _library.gnutls_pubkey_init
802
750
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
803
751
        pubkey_init.restype = _error_code
817
765
        pubkey_deinit.argtypes = [pubkey_t]
818
766
        pubkey_deinit.restype = None
819
767
    else:
820
 
        # All the function declarations below are from
821
 
        # gnutls/openpgp.h
 
768
        # All the function declarations below are from gnutls/openpgp.h
822
769
 
823
770
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
824
771
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
830
777
                                       openpgp_crt_fmt_t]
831
778
        openpgp_crt_import.restype = _error_code
832
779
 
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
 
        ]
 
780
        openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
 
781
        openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
 
782
                                            ctypes.POINTER(ctypes.c_uint)]
840
783
        openpgp_crt_verify_self.restype = _error_code
841
784
 
842
785
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
851
794
                                                    ctypes.c_size_t)]
852
795
        openpgp_crt_get_fingerprint.restype = _error_code
853
796
 
854
 
    if check_version(b"3.6.4"):
 
797
    if check_version("3.6.4"):
855
798
        certificate_type_get2 = _library.gnutls_certificate_type_get2
856
 
        certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
 
799
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
857
800
        certificate_type_get2.restype = _error_code
858
801
 
859
802
    # Remove non-public functions
871
814
    connection.close()
872
815
 
873
816
 
874
 
class Client:
 
817
class Client(object):
875
818
    """A representation of a client host served by this server.
876
819
 
877
820
    Attributes:
878
 
    approved:   bool(); None if not yet approved/disapproved
 
821
    approved:   bool(); 'None' if not yet approved/disapproved
879
822
    approval_delay: datetime.timedelta(); Time to wait for approval
880
823
    approval_duration: datetime.timedelta(); Duration of one approval
881
 
    checker: multiprocessing.Process(); a running checker process used
882
 
             to see if the client lives. None if no process is
883
 
             running.
 
824
    checker:    subprocess.Popen(); a running checker process used
 
825
                                    to see if the client lives.
 
826
                                    'None' if no process is running.
884
827
    checker_callback_tag: a GLib event source tag, or None
885
828
    checker_command: string; External command which is run to check
886
829
                     if client lives.  %() expansions are done at
961
904
            # key_id() and fingerprint() functions
962
905
            client["key_id"] = (section.get("key_id", "").upper()
963
906
                                .replace(" ", ""))
964
 
            client["fingerprint"] = (section.get("fingerprint",
965
 
                                                 "").upper()
 
907
            client["fingerprint"] = (section["fingerprint"].upper()
966
908
                                     .replace(" ", ""))
967
 
            if not (client["key_id"] or client["fingerprint"]):
968
 
                log.error("Skipping client %s without key_id or"
969
 
                          " fingerprint", client_name)
970
 
                del settings[client_name]
971
 
                continue
972
909
            if "secret" in section:
973
910
                client["secret"] = codecs.decode(section["secret"]
974
911
                                                 .encode("utf-8"),
1015
952
            self.last_enabled = None
1016
953
            self.expires = None
1017
954
 
1018
 
        log.debug("Creating client %r", self.name)
1019
 
        log.debug("  Key ID: %s", self.key_id)
1020
 
        log.debug("  Fingerprint: %s", self.fingerprint)
 
955
        logger.debug("Creating client %r", self.name)
 
956
        logger.debug("  Key ID: %s", self.key_id)
 
957
        logger.debug("  Fingerprint: %s", self.fingerprint)
1021
958
        self.created = settings.get("created",
1022
959
                                    datetime.datetime.utcnow())
1023
960
 
1051
988
        if getattr(self, "enabled", False):
1052
989
            # Already enabled
1053
990
            return
 
991
        self.expires = datetime.datetime.utcnow() + self.timeout
1054
992
        self.enabled = True
1055
993
        self.last_enabled = datetime.datetime.utcnow()
1056
994
        self.init_checker()
1061
999
        if not getattr(self, "enabled", False):
1062
1000
            return False
1063
1001
        if not quiet:
1064
 
            log.info("Disabling client %s", self.name)
 
1002
            logger.info("Disabling client %s", self.name)
1065
1003
        if getattr(self, "disable_initiator_tag", None) is not None:
1066
1004
            GLib.source_remove(self.disable_initiator_tag)
1067
1005
            self.disable_initiator_tag = None
1079
1017
    def __del__(self):
1080
1018
        self.disable()
1081
1019
 
1082
 
    def init_checker(self, randomize_start=False):
1083
 
        # Schedule a new checker to be started a randomly selected
1084
 
        # time (a fraction of 'interval') from now.  This spreads out
1085
 
        # the startup of checkers over time when the server is
1086
 
        # started.
 
1020
    def init_checker(self):
 
1021
        # Schedule a new checker to be started an 'interval' from now,
 
1022
        # and every interval from then on.
1087
1023
        if self.checker_initiator_tag is not None:
1088
1024
            GLib.source_remove(self.checker_initiator_tag)
1089
 
        interval_milliseconds = int(self.interval.total_seconds()
1090
 
                                    * 1000)
1091
 
        if randomize_start:
1092
 
            delay_milliseconds = random.randrange(
1093
 
                interval_milliseconds + 1)
1094
 
        else:
1095
 
            delay_milliseconds = interval_milliseconds
1096
1025
        self.checker_initiator_tag = GLib.timeout_add(
1097
 
            delay_milliseconds, self.start_checker, randomize_start)
1098
 
        delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1099
 
        # A checker might take up to an 'interval' of time, so we can
1100
 
        # expire at the soonest one interval after a checker was
1101
 
        # started.  Since the initial checker is delayed, the expire
1102
 
        # time might have to be extended.
1103
 
        now = datetime.datetime.utcnow()
1104
 
        self.expires = now + delay + self.interval
1105
 
        # Schedule a disable() at expire time
 
1026
            int(self.interval.total_seconds() * 1000),
 
1027
            self.start_checker)
 
1028
        # Schedule a disable() when 'timeout' has passed
1106
1029
        if self.disable_initiator_tag is not None:
1107
1030
            GLib.source_remove(self.disable_initiator_tag)
1108
1031
        self.disable_initiator_tag = GLib.timeout_add(
1109
 
            int((self.expires - now).total_seconds() * 1000),
1110
 
            self.disable)
 
1032
            int(self.timeout.total_seconds() * 1000), self.disable)
 
1033
        # Also start a new checker *right now*.
 
1034
        self.start_checker()
1111
1035
 
1112
1036
    def checker_callback(self, source, condition, connection,
1113
1037
                         command):
1114
1038
        """The checker has completed, so take appropriate actions."""
 
1039
        self.checker_callback_tag = None
 
1040
        self.checker = None
1115
1041
        # Read return code from connection (see call_pipe)
1116
1042
        returncode = connection.recv()
1117
1043
        connection.close()
1118
 
        if self.checker is not None:
1119
 
            self.checker.join()
1120
 
        self.checker_callback_tag = None
1121
 
        self.checker = None
1122
1044
 
1123
1045
        if returncode >= 0:
1124
1046
            self.last_checker_status = returncode
1125
1047
            self.last_checker_signal = None
1126
1048
            if self.last_checker_status == 0:
1127
 
                log.info("Checker for %(name)s succeeded", vars(self))
 
1049
                logger.info("Checker for %(name)s succeeded",
 
1050
                            vars(self))
1128
1051
                self.checked_ok()
1129
1052
            else:
1130
 
                log.info("Checker for %(name)s failed", vars(self))
 
1053
                logger.info("Checker for %(name)s failed", vars(self))
1131
1054
        else:
1132
1055
            self.last_checker_status = -1
1133
1056
            self.last_checker_signal = -returncode
1134
 
            log.warning("Checker for %(name)s crashed?", vars(self))
 
1057
            logger.warning("Checker for %(name)s crashed?",
 
1058
                           vars(self))
1135
1059
        return False
1136
1060
 
1137
1061
    def checked_ok(self):
1156
1080
    def need_approval(self):
1157
1081
        self.last_approval_request = datetime.datetime.utcnow()
1158
1082
 
1159
 
    def start_checker(self, start_was_randomized=False):
 
1083
    def start_checker(self):
1160
1084
        """Start a new checker subprocess if one is not running.
1161
1085
 
1162
1086
        If a checker already exists, leave it running and do
1171
1095
        # should be.
1172
1096
 
1173
1097
        if self.checker is not None and not self.checker.is_alive():
1174
 
            log.warning("Checker was not alive; joining")
 
1098
            logger.warning("Checker was not alive; joining")
1175
1099
            self.checker.join()
1176
1100
            self.checker = None
1177
1101
        # Start a new checker if needed
1178
1102
        if self.checker is None:
1179
1103
            # Escape attributes for the shell
1180
1104
            escaped_attrs = {
1181
 
                attr: shlex.quote(str(getattr(self, attr)))
 
1105
                attr: re.escape(str(getattr(self, attr)))
1182
1106
                for attr in self.runtime_expansions}
1183
1107
            try:
1184
1108
                command = self.checker_command % escaped_attrs
1185
1109
            except TypeError as error:
1186
 
                log.error('Could not format string "%s"',
1187
 
                          self.checker_command, exc_info=error)
 
1110
                logger.error('Could not format string "%s"',
 
1111
                             self.checker_command,
 
1112
                             exc_info=error)
1188
1113
                return True     # Try again later
1189
1114
            self.current_checker_command = command
1190
 
            log.info("Starting checker %r for %s", command, self.name)
 
1115
            logger.info("Starting checker %r for %s", command,
 
1116
                        self.name)
1191
1117
            # We don't need to redirect stdout and stderr, since
1192
1118
            # in normal mode, that is already done by daemon(),
1193
1119
            # and in debug mode we don't want to.  (Stdin is
1209
1135
                kwargs=popen_args)
1210
1136
            self.checker.start()
1211
1137
            self.checker_callback_tag = GLib.io_add_watch(
1212
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
1213
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
1138
                pipe[0].fileno(), GLib.IO_IN,
1214
1139
                self.checker_callback, pipe[0], command)
1215
 
        if start_was_randomized:
1216
 
            # We were started after a random delay; Schedule a new
1217
 
            # checker to be started an 'interval' from now, and every
1218
 
            # interval from then on.
1219
 
            now = datetime.datetime.utcnow()
1220
 
            self.checker_initiator_tag = GLib.timeout_add(
1221
 
                int(self.interval.total_seconds() * 1000),
1222
 
                self.start_checker)
1223
 
            self.expires = max(self.expires, now + self.interval)
1224
 
            # Don't start a new checker again after same random delay
1225
 
            return False
1226
1140
        # Re-run this periodically if run by GLib.timeout_add
1227
1141
        return True
1228
1142
 
1233
1147
            self.checker_callback_tag = None
1234
1148
        if getattr(self, "checker", None) is None:
1235
1149
            return
1236
 
        log.debug("Stopping checker for %(name)s", vars(self))
 
1150
        logger.debug("Stopping checker for %(name)s", vars(self))
1237
1151
        self.checker.terminate()
1238
1152
        self.checker = None
1239
1153
 
1266
1180
        func._dbus_name = func.__name__
1267
1181
        if func._dbus_name.endswith("_dbus_property"):
1268
1182
            func._dbus_name = func._dbus_name[:-14]
1269
 
        func._dbus_get_args_options = {"byte_arrays": byte_arrays}
 
1183
        func._dbus_get_args_options = {'byte_arrays': byte_arrays}
1270
1184
        return func
1271
1185
 
1272
1186
    return decorator
1361
1275
 
1362
1276
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1363
1277
                         out_signature="s",
1364
 
                         path_keyword="object_path",
1365
 
                         connection_keyword="connection")
 
1278
                         path_keyword='object_path',
 
1279
                         connection_keyword='connection')
1366
1280
    def Introspect(self, object_path, connection):
1367
1281
        """Overloading of standard D-Bus method.
1368
1282
 
1417
1331
            document.unlink()
1418
1332
        except (AttributeError, xml.dom.DOMException,
1419
1333
                xml.parsers.expat.ExpatError) as error:
1420
 
            log.error("Failed to override Introspection method",
1421
 
                      exc_info=error)
 
1334
            logger.error("Failed to override Introspection method",
 
1335
                         exc_info=error)
1422
1336
        return xmlstring
1423
1337
 
1424
1338
 
1482
1396
                raise ValueError("Byte arrays not supported for non-"
1483
1397
                                 "'ay' signature {!r}"
1484
1398
                                 .format(prop._dbus_signature))
1485
 
            value = dbus.ByteArray(bytes(value))
 
1399
            value = dbus.ByteArray(b''.join(chr(byte)
 
1400
                                            for byte in value))
1486
1401
        prop(value)
1487
1402
 
1488
1403
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1521
1436
 
1522
1437
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1523
1438
                         out_signature="s",
1524
 
                         path_keyword="object_path",
1525
 
                         connection_keyword="connection")
 
1439
                         path_keyword='object_path',
 
1440
                         connection_keyword='connection')
1526
1441
    def Introspect(self, object_path, connection):
1527
1442
        """Overloading of standard D-Bus method.
1528
1443
 
1584
1499
            document.unlink()
1585
1500
        except (AttributeError, xml.dom.DOMException,
1586
1501
                xml.parsers.expat.ExpatError) as error:
1587
 
            log.error("Failed to override Introspection method",
1588
 
                      exc_info=error)
 
1502
            logger.error("Failed to override Introspection method",
 
1503
                         exc_info=error)
1589
1504
        return xmlstring
1590
1505
 
1591
1506
 
1623
1538
 
1624
1539
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1625
1540
                         out_signature="s",
1626
 
                         path_keyword="object_path",
1627
 
                         connection_keyword="connection")
 
1541
                         path_keyword='object_path',
 
1542
                         connection_keyword='connection')
1628
1543
    def Introspect(self, object_path, connection):
1629
1544
        """Overloading of standard D-Bus method.
1630
1545
 
1655
1570
            document.unlink()
1656
1571
        except (AttributeError, xml.dom.DOMException,
1657
1572
                xml.parsers.expat.ExpatError) as error:
1658
 
            log.error("Failed to override Introspection method",
1659
 
                      exc_info=error)
 
1573
            logger.error("Failed to override Introspection method",
 
1574
                         exc_info=error)
1660
1575
        return xmlstring
1661
1576
 
1662
1577
 
2293
2208
    del _interface
2294
2209
 
2295
2210
 
2296
 
class ProxyClient:
 
2211
class ProxyClient(object):
2297
2212
    def __init__(self, child_pipe, key_id, fpr, address):
2298
2213
        self._pipe = child_pipe
2299
 
        self._pipe.send(("init", key_id, fpr, address))
 
2214
        self._pipe.send(('init', key_id, fpr, address))
2300
2215
        if not self._pipe.recv():
2301
2216
            raise KeyError(key_id or fpr)
2302
2217
 
2303
2218
    def __getattribute__(self, name):
2304
 
        if name == "_pipe":
 
2219
        if name == '_pipe':
2305
2220
            return super(ProxyClient, self).__getattribute__(name)
2306
 
        self._pipe.send(("getattr", name))
 
2221
        self._pipe.send(('getattr', name))
2307
2222
        data = self._pipe.recv()
2308
 
        if data[0] == "data":
 
2223
        if data[0] == 'data':
2309
2224
            return data[1]
2310
 
        if data[0] == "function":
 
2225
        if data[0] == 'function':
2311
2226
 
2312
2227
            def func(*args, **kwargs):
2313
 
                self._pipe.send(("funcall", name, args, kwargs))
 
2228
                self._pipe.send(('funcall', name, args, kwargs))
2314
2229
                return self._pipe.recv()[1]
2315
2230
 
2316
2231
            return func
2317
2232
 
2318
2233
    def __setattr__(self, name, value):
2319
 
        if name == "_pipe":
 
2234
        if name == '_pipe':
2320
2235
            return super(ProxyClient, self).__setattr__(name, value)
2321
 
        self._pipe.send(("setattr", name, value))
 
2236
        self._pipe.send(('setattr', name, value))
2322
2237
 
2323
2238
 
2324
2239
class ClientHandler(socketserver.BaseRequestHandler, object):
2329
2244
 
2330
2245
    def handle(self):
2331
2246
        with contextlib.closing(self.server.child_pipe) as child_pipe:
2332
 
            log.info("TCP connection from: %s",
2333
 
                     str(self.client_address))
2334
 
            log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
 
2247
            logger.info("TCP connection from: %s",
 
2248
                        str(self.client_address))
 
2249
            logger.debug("Pipe FD: %d",
 
2250
                         self.server.child_pipe.fileno())
2335
2251
 
2336
2252
            session = gnutls.ClientSession(self.request)
2337
2253
 
2338
 
            # priority = ":".join(("NONE", "+VERS-TLS1.1",
 
2254
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
2339
2255
            #                       "+AES-256-CBC", "+SHA1",
2340
2256
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
2341
2257
            #                       "+DHE-DSS"))
2343
2259
            priority = self.server.gnutls_priority
2344
2260
            if priority is None:
2345
2261
                priority = "NORMAL"
2346
 
            gnutls.priority_set_direct(session,
2347
 
                                       priority.encode("utf-8"), None)
 
2262
            gnutls.priority_set_direct(session._c_object,
 
2263
                                       priority.encode("utf-8"),
 
2264
                                       None)
2348
2265
 
2349
2266
            # Start communication using the Mandos protocol
2350
2267
            # Get protocol number
2351
2268
            line = self.request.makefile().readline()
2352
 
            log.debug("Protocol version: %r", line)
 
2269
            logger.debug("Protocol version: %r", line)
2353
2270
            try:
2354
2271
                if int(line.strip().split()[0]) > 1:
2355
2272
                    raise RuntimeError(line)
2356
2273
            except (ValueError, IndexError, RuntimeError) as error:
2357
 
                log.error("Unknown protocol version: %s", error)
 
2274
                logger.error("Unknown protocol version: %s", error)
2358
2275
                return
2359
2276
 
2360
2277
            # Start GnuTLS connection
2361
2278
            try:
2362
2279
                session.handshake()
2363
2280
            except gnutls.Error as error:
2364
 
                log.warning("Handshake failed: %s", error)
 
2281
                logger.warning("Handshake failed: %s", error)
2365
2282
                # Do not run session.bye() here: the session is not
2366
2283
                # established.  Just abandon the request.
2367
2284
                return
2368
 
            log.debug("Handshake succeeded")
 
2285
            logger.debug("Handshake succeeded")
2369
2286
 
2370
2287
            approval_required = False
2371
2288
            try:
2372
2289
                if gnutls.has_rawpk:
2373
 
                    fpr = b""
 
2290
                    fpr = ""
2374
2291
                    try:
2375
2292
                        key_id = self.key_id(
2376
2293
                            self.peer_certificate(session))
2377
2294
                    except (TypeError, gnutls.Error) as error:
2378
 
                        log.warning("Bad certificate: %s", error)
 
2295
                        logger.warning("Bad certificate: %s", error)
2379
2296
                        return
2380
 
                    log.debug("Key ID: %s",
2381
 
                              key_id.decode("utf-8",
2382
 
                                            errors="replace"))
 
2297
                    logger.debug("Key ID: %s", key_id)
2383
2298
 
2384
2299
                else:
2385
 
                    key_id = b""
 
2300
                    key_id = ""
2386
2301
                    try:
2387
2302
                        fpr = self.fingerprint(
2388
2303
                            self.peer_certificate(session))
2389
2304
                    except (TypeError, gnutls.Error) as error:
2390
 
                        log.warning("Bad certificate: %s", error)
 
2305
                        logger.warning("Bad certificate: %s", error)
2391
2306
                        return
2392
 
                    log.debug("Fingerprint: %s", fpr)
 
2307
                    logger.debug("Fingerprint: %s", fpr)
2393
2308
 
2394
2309
                try:
2395
2310
                    client = ProxyClient(child_pipe, key_id, fpr,
2404
2319
 
2405
2320
                while True:
2406
2321
                    if not client.enabled:
2407
 
                        log.info("Client %s is disabled", client.name)
 
2322
                        logger.info("Client %s is disabled",
 
2323
                                    client.name)
2408
2324
                        if self.server.use_dbus:
2409
2325
                            # Emit D-Bus signal
2410
2326
                            client.Rejected("Disabled")
2414
2330
                        # We are approved or approval is disabled
2415
2331
                        break
2416
2332
                    elif client.approved is None:
2417
 
                        log.info("Client %s needs approval",
2418
 
                                 client.name)
 
2333
                        logger.info("Client %s needs approval",
 
2334
                                    client.name)
2419
2335
                        if self.server.use_dbus:
2420
2336
                            # Emit D-Bus signal
2421
2337
                            client.NeedApproval(
2422
2338
                                client.approval_delay.total_seconds()
2423
2339
                                * 1000, client.approved_by_default)
2424
2340
                    else:
2425
 
                        log.warning("Client %s was not approved",
2426
 
                                    client.name)
 
2341
                        logger.warning("Client %s was not approved",
 
2342
                                       client.name)
2427
2343
                        if self.server.use_dbus:
2428
2344
                            # Emit D-Bus signal
2429
2345
                            client.Rejected("Denied")
2437
2353
                    time2 = datetime.datetime.now()
2438
2354
                    if (time2 - time) >= delay:
2439
2355
                        if not client.approved_by_default:
2440
 
                            log.warning("Client %s timed out while"
2441
 
                                        " waiting for approval",
2442
 
                                        client.name)
 
2356
                            logger.warning("Client %s timed out while"
 
2357
                                           " waiting for approval",
 
2358
                                           client.name)
2443
2359
                            if self.server.use_dbus:
2444
2360
                                # Emit D-Bus signal
2445
2361
                                client.Rejected("Approval timed out")
2452
2368
                try:
2453
2369
                    session.send(client.secret)
2454
2370
                except gnutls.Error as error:
2455
 
                    log.warning("gnutls send failed", exc_info=error)
 
2371
                    logger.warning("gnutls send failed",
 
2372
                                   exc_info=error)
2456
2373
                    return
2457
2374
 
2458
 
                log.info("Sending secret to %s", client.name)
 
2375
                logger.info("Sending secret to %s", client.name)
2459
2376
                # bump the timeout using extended_timeout
2460
2377
                client.bump_timeout(client.extended_timeout)
2461
2378
                if self.server.use_dbus:
2468
2385
                try:
2469
2386
                    session.bye()
2470
2387
                except gnutls.Error as error:
2471
 
                    log.warning("GnuTLS bye failed", exc_info=error)
 
2388
                    logger.warning("GnuTLS bye failed",
 
2389
                                   exc_info=error)
2472
2390
 
2473
2391
    @staticmethod
2474
2392
    def peer_certificate(session):
2475
2393
        "Return the peer's certificate as a bytestring"
2476
2394
        try:
2477
 
            cert_type = gnutls.certificate_type_get2(
2478
 
                session, gnutls.CTYPE_PEERS)
 
2395
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
2396
                                                     gnutls.CTYPE_PEERS)
2479
2397
        except AttributeError:
2480
 
            cert_type = gnutls.certificate_type_get(session)
 
2398
            cert_type = gnutls.certificate_type_get(session._c_object)
2481
2399
        if gnutls.has_rawpk:
2482
2400
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2483
2401
        else:
2484
2402
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2485
2403
        # If not a valid certificate type...
2486
2404
        if cert_type not in valid_cert_types:
2487
 
            log.info("Cert type %r not in %r", cert_type,
2488
 
                     valid_cert_types)
 
2405
            logger.info("Cert type %r not in %r", cert_type,
 
2406
                        valid_cert_types)
2489
2407
            # ...return invalid data
2490
2408
            return b""
2491
2409
        list_size = ctypes.c_uint(1)
2492
2410
        cert_list = (gnutls.certificate_get_peers
2493
 
                     (session, ctypes.byref(list_size)))
 
2411
                     (session._c_object, ctypes.byref(list_size)))
2494
2412
        if not bool(cert_list) and list_size.value != 0:
2495
2413
            raise gnutls.Error("error getting peer certificate")
2496
2414
        if list_size.value == 0:
2518
2436
        buf = ctypes.create_string_buffer(32)
2519
2437
        buf_len = ctypes.c_size_t(len(buf))
2520
2438
        # Get the key ID from the raw public key into the buffer
2521
 
        gnutls.pubkey_get_key_id(
2522
 
            pubkey,
2523
 
            gnutls.KEYID_USE_SHA256,
2524
 
            ctypes.cast(ctypes.byref(buf),
2525
 
                        ctypes.POINTER(ctypes.c_ubyte)),
2526
 
            ctypes.byref(buf_len))
 
2439
        gnutls.pubkey_get_key_id(pubkey,
 
2440
                                 gnutls.KEYID_USE_SHA256,
 
2441
                                 ctypes.cast(ctypes.byref(buf),
 
2442
                                             ctypes.POINTER(ctypes.c_ubyte)),
 
2443
                                 ctypes.byref(buf_len))
2527
2444
        # Deinit the certificate
2528
2445
        gnutls.pubkey_deinit(pubkey)
2529
2446
 
2570
2487
        return hex_fpr
2571
2488
 
2572
2489
 
2573
 
class MultiprocessingMixIn:
 
2490
class MultiprocessingMixIn(object):
2574
2491
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2575
2492
 
2576
2493
    def sub_process_main(self, request, address):
2588
2505
        return proc
2589
2506
 
2590
2507
 
2591
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
2508
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2592
2509
    """ adds a pipe to the MixIn """
2593
2510
 
2594
2511
    def process_request(self, request, client_address):
2609
2526
 
2610
2527
 
2611
2528
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2612
 
                     socketserver.TCPServer):
2613
 
    """IPv6-capable TCP server.  Accepts None as address and/or port
 
2529
                     socketserver.TCPServer, object):
 
2530
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2614
2531
 
2615
2532
    Attributes:
2616
2533
        enabled:        Boolean; whether this server is activated yet
2667
2584
            if SO_BINDTODEVICE is None:
2668
2585
                # Fall back to a hard-coded value which seems to be
2669
2586
                # common enough.
2670
 
                log.warning("SO_BINDTODEVICE not found, trying 25")
 
2587
                logger.warning("SO_BINDTODEVICE not found, trying 25")
2671
2588
                SO_BINDTODEVICE = 25
2672
2589
            try:
2673
2590
                self.socket.setsockopt(
2675
2592
                    (self.interface + "\0").encode("utf-8"))
2676
2593
            except socket.error as error:
2677
2594
                if error.errno == errno.EPERM:
2678
 
                    log.error("No permission to bind to interface %s",
2679
 
                              self.interface)
 
2595
                    logger.error("No permission to bind to"
 
2596
                                 " interface %s", self.interface)
2680
2597
                elif error.errno == errno.ENOPROTOOPT:
2681
 
                    log.error("SO_BINDTODEVICE not available; cannot"
2682
 
                              " bind to interface %s", self.interface)
 
2598
                    logger.error("SO_BINDTODEVICE not available;"
 
2599
                                 " cannot bind to interface %s",
 
2600
                                 self.interface)
2683
2601
                elif error.errno == errno.ENODEV:
2684
 
                    log.error("Interface %s does not exist, cannot"
2685
 
                              " bind", self.interface)
 
2602
                    logger.error("Interface %s does not exist,"
 
2603
                                 " cannot bind", self.interface)
2686
2604
                else:
2687
2605
                    raise
2688
2606
        # Only bind(2) the socket if we really need to.
2747
2665
    def add_pipe(self, parent_pipe, proc):
2748
2666
        # Call "handle_ipc" for both data and EOF events
2749
2667
        GLib.io_add_watch(
2750
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
2751
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2668
            parent_pipe.fileno(),
 
2669
            GLib.IO_IN | GLib.IO_HUP,
2752
2670
            functools.partial(self.handle_ipc,
2753
2671
                              parent_pipe=parent_pipe,
2754
2672
                              proc=proc))
2767
2685
        request = parent_pipe.recv()
2768
2686
        command = request[0]
2769
2687
 
2770
 
        if command == "init":
 
2688
        if command == 'init':
2771
2689
            key_id = request[1].decode("ascii")
2772
2690
            fpr = request[2].decode("ascii")
2773
2691
            address = request[3]
2774
2692
 
2775
2693
            for c in self.clients.values():
2776
 
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2777
 
                              "27AE41E4649B934CA495991B7852B855"):
 
2694
                if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2778
2695
                    continue
2779
2696
                if key_id and c.key_id == key_id:
2780
2697
                    client = c
2783
2700
                    client = c
2784
2701
                    break
2785
2702
            else:
2786
 
                log.info("Client not found for key ID: %s, address:"
2787
 
                         " %s", key_id or fpr, address)
 
2703
                logger.info("Client not found for key ID: %s, address"
 
2704
                            ": %s", key_id or fpr, address)
2788
2705
                if self.use_dbus:
2789
2706
                    # Emit D-Bus signal
2790
2707
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
2793
2710
                return False
2794
2711
 
2795
2712
            GLib.io_add_watch(
2796
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
2797
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
 
2713
                parent_pipe.fileno(),
 
2714
                GLib.IO_IN | GLib.IO_HUP,
2798
2715
                functools.partial(self.handle_ipc,
2799
2716
                                  parent_pipe=parent_pipe,
2800
2717
                                  proc=proc,
2803
2720
            # remove the old hook in favor of the new above hook on
2804
2721
            # same fileno
2805
2722
            return False
2806
 
        if command == "funcall":
 
2723
        if command == 'funcall':
2807
2724
            funcname = request[1]
2808
2725
            args = request[2]
2809
2726
            kwargs = request[3]
2810
2727
 
2811
 
            parent_pipe.send(("data", getattr(client_object,
 
2728
            parent_pipe.send(('data', getattr(client_object,
2812
2729
                                              funcname)(*args,
2813
2730
                                                        **kwargs)))
2814
2731
 
2815
 
        if command == "getattr":
 
2732
        if command == 'getattr':
2816
2733
            attrname = request[1]
2817
2734
            if isinstance(client_object.__getattribute__(attrname),
2818
 
                          collections.abc.Callable):
2819
 
                parent_pipe.send(("function", ))
 
2735
                          collections.Callable):
 
2736
                parent_pipe.send(('function', ))
2820
2737
            else:
2821
2738
                parent_pipe.send((
2822
 
                    "data", client_object.__getattribute__(attrname)))
 
2739
                    'data', client_object.__getattribute__(attrname)))
2823
2740
 
2824
 
        if command == "setattr":
 
2741
        if command == 'setattr':
2825
2742
            attrname = request[1]
2826
2743
            value = request[2]
2827
2744
            setattr(client_object, attrname, value)
2832
2749
def rfc3339_duration_to_delta(duration):
2833
2750
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2834
2751
 
2835
 
    >>> timedelta = datetime.timedelta
2836
 
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2837
 
    True
2838
 
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2839
 
    True
2840
 
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2841
 
    True
2842
 
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2843
 
    True
2844
 
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2845
 
    True
2846
 
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2847
 
    True
2848
 
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2849
 
    True
2850
 
    >>> del timedelta
 
2752
    >>> rfc3339_duration_to_delta("P7D")
 
2753
    datetime.timedelta(7)
 
2754
    >>> rfc3339_duration_to_delta("PT60S")
 
2755
    datetime.timedelta(0, 60)
 
2756
    >>> rfc3339_duration_to_delta("PT60M")
 
2757
    datetime.timedelta(0, 3600)
 
2758
    >>> rfc3339_duration_to_delta("PT24H")
 
2759
    datetime.timedelta(1)
 
2760
    >>> rfc3339_duration_to_delta("P1W")
 
2761
    datetime.timedelta(7)
 
2762
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2763
    datetime.timedelta(0, 330)
 
2764
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2765
    datetime.timedelta(1, 200)
2851
2766
    """
2852
2767
 
2853
2768
    # Parsing an RFC 3339 duration with regular expressions is not
2933
2848
def string_to_delta(interval):
2934
2849
    """Parse a string and return a datetime.timedelta
2935
2850
 
2936
 
    >>> string_to_delta("7d") == datetime.timedelta(7)
2937
 
    True
2938
 
    >>> string_to_delta("60s") == datetime.timedelta(0, 60)
2939
 
    True
2940
 
    >>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2941
 
    True
2942
 
    >>> string_to_delta("24h") == datetime.timedelta(1)
2943
 
    True
2944
 
    >>> string_to_delta("1w") == datetime.timedelta(7)
2945
 
    True
2946
 
    >>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
2947
 
    True
 
2851
    >>> string_to_delta('7d')
 
2852
    datetime.timedelta(7)
 
2853
    >>> string_to_delta('60s')
 
2854
    datetime.timedelta(0, 60)
 
2855
    >>> string_to_delta('60m')
 
2856
    datetime.timedelta(0, 3600)
 
2857
    >>> string_to_delta('24h')
 
2858
    datetime.timedelta(1)
 
2859
    >>> string_to_delta('1w')
 
2860
    datetime.timedelta(7)
 
2861
    >>> string_to_delta('5m 30s')
 
2862
    datetime.timedelta(0, 330)
2948
2863
    """
2949
2864
 
2950
2865
    try:
3052
2967
 
3053
2968
    options = parser.parse_args()
3054
2969
 
 
2970
    if options.check:
 
2971
        import doctest
 
2972
        fail_count, test_count = doctest.testmod()
 
2973
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2974
 
3055
2975
    # Default values for config file for server-global settings
3056
2976
    if gnutls.has_rawpk:
3057
2977
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3077
2997
    del priority
3078
2998
 
3079
2999
    # Parse config file for server-global settings
3080
 
    server_config = configparser.ConfigParser(server_defaults)
 
3000
    server_config = configparser.SafeConfigParser(server_defaults)
3081
3001
    del server_defaults
3082
3002
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
3083
 
    # Convert the ConfigParser object to a dict
 
3003
    # Convert the SafeConfigParser object to a dict
3084
3004
    server_settings = server_config.defaults()
3085
3005
    # Use the appropriate methods on the non-string config options
3086
3006
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
3153
3073
 
3154
3074
    if server_settings["servicename"] != "Mandos":
3155
3075
        syslogger.setFormatter(
3156
 
            logging.Formatter("Mandos ({}) [%(process)d]:"
3157
 
                              " %(levelname)s: %(message)s".format(
 
3076
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
3077
                              ' %(levelname)s: %(message)s'.format(
3158
3078
                                  server_settings["servicename"])))
3159
3079
 
3160
3080
    # Parse config file with clients
3161
 
    client_config = configparser.ConfigParser(Client.client_defaults)
 
3081
    client_config = configparser.SafeConfigParser(Client
 
3082
                                                  .client_defaults)
3162
3083
    client_config.read(os.path.join(server_settings["configdir"],
3163
3084
                                    "clients.conf"))
3164
3085
 
3184
3105
        try:
3185
3106
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3186
3107
        except IOError as e:
3187
 
            log.error("Could not open file %r", pidfilename,
3188
 
                      exc_info=e)
 
3108
            logger.error("Could not open file %r", pidfilename,
 
3109
                         exc_info=e)
3189
3110
 
3190
3111
    for name, group in (("_mandos", "_mandos"),
3191
3112
                        ("mandos", "mandos"),
3202
3123
    try:
3203
3124
        os.setgid(gid)
3204
3125
        os.setuid(uid)
3205
 
        log.debug("Did setuid/setgid to %s:%s", uid, gid)
 
3126
        if debug:
 
3127
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
3128
                                                             gid))
3206
3129
    except OSError as error:
3207
 
        log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
3208
 
                    os.strerror(error.errno))
 
3130
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
3131
                       .format(uid, gid, os.strerror(error.errno)))
3209
3132
        if error.errno != errno.EPERM:
3210
3133
            raise
3211
3134
 
3218
3141
 
3219
3142
        @gnutls.log_func
3220
3143
        def debug_gnutls(level, string):
3221
 
            log.debug("GnuTLS: %s",
3222
 
                      string[:-1].decode("utf-8", errors="replace"))
 
3144
            logger.debug("GnuTLS: %s", string[:-1])
3223
3145
 
3224
3146
        gnutls.global_set_log_function(debug_gnutls)
3225
3147
 
3234
3156
        # Close all input and output, do double fork, etc.
3235
3157
        daemon()
3236
3158
 
3237
 
    if gi.version_info < (3, 10, 2):
3238
 
        # multiprocessing will use threads, so before we use GLib we
3239
 
        # need to inform GLib that threads will be used.
3240
 
        GLib.threads_init()
 
3159
    # multiprocessing will use threads, so before we use GLib we need
 
3160
    # to inform GLib that threads will be used.
 
3161
    GLib.threads_init()
3241
3162
 
3242
3163
    global main_loop
3243
3164
    # From the Avahi example code
3244
3165
    DBusGMainLoop(set_as_default=True)
3245
3166
    main_loop = GLib.MainLoop()
3246
 
    if use_dbus or zeroconf:
3247
 
        bus = dbus.SystemBus()
 
3167
    bus = dbus.SystemBus()
3248
3168
    # End of Avahi example code
3249
3169
    if use_dbus:
3250
3170
        try:
3255
3175
                "se.bsnet.fukt.Mandos", bus,
3256
3176
                do_not_queue=True)
3257
3177
        except dbus.exceptions.DBusException as e:
3258
 
            log.error("Disabling D-Bus:", exc_info=e)
 
3178
            logger.error("Disabling D-Bus:", exc_info=e)
3259
3179
            use_dbus = False
3260
3180
            server_settings["use_dbus"] = False
3261
3181
            tcp_server.use_dbus = False
3320
3240
                             if isinstance(s, bytes)
3321
3241
                             else s) for s in
3322
3242
                            value["client_structure"]]
3323
 
                        # .name, .host, and .checker_command
3324
 
                        for k in ("name", "host", "checker_command"):
 
3243
                        # .name & .host
 
3244
                        for k in ("name", "host"):
3325
3245
                            if isinstance(value[k], bytes):
3326
3246
                                value[k] = value[k].decode("utf-8")
3327
 
                        if "key_id" not in value:
 
3247
                        if not value.has_key("key_id"):
3328
3248
                            value["key_id"] = ""
3329
 
                        elif "fingerprint" not in value:
 
3249
                        elif not value.has_key("fingerprint"):
3330
3250
                            value["fingerprint"] = ""
3331
3251
                    #  old_client_settings
3332
3252
                    # .keys()
3337
3257
                        for key, value in
3338
3258
                        bytes_old_client_settings.items()}
3339
3259
                    del bytes_old_client_settings
3340
 
                    # .host and .checker_command
 
3260
                    # .host
3341
3261
                    for value in old_client_settings.values():
3342
 
                        for attribute in ("host", "checker_command"):
3343
 
                            if isinstance(value[attribute], bytes):
3344
 
                                value[attribute] = (value[attribute]
3345
 
                                                    .decode("utf-8"))
 
3262
                        if isinstance(value["host"], bytes):
 
3263
                            value["host"] = (value["host"]
 
3264
                                             .decode("utf-8"))
3346
3265
            os.remove(stored_state_path)
3347
3266
        except IOError as e:
3348
3267
            if e.errno == errno.ENOENT:
3349
 
                log.warning("Could not load persistent state:"
3350
 
                            " %s", os.strerror(e.errno))
 
3268
                logger.warning("Could not load persistent state:"
 
3269
                               " {}".format(os.strerror(e.errno)))
3351
3270
            else:
3352
 
                log.critical("Could not load persistent state:",
3353
 
                             exc_info=e)
 
3271
                logger.critical("Could not load persistent state:",
 
3272
                                exc_info=e)
3354
3273
                raise
3355
3274
        except EOFError as e:
3356
 
            log.warning("Could not load persistent state: EOFError:",
3357
 
                        exc_info=e)
 
3275
            logger.warning("Could not load persistent state: "
 
3276
                           "EOFError:",
 
3277
                           exc_info=e)
3358
3278
 
3359
3279
    with PGPEngine() as pgp:
3360
3280
        for client_name, client in clients_data.items():
3387
3307
            if client["enabled"]:
3388
3308
                if datetime.datetime.utcnow() >= client["expires"]:
3389
3309
                    if not client["last_checked_ok"]:
3390
 
                        log.warning("disabling client %s - Client"
3391
 
                                    " never performed a successful"
3392
 
                                    " checker", client_name)
 
3310
                        logger.warning(
 
3311
                            "disabling client {} - Client never "
 
3312
                            "performed a successful checker".format(
 
3313
                                client_name))
3393
3314
                        client["enabled"] = False
3394
3315
                    elif client["last_checker_status"] != 0:
3395
 
                        log.warning("disabling client %s - Client"
3396
 
                                    " last checker failed with error"
3397
 
                                    " code %s", client_name,
3398
 
                                    client["last_checker_status"])
 
3316
                        logger.warning(
 
3317
                            "disabling client {} - Client last"
 
3318
                            " checker failed with error code"
 
3319
                            " {}".format(
 
3320
                                client_name,
 
3321
                                client["last_checker_status"]))
3399
3322
                        client["enabled"] = False
3400
3323
                    else:
3401
3324
                        client["expires"] = (
3402
3325
                            datetime.datetime.utcnow()
3403
3326
                            + client["timeout"])
3404
 
                        log.debug("Last checker succeeded, keeping %s"
3405
 
                                  " enabled", client_name)
 
3327
                        logger.debug("Last checker succeeded,"
 
3328
                                     " keeping {} enabled".format(
 
3329
                                         client_name))
3406
3330
            try:
3407
3331
                client["secret"] = pgp.decrypt(
3408
3332
                    client["encrypted_secret"],
3409
3333
                    client_settings[client_name]["secret"])
3410
3334
            except PGPError:
3411
3335
                # If decryption fails, we use secret from new settings
3412
 
                log.debug("Failed to decrypt %s old secret",
3413
 
                          client_name)
 
3336
                logger.debug("Failed to decrypt {} old secret".format(
 
3337
                    client_name))
3414
3338
                client["secret"] = (client_settings[client_name]
3415
3339
                                    ["secret"])
3416
3340
 
3430
3354
            server_settings=server_settings)
3431
3355
 
3432
3356
    if not tcp_server.clients:
3433
 
        log.warning("No clients defined")
 
3357
        logger.warning("No clients defined")
3434
3358
 
3435
3359
    if not foreground:
3436
3360
        if pidfile is not None:
3439
3363
                with pidfile:
3440
3364
                    print(pid, file=pidfile)
3441
3365
            except IOError:
3442
 
                log.error("Could not write to file %r with PID %d",
3443
 
                          pidfilename, pid)
 
3366
                logger.error("Could not write to file %r with PID %d",
 
3367
                             pidfilename, pid)
3444
3368
        del pidfile
3445
3369
        del pidfilename
3446
3370
 
3596
3520
 
3597
3521
        try:
3598
3522
            with tempfile.NamedTemporaryFile(
3599
 
                    mode="wb",
 
3523
                    mode='wb',
3600
3524
                    suffix=".pickle",
3601
 
                    prefix="clients-",
 
3525
                    prefix='clients-',
3602
3526
                    dir=os.path.dirname(stored_state_path),
3603
3527
                    delete=False) as stored_state:
3604
3528
                pickle.dump((clients, client_settings), stored_state,
3612
3536
                except NameError:
3613
3537
                    pass
3614
3538
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3615
 
                log.warning("Could not save persistent state: %s",
3616
 
                            os.strerror(e.errno))
 
3539
                logger.warning("Could not save persistent state: {}"
 
3540
                               .format(os.strerror(e.errno)))
3617
3541
            else:
3618
 
                log.warning("Could not save persistent state:",
3619
 
                            exc_info=e)
 
3542
                logger.warning("Could not save persistent state:",
 
3543
                               exc_info=e)
3620
3544
                raise
3621
3545
 
3622
3546
        # Delete all clients, and settings from config
3639
3563
            mandos_dbus_service.client_added_signal(client)
3640
3564
        # Need to initiate checking of clients
3641
3565
        if client.enabled:
3642
 
            client.init_checker(randomize_start=True)
 
3566
            client.init_checker()
3643
3567
 
3644
3568
    tcp_server.enable()
3645
3569
    tcp_server.server_activate()
3648
3572
    if zeroconf:
3649
3573
        service.port = tcp_server.socket.getsockname()[1]
3650
3574
    if use_ipv6:
3651
 
        log.info("Now listening on address %r, port %d, flowinfo %d,"
3652
 
                 " scope_id %d", *tcp_server.socket.getsockname())
 
3575
        logger.info("Now listening on address %r, port %d,"
 
3576
                    " flowinfo %d, scope_id %d",
 
3577
                    *tcp_server.socket.getsockname())
3653
3578
    else:                       # IPv4
3654
 
        log.info("Now listening on address %r, port %d",
3655
 
                 *tcp_server.socket.getsockname())
 
3579
        logger.info("Now listening on address %r, port %d",
 
3580
                    *tcp_server.socket.getsockname())
3656
3581
 
3657
3582
    # service.interface = tcp_server.socket.getsockname()[3]
3658
3583
 
3662
3587
            try:
3663
3588
                service.activate()
3664
3589
            except dbus.exceptions.DBusException as error:
3665
 
                log.critical("D-Bus Exception", exc_info=error)
 
3590
                logger.critical("D-Bus Exception", exc_info=error)
3666
3591
                cleanup()
3667
3592
                sys.exit(1)
3668
3593
            # End of Avahi example code
3669
3594
 
3670
 
        GLib.io_add_watch(
3671
 
            GLib.IOChannel.unix_new(tcp_server.fileno()),
3672
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3673
 
            lambda *args, **kwargs: (tcp_server.handle_request
3674
 
                                     (*args[2:], **kwargs) or True))
 
3595
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
 
3596
                          lambda *args, **kwargs:
 
3597
                          (tcp_server.handle_request
 
3598
                           (*args[2:], **kwargs) or True))
3675
3599
 
3676
 
        log.debug("Starting main loop")
 
3600
        logger.debug("Starting main loop")
3677
3601
        main_loop.run()
3678
3602
    except AvahiError as error:
3679
 
        log.critical("Avahi Error", exc_info=error)
 
3603
        logger.critical("Avahi Error", exc_info=error)
3680
3604
        cleanup()
3681
3605
        sys.exit(1)
3682
3606
    except KeyboardInterrupt:
3683
3607
        if debug:
3684
3608
            print("", file=sys.stderr)
3685
 
        log.debug("Server received KeyboardInterrupt")
3686
 
    log.debug("Server exiting")
 
3609
        logger.debug("Server received KeyboardInterrupt")
 
3610
    logger.debug("Server exiting")
3687
3611
    # Must run before the D-Bus bus name gets deregistered
3688
3612
    cleanup()
3689
3613
 
3690
 
 
3691
 
def parse_test_args():
3692
 
    # type: () -> argparse.Namespace
3693
 
    parser = argparse.ArgumentParser(add_help=False)
3694
 
    parser.add_argument("--check", action="store_true")
3695
 
    parser.add_argument("--prefix", )
3696
 
    args, unknown_args = parser.parse_known_args()
3697
 
    if args.check:
3698
 
        # Remove test options from sys.argv
3699
 
        sys.argv[1:] = unknown_args
3700
 
    return args
3701
 
 
3702
 
# Add all tests from doctest strings
3703
 
def load_tests(loader, tests, none):
3704
 
    import doctest
3705
 
    tests.addTests(doctest.DocTestSuite())
3706
 
    return tests
3707
 
 
3708
 
if __name__ == "__main__":
3709
 
    options = parse_test_args()
3710
 
    try:
3711
 
        if options.check:
3712
 
            extra_test_prefix = options.prefix
3713
 
            if extra_test_prefix is not None:
3714
 
                if not (unittest.main(argv=[""], exit=False)
3715
 
                        .result.wasSuccessful()):
3716
 
                    sys.exit(1)
3717
 
                class ExtraTestLoader(unittest.TestLoader):
3718
 
                    testMethodPrefix = extra_test_prefix
3719
 
                # Call using ./scriptname --test [--verbose]
3720
 
                unittest.main(argv=[""], testLoader=ExtraTestLoader())
3721
 
            else:
3722
 
                unittest.main(argv=[""])
3723
 
        else:
3724
 
            main()
3725
 
    finally:
3726
 
        logging.shutdown()
3727
 
 
3728
 
# Local Variables:
3729
 
# run-tests:
3730
 
# (lambda (&optional extra)
3731
 
#   (if (not (funcall run-tests-in-test-buffer default-directory
3732
 
#             extra))
3733
 
#       (funcall show-test-buffer-in-test-window)
3734
 
#     (funcall remove-test-window)
3735
 
#     (if extra (message "Extra tests run successfully!"))))
3736
 
# run-tests-in-test-buffer:
3737
 
# (lambda (dir &optional extra)
3738
 
#   (with-current-buffer (get-buffer-create "*Test*")
3739
 
#     (setq buffer-read-only nil
3740
 
#           default-directory dir)
3741
 
#     (erase-buffer)
3742
 
#     (compilation-mode))
3743
 
#   (let ((process-result
3744
 
#          (let ((inhibit-read-only t))
3745
 
#            (process-file-shell-command
3746
 
#             (funcall get-command-line extra) nil "*Test*"))))
3747
 
#     (and (numberp process-result)
3748
 
#          (= process-result 0))))
3749
 
# get-command-line:
3750
 
# (lambda (&optional extra)
3751
 
#   (let ((quoted-script
3752
 
#          (shell-quote-argument (funcall get-script-name))))
3753
 
#     (format
3754
 
#      (concat "%s --check" (if extra " --prefix=atest" ""))
3755
 
#      quoted-script)))
3756
 
# get-script-name:
3757
 
# (lambda ()
3758
 
#   (if (fboundp 'file-local-name)
3759
 
#       (file-local-name (buffer-file-name))
3760
 
#     (or (file-remote-p (buffer-file-name) 'localname)
3761
 
#         (buffer-file-name))))
3762
 
# remove-test-window:
3763
 
# (lambda ()
3764
 
#   (let ((test-window (get-buffer-window "*Test*")))
3765
 
#     (if test-window (delete-window test-window))))
3766
 
# show-test-buffer-in-test-window:
3767
 
# (lambda ()
3768
 
#   (when (not (get-buffer-window-list "*Test*"))
3769
 
#     (setq next-error-last-buffer (get-buffer "*Test*"))
3770
 
#     (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3771
 
#            (display-buffer-overriding-action
3772
 
#             `((display-buffer-in-side-window) (side . ,side)
3773
 
#               (window-height . fit-window-to-buffer)
3774
 
#               (window-width . fit-window-to-buffer))))
3775
 
#       (display-buffer "*Test*"))))
3776
 
# eval:
3777
 
# (progn
3778
 
#   (let* ((run-extra-tests (lambda () (interactive)
3779
 
#                             (funcall run-tests t)))
3780
 
#          (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3781
 
#          (outer-keymap `(keymap (3 . ,inner-keymap))))     ; C-c
3782
 
#     (setq minor-mode-overriding-map-alist
3783
 
#           (cons `(run-tests . ,outer-keymap)
3784
 
#                 minor-mode-overriding-map-alist)))
3785
 
#   (add-hook 'after-save-hook run-tests 90 t))
3786
 
# End:
 
3614
 
 
3615
if __name__ == '__main__':
 
3616
    main()