/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2021-02-03 08:40:41 UTC
  • Revision ID: teddy@recompile.se-20210203084041-kfmyueudtc2pdhjg
Remove superfluous whitespace

* plugin-helpers/mandos-client-iprouteadddel.c (fprintf_plus): Remove
  a stray space character.

Show diffs side-by-side

added added

removed removed

Lines of Context:
143
143
if sys.version_info < (3, 2):
144
144
    configparser.Configparser = configparser.SafeConfigParser
145
145
 
146
 
version = "1.8.14"
 
146
version = "1.8.13"
147
147
stored_state_file = "clients.pickle"
148
148
 
149
 
log = logging.getLogger(os.path.basename(sys.argv[0]))
 
149
logger = logging.getLogger()
150
150
logging.captureWarnings(True)   # Show warnings via the logging system
151
151
syslogger = None
152
152
 
189
189
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
190
190
        address="/dev/log"))
191
191
    syslogger.setFormatter(logging.Formatter
192
 
                           ("Mandos [%(process)d]: %(levelname)s:"
193
 
                            " %(message)s"))
194
 
    log.addHandler(syslogger)
 
192
                           ('Mandos [%(process)d]: %(levelname)s:'
 
193
                            ' %(message)s'))
 
194
    logger.addHandler(syslogger)
195
195
 
196
196
    if debug:
197
197
        console = logging.StreamHandler()
198
 
        console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
199
 
                                               " [%(process)d]:"
200
 
                                               " %(levelname)s:"
201
 
                                               " %(message)s"))
202
 
        log.addHandler(console)
203
 
    log.setLevel(level)
 
198
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
199
                                               ' [%(process)d]:'
 
200
                                               ' %(levelname)s:'
 
201
                                               ' %(message)s'))
 
202
        logger.addHandler(console)
 
203
    logger.setLevel(level)
204
204
 
205
205
 
206
206
class PGPError(Exception):
224
224
        except OSError as e:
225
225
            if e.errno != errno.ENOENT:
226
226
                raise
227
 
        self.gnupgargs = ["--batch",
228
 
                          "--homedir", self.tempdir,
229
 
                          "--force-mdc",
230
 
                          "--quiet"]
 
227
        self.gnupgargs = ['--batch',
 
228
                          '--homedir', self.tempdir,
 
229
                          '--force-mdc',
 
230
                          '--quiet']
231
231
        # Only GPG version 1 has the --no-use-agent option.
232
232
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
233
233
            self.gnupgargs.append("--no-use-agent")
272
272
                dir=self.tempdir) as passfile:
273
273
            passfile.write(passphrase)
274
274
            passfile.flush()
275
 
            proc = subprocess.Popen([self.gpg, "--symmetric",
276
 
                                     "--passphrase-file",
 
275
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
276
                                     '--passphrase-file',
277
277
                                     passfile.name]
278
278
                                    + self.gnupgargs,
279
279
                                    stdin=subprocess.PIPE,
290
290
                dir=self.tempdir) as passfile:
291
291
            passfile.write(passphrase)
292
292
            passfile.flush()
293
 
            proc = subprocess.Popen([self.gpg, "--decrypt",
294
 
                                     "--passphrase-file",
 
293
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
294
                                     '--passphrase-file',
295
295
                                     passfile.name]
296
296
                                    + self.gnupgargs,
297
297
                                    stdin=subprocess.PIPE,
350
350
    Attributes:
351
351
    interface: integer; avahi.IF_UNSPEC or an interface index.
352
352
               Used to optionally bind to the specified interface.
353
 
    name: string; Example: "Mandos"
354
 
    type: string; Example: "_mandos._tcp".
 
353
    name: string; Example: 'Mandos'
 
354
    type: string; Example: '_mandos._tcp'.
355
355
     See <https://www.iana.org/assignments/service-names-port-numbers>
356
356
    port: integer; what port to announce
357
357
    TXT: list of strings; TXT record for the service
394
394
    def rename(self, remove=True):
395
395
        """Derived from the Avahi example code"""
396
396
        if self.rename_count >= self.max_renames:
397
 
            log.critical("No suitable Zeroconf service name found"
398
 
                         " after %i retries, exiting.",
399
 
                         self.rename_count)
 
397
            logger.critical("No suitable Zeroconf service name found"
 
398
                            " after %i retries, exiting.",
 
399
                            self.rename_count)
400
400
            raise AvahiServiceError("Too many renames")
401
401
        self.name = str(
402
402
            self.server.GetAlternativeServiceName(self.name))
403
403
        self.rename_count += 1
404
 
        log.info("Changing Zeroconf service name to %r ...",
405
 
                 self.name)
 
404
        logger.info("Changing Zeroconf service name to %r ...",
 
405
                    self.name)
406
406
        if remove:
407
407
            self.remove()
408
408
        try:
410
410
        except dbus.exceptions.DBusException as error:
411
411
            if (error.get_dbus_name()
412
412
                == "org.freedesktop.Avahi.CollisionError"):
413
 
                log.info("Local Zeroconf service name collision.")
 
413
                logger.info("Local Zeroconf service name collision.")
414
414
                return self.rename(remove=False)
415
415
            else:
416
 
                log.critical("D-Bus Exception", exc_info=error)
 
416
                logger.critical("D-Bus Exception", exc_info=error)
417
417
                self.cleanup()
418
418
                os._exit(1)
419
419
 
435
435
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
436
436
        self.entry_group_state_changed_match = (
437
437
            self.group.connect_to_signal(
438
 
                "StateChanged", self.entry_group_state_changed))
439
 
        log.debug("Adding Zeroconf service '%s' of type '%s' ...",
440
 
                  self.name, self.type)
 
438
                'StateChanged', self.entry_group_state_changed))
 
439
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
 
440
                     self.name, self.type)
441
441
        self.group.AddService(
442
442
            self.interface,
443
443
            self.protocol,
450
450
 
451
451
    def entry_group_state_changed(self, state, error):
452
452
        """Derived from the Avahi example code"""
453
 
        log.debug("Avahi entry group state change: %i", state)
 
453
        logger.debug("Avahi entry group state change: %i", state)
454
454
 
455
455
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
456
 
            log.debug("Zeroconf service established.")
 
456
            logger.debug("Zeroconf service established.")
457
457
        elif state == avahi.ENTRY_GROUP_COLLISION:
458
 
            log.info("Zeroconf service name collision.")
 
458
            logger.info("Zeroconf service name collision.")
459
459
            self.rename()
460
460
        elif state == avahi.ENTRY_GROUP_FAILURE:
461
 
            log.critical("Avahi: Error in group state changed %s",
462
 
                         str(error))
 
461
            logger.critical("Avahi: Error in group state changed %s",
 
462
                            str(error))
463
463
            raise AvahiGroupError("State changed: {!s}".format(error))
464
464
 
465
465
    def cleanup(self):
475
475
 
476
476
    def server_state_changed(self, state, error=None):
477
477
        """Derived from the Avahi example code"""
478
 
        log.debug("Avahi server state change: %i", state)
 
478
        logger.debug("Avahi server state change: %i", state)
479
479
        bad_states = {
480
480
            avahi.SERVER_INVALID: "Zeroconf server invalid",
481
481
            avahi.SERVER_REGISTERING: None,
485
485
        if state in bad_states:
486
486
            if bad_states[state] is not None:
487
487
                if error is None:
488
 
                    log.error(bad_states[state])
 
488
                    logger.error(bad_states[state])
489
489
                else:
490
 
                    log.error(bad_states[state] + ": %r", error)
 
490
                    logger.error(bad_states[state] + ": %r", error)
491
491
            self.cleanup()
492
492
        elif state == avahi.SERVER_RUNNING:
493
493
            try:
495
495
            except dbus.exceptions.DBusException as error:
496
496
                if (error.get_dbus_name()
497
497
                    == "org.freedesktop.Avahi.CollisionError"):
498
 
                    log.info("Local Zeroconf service name collision.")
 
498
                    logger.info("Local Zeroconf service name"
 
499
                                " collision.")
499
500
                    return self.rename(remove=False)
500
501
                else:
501
 
                    log.critical("D-Bus Exception", exc_info=error)
 
502
                    logger.critical("D-Bus Exception", exc_info=error)
502
503
                    self.cleanup()
503
504
                    os._exit(1)
504
505
        else:
505
506
            if error is None:
506
 
                log.debug("Unknown state: %r", state)
 
507
                logger.debug("Unknown state: %r", state)
507
508
            else:
508
 
                log.debug("Unknown state: %r: %r", state, error)
 
509
                logger.debug("Unknown state: %r: %r", state, error)
509
510
 
510
511
    def activate(self):
511
512
        """Derived from the Avahi example code"""
526
527
        ret = super(AvahiServiceToSyslog, self).rename(*args,
527
528
                                                       **kwargs)
528
529
        syslogger.setFormatter(logging.Formatter(
529
 
            "Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
 
530
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
530
531
            .format(self.name)))
531
532
        return ret
532
533
 
562
563
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
563
564
 
564
565
    # Types
565
 
    class _session_int(ctypes.Structure):
 
566
    class session_int(ctypes.Structure):
566
567
        _fields_ = []
567
 
    session_t = ctypes.POINTER(_session_int)
 
568
    session_t = ctypes.POINTER(session_int)
568
569
 
569
570
    class certificate_credentials_st(ctypes.Structure):
570
571
        _fields_ = []
573
574
    certificate_type_t = ctypes.c_int
574
575
 
575
576
    class datum_t(ctypes.Structure):
576
 
        _fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
577
 
                    ("size", ctypes.c_uint)]
 
577
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
 
578
                    ('size', ctypes.c_uint)]
578
579
 
579
 
    class _openpgp_crt_int(ctypes.Structure):
 
580
    class openpgp_crt_int(ctypes.Structure):
580
581
        _fields_ = []
581
 
    openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
 
582
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
582
583
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
583
584
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
584
585
    credentials_type_t = ctypes.c_int
593
594
            # gnutls.strerror()
594
595
            self.code = code
595
596
            if message is None and code is not None:
596
 
                message = gnutls.strerror(code).decode(
597
 
                    "utf-8", errors="replace")
 
597
                message = gnutls.strerror(code)
598
598
            return super(gnutls.Error, self).__init__(
599
599
                message, *args)
600
600
 
601
601
    class CertificateSecurityError(Error):
602
602
        pass
603
603
 
604
 
    class PointerTo:
605
 
        def __init__(self, cls):
606
 
            self.cls = cls
607
 
 
608
 
        def from_param(self, obj):
609
 
            if not isinstance(obj, self.cls):
610
 
                raise TypeError("Not of type {}: {!r}"
611
 
                                .format(self.cls.__name__, obj))
612
 
            return ctypes.byref(obj.from_param(obj))
613
 
 
614
 
    class CastToVoidPointer:
615
 
        def __init__(self, cls):
616
 
            self.cls = cls
617
 
 
618
 
        def from_param(self, obj):
619
 
            if not isinstance(obj, self.cls):
620
 
                raise TypeError("Not of type {}: {!r}"
621
 
                                .format(self.cls.__name__, obj))
622
 
            return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
623
 
 
624
 
    class With_from_param:
625
 
        @classmethod
626
 
        def from_param(cls, obj):
627
 
            return obj._as_parameter_
628
 
 
629
604
    # Classes
630
 
    class Credentials(With_from_param):
 
605
    class Credentials:
631
606
        def __init__(self):
632
 
            self._as_parameter_ = gnutls.certificate_credentials_t()
633
 
            gnutls.certificate_allocate_credentials(self)
 
607
            self._c_object = gnutls.certificate_credentials_t()
 
608
            gnutls.certificate_allocate_credentials(
 
609
                ctypes.byref(self._c_object))
634
610
            self.type = gnutls.CRD_CERTIFICATE
635
611
 
636
612
        def __del__(self):
637
 
            gnutls.certificate_free_credentials(self)
 
613
            gnutls.certificate_free_credentials(self._c_object)
638
614
 
639
 
    class ClientSession(With_from_param):
 
615
    class ClientSession:
640
616
        def __init__(self, socket, credentials=None):
641
 
            self._as_parameter_ = gnutls.session_t()
 
617
            self._c_object = gnutls.session_t()
642
618
            gnutls_flags = gnutls.CLIENT
643
619
            if gnutls.check_version(b"3.5.6"):
644
620
                gnutls_flags |= gnutls.NO_TICKETS
645
621
            if gnutls.has_rawpk:
646
622
                gnutls_flags |= gnutls.ENABLE_RAWPK
647
 
            gnutls.init(self, gnutls_flags)
 
623
            gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
648
624
            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)
 
625
            gnutls.set_default_priority(self._c_object)
 
626
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
 
627
            gnutls.handshake_set_private_extensions(self._c_object,
 
628
                                                    True)
652
629
            self.socket = socket
653
630
            if credentials is None:
654
631
                credentials = gnutls.Credentials()
655
 
            gnutls.credentials_set(self, credentials.type,
656
 
                                   credentials)
 
632
            gnutls.credentials_set(self._c_object, credentials.type,
 
633
                                   ctypes.cast(credentials._c_object,
 
634
                                               ctypes.c_void_p))
657
635
            self.credentials = credentials
658
636
 
659
637
        def __del__(self):
660
 
            gnutls.deinit(self)
 
638
            gnutls.deinit(self._c_object)
661
639
 
662
640
        def handshake(self):
663
 
            return gnutls.handshake(self)
 
641
            return gnutls.handshake(self._c_object)
664
642
 
665
643
        def send(self, data):
666
644
            data = bytes(data)
667
645
            data_len = len(data)
668
646
            while data_len > 0:
669
 
                data_len -= gnutls.record_send(self, data[-data_len:],
 
647
                data_len -= gnutls.record_send(self._c_object,
 
648
                                               data[-data_len:],
670
649
                                               data_len)
671
650
 
672
651
        def bye(self):
673
 
            return gnutls.bye(self, gnutls.SHUT_RDWR)
 
652
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
674
653
 
675
654
    # Error handling functions
676
655
    def _error_code(result):
677
656
        """A function to raise exceptions on errors, suitable
678
 
        for the "restype" attribute on ctypes functions"""
679
 
        if result >= gnutls.E_SUCCESS:
 
657
        for the 'restype' attribute on ctypes functions"""
 
658
        if result >= 0:
680
659
            return result
681
660
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
682
661
            raise gnutls.CertificateSecurityError(code=result)
683
662
        raise gnutls.Error(code=result)
684
663
 
685
 
    def _retry_on_error(result, func, arguments,
686
 
                        _error_code=_error_code):
 
664
    def _retry_on_error(result, func, arguments):
687
665
        """A function to retry on some errors, suitable
688
 
        for the "errcheck" attribute on ctypes functions"""
689
 
        while result < gnutls.E_SUCCESS:
 
666
        for the 'errcheck' attribute on ctypes functions"""
 
667
        while result < 0:
690
668
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
691
669
                return _error_code(result)
692
670
            result = func(*arguments)
697
675
 
698
676
    # Functions
699
677
    priority_set_direct = _library.gnutls_priority_set_direct
700
 
    priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
 
678
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
701
679
                                    ctypes.POINTER(ctypes.c_char_p)]
702
680
    priority_set_direct.restype = _error_code
703
681
 
704
682
    init = _library.gnutls_init
705
 
    init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
 
683
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
706
684
    init.restype = _error_code
707
685
 
708
686
    set_default_priority = _library.gnutls_set_default_priority
709
 
    set_default_priority.argtypes = [ClientSession]
 
687
    set_default_priority.argtypes = [session_t]
710
688
    set_default_priority.restype = _error_code
711
689
 
712
690
    record_send = _library.gnutls_record_send
713
 
    record_send.argtypes = [ClientSession, ctypes.c_void_p,
 
691
    record_send.argtypes = [session_t, ctypes.c_void_p,
714
692
                            ctypes.c_size_t]
715
693
    record_send.restype = ctypes.c_ssize_t
716
694
    record_send.errcheck = _retry_on_error
718
696
    certificate_allocate_credentials = (
719
697
        _library.gnutls_certificate_allocate_credentials)
720
698
    certificate_allocate_credentials.argtypes = [
721
 
        PointerTo(Credentials)]
 
699
        ctypes.POINTER(certificate_credentials_t)]
722
700
    certificate_allocate_credentials.restype = _error_code
723
701
 
724
702
    certificate_free_credentials = (
725
703
        _library.gnutls_certificate_free_credentials)
726
 
    certificate_free_credentials.argtypes = [Credentials]
 
704
    certificate_free_credentials.argtypes = [
 
705
        certificate_credentials_t]
727
706
    certificate_free_credentials.restype = None
728
707
 
729
708
    handshake_set_private_extensions = (
730
709
        _library.gnutls_handshake_set_private_extensions)
731
 
    handshake_set_private_extensions.argtypes = [ClientSession,
 
710
    handshake_set_private_extensions.argtypes = [session_t,
732
711
                                                 ctypes.c_int]
733
712
    handshake_set_private_extensions.restype = None
734
713
 
735
714
    credentials_set = _library.gnutls_credentials_set
736
 
    credentials_set.argtypes = [ClientSession, credentials_type_t,
737
 
                                CastToVoidPointer(Credentials)]
 
715
    credentials_set.argtypes = [session_t, credentials_type_t,
 
716
                                ctypes.c_void_p]
738
717
    credentials_set.restype = _error_code
739
718
 
740
719
    strerror = _library.gnutls_strerror
742
721
    strerror.restype = ctypes.c_char_p
743
722
 
744
723
    certificate_type_get = _library.gnutls_certificate_type_get
745
 
    certificate_type_get.argtypes = [ClientSession]
 
724
    certificate_type_get.argtypes = [session_t]
746
725
    certificate_type_get.restype = _error_code
747
726
 
748
727
    certificate_get_peers = _library.gnutls_certificate_get_peers
749
 
    certificate_get_peers.argtypes = [ClientSession,
 
728
    certificate_get_peers.argtypes = [session_t,
750
729
                                      ctypes.POINTER(ctypes.c_uint)]
751
730
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
752
731
 
759
738
    global_set_log_function.restype = None
760
739
 
761
740
    deinit = _library.gnutls_deinit
762
 
    deinit.argtypes = [ClientSession]
 
741
    deinit.argtypes = [session_t]
763
742
    deinit.restype = None
764
743
 
765
744
    handshake = _library.gnutls_handshake
766
 
    handshake.argtypes = [ClientSession]
767
 
    handshake.restype = ctypes.c_int
 
745
    handshake.argtypes = [session_t]
 
746
    handshake.restype = _error_code
768
747
    handshake.errcheck = _retry_on_error
769
748
 
770
749
    transport_set_ptr = _library.gnutls_transport_set_ptr
771
 
    transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
 
750
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
772
751
    transport_set_ptr.restype = None
773
752
 
774
753
    bye = _library.gnutls_bye
775
 
    bye.argtypes = [ClientSession, close_request_t]
776
 
    bye.restype = ctypes.c_int
 
754
    bye.argtypes = [session_t, close_request_t]
 
755
    bye.restype = _error_code
777
756
    bye.errcheck = _retry_on_error
778
757
 
779
758
    check_version = _library.gnutls_check_version
853
832
 
854
833
    if check_version(b"3.6.4"):
855
834
        certificate_type_get2 = _library.gnutls_certificate_type_get2
856
 
        certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
 
835
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
857
836
        certificate_type_get2.restype = _error_code
858
837
 
859
838
    # Remove non-public functions
875
854
    """A representation of a client host served by this server.
876
855
 
877
856
    Attributes:
878
 
    approved:   bool(); None if not yet approved/disapproved
 
857
    approved:   bool(); 'None' if not yet approved/disapproved
879
858
    approval_delay: datetime.timedelta(); Time to wait for approval
880
859
    approval_duration: datetime.timedelta(); Duration of one approval
881
860
    checker: multiprocessing.Process(); a running checker process used
882
 
             to see if the client lives. None if no process is
 
861
             to see if the client lives. 'None' if no process is
883
862
             running.
884
863
    checker_callback_tag: a GLib event source tag, or None
885
864
    checker_command: string; External command which is run to check
1009
988
            self.last_enabled = None
1010
989
            self.expires = None
1011
990
 
1012
 
        log.debug("Creating client %r", self.name)
1013
 
        log.debug("  Key ID: %s", self.key_id)
1014
 
        log.debug("  Fingerprint: %s", self.fingerprint)
 
991
        logger.debug("Creating client %r", self.name)
 
992
        logger.debug("  Key ID: %s", self.key_id)
 
993
        logger.debug("  Fingerprint: %s", self.fingerprint)
1015
994
        self.created = settings.get("created",
1016
995
                                    datetime.datetime.utcnow())
1017
996
 
1056
1035
        if not getattr(self, "enabled", False):
1057
1036
            return False
1058
1037
        if not quiet:
1059
 
            log.info("Disabling client %s", self.name)
 
1038
            logger.info("Disabling client %s", self.name)
1060
1039
        if getattr(self, "disable_initiator_tag", None) is not None:
1061
1040
            GLib.source_remove(self.disable_initiator_tag)
1062
1041
            self.disable_initiator_tag = None
1106
1085
            self.last_checker_status = returncode
1107
1086
            self.last_checker_signal = None
1108
1087
            if self.last_checker_status == 0:
1109
 
                log.info("Checker for %(name)s succeeded", vars(self))
 
1088
                logger.info("Checker for %(name)s succeeded",
 
1089
                            vars(self))
1110
1090
                self.checked_ok()
1111
1091
            else:
1112
 
                log.info("Checker for %(name)s failed", vars(self))
 
1092
                logger.info("Checker for %(name)s failed", vars(self))
1113
1093
        else:
1114
1094
            self.last_checker_status = -1
1115
1095
            self.last_checker_signal = -returncode
1116
 
            log.warning("Checker for %(name)s crashed?", vars(self))
 
1096
            logger.warning("Checker for %(name)s crashed?",
 
1097
                           vars(self))
1117
1098
        return False
1118
1099
 
1119
1100
    def checked_ok(self):
1153
1134
        # should be.
1154
1135
 
1155
1136
        if self.checker is not None and not self.checker.is_alive():
1156
 
            log.warning("Checker was not alive; joining")
 
1137
            logger.warning("Checker was not alive; joining")
1157
1138
            self.checker.join()
1158
1139
            self.checker = None
1159
1140
        # Start a new checker if needed
1165
1146
            try:
1166
1147
                command = self.checker_command % escaped_attrs
1167
1148
            except TypeError as error:
1168
 
                log.error('Could not format string "%s"',
1169
 
                          self.checker_command, exc_info=error)
 
1149
                logger.error('Could not format string "%s"',
 
1150
                             self.checker_command,
 
1151
                             exc_info=error)
1170
1152
                return True     # Try again later
1171
1153
            self.current_checker_command = command
1172
 
            log.info("Starting checker %r for %s", command, self.name)
 
1154
            logger.info("Starting checker %r for %s", command,
 
1155
                        self.name)
1173
1156
            # We don't need to redirect stdout and stderr, since
1174
1157
            # in normal mode, that is already done by daemon(),
1175
1158
            # and in debug mode we don't want to.  (Stdin is
1204
1187
            self.checker_callback_tag = None
1205
1188
        if getattr(self, "checker", None) is None:
1206
1189
            return
1207
 
        log.debug("Stopping checker for %(name)s", vars(self))
 
1190
        logger.debug("Stopping checker for %(name)s", vars(self))
1208
1191
        self.checker.terminate()
1209
1192
        self.checker = None
1210
1193
 
1237
1220
        func._dbus_name = func.__name__
1238
1221
        if func._dbus_name.endswith("_dbus_property"):
1239
1222
            func._dbus_name = func._dbus_name[:-14]
1240
 
        func._dbus_get_args_options = {"byte_arrays": byte_arrays}
 
1223
        func._dbus_get_args_options = {'byte_arrays': byte_arrays}
1241
1224
        return func
1242
1225
 
1243
1226
    return decorator
1332
1315
 
1333
1316
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1334
1317
                         out_signature="s",
1335
 
                         path_keyword="object_path",
1336
 
                         connection_keyword="connection")
 
1318
                         path_keyword='object_path',
 
1319
                         connection_keyword='connection')
1337
1320
    def Introspect(self, object_path, connection):
1338
1321
        """Overloading of standard D-Bus method.
1339
1322
 
1388
1371
            document.unlink()
1389
1372
        except (AttributeError, xml.dom.DOMException,
1390
1373
                xml.parsers.expat.ExpatError) as error:
1391
 
            log.error("Failed to override Introspection method",
1392
 
                      exc_info=error)
 
1374
            logger.error("Failed to override Introspection method",
 
1375
                         exc_info=error)
1393
1376
        return xmlstring
1394
1377
 
1395
1378
 
1492
1475
 
1493
1476
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1494
1477
                         out_signature="s",
1495
 
                         path_keyword="object_path",
1496
 
                         connection_keyword="connection")
 
1478
                         path_keyword='object_path',
 
1479
                         connection_keyword='connection')
1497
1480
    def Introspect(self, object_path, connection):
1498
1481
        """Overloading of standard D-Bus method.
1499
1482
 
1555
1538
            document.unlink()
1556
1539
        except (AttributeError, xml.dom.DOMException,
1557
1540
                xml.parsers.expat.ExpatError) as error:
1558
 
            log.error("Failed to override Introspection method",
1559
 
                      exc_info=error)
 
1541
            logger.error("Failed to override Introspection method",
 
1542
                         exc_info=error)
1560
1543
        return xmlstring
1561
1544
 
1562
1545
 
1594
1577
 
1595
1578
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1596
1579
                         out_signature="s",
1597
 
                         path_keyword="object_path",
1598
 
                         connection_keyword="connection")
 
1580
                         path_keyword='object_path',
 
1581
                         connection_keyword='connection')
1599
1582
    def Introspect(self, object_path, connection):
1600
1583
        """Overloading of standard D-Bus method.
1601
1584
 
1626
1609
            document.unlink()
1627
1610
        except (AttributeError, xml.dom.DOMException,
1628
1611
                xml.parsers.expat.ExpatError) as error:
1629
 
            log.error("Failed to override Introspection method",
1630
 
                      exc_info=error)
 
1612
            logger.error("Failed to override Introspection method",
 
1613
                         exc_info=error)
1631
1614
        return xmlstring
1632
1615
 
1633
1616
 
2267
2250
class ProxyClient:
2268
2251
    def __init__(self, child_pipe, key_id, fpr, address):
2269
2252
        self._pipe = child_pipe
2270
 
        self._pipe.send(("init", key_id, fpr, address))
 
2253
        self._pipe.send(('init', key_id, fpr, address))
2271
2254
        if not self._pipe.recv():
2272
2255
            raise KeyError(key_id or fpr)
2273
2256
 
2274
2257
    def __getattribute__(self, name):
2275
 
        if name == "_pipe":
 
2258
        if name == '_pipe':
2276
2259
            return super(ProxyClient, self).__getattribute__(name)
2277
 
        self._pipe.send(("getattr", name))
 
2260
        self._pipe.send(('getattr', name))
2278
2261
        data = self._pipe.recv()
2279
 
        if data[0] == "data":
 
2262
        if data[0] == 'data':
2280
2263
            return data[1]
2281
 
        if data[0] == "function":
 
2264
        if data[0] == 'function':
2282
2265
 
2283
2266
            def func(*args, **kwargs):
2284
 
                self._pipe.send(("funcall", name, args, kwargs))
 
2267
                self._pipe.send(('funcall', name, args, kwargs))
2285
2268
                return self._pipe.recv()[1]
2286
2269
 
2287
2270
            return func
2288
2271
 
2289
2272
    def __setattr__(self, name, value):
2290
 
        if name == "_pipe":
 
2273
        if name == '_pipe':
2291
2274
            return super(ProxyClient, self).__setattr__(name, value)
2292
 
        self._pipe.send(("setattr", name, value))
 
2275
        self._pipe.send(('setattr', name, value))
2293
2276
 
2294
2277
 
2295
2278
class ClientHandler(socketserver.BaseRequestHandler, object):
2300
2283
 
2301
2284
    def handle(self):
2302
2285
        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())
 
2286
            logger.info("TCP connection from: %s",
 
2287
                        str(self.client_address))
 
2288
            logger.debug("Pipe FD: %d",
 
2289
                         self.server.child_pipe.fileno())
2306
2290
 
2307
2291
            session = gnutls.ClientSession(self.request)
2308
2292
 
2309
 
            # priority = ":".join(("NONE", "+VERS-TLS1.1",
 
2293
            # priority = ':'.join(("NONE", "+VERS-TLS1.1",
2310
2294
            #                       "+AES-256-CBC", "+SHA1",
2311
2295
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
2312
2296
            #                       "+DHE-DSS"))
2314
2298
            priority = self.server.gnutls_priority
2315
2299
            if priority is None:
2316
2300
                priority = "NORMAL"
2317
 
            gnutls.priority_set_direct(session,
2318
 
                                       priority.encode("utf-8"), None)
 
2301
            gnutls.priority_set_direct(session._c_object,
 
2302
                                       priority.encode("utf-8"),
 
2303
                                       None)
2319
2304
 
2320
2305
            # Start communication using the Mandos protocol
2321
2306
            # Get protocol number
2322
2307
            line = self.request.makefile().readline()
2323
 
            log.debug("Protocol version: %r", line)
 
2308
            logger.debug("Protocol version: %r", line)
2324
2309
            try:
2325
2310
                if int(line.strip().split()[0]) > 1:
2326
2311
                    raise RuntimeError(line)
2327
2312
            except (ValueError, IndexError, RuntimeError) as error:
2328
 
                log.error("Unknown protocol version: %s", error)
 
2313
                logger.error("Unknown protocol version: %s", error)
2329
2314
                return
2330
2315
 
2331
2316
            # Start GnuTLS connection
2332
2317
            try:
2333
2318
                session.handshake()
2334
2319
            except gnutls.Error as error:
2335
 
                log.warning("Handshake failed: %s", error)
 
2320
                logger.warning("Handshake failed: %s", error)
2336
2321
                # Do not run session.bye() here: the session is not
2337
2322
                # established.  Just abandon the request.
2338
2323
                return
2339
 
            log.debug("Handshake succeeded")
 
2324
            logger.debug("Handshake succeeded")
2340
2325
 
2341
2326
            approval_required = False
2342
2327
            try:
2346
2331
                        key_id = self.key_id(
2347
2332
                            self.peer_certificate(session))
2348
2333
                    except (TypeError, gnutls.Error) as error:
2349
 
                        log.warning("Bad certificate: %s", error)
 
2334
                        logger.warning("Bad certificate: %s", error)
2350
2335
                        return
2351
 
                    log.debug("Key ID: %s",
2352
 
                              key_id.decode("utf-8",
2353
 
                                            errors="replace"))
 
2336
                    logger.debug("Key ID: %s", key_id)
2354
2337
 
2355
2338
                else:
2356
2339
                    key_id = b""
2358
2341
                        fpr = self.fingerprint(
2359
2342
                            self.peer_certificate(session))
2360
2343
                    except (TypeError, gnutls.Error) as error:
2361
 
                        log.warning("Bad certificate: %s", error)
 
2344
                        logger.warning("Bad certificate: %s", error)
2362
2345
                        return
2363
 
                    log.debug("Fingerprint: %s", fpr)
 
2346
                    logger.debug("Fingerprint: %s", fpr)
2364
2347
 
2365
2348
                try:
2366
2349
                    client = ProxyClient(child_pipe, key_id, fpr,
2375
2358
 
2376
2359
                while True:
2377
2360
                    if not client.enabled:
2378
 
                        log.info("Client %s is disabled", client.name)
 
2361
                        logger.info("Client %s is disabled",
 
2362
                                    client.name)
2379
2363
                        if self.server.use_dbus:
2380
2364
                            # Emit D-Bus signal
2381
2365
                            client.Rejected("Disabled")
2385
2369
                        # We are approved or approval is disabled
2386
2370
                        break
2387
2371
                    elif client.approved is None:
2388
 
                        log.info("Client %s needs approval",
2389
 
                                 client.name)
 
2372
                        logger.info("Client %s needs approval",
 
2373
                                    client.name)
2390
2374
                        if self.server.use_dbus:
2391
2375
                            # Emit D-Bus signal
2392
2376
                            client.NeedApproval(
2393
2377
                                client.approval_delay.total_seconds()
2394
2378
                                * 1000, client.approved_by_default)
2395
2379
                    else:
2396
 
                        log.warning("Client %s was not approved",
2397
 
                                    client.name)
 
2380
                        logger.warning("Client %s was not approved",
 
2381
                                       client.name)
2398
2382
                        if self.server.use_dbus:
2399
2383
                            # Emit D-Bus signal
2400
2384
                            client.Rejected("Denied")
2408
2392
                    time2 = datetime.datetime.now()
2409
2393
                    if (time2 - time) >= delay:
2410
2394
                        if not client.approved_by_default:
2411
 
                            log.warning("Client %s timed out while"
2412
 
                                        " waiting for approval",
2413
 
                                        client.name)
 
2395
                            logger.warning("Client %s timed out while"
 
2396
                                           " waiting for approval",
 
2397
                                           client.name)
2414
2398
                            if self.server.use_dbus:
2415
2399
                                # Emit D-Bus signal
2416
2400
                                client.Rejected("Approval timed out")
2423
2407
                try:
2424
2408
                    session.send(client.secret)
2425
2409
                except gnutls.Error as error:
2426
 
                    log.warning("gnutls send failed", exc_info=error)
 
2410
                    logger.warning("gnutls send failed",
 
2411
                                   exc_info=error)
2427
2412
                    return
2428
2413
 
2429
 
                log.info("Sending secret to %s", client.name)
 
2414
                logger.info("Sending secret to %s", client.name)
2430
2415
                # bump the timeout using extended_timeout
2431
2416
                client.bump_timeout(client.extended_timeout)
2432
2417
                if self.server.use_dbus:
2439
2424
                try:
2440
2425
                    session.bye()
2441
2426
                except gnutls.Error as error:
2442
 
                    log.warning("GnuTLS bye failed", exc_info=error)
 
2427
                    logger.warning("GnuTLS bye failed",
 
2428
                                   exc_info=error)
2443
2429
 
2444
2430
    @staticmethod
2445
2431
    def peer_certificate(session):
2446
2432
        "Return the peer's certificate as a bytestring"
2447
2433
        try:
2448
 
            cert_type = gnutls.certificate_type_get2(
2449
 
                session, gnutls.CTYPE_PEERS)
 
2434
            cert_type = gnutls.certificate_type_get2(session._c_object,
 
2435
                                                     gnutls.CTYPE_PEERS)
2450
2436
        except AttributeError:
2451
 
            cert_type = gnutls.certificate_type_get(session)
 
2437
            cert_type = gnutls.certificate_type_get(session._c_object)
2452
2438
        if gnutls.has_rawpk:
2453
2439
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2454
2440
        else:
2455
2441
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2456
2442
        # If not a valid certificate type...
2457
2443
        if cert_type not in valid_cert_types:
2458
 
            log.info("Cert type %r not in %r", cert_type,
2459
 
                     valid_cert_types)
 
2444
            logger.info("Cert type %r not in %r", cert_type,
 
2445
                        valid_cert_types)
2460
2446
            # ...return invalid data
2461
2447
            return b""
2462
2448
        list_size = ctypes.c_uint(1)
2463
2449
        cert_list = (gnutls.certificate_get_peers
2464
 
                     (session, ctypes.byref(list_size)))
 
2450
                     (session._c_object, ctypes.byref(list_size)))
2465
2451
        if not bool(cert_list) and list_size.value != 0:
2466
2452
            raise gnutls.Error("error getting peer certificate")
2467
2453
        if list_size.value == 0:
2581
2567
 
2582
2568
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2583
2569
                     socketserver.TCPServer):
2584
 
    """IPv6-capable TCP server.  Accepts None as address and/or port
 
2570
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
2585
2571
 
2586
2572
    Attributes:
2587
2573
        enabled:        Boolean; whether this server is activated yet
2638
2624
            if SO_BINDTODEVICE is None:
2639
2625
                # Fall back to a hard-coded value which seems to be
2640
2626
                # common enough.
2641
 
                log.warning("SO_BINDTODEVICE not found, trying 25")
 
2627
                logger.warning("SO_BINDTODEVICE not found, trying 25")
2642
2628
                SO_BINDTODEVICE = 25
2643
2629
            try:
2644
2630
                self.socket.setsockopt(
2646
2632
                    (self.interface + "\0").encode("utf-8"))
2647
2633
            except socket.error as error:
2648
2634
                if error.errno == errno.EPERM:
2649
 
                    log.error("No permission to bind to interface %s",
2650
 
                              self.interface)
 
2635
                    logger.error("No permission to bind to"
 
2636
                                 " interface %s", self.interface)
2651
2637
                elif error.errno == errno.ENOPROTOOPT:
2652
 
                    log.error("SO_BINDTODEVICE not available; cannot"
2653
 
                              " bind to interface %s", self.interface)
 
2638
                    logger.error("SO_BINDTODEVICE not available;"
 
2639
                                 " cannot bind to interface %s",
 
2640
                                 self.interface)
2654
2641
                elif error.errno == errno.ENODEV:
2655
 
                    log.error("Interface %s does not exist, cannot"
2656
 
                              " bind", self.interface)
 
2642
                    logger.error("Interface %s does not exist,"
 
2643
                                 " cannot bind", self.interface)
2657
2644
                else:
2658
2645
                    raise
2659
2646
        # Only bind(2) the socket if we really need to.
2738
2725
        request = parent_pipe.recv()
2739
2726
        command = request[0]
2740
2727
 
2741
 
        if command == "init":
 
2728
        if command == 'init':
2742
2729
            key_id = request[1].decode("ascii")
2743
2730
            fpr = request[2].decode("ascii")
2744
2731
            address = request[3]
2754
2741
                    client = c
2755
2742
                    break
2756
2743
            else:
2757
 
                log.info("Client not found for key ID: %s, address:"
2758
 
                         " %s", key_id or fpr, address)
 
2744
                logger.info("Client not found for key ID: %s, address"
 
2745
                            ": %s", key_id or fpr, address)
2759
2746
                if self.use_dbus:
2760
2747
                    # Emit D-Bus signal
2761
2748
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
2774
2761
            # remove the old hook in favor of the new above hook on
2775
2762
            # same fileno
2776
2763
            return False
2777
 
        if command == "funcall":
 
2764
        if command == 'funcall':
2778
2765
            funcname = request[1]
2779
2766
            args = request[2]
2780
2767
            kwargs = request[3]
2781
2768
 
2782
 
            parent_pipe.send(("data", getattr(client_object,
 
2769
            parent_pipe.send(('data', getattr(client_object,
2783
2770
                                              funcname)(*args,
2784
2771
                                                        **kwargs)))
2785
2772
 
2786
 
        if command == "getattr":
 
2773
        if command == 'getattr':
2787
2774
            attrname = request[1]
2788
2775
            if isinstance(client_object.__getattribute__(attrname),
2789
2776
                          collections.abc.Callable):
2790
 
                parent_pipe.send(("function", ))
 
2777
                parent_pipe.send(('function', ))
2791
2778
            else:
2792
2779
                parent_pipe.send((
2793
 
                    "data", client_object.__getattribute__(attrname)))
 
2780
                    'data', client_object.__getattribute__(attrname)))
2794
2781
 
2795
 
        if command == "setattr":
 
2782
        if command == 'setattr':
2796
2783
            attrname = request[1]
2797
2784
            value = request[2]
2798
2785
            setattr(client_object, attrname, value)
2904
2891
def string_to_delta(interval):
2905
2892
    """Parse a string and return a datetime.timedelta
2906
2893
 
2907
 
    >>> string_to_delta("7d") == datetime.timedelta(7)
2908
 
    True
2909
 
    >>> string_to_delta("60s") == datetime.timedelta(0, 60)
2910
 
    True
2911
 
    >>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2912
 
    True
2913
 
    >>> string_to_delta("24h") == datetime.timedelta(1)
2914
 
    True
2915
 
    >>> string_to_delta("1w") == datetime.timedelta(7)
2916
 
    True
2917
 
    >>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
 
2894
    >>> string_to_delta('7d') == datetime.timedelta(7)
 
2895
    True
 
2896
    >>> string_to_delta('60s') == datetime.timedelta(0, 60)
 
2897
    True
 
2898
    >>> string_to_delta('60m') == datetime.timedelta(0, 3600)
 
2899
    True
 
2900
    >>> string_to_delta('24h') == datetime.timedelta(1)
 
2901
    True
 
2902
    >>> string_to_delta('1w') == datetime.timedelta(7)
 
2903
    True
 
2904
    >>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
2918
2905
    True
2919
2906
    """
2920
2907
 
3124
3111
 
3125
3112
    if server_settings["servicename"] != "Mandos":
3126
3113
        syslogger.setFormatter(
3127
 
            logging.Formatter("Mandos ({}) [%(process)d]:"
3128
 
                              " %(levelname)s: %(message)s".format(
 
3114
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
3115
                              ' %(levelname)s: %(message)s'.format(
3129
3116
                                  server_settings["servicename"])))
3130
3117
 
3131
3118
    # Parse config file with clients
3155
3142
        try:
3156
3143
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3157
3144
        except IOError as e:
3158
 
            log.error("Could not open file %r", pidfilename,
3159
 
                      exc_info=e)
 
3145
            logger.error("Could not open file %r", pidfilename,
 
3146
                         exc_info=e)
3160
3147
 
3161
3148
    for name, group in (("_mandos", "_mandos"),
3162
3149
                        ("mandos", "mandos"),
3173
3160
    try:
3174
3161
        os.setgid(gid)
3175
3162
        os.setuid(uid)
3176
 
        log.debug("Did setuid/setgid to %s:%s", uid, gid)
 
3163
        if debug:
 
3164
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
 
3165
                                                             gid))
3177
3166
    except OSError as error:
3178
 
        log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
3179
 
                    os.strerror(error.errno))
 
3167
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
 
3168
                       .format(uid, gid, os.strerror(error.errno)))
3180
3169
        if error.errno != errno.EPERM:
3181
3170
            raise
3182
3171
 
3189
3178
 
3190
3179
        @gnutls.log_func
3191
3180
        def debug_gnutls(level, string):
3192
 
            log.debug("GnuTLS: %s",
3193
 
                      string[:-1].decode("utf-8", errors="replace"))
 
3181
            logger.debug("GnuTLS: %s", string[:-1])
3194
3182
 
3195
3183
        gnutls.global_set_log_function(debug_gnutls)
3196
3184
 
3225
3213
                "se.bsnet.fukt.Mandos", bus,
3226
3214
                do_not_queue=True)
3227
3215
        except dbus.exceptions.DBusException as e:
3228
 
            log.error("Disabling D-Bus:", exc_info=e)
 
3216
            logger.error("Disabling D-Bus:", exc_info=e)
3229
3217
            use_dbus = False
3230
3218
            server_settings["use_dbus"] = False
3231
3219
            tcp_server.use_dbus = False
3316
3304
            os.remove(stored_state_path)
3317
3305
        except IOError as e:
3318
3306
            if e.errno == errno.ENOENT:
3319
 
                log.warning("Could not load persistent state:"
3320
 
                            " %s", os.strerror(e.errno))
 
3307
                logger.warning("Could not load persistent state:"
 
3308
                               " {}".format(os.strerror(e.errno)))
3321
3309
            else:
3322
 
                log.critical("Could not load persistent state:",
3323
 
                             exc_info=e)
 
3310
                logger.critical("Could not load persistent state:",
 
3311
                                exc_info=e)
3324
3312
                raise
3325
3313
        except EOFError as e:
3326
 
            log.warning("Could not load persistent state: EOFError:",
3327
 
                        exc_info=e)
 
3314
            logger.warning("Could not load persistent state: "
 
3315
                           "EOFError:",
 
3316
                           exc_info=e)
3328
3317
 
3329
3318
    with PGPEngine() as pgp:
3330
3319
        for client_name, client in clients_data.items():
3357
3346
            if client["enabled"]:
3358
3347
                if datetime.datetime.utcnow() >= client["expires"]:
3359
3348
                    if not client["last_checked_ok"]:
3360
 
                        log.warning("disabling client %s - Client"
3361
 
                                    " never performed a successful"
3362
 
                                    " checker", client_name)
 
3349
                        logger.warning(
 
3350
                            "disabling client {} - Client never "
 
3351
                            "performed a successful checker".format(
 
3352
                                client_name))
3363
3353
                        client["enabled"] = False
3364
3354
                    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"])
 
3355
                        logger.warning(
 
3356
                            "disabling client {} - Client last"
 
3357
                            " checker failed with error code"
 
3358
                            " {}".format(
 
3359
                                client_name,
 
3360
                                client["last_checker_status"]))
3369
3361
                        client["enabled"] = False
3370
3362
                    else:
3371
3363
                        client["expires"] = (
3372
3364
                            datetime.datetime.utcnow()
3373
3365
                            + client["timeout"])
3374
 
                        log.debug("Last checker succeeded, keeping %s"
3375
 
                                  " enabled", client_name)
 
3366
                        logger.debug("Last checker succeeded,"
 
3367
                                     " keeping {} enabled".format(
 
3368
                                         client_name))
3376
3369
            try:
3377
3370
                client["secret"] = pgp.decrypt(
3378
3371
                    client["encrypted_secret"],
3379
3372
                    client_settings[client_name]["secret"])
3380
3373
            except PGPError:
3381
3374
                # If decryption fails, we use secret from new settings
3382
 
                log.debug("Failed to decrypt %s old secret",
3383
 
                          client_name)
 
3375
                logger.debug("Failed to decrypt {} old secret".format(
 
3376
                    client_name))
3384
3377
                client["secret"] = (client_settings[client_name]
3385
3378
                                    ["secret"])
3386
3379
 
3400
3393
            server_settings=server_settings)
3401
3394
 
3402
3395
    if not tcp_server.clients:
3403
 
        log.warning("No clients defined")
 
3396
        logger.warning("No clients defined")
3404
3397
 
3405
3398
    if not foreground:
3406
3399
        if pidfile is not None:
3409
3402
                with pidfile:
3410
3403
                    print(pid, file=pidfile)
3411
3404
            except IOError:
3412
 
                log.error("Could not write to file %r with PID %d",
3413
 
                          pidfilename, pid)
 
3405
                logger.error("Could not write to file %r with PID %d",
 
3406
                             pidfilename, pid)
3414
3407
        del pidfile
3415
3408
        del pidfilename
3416
3409
 
3566
3559
 
3567
3560
        try:
3568
3561
            with tempfile.NamedTemporaryFile(
3569
 
                    mode="wb",
 
3562
                    mode='wb',
3570
3563
                    suffix=".pickle",
3571
 
                    prefix="clients-",
 
3564
                    prefix='clients-',
3572
3565
                    dir=os.path.dirname(stored_state_path),
3573
3566
                    delete=False) as stored_state:
3574
3567
                pickle.dump((clients, client_settings), stored_state,
3582
3575
                except NameError:
3583
3576
                    pass
3584
3577
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3585
 
                log.warning("Could not save persistent state: %s",
3586
 
                            os.strerror(e.errno))
 
3578
                logger.warning("Could not save persistent state: {}"
 
3579
                               .format(os.strerror(e.errno)))
3587
3580
            else:
3588
 
                log.warning("Could not save persistent state:",
3589
 
                            exc_info=e)
 
3581
                logger.warning("Could not save persistent state:",
 
3582
                               exc_info=e)
3590
3583
                raise
3591
3584
 
3592
3585
        # Delete all clients, and settings from config
3618
3611
    if zeroconf:
3619
3612
        service.port = tcp_server.socket.getsockname()[1]
3620
3613
    if use_ipv6:
3621
 
        log.info("Now listening on address %r, port %d, flowinfo %d,"
3622
 
                 " scope_id %d", *tcp_server.socket.getsockname())
 
3614
        logger.info("Now listening on address %r, port %d,"
 
3615
                    " flowinfo %d, scope_id %d",
 
3616
                    *tcp_server.socket.getsockname())
3623
3617
    else:                       # IPv4
3624
 
        log.info("Now listening on address %r, port %d",
3625
 
                 *tcp_server.socket.getsockname())
 
3618
        logger.info("Now listening on address %r, port %d",
 
3619
                    *tcp_server.socket.getsockname())
3626
3620
 
3627
3621
    # service.interface = tcp_server.socket.getsockname()[3]
3628
3622
 
3632
3626
            try:
3633
3627
                service.activate()
3634
3628
            except dbus.exceptions.DBusException as error:
3635
 
                log.critical("D-Bus Exception", exc_info=error)
 
3629
                logger.critical("D-Bus Exception", exc_info=error)
3636
3630
                cleanup()
3637
3631
                sys.exit(1)
3638
3632
            # End of Avahi example code
3643
3637
            lambda *args, **kwargs: (tcp_server.handle_request
3644
3638
                                     (*args[2:], **kwargs) or True))
3645
3639
 
3646
 
        log.debug("Starting main loop")
 
3640
        logger.debug("Starting main loop")
3647
3641
        main_loop.run()
3648
3642
    except AvahiError as error:
3649
 
        log.critical("Avahi Error", exc_info=error)
 
3643
        logger.critical("Avahi Error", exc_info=error)
3650
3644
        cleanup()
3651
3645
        sys.exit(1)
3652
3646
    except KeyboardInterrupt:
3653
3647
        if debug:
3654
3648
            print("", file=sys.stderr)
3655
 
        log.debug("Server received KeyboardInterrupt")
3656
 
    log.debug("Server exiting")
 
3649
        logger.debug("Server received KeyboardInterrupt")
 
3650
    logger.debug("Server exiting")
3657
3651
    # Must run before the D-Bus bus name gets deregistered
3658
3652
    cleanup()
3659
3653
 
3660
3654
 
3661
3655
def should_only_run_tests():
3662
3656
    parser = argparse.ArgumentParser(add_help=False)
3663
 
    parser.add_argument("--check", action="store_true")
 
3657
    parser.add_argument("--check", action='store_true')
3664
3658
    args, unknown_args = parser.parse_known_args()
3665
3659
    run_tests = args.check
3666
3660
    if run_tests:
3674
3668
    tests.addTests(doctest.DocTestSuite())
3675
3669
    return tests
3676
3670
 
3677
 
if __name__ == "__main__":
 
3671
if __name__ == '__main__':
3678
3672
    try:
3679
3673
        if should_only_run_tests():
3680
3674
            # Call using ./mandos --check [--verbose]