496
523
class AvahiServiceToSyslog(AvahiService):
497
524
def rename(self, *args, **kwargs):
498
525
"""Add the new name to the syslog messages"""
499
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
526
ret = super(AvahiServiceToSyslog, self).rename(*args,
500
528
syslogger.setFormatter(logging.Formatter(
501
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
529
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
502
530
.format(self.name)))
506
534
# Pretend that we have a GnuTLS module
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."""
536
"""This isn't so much a class as it is a module-like namespace."""
511
538
library = ctypes.util.find_library("gnutls")
512
539
if library is None:
513
540
library = ctypes.util.find_library("gnutls-deb0")
514
541
_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))
526
544
# Unless otherwise indicated, the constants and types below are
527
545
# all from the gnutls/gnutls.h C header file.
571
589
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.
576
590
def __init__(self, message=None, code=None, args=()):
577
591
# Default usage is by a message string, but if a return
578
592
# code is passed, convert it to a string with
579
593
# gnutls.strerror()
581
595
if message is None and code is not None:
582
message = GnuTLS.strerror(code)
583
return super(GnuTLS.Error, self).__init__(
596
message = gnutls.strerror(code).decode(
597
"utf-8", errors="replace")
598
return super(gnutls.Error, self).__init__(
586
601
class CertificateSecurityError(Error):
605
def __init__(self, cls):
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))
614
class CastToVoidPointer:
615
def __init__(self, cls):
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)
624
class With_from_param:
626
def from_param(cls, obj):
627
return obj._as_parameter_
590
class Credentials(object):
630
class Credentials(With_from_param):
591
631
def __init__(self):
592
self._c_object = gnutls.certificate_credentials_t()
593
gnutls.certificate_allocate_credentials(
594
ctypes.byref(self._c_object))
632
self._as_parameter_ = gnutls.certificate_credentials_t()
633
gnutls.certificate_allocate_credentials(self)
595
634
self.type = gnutls.CRD_CERTIFICATE
597
636
def __del__(self):
598
gnutls.certificate_free_credentials(self._c_object)
637
gnutls.certificate_free_credentials(self)
600
class ClientSession(object):
639
class ClientSession(With_from_param):
601
640
def __init__(self, socket, credentials=None):
602
self._c_object = gnutls.session_t()
641
self._as_parameter_ = gnutls.session_t()
603
642
gnutls_flags = gnutls.CLIENT
604
if gnutls.check_version("3.5.6"):
643
if gnutls.check_version(b"3.5.6"):
605
644
gnutls_flags |= gnutls.NO_TICKETS
606
645
if gnutls.has_rawpk:
607
646
gnutls_flags |= gnutls.ENABLE_RAWPK
608
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
647
gnutls.init(self, gnutls_flags)
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,
649
gnutls.set_default_priority(self)
650
gnutls.transport_set_ptr(self, socket.fileno())
651
gnutls.handshake_set_private_extensions(self, True)
614
652
self.socket = socket
615
653
if credentials is None:
616
654
credentials = gnutls.Credentials()
617
gnutls.credentials_set(self._c_object, credentials.type,
618
ctypes.cast(credentials._c_object,
655
gnutls.credentials_set(self, credentials.type,
620
657
self.credentials = credentials
622
659
def __del__(self):
623
gnutls.deinit(self._c_object)
625
662
def handshake(self):
626
return gnutls.handshake(self._c_object)
663
return gnutls.handshake(self)
628
665
def send(self, data):
629
666
data = bytes(data)
630
667
data_len = len(data)
631
668
while data_len > 0:
632
data_len -= gnutls.record_send(self._c_object,
669
data_len -= gnutls.record_send(self, data[-data_len:],
637
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
673
return gnutls.bye(self, gnutls.SHUT_RDWR)
639
675
# Error handling functions
640
676
def _error_code(result):
641
677
"""A function to raise exceptions on errors, suitable
642
for the 'restype' attribute on ctypes functions"""
678
for the "restype" attribute on ctypes functions"""
679
if result >= gnutls.E_SUCCESS:
645
681
if result == gnutls.E_NO_CERTIFICATE_FOUND:
646
682
raise gnutls.CertificateSecurityError(code=result)
647
683
raise gnutls.Error(code=result)
649
def _retry_on_error(result, func, arguments):
685
def _retry_on_error(result, func, arguments,
686
_error_code=_error_code):
650
687
"""A function to retry on some errors, suitable
651
for the 'errcheck' attribute on ctypes functions"""
688
for the "errcheck" attribute on ctypes functions"""
689
while result < gnutls.E_SUCCESS:
653
690
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
654
691
return _error_code(result)
655
692
result = func(*arguments)
662
699
priority_set_direct = _library.gnutls_priority_set_direct
663
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
700
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
664
701
ctypes.POINTER(ctypes.c_char_p)]
665
702
priority_set_direct.restype = _error_code
667
704
init = _library.gnutls_init
668
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
705
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
669
706
init.restype = _error_code
671
708
set_default_priority = _library.gnutls_set_default_priority
672
set_default_priority.argtypes = [session_t]
709
set_default_priority.argtypes = [ClientSession]
673
710
set_default_priority.restype = _error_code
675
712
record_send = _library.gnutls_record_send
676
record_send.argtypes = [session_t, ctypes.c_void_p,
713
record_send.argtypes = [ClientSession, ctypes.c_void_p,
678
715
record_send.restype = ctypes.c_ssize_t
679
716
record_send.errcheck = _retry_on_error
681
718
certificate_allocate_credentials = (
682
719
_library.gnutls_certificate_allocate_credentials)
683
720
certificate_allocate_credentials.argtypes = [
684
ctypes.POINTER(certificate_credentials_t)]
721
PointerTo(Credentials)]
685
722
certificate_allocate_credentials.restype = _error_code
687
724
certificate_free_credentials = (
688
725
_library.gnutls_certificate_free_credentials)
689
certificate_free_credentials.argtypes = [
690
certificate_credentials_t]
726
certificate_free_credentials.argtypes = [Credentials]
691
727
certificate_free_credentials.restype = None
693
729
handshake_set_private_extensions = (
694
730
_library.gnutls_handshake_set_private_extensions)
695
handshake_set_private_extensions.argtypes = [session_t,
731
handshake_set_private_extensions.argtypes = [ClientSession,
697
733
handshake_set_private_extensions.restype = None
699
735
credentials_set = _library.gnutls_credentials_set
700
credentials_set.argtypes = [session_t, credentials_type_t,
736
credentials_set.argtypes = [ClientSession, credentials_type_t,
737
CastToVoidPointer(Credentials)]
702
738
credentials_set.restype = _error_code
704
740
strerror = _library.gnutls_strerror
723
759
global_set_log_function.restype = None
725
761
deinit = _library.gnutls_deinit
726
deinit.argtypes = [session_t]
762
deinit.argtypes = [ClientSession]
727
763
deinit.restype = None
729
765
handshake = _library.gnutls_handshake
730
handshake.argtypes = [session_t]
731
handshake.restype = _error_code
766
handshake.argtypes = [ClientSession]
767
handshake.restype = ctypes.c_int
732
768
handshake.errcheck = _retry_on_error
734
770
transport_set_ptr = _library.gnutls_transport_set_ptr
735
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
771
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
736
772
transport_set_ptr.restype = None
738
774
bye = _library.gnutls_bye
739
bye.argtypes = [session_t, close_request_t]
740
bye.restype = _error_code
775
bye.argtypes = [ClientSession, close_request_t]
776
bye.restype = ctypes.c_int
741
777
bye.errcheck = _retry_on_error
743
779
check_version = _library.gnutls_check_version
744
780
check_version.argtypes = [ctypes.c_char_p]
745
781
check_version.restype = ctypes.c_char_p
783
_need_version = b"3.3.0"
784
if check_version(_need_version) is None:
785
raise self.Error("Needs GnuTLS {} or later"
786
.format(_need_version))
788
_tls_rawpk_version = b"3.6.6"
747
789
has_rawpk = bool(check_version(_tls_rawpk_version))
1028
1073
def __del__(self):
1031
def init_checker(self):
1032
# Schedule a new checker to be started an 'interval' from now,
1033
# and every interval from then on.
1076
def init_checker(self, randomize_start=False):
1077
# Schedule a new checker to be started a randomly selected
1078
# time (a fraction of 'interval') from now. This spreads out
1079
# the startup of checkers over time when the server is
1034
1081
if self.checker_initiator_tag is not None:
1035
1082
GLib.source_remove(self.checker_initiator_tag)
1083
interval_milliseconds = int(self.interval.total_seconds()
1086
delay_milliseconds = random.randrange(
1087
interval_milliseconds + 1)
1089
delay_milliseconds = interval_milliseconds
1036
1090
self.checker_initiator_tag = GLib.timeout_add(
1037
int(self.interval.total_seconds() * 1000),
1039
# Schedule a disable() when 'timeout' has passed
1091
delay_milliseconds, self.start_checker, randomize_start)
1092
delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1093
# A checker might take up to an 'interval' of time, so we can
1094
# expire at the soonest one interval after a checker was
1095
# started. Since the initial checker is delayed, the expire
1096
# time might have to be extended.
1097
now = datetime.datetime.utcnow()
1098
self.expires = now + delay + self.interval
1099
# Schedule a disable() at expire time
1040
1100
if self.disable_initiator_tag is not None:
1041
1101
GLib.source_remove(self.disable_initiator_tag)
1042
1102
self.disable_initiator_tag = GLib.timeout_add(
1043
int(self.timeout.total_seconds() * 1000), self.disable)
1044
# Also start a new checker *right now*.
1045
self.start_checker()
1103
int((self.expires - now).total_seconds() * 1000),
1047
1106
def checker_callback(self, source, condition, connection,
1049
1108
"""The checker has completed, so take appropriate actions."""
1050
self.checker_callback_tag = None
1052
1109
# Read return code from connection (see call_pipe)
1053
1110
returncode = connection.recv()
1054
1111
connection.close()
1112
if self.checker is not None:
1114
self.checker_callback_tag = None
1056
1117
if returncode >= 0:
1057
1118
self.last_checker_status = returncode
1058
1119
self.last_checker_signal = None
1059
1120
if self.last_checker_status == 0:
1060
logger.info("Checker for %(name)s succeeded",
1121
log.info("Checker for %(name)s succeeded", vars(self))
1062
1122
self.checked_ok()
1064
logger.info("Checker for %(name)s failed", vars(self))
1124
log.info("Checker for %(name)s failed", vars(self))
1066
1126
self.last_checker_status = -1
1067
1127
self.last_checker_signal = -returncode
1068
logger.warning("Checker for %(name)s crashed?",
1128
log.warning("Checker for %(name)s crashed?", vars(self))
1072
1131
def checked_ok(self):
1108
1167
if self.checker is not None and not self.checker.is_alive():
1109
logger.warning("Checker was not alive; joining")
1168
log.warning("Checker was not alive; joining")
1110
1169
self.checker.join()
1111
1170
self.checker = None
1112
1171
# Start a new checker if needed
1113
1172
if self.checker is None:
1114
1173
# Escape attributes for the shell
1115
1174
escaped_attrs = {
1116
attr: re.escape(str(getattr(self, attr)))
1175
attr: shlex.quote(str(getattr(self, attr)))
1117
1176
for attr in self.runtime_expansions}
1119
1178
command = self.checker_command % escaped_attrs
1120
1179
except TypeError as error:
1121
logger.error('Could not format string "%s"',
1122
self.checker_command,
1180
log.error('Could not format string "%s"',
1181
self.checker_command, exc_info=error)
1124
1182
return True # Try again later
1125
1183
self.current_checker_command = command
1126
logger.info("Starting checker %r for %s", command,
1184
log.info("Starting checker %r for %s", command, self.name)
1128
1185
# We don't need to redirect stdout and stderr, since
1129
1186
# in normal mode, that is already done by daemon(),
1130
1187
# and in debug mode we don't want to. (Stdin is
1146
1203
kwargs=popen_args)
1147
1204
self.checker.start()
1148
1205
self.checker_callback_tag = GLib.io_add_watch(
1149
pipe[0].fileno(), GLib.IO_IN,
1206
GLib.IOChannel.unix_new(pipe[0].fileno()),
1207
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1150
1208
self.checker_callback, pipe[0], command)
1209
if start_was_randomized:
1210
# We were started after a random delay; Schedule a new
1211
# checker to be started an 'interval' from now, and every
1212
# interval from then on.
1213
now = datetime.datetime.utcnow()
1214
self.checker_initiator_tag = GLib.timeout_add(
1215
int(self.interval.total_seconds() * 1000),
1217
self.expires = max(self.expires, now + self.interval)
1218
# Don't start a new checker again after same random delay
1151
1220
# Re-run this periodically if run by GLib.timeout_add
2222
class ProxyClient(object):
2223
2291
def __init__(self, child_pipe, key_id, fpr, address):
2224
2292
self._pipe = child_pipe
2225
self._pipe.send(('init', key_id, fpr, address))
2293
self._pipe.send(("init", key_id, fpr, address))
2226
2294
if not self._pipe.recv():
2227
2295
raise KeyError(key_id or fpr)
2229
2297
def __getattribute__(self, name):
2231
2299
return super(ProxyClient, self).__getattribute__(name)
2232
self._pipe.send(('getattr', name))
2300
self._pipe.send(("getattr", name))
2233
2301
data = self._pipe.recv()
2234
if data[0] == 'data':
2302
if data[0] == "data":
2236
if data[0] == 'function':
2304
if data[0] == "function":
2238
2306
def func(*args, **kwargs):
2239
self._pipe.send(('funcall', name, args, kwargs))
2307
self._pipe.send(("funcall", name, args, kwargs))
2240
2308
return self._pipe.recv()[1]
2244
2312
def __setattr__(self, name, value):
2246
2314
return super(ProxyClient, self).__setattr__(name, value)
2247
self._pipe.send(('setattr', name, value))
2315
self._pipe.send(("setattr", name, value))
2250
2318
class ClientHandler(socketserver.BaseRequestHandler, object):
2256
2324
def handle(self):
2257
2325
with contextlib.closing(self.server.child_pipe) as child_pipe:
2258
logger.info("TCP connection from: %s",
2259
str(self.client_address))
2260
logger.debug("Pipe FD: %d",
2261
self.server.child_pipe.fileno())
2326
log.info("TCP connection from: %s",
2327
str(self.client_address))
2328
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2263
2330
session = gnutls.ClientSession(self.request)
2265
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2332
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2266
2333
# "+AES-256-CBC", "+SHA1",
2267
2334
# "+COMP-NULL", "+CTYPE-OPENPGP",
2270
2337
priority = self.server.gnutls_priority
2271
2338
if priority is None:
2272
2339
priority = "NORMAL"
2273
gnutls.priority_set_direct(session._c_object,
2274
priority.encode("utf-8"),
2340
gnutls.priority_set_direct(session,
2341
priority.encode("utf-8"), None)
2277
2343
# Start communication using the Mandos protocol
2278
2344
# Get protocol number
2279
2345
line = self.request.makefile().readline()
2280
logger.debug("Protocol version: %r", line)
2346
log.debug("Protocol version: %r", line)
2282
2348
if int(line.strip().split()[0]) > 1:
2283
2349
raise RuntimeError(line)
2284
2350
except (ValueError, IndexError, RuntimeError) as error:
2285
logger.error("Unknown protocol version: %s", error)
2351
log.error("Unknown protocol version: %s", error)
2288
2354
# Start GnuTLS connection
2290
2356
session.handshake()
2291
2357
except gnutls.Error as error:
2292
logger.warning("Handshake failed: %s", error)
2358
log.warning("Handshake failed: %s", error)
2293
2359
# Do not run session.bye() here: the session is not
2294
2360
# established. Just abandon the request.
2296
logger.debug("Handshake succeeded")
2362
log.debug("Handshake succeeded")
2298
2364
approval_required = False
2300
2366
if gnutls.has_rawpk:
2303
2369
key_id = self.key_id(
2304
2370
self.peer_certificate(session))
2305
2371
except (TypeError, gnutls.Error) as error:
2306
logger.warning("Bad certificate: %s", error)
2372
log.warning("Bad certificate: %s", error)
2308
logger.debug("Key ID: %s", key_id)
2374
log.debug("Key ID: %s",
2375
key_id.decode("utf-8",
2313
2381
fpr = self.fingerprint(
2314
2382
self.peer_certificate(session))
2315
2383
except (TypeError, gnutls.Error) as error:
2316
logger.warning("Bad certificate: %s", error)
2384
log.warning("Bad certificate: %s", error)
2318
logger.debug("Fingerprint: %s", fpr)
2386
log.debug("Fingerprint: %s", fpr)
2321
2389
client = ProxyClient(child_pipe, key_id, fpr,
2398
2464
except gnutls.Error as error:
2399
logger.warning("GnuTLS bye failed",
2465
log.warning("GnuTLS bye failed", exc_info=error)
2403
2468
def peer_certificate(session):
2404
2469
"Return the peer's certificate as a bytestring"
2406
cert_type = gnutls.certificate_type_get2(session._c_object,
2471
cert_type = gnutls.certificate_type_get2(
2472
session, gnutls.CTYPE_PEERS)
2408
2473
except AttributeError:
2409
cert_type = gnutls.certificate_type_get(session._c_object)
2474
cert_type = gnutls.certificate_type_get(session)
2410
2475
if gnutls.has_rawpk:
2411
2476
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2413
2478
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2414
2479
# If not a valid certificate type...
2415
2480
if cert_type not in valid_cert_types:
2416
logger.info("Cert type %r not in %r", cert_type,
2481
log.info("Cert type %r not in %r", cert_type,
2418
2483
# ...return invalid data
2420
2485
list_size = ctypes.c_uint(1)
2421
2486
cert_list = (gnutls.certificate_get_peers
2422
(session._c_object, ctypes.byref(list_size)))
2487
(session, ctypes.byref(list_size)))
2423
2488
if not bool(cert_list) and list_size.value != 0:
2424
2489
raise gnutls.Error("error getting peer certificate")
2425
2490
if list_size.value == 0:
2603
2669
(self.interface + "\0").encode("utf-8"))
2604
2670
except socket.error as error:
2605
2671
if error.errno == errno.EPERM:
2606
logger.error("No permission to bind to"
2607
" interface %s", self.interface)
2672
log.error("No permission to bind to interface %s",
2608
2674
elif error.errno == errno.ENOPROTOOPT:
2609
logger.error("SO_BINDTODEVICE not available;"
2610
" cannot bind to interface %s",
2675
log.error("SO_BINDTODEVICE not available; cannot"
2676
" bind to interface %s", self.interface)
2612
2677
elif error.errno == errno.ENODEV:
2613
logger.error("Interface %s does not exist,"
2614
" cannot bind", self.interface)
2678
log.error("Interface %s does not exist, cannot"
2679
" bind", self.interface)
2617
2682
# Only bind(2) the socket if we really need to.
2618
2683
if self.server_address[0] or self.server_address[1]:
2684
if self.server_address[1]:
2685
self.allow_reuse_address = True
2619
2686
if not self.server_address[0]:
2620
2687
if self.address_family == socket.AF_INET6:
2621
2688
any_address = "::" # in6addr_any
2758
2826
def rfc3339_duration_to_delta(duration):
2759
2827
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
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)
2829
>>> timedelta = datetime.timedelta
2830
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2832
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2834
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2836
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2838
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2840
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2842
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2777
2847
# Parsing an RFC 3339 duration with regular expressions is not
2857
2927
def string_to_delta(interval):
2858
2928
"""Parse a string and return a datetime.timedelta
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)
2930
>>> string_to_delta("7d") == datetime.timedelta(7)
2932
>>> string_to_delta("60s") == datetime.timedelta(0, 60)
2934
>>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2936
>>> string_to_delta("24h") == datetime.timedelta(1)
2938
>>> string_to_delta("1w") == datetime.timedelta(7)
2940
>>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
3266
3330
for key, value in
3267
3331
bytes_old_client_settings.items()}
3268
3332
del bytes_old_client_settings
3333
# .host and .checker_command
3270
3334
for value in old_client_settings.values():
3271
if isinstance(value["host"], bytes):
3272
value["host"] = (value["host"]
3335
for attribute in ("host", "checker_command"):
3336
if isinstance(value[attribute], bytes):
3337
value[attribute] = (value[attribute]
3274
3339
os.remove(stored_state_path)
3275
3340
except IOError as e:
3276
3341
if e.errno == errno.ENOENT:
3277
logger.warning("Could not load persistent state:"
3278
" {}".format(os.strerror(e.errno)))
3342
log.warning("Could not load persistent state:"
3343
" %s", os.strerror(e.errno))
3280
logger.critical("Could not load persistent state:",
3345
log.critical("Could not load persistent state:",
3283
3348
except EOFError as e:
3284
logger.warning("Could not load persistent state: "
3349
log.warning("Could not load persistent state: EOFError:",
3288
3352
with PGPEngine() as pgp:
3289
3353
for client_name, client in clients_data.items():
3316
3380
if client["enabled"]:
3317
3381
if datetime.datetime.utcnow() >= client["expires"]:
3318
3382
if not client["last_checked_ok"]:
3320
"disabling client {} - Client never "
3321
"performed a successful checker".format(
3383
log.warning("disabling client %s - Client"
3384
" never performed a successful"
3385
" checker", client_name)
3323
3386
client["enabled"] = False
3324
3387
elif client["last_checker_status"] != 0:
3326
"disabling client {} - Client last"
3327
" checker failed with error code"
3330
client["last_checker_status"]))
3388
log.warning("disabling client %s - Client"
3389
" last checker failed with error"
3390
" code %s", client_name,
3391
client["last_checker_status"])
3331
3392
client["enabled"] = False
3333
3394
client["expires"] = (
3334
3395
datetime.datetime.utcnow()
3335
3396
+ client["timeout"])
3336
logger.debug("Last checker succeeded,"
3337
" keeping {} enabled".format(
3397
log.debug("Last checker succeeded, keeping %s"
3398
" enabled", client_name)
3340
3400
client["secret"] = pgp.decrypt(
3341
3401
client["encrypted_secret"],
3342
3402
client_settings[client_name]["secret"])
3343
3403
except PGPError:
3344
3404
# If decryption fails, we use secret from new settings
3345
logger.debug("Failed to decrypt {} old secret".format(
3405
log.debug("Failed to decrypt %s old secret",
3347
3407
client["secret"] = (client_settings[client_name]
3597
3656
service.activate()
3598
3657
except dbus.exceptions.DBusException as error:
3599
logger.critical("D-Bus Exception", exc_info=error)
3658
log.critical("D-Bus Exception", exc_info=error)
3602
3661
# End of Avahi example code
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))
3664
GLib.IOChannel.unix_new(tcp_server.fileno()),
3665
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3666
lambda *args, **kwargs: (tcp_server.handle_request
3667
(*args[2:], **kwargs) or True))
3609
logger.debug("Starting main loop")
3669
log.debug("Starting main loop")
3610
3670
main_loop.run()
3611
3671
except AvahiError as error:
3612
logger.critical("Avahi Error", exc_info=error)
3672
log.critical("Avahi Error", exc_info=error)
3615
3675
except KeyboardInterrupt:
3617
3677
print("", file=sys.stderr)
3618
logger.debug("Server received KeyboardInterrupt")
3619
logger.debug("Server exiting")
3678
log.debug("Server received KeyboardInterrupt")
3679
log.debug("Server exiting")
3620
3680
# Must run before the D-Bus bus name gets deregistered
3624
if __name__ == '__main__':
3684
def parse_test_args():
3685
# type: () -> argparse.Namespace
3686
parser = argparse.ArgumentParser(add_help=False)
3687
parser.add_argument("--check", action="store_true")
3688
parser.add_argument("--prefix", )
3689
args, unknown_args = parser.parse_known_args()
3691
# Remove test options from sys.argv
3692
sys.argv[1:] = unknown_args
3695
# Add all tests from doctest strings
3696
def load_tests(loader, tests, none):
3698
tests.addTests(doctest.DocTestSuite())
3701
if __name__ == "__main__":
3702
options = parse_test_args()
3705
extra_test_prefix = options.prefix
3706
if extra_test_prefix is not None:
3707
if not (unittest.main(argv=[""], exit=False)
3708
.result.wasSuccessful()):
3710
class ExtraTestLoader(unittest.TestLoader):
3711
testMethodPrefix = extra_test_prefix
3712
# Call using ./scriptname --test [--verbose]
3713
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3715
unittest.main(argv=[""])
3723
# (lambda (&optional extra)
3724
# (if (not (funcall run-tests-in-test-buffer default-directory
3726
# (funcall show-test-buffer-in-test-window)
3727
# (funcall remove-test-window)
3728
# (if extra (message "Extra tests run successfully!"))))
3729
# run-tests-in-test-buffer:
3730
# (lambda (dir &optional extra)
3731
# (with-current-buffer (get-buffer-create "*Test*")
3732
# (setq buffer-read-only nil
3733
# default-directory dir)
3735
# (compilation-mode))
3736
# (let ((process-result
3737
# (let ((inhibit-read-only t))
3738
# (process-file-shell-command
3739
# (funcall get-command-line extra) nil "*Test*"))))
3740
# (and (numberp process-result)
3741
# (= process-result 0))))
3743
# (lambda (&optional extra)
3744
# (let ((quoted-script
3745
# (shell-quote-argument (funcall get-script-name))))
3747
# (concat "%s --check" (if extra " --prefix=atest" ""))
3751
# (if (fboundp 'file-local-name)
3752
# (file-local-name (buffer-file-name))
3753
# (or (file-remote-p (buffer-file-name) 'localname)
3754
# (buffer-file-name))))
3755
# remove-test-window:
3757
# (let ((test-window (get-buffer-window "*Test*")))
3758
# (if test-window (delete-window test-window))))
3759
# show-test-buffer-in-test-window:
3761
# (when (not (get-buffer-window-list "*Test*"))
3762
# (setq next-error-last-buffer (get-buffer "*Test*"))
3763
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3764
# (display-buffer-overriding-action
3765
# `((display-buffer-in-side-window) (side . ,side)
3766
# (window-height . fit-window-to-buffer)
3767
# (window-width . fit-window-to-buffer))))
3768
# (display-buffer "*Test*"))))
3771
# (let* ((run-extra-tests (lambda () (interactive)
3772
# (funcall run-tests t)))
3773
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3774
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3775
# (setq minor-mode-overriding-map-alist
3776
# (cons `(run-tests . ,outer-keymap)
3777
# minor-mode-overriding-map-alist)))
3778
# (add-hook 'after-save-hook run-tests 90 t))