90
87
import xml.dom.minidom
93
if sys.version_info.major == 2:
98
# Add collections.abc.Callable if it does not exist
100
collections.abc.Callable
101
except AttributeError:
103
Callable = collections.Callable
104
collections.abc = abc
107
# Add shlex.quote if it does not exist
110
except AttributeError:
111
shlex.quote = re.escape
113
# Add os.set_inheritable if it does not exist
116
except AttributeError:
117
def set_inheritable(fd, inheritable):
118
flags = fcntl.fcntl(fd, fcntl.F_GETFD)
119
if inheritable and ((flags & fcntl.FD_CLOEXEC) != 0):
120
fcntl.fcntl(fd, fcntl.F_SETFL, flags & ~fcntl.FD_CLOEXEC)
121
elif (not inheritable) and ((flags & fcntl.FD_CLOEXEC) == 0):
122
fcntl.fcntl(fd, fcntl.F_SETFL, flags | fcntl.FD_CLOEXEC)
123
os.set_inheritable = set_inheritable
126
# Show warnings by default
127
if not sys.warnoptions:
129
warnings.simplefilter("default")
131
90
# Try to find the value of SO_BINDTODEVICE:
133
92
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
536
496
class AvahiServiceToSyslog(AvahiService):
537
497
def rename(self, *args, **kwargs):
538
498
"""Add the new name to the syslog messages"""
539
ret = super(AvahiServiceToSyslog, self).rename(*args,
499
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
541
500
syslogger.setFormatter(logging.Formatter(
542
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
501
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
543
502
.format(self.name)))
547
506
# Pretend that we have a GnuTLS module
549
"""This isn't so much a class as it is a module-like namespace."""
507
class GnuTLS(object):
508
"""This isn't so much a class as it is a module-like namespace.
509
It is instantiated once, and simulates having a GnuTLS module."""
551
511
library = ctypes.util.find_library("gnutls")
552
512
if library is None:
553
513
library = ctypes.util.find_library("gnutls-deb0")
554
514
_library = ctypes.cdll.LoadLibrary(library)
516
_need_version = b"3.3.0"
517
_tls_rawpk_version = b"3.6.6"
520
# Need to use "self" here, since this method is called before
521
# the assignment to the "gnutls" global variable happens.
522
if self.check_version(self._need_version) is None:
523
raise self.Error("Needs GnuTLS {} or later"
524
.format(self._need_version))
557
526
# Unless otherwise indicated, the constants and types below are
558
527
# all from the gnutls/gnutls.h C header file.
602
571
class Error(Exception):
572
# We need to use the class name "GnuTLS" here, since this
573
# exception might be raised from within GnuTLS.__init__,
574
# which is called before the assignment to the "gnutls"
575
# global variable has happened.
603
576
def __init__(self, message=None, code=None, args=()):
604
577
# Default usage is by a message string, but if a return
605
578
# code is passed, convert it to a string with
606
579
# gnutls.strerror()
608
581
if message is None and code is not None:
609
message = gnutls.strerror(code).decode(
610
"utf-8", errors="replace")
611
return super(gnutls.Error, self).__init__(
582
message = GnuTLS.strerror(code)
583
return super(GnuTLS.Error, self).__init__(
614
586
class CertificateSecurityError(Error):
618
def __init__(self, cls):
621
def from_param(self, obj):
622
if not isinstance(obj, self.cls):
623
raise TypeError("Not of type {}: {!r}"
624
.format(self.cls.__name__, obj))
625
return ctypes.byref(obj.from_param(obj))
627
class CastToVoidPointer:
628
def __init__(self, cls):
631
def from_param(self, obj):
632
if not isinstance(obj, self.cls):
633
raise TypeError("Not of type {}: {!r}"
634
.format(self.cls.__name__, obj))
635
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
637
class With_from_param:
639
def from_param(cls, obj):
640
return obj._as_parameter_
643
class Credentials(With_from_param):
590
class Credentials(object):
644
591
def __init__(self):
645
self._as_parameter_ = gnutls.certificate_credentials_t()
646
gnutls.certificate_allocate_credentials(self)
592
self._c_object = gnutls.certificate_credentials_t()
593
gnutls.certificate_allocate_credentials(
594
ctypes.byref(self._c_object))
647
595
self.type = gnutls.CRD_CERTIFICATE
649
597
def __del__(self):
650
gnutls.certificate_free_credentials(self)
598
gnutls.certificate_free_credentials(self._c_object)
652
class ClientSession(With_from_param):
600
class ClientSession(object):
653
601
def __init__(self, socket, credentials=None):
654
self._as_parameter_ = gnutls.session_t()
602
self._c_object = gnutls.session_t()
655
603
gnutls_flags = gnutls.CLIENT
656
if gnutls.check_version(b"3.5.6"):
604
if gnutls.check_version("3.5.6"):
657
605
gnutls_flags |= gnutls.NO_TICKETS
658
606
if gnutls.has_rawpk:
659
607
gnutls_flags |= gnutls.ENABLE_RAWPK
660
gnutls.init(self, gnutls_flags)
608
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
662
gnutls.set_default_priority(self)
663
gnutls.transport_set_ptr(self, socket.fileno())
664
gnutls.handshake_set_private_extensions(self, True)
610
gnutls.set_default_priority(self._c_object)
611
gnutls.transport_set_ptr(self._c_object, socket.fileno())
612
gnutls.handshake_set_private_extensions(self._c_object,
665
614
self.socket = socket
666
615
if credentials is None:
667
616
credentials = gnutls.Credentials()
668
gnutls.credentials_set(self, credentials.type,
617
gnutls.credentials_set(self._c_object, credentials.type,
618
ctypes.cast(credentials._c_object,
670
620
self.credentials = credentials
672
622
def __del__(self):
623
gnutls.deinit(self._c_object)
675
625
def handshake(self):
676
return gnutls.handshake(self)
626
return gnutls.handshake(self._c_object)
678
628
def send(self, data):
679
629
data = bytes(data)
680
630
data_len = len(data)
681
631
while data_len > 0:
682
data_len -= gnutls.record_send(self, data[-data_len:],
632
data_len -= gnutls.record_send(self._c_object,
686
return gnutls.bye(self, gnutls.SHUT_RDWR)
637
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
688
639
# Error handling functions
689
640
def _error_code(result):
690
641
"""A function to raise exceptions on errors, suitable
691
for the "restype" attribute on ctypes functions"""
692
if result >= gnutls.E_SUCCESS:
642
for the 'restype' attribute on ctypes functions"""
694
645
if result == gnutls.E_NO_CERTIFICATE_FOUND:
695
646
raise gnutls.CertificateSecurityError(code=result)
696
647
raise gnutls.Error(code=result)
698
def _retry_on_error(result, func, arguments,
699
_error_code=_error_code):
649
def _retry_on_error(result, func, arguments):
700
650
"""A function to retry on some errors, suitable
701
for the "errcheck" attribute on ctypes functions"""
702
while result < gnutls.E_SUCCESS:
651
for the 'errcheck' attribute on ctypes functions"""
703
653
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
704
654
return _error_code(result)
705
655
result = func(*arguments)
712
662
priority_set_direct = _library.gnutls_priority_set_direct
713
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
663
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
714
664
ctypes.POINTER(ctypes.c_char_p)]
715
665
priority_set_direct.restype = _error_code
717
667
init = _library.gnutls_init
718
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
668
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
719
669
init.restype = _error_code
721
671
set_default_priority = _library.gnutls_set_default_priority
722
set_default_priority.argtypes = [ClientSession]
672
set_default_priority.argtypes = [session_t]
723
673
set_default_priority.restype = _error_code
725
675
record_send = _library.gnutls_record_send
726
record_send.argtypes = [ClientSession, ctypes.c_void_p,
676
record_send.argtypes = [session_t, ctypes.c_void_p,
728
678
record_send.restype = ctypes.c_ssize_t
729
679
record_send.errcheck = _retry_on_error
731
681
certificate_allocate_credentials = (
732
682
_library.gnutls_certificate_allocate_credentials)
733
683
certificate_allocate_credentials.argtypes = [
734
PointerTo(Credentials)]
684
ctypes.POINTER(certificate_credentials_t)]
735
685
certificate_allocate_credentials.restype = _error_code
737
687
certificate_free_credentials = (
738
688
_library.gnutls_certificate_free_credentials)
739
certificate_free_credentials.argtypes = [Credentials]
689
certificate_free_credentials.argtypes = [
690
certificate_credentials_t]
740
691
certificate_free_credentials.restype = None
742
693
handshake_set_private_extensions = (
743
694
_library.gnutls_handshake_set_private_extensions)
744
handshake_set_private_extensions.argtypes = [ClientSession,
695
handshake_set_private_extensions.argtypes = [session_t,
746
697
handshake_set_private_extensions.restype = None
748
699
credentials_set = _library.gnutls_credentials_set
749
credentials_set.argtypes = [ClientSession, credentials_type_t,
750
CastToVoidPointer(Credentials)]
700
credentials_set.argtypes = [session_t, credentials_type_t,
751
702
credentials_set.restype = _error_code
753
704
strerror = _library.gnutls_strerror
772
723
global_set_log_function.restype = None
774
725
deinit = _library.gnutls_deinit
775
deinit.argtypes = [ClientSession]
726
deinit.argtypes = [session_t]
776
727
deinit.restype = None
778
729
handshake = _library.gnutls_handshake
779
handshake.argtypes = [ClientSession]
780
handshake.restype = ctypes.c_int
730
handshake.argtypes = [session_t]
731
handshake.restype = _error_code
781
732
handshake.errcheck = _retry_on_error
783
734
transport_set_ptr = _library.gnutls_transport_set_ptr
784
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
735
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
785
736
transport_set_ptr.restype = None
787
738
bye = _library.gnutls_bye
788
bye.argtypes = [ClientSession, close_request_t]
789
bye.restype = ctypes.c_int
739
bye.argtypes = [session_t, close_request_t]
740
bye.restype = _error_code
790
741
bye.errcheck = _retry_on_error
792
743
check_version = _library.gnutls_check_version
793
744
check_version.argtypes = [ctypes.c_char_p]
794
745
check_version.restype = ctypes.c_char_p
796
_need_version = b"3.3.0"
797
if check_version(_need_version) is None:
798
raise self.Error("Needs GnuTLS {} or later"
799
.format(_need_version))
801
_tls_rawpk_version = b"3.6.6"
802
747
has_rawpk = bool(check_version(_tls_rawpk_version))
1092
1028
def __del__(self):
1095
def init_checker(self, randomize_start=False):
1096
# Schedule a new checker to be started a randomly selected
1097
# time (a fraction of 'interval') from now. This spreads out
1098
# the startup of checkers over time when the server is
1031
def init_checker(self):
1032
# Schedule a new checker to be started an 'interval' from now,
1033
# and every interval from then on.
1100
1034
if self.checker_initiator_tag is not None:
1101
1035
GLib.source_remove(self.checker_initiator_tag)
1102
interval_milliseconds = int(self.interval.total_seconds()
1105
delay_milliseconds = random.randrange(
1106
interval_milliseconds + 1)
1108
delay_milliseconds = interval_milliseconds
1109
1036
self.checker_initiator_tag = GLib.timeout_add(
1110
delay_milliseconds, self.start_checker, randomize_start)
1111
delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1112
# A checker might take up to an 'interval' of time, so we can
1113
# expire at the soonest one interval after a checker was
1114
# started. Since the initial checker is delayed, the expire
1115
# time might have to be extended.
1116
now = datetime.datetime.utcnow()
1117
self.expires = now + delay + self.interval
1118
# Schedule a disable() at expire time
1037
int(self.interval.total_seconds() * 1000),
1039
# Schedule a disable() when 'timeout' has passed
1119
1040
if self.disable_initiator_tag is not None:
1120
1041
GLib.source_remove(self.disable_initiator_tag)
1121
1042
self.disable_initiator_tag = GLib.timeout_add(
1122
int((self.expires - now).total_seconds() * 1000),
1043
int(self.timeout.total_seconds() * 1000), self.disable)
1044
# Also start a new checker *right now*.
1045
self.start_checker()
1125
1047
def checker_callback(self, source, condition, connection,
1127
1049
"""The checker has completed, so take appropriate actions."""
1050
self.checker_callback_tag = None
1128
1052
# Read return code from connection (see call_pipe)
1129
1053
returncode = connection.recv()
1130
1054
connection.close()
1131
if self.checker is not None:
1133
self.checker_callback_tag = None
1136
1056
if returncode >= 0:
1137
1057
self.last_checker_status = returncode
1138
1058
self.last_checker_signal = None
1139
1059
if self.last_checker_status == 0:
1140
log.info("Checker for %(name)s succeeded", vars(self))
1060
logger.info("Checker for %(name)s succeeded",
1141
1062
self.checked_ok()
1143
log.info("Checker for %(name)s failed", vars(self))
1064
logger.info("Checker for %(name)s failed", vars(self))
1145
1066
self.last_checker_status = -1
1146
1067
self.last_checker_signal = -returncode
1147
log.warning("Checker for %(name)s crashed?", vars(self))
1068
logger.warning("Checker for %(name)s crashed?",
1150
1072
def checked_ok(self):
1186
1108
if self.checker is not None and not self.checker.is_alive():
1187
log.warning("Checker was not alive; joining")
1109
logger.warning("Checker was not alive; joining")
1188
1110
self.checker.join()
1189
1111
self.checker = None
1190
1112
# Start a new checker if needed
1191
1113
if self.checker is None:
1192
1114
# Escape attributes for the shell
1193
1115
escaped_attrs = {
1194
attr: shlex.quote(str(getattr(self, attr)))
1116
attr: re.escape(str(getattr(self, attr)))
1195
1117
for attr in self.runtime_expansions}
1197
1119
command = self.checker_command % escaped_attrs
1198
1120
except TypeError as error:
1199
log.error('Could not format string "%s"',
1200
self.checker_command, exc_info=error)
1121
logger.error('Could not format string "%s"',
1122
self.checker_command,
1201
1124
return True # Try again later
1202
1125
self.current_checker_command = command
1203
log.info("Starting checker %r for %s", command, self.name)
1126
logger.info("Starting checker %r for %s", command,
1204
1128
# We don't need to redirect stdout and stderr, since
1205
1129
# in normal mode, that is already done by daemon(),
1206
1130
# and in debug mode we don't want to. (Stdin is
1222
1146
kwargs=popen_args)
1223
1147
self.checker.start()
1224
1148
self.checker_callback_tag = GLib.io_add_watch(
1225
GLib.IOChannel.unix_new(pipe[0].fileno()),
1226
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1149
pipe[0].fileno(), GLib.IO_IN,
1227
1150
self.checker_callback, pipe[0], command)
1228
if start_was_randomized:
1229
# We were started after a random delay; Schedule a new
1230
# checker to be started an 'interval' from now, and every
1231
# interval from then on.
1232
now = datetime.datetime.utcnow()
1233
self.checker_initiator_tag = GLib.timeout_add(
1234
int(self.interval.total_seconds() * 1000),
1236
self.expires = max(self.expires, now + self.interval)
1237
# Don't start a new checker again after same random delay
1239
1151
# Re-run this periodically if run by GLib.timeout_add
2222
class ProxyClient(object):
2310
2223
def __init__(self, child_pipe, key_id, fpr, address):
2311
2224
self._pipe = child_pipe
2312
self._pipe.send(("init", key_id, fpr, address))
2225
self._pipe.send(('init', key_id, fpr, address))
2313
2226
if not self._pipe.recv():
2314
2227
raise KeyError(key_id or fpr)
2316
2229
def __getattribute__(self, name):
2318
2231
return super(ProxyClient, self).__getattribute__(name)
2319
self._pipe.send(("getattr", name))
2232
self._pipe.send(('getattr', name))
2320
2233
data = self._pipe.recv()
2321
if data[0] == "data":
2234
if data[0] == 'data':
2323
if data[0] == "function":
2236
if data[0] == 'function':
2325
2238
def func(*args, **kwargs):
2326
self._pipe.send(("funcall", name, args, kwargs))
2239
self._pipe.send(('funcall', name, args, kwargs))
2327
2240
return self._pipe.recv()[1]
2331
2244
def __setattr__(self, name, value):
2333
2246
return super(ProxyClient, self).__setattr__(name, value)
2334
self._pipe.send(("setattr", name, value))
2247
self._pipe.send(('setattr', name, value))
2337
2250
class ClientHandler(socketserver.BaseRequestHandler, object):
2343
2256
def handle(self):
2344
2257
with contextlib.closing(self.server.child_pipe) as child_pipe:
2345
log.info("TCP connection from: %s",
2346
str(self.client_address))
2347
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2258
logger.info("TCP connection from: %s",
2259
str(self.client_address))
2260
logger.debug("Pipe FD: %d",
2261
self.server.child_pipe.fileno())
2349
2263
session = gnutls.ClientSession(self.request)
2351
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2265
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2352
2266
# "+AES-256-CBC", "+SHA1",
2353
2267
# "+COMP-NULL", "+CTYPE-OPENPGP",
2356
2270
priority = self.server.gnutls_priority
2357
2271
if priority is None:
2358
2272
priority = "NORMAL"
2359
gnutls.priority_set_direct(session,
2360
priority.encode("utf-8"), None)
2273
gnutls.priority_set_direct(session._c_object,
2274
priority.encode("utf-8"),
2362
2277
# Start communication using the Mandos protocol
2363
2278
# Get protocol number
2364
2279
line = self.request.makefile().readline()
2365
log.debug("Protocol version: %r", line)
2280
logger.debug("Protocol version: %r", line)
2367
2282
if int(line.strip().split()[0]) > 1:
2368
2283
raise RuntimeError(line)
2369
2284
except (ValueError, IndexError, RuntimeError) as error:
2370
log.error("Unknown protocol version: %s", error)
2285
logger.error("Unknown protocol version: %s", error)
2373
2288
# Start GnuTLS connection
2375
2290
session.handshake()
2376
2291
except gnutls.Error as error:
2377
log.warning("Handshake failed: %s", error)
2292
logger.warning("Handshake failed: %s", error)
2378
2293
# Do not run session.bye() here: the session is not
2379
2294
# established. Just abandon the request.
2381
log.debug("Handshake succeeded")
2296
logger.debug("Handshake succeeded")
2383
2298
approval_required = False
2385
2300
if gnutls.has_rawpk:
2388
2303
key_id = self.key_id(
2389
2304
self.peer_certificate(session))
2390
2305
except (TypeError, gnutls.Error) as error:
2391
log.warning("Bad certificate: %s", error)
2306
logger.warning("Bad certificate: %s", error)
2393
log.debug("Key ID: %s",
2394
key_id.decode("utf-8",
2308
logger.debug("Key ID: %s", key_id)
2400
2313
fpr = self.fingerprint(
2401
2314
self.peer_certificate(session))
2402
2315
except (TypeError, gnutls.Error) as error:
2403
log.warning("Bad certificate: %s", error)
2316
logger.warning("Bad certificate: %s", error)
2405
log.debug("Fingerprint: %s", fpr)
2318
logger.debug("Fingerprint: %s", fpr)
2408
2321
client = ProxyClient(child_pipe, key_id, fpr,
2483
2398
except gnutls.Error as error:
2484
log.warning("GnuTLS bye failed", exc_info=error)
2399
logger.warning("GnuTLS bye failed",
2487
2403
def peer_certificate(session):
2488
2404
"Return the peer's certificate as a bytestring"
2490
cert_type = gnutls.certificate_type_get2(
2491
session, gnutls.CTYPE_PEERS)
2406
cert_type = gnutls.certificate_type_get2(session._c_object,
2492
2408
except AttributeError:
2493
cert_type = gnutls.certificate_type_get(session)
2409
cert_type = gnutls.certificate_type_get(session._c_object)
2494
2410
if gnutls.has_rawpk:
2495
2411
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2497
2413
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2498
2414
# If not a valid certificate type...
2499
2415
if cert_type not in valid_cert_types:
2500
log.info("Cert type %r not in %r", cert_type,
2416
logger.info("Cert type %r not in %r", cert_type,
2502
2418
# ...return invalid data
2504
2420
list_size = ctypes.c_uint(1)
2505
2421
cert_list = (gnutls.certificate_get_peers
2506
(session, ctypes.byref(list_size)))
2422
(session._c_object, ctypes.byref(list_size)))
2507
2423
if not bool(cert_list) and list_size.value != 0:
2508
2424
raise gnutls.Error("error getting peer certificate")
2509
2425
if list_size.value == 0:
2688
2603
(self.interface + "\0").encode("utf-8"))
2689
2604
except socket.error as error:
2690
2605
if error.errno == errno.EPERM:
2691
log.error("No permission to bind to interface %s",
2606
logger.error("No permission to bind to"
2607
" interface %s", self.interface)
2693
2608
elif error.errno == errno.ENOPROTOOPT:
2694
log.error("SO_BINDTODEVICE not available; cannot"
2695
" bind to interface %s", self.interface)
2609
logger.error("SO_BINDTODEVICE not available;"
2610
" cannot bind to interface %s",
2696
2612
elif error.errno == errno.ENODEV:
2697
log.error("Interface %s does not exist, cannot"
2698
" bind", self.interface)
2613
logger.error("Interface %s does not exist,"
2614
" cannot bind", self.interface)
2701
2617
# Only bind(2) the socket if we really need to.
2702
2618
if self.server_address[0] or self.server_address[1]:
2703
if self.server_address[1]:
2704
self.allow_reuse_address = True
2705
2619
if not self.server_address[0]:
2706
2620
if self.address_family == socket.AF_INET6:
2707
2621
any_address = "::" # in6addr_any
2845
2758
def rfc3339_duration_to_delta(duration):
2846
2759
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2848
>>> timedelta = datetime.timedelta
2849
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2851
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2853
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2855
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2857
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2859
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2861
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2761
>>> rfc3339_duration_to_delta("P7D")
2762
datetime.timedelta(7)
2763
>>> rfc3339_duration_to_delta("PT60S")
2764
datetime.timedelta(0, 60)
2765
>>> rfc3339_duration_to_delta("PT60M")
2766
datetime.timedelta(0, 3600)
2767
>>> rfc3339_duration_to_delta("PT24H")
2768
datetime.timedelta(1)
2769
>>> rfc3339_duration_to_delta("P1W")
2770
datetime.timedelta(7)
2771
>>> rfc3339_duration_to_delta("PT5M30S")
2772
datetime.timedelta(0, 330)
2773
>>> rfc3339_duration_to_delta("P1DT3M20S")
2774
datetime.timedelta(1, 200)
2866
2777
# Parsing an RFC 3339 duration with regular expressions is not
2946
2857
def string_to_delta(interval):
2947
2858
"""Parse a string and return a datetime.timedelta
2949
>>> string_to_delta("7d") == datetime.timedelta(7)
2951
>>> string_to_delta("60s") == datetime.timedelta(0, 60)
2953
>>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2955
>>> string_to_delta("24h") == datetime.timedelta(1)
2957
>>> string_to_delta("1w") == datetime.timedelta(7)
2959
>>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
2860
>>> string_to_delta('7d')
2861
datetime.timedelta(7)
2862
>>> string_to_delta('60s')
2863
datetime.timedelta(0, 60)
2864
>>> string_to_delta('60m')
2865
datetime.timedelta(0, 3600)
2866
>>> string_to_delta('24h')
2867
datetime.timedelta(1)
2868
>>> string_to_delta('1w')
2869
datetime.timedelta(7)
2870
>>> string_to_delta('5m 30s')
2871
datetime.timedelta(0, 330)
3351
3266
for key, value in
3352
3267
bytes_old_client_settings.items()}
3353
3268
del bytes_old_client_settings
3354
# .host and .checker_command
3355
3270
for value in old_client_settings.values():
3356
for attribute in ("host", "checker_command"):
3357
if isinstance(value[attribute], bytes):
3358
value[attribute] = (value[attribute]
3271
if isinstance(value["host"], bytes):
3272
value["host"] = (value["host"]
3360
3274
os.remove(stored_state_path)
3361
3275
except IOError as e:
3362
3276
if e.errno == errno.ENOENT:
3363
log.warning("Could not load persistent state:"
3364
" %s", os.strerror(e.errno))
3277
logger.warning("Could not load persistent state:"
3278
" {}".format(os.strerror(e.errno)))
3366
log.critical("Could not load persistent state:",
3280
logger.critical("Could not load persistent state:",
3369
3283
except EOFError as e:
3370
log.warning("Could not load persistent state: EOFError:",
3284
logger.warning("Could not load persistent state: "
3373
3288
with PGPEngine() as pgp:
3374
3289
for client_name, client in clients_data.items():
3401
3316
if client["enabled"]:
3402
3317
if datetime.datetime.utcnow() >= client["expires"]:
3403
3318
if not client["last_checked_ok"]:
3404
log.warning("disabling client %s - Client"
3405
" never performed a successful"
3406
" checker", client_name)
3320
"disabling client {} - Client never "
3321
"performed a successful checker".format(
3407
3323
client["enabled"] = False
3408
3324
elif client["last_checker_status"] != 0:
3409
log.warning("disabling client %s - Client"
3410
" last checker failed with error"
3411
" code %s", client_name,
3412
client["last_checker_status"])
3326
"disabling client {} - Client last"
3327
" checker failed with error code"
3330
client["last_checker_status"]))
3413
3331
client["enabled"] = False
3415
3333
client["expires"] = (
3416
3334
datetime.datetime.utcnow()
3417
3335
+ client["timeout"])
3418
log.debug("Last checker succeeded, keeping %s"
3419
" enabled", client_name)
3336
logger.debug("Last checker succeeded,"
3337
" keeping {} enabled".format(
3421
3340
client["secret"] = pgp.decrypt(
3422
3341
client["encrypted_secret"],
3423
3342
client_settings[client_name]["secret"])
3424
3343
except PGPError:
3425
3344
# If decryption fails, we use secret from new settings
3426
log.debug("Failed to decrypt %s old secret",
3345
logger.debug("Failed to decrypt {} old secret".format(
3428
3347
client["secret"] = (client_settings[client_name]
3677
3597
service.activate()
3678
3598
except dbus.exceptions.DBusException as error:
3679
log.critical("D-Bus Exception", exc_info=error)
3599
logger.critical("D-Bus Exception", exc_info=error)
3682
3602
# End of Avahi example code
3685
GLib.IOChannel.unix_new(tcp_server.fileno()),
3686
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3687
lambda *args, **kwargs: (tcp_server.handle_request
3688
(*args[2:], **kwargs) or True))
3604
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3605
lambda *args, **kwargs:
3606
(tcp_server.handle_request
3607
(*args[2:], **kwargs) or True))
3690
log.debug("Starting main loop")
3609
logger.debug("Starting main loop")
3691
3610
main_loop.run()
3692
3611
except AvahiError as error:
3693
log.critical("Avahi Error", exc_info=error)
3612
logger.critical("Avahi Error", exc_info=error)
3696
3615
except KeyboardInterrupt:
3698
3617
print("", file=sys.stderr)
3699
log.debug("Server received KeyboardInterrupt")
3700
log.debug("Server exiting")
3618
logger.debug("Server received KeyboardInterrupt")
3619
logger.debug("Server exiting")
3701
3620
# Must run before the D-Bus bus name gets deregistered
3705
def parse_test_args():
3706
# type: () -> argparse.Namespace
3707
parser = argparse.ArgumentParser(add_help=False)
3708
parser.add_argument("--check", action="store_true")
3709
parser.add_argument("--prefix", )
3710
args, unknown_args = parser.parse_known_args()
3712
# Remove test options from sys.argv
3713
sys.argv[1:] = unknown_args
3716
# Add all tests from doctest strings
3717
def load_tests(loader, tests, none):
3719
tests.addTests(doctest.DocTestSuite())
3722
if __name__ == "__main__":
3723
options = parse_test_args()
3726
extra_test_prefix = options.prefix
3727
if extra_test_prefix is not None:
3728
if not (unittest.main(argv=[""], exit=False)
3729
.result.wasSuccessful()):
3731
class ExtraTestLoader(unittest.TestLoader):
3732
testMethodPrefix = extra_test_prefix
3733
# Call using ./scriptname --test [--verbose]
3734
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3736
unittest.main(argv=[""])
3744
# (lambda (&optional extra)
3745
# (if (not (funcall run-tests-in-test-buffer default-directory
3747
# (funcall show-test-buffer-in-test-window)
3748
# (funcall remove-test-window)
3749
# (if extra (message "Extra tests run successfully!"))))
3750
# run-tests-in-test-buffer:
3751
# (lambda (dir &optional extra)
3752
# (with-current-buffer (get-buffer-create "*Test*")
3753
# (setq buffer-read-only nil
3754
# default-directory dir)
3756
# (compilation-mode))
3757
# (let ((process-result
3758
# (let ((inhibit-read-only t))
3759
# (process-file-shell-command
3760
# (funcall get-command-line extra) nil "*Test*"))))
3761
# (and (numberp process-result)
3762
# (= process-result 0))))
3764
# (lambda (&optional extra)
3765
# (let ((quoted-script
3766
# (shell-quote-argument (funcall get-script-name))))
3768
# (concat "%s --check" (if extra " --prefix=atest" ""))
3772
# (if (fboundp 'file-local-name)
3773
# (file-local-name (buffer-file-name))
3774
# (or (file-remote-p (buffer-file-name) 'localname)
3775
# (buffer-file-name))))
3776
# remove-test-window:
3778
# (let ((test-window (get-buffer-window "*Test*")))
3779
# (if test-window (delete-window test-window))))
3780
# show-test-buffer-in-test-window:
3782
# (when (not (get-buffer-window-list "*Test*"))
3783
# (setq next-error-last-buffer (get-buffer "*Test*"))
3784
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3785
# (display-buffer-overriding-action
3786
# `((display-buffer-in-side-window) (side . ,side)
3787
# (window-height . fit-window-to-buffer)
3788
# (window-width . fit-window-to-buffer))))
3789
# (display-buffer "*Test*"))))
3792
# (let* ((run-extra-tests (lambda () (interactive)
3793
# (funcall run-tests t)))
3794
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3795
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3796
# (setq minor-mode-overriding-map-alist
3797
# (cons `(run-tests . ,outer-keymap)
3798
# minor-mode-overriding-map-alist)))
3799
# (add-hook 'after-save-hook run-tests 90 t))
3624
if __name__ == '__main__':