451
435
def entry_group_state_changed(self, state, error):
452
436
"""Derived from the Avahi example code"""
453
log.debug("Avahi entry group state change: %i", state)
437
logger.debug("Avahi entry group state change: %i", state)
455
439
if state == avahi.ENTRY_GROUP_ESTABLISHED:
456
log.debug("Zeroconf service established.")
440
logger.debug("Zeroconf service established.")
457
441
elif state == avahi.ENTRY_GROUP_COLLISION:
458
log.info("Zeroconf service name collision.")
442
logger.info("Zeroconf service name collision.")
460
444
elif state == avahi.ENTRY_GROUP_FAILURE:
461
log.critical("Avahi: Error in group state changed %s",
445
logger.critical("Avahi: Error in group state changed %s",
463
447
raise AvahiGroupError("State changed: {!s}".format(error))
465
449
def cleanup(self):
495
479
except dbus.exceptions.DBusException as error:
496
480
if (error.get_dbus_name()
497
481
== "org.freedesktop.Avahi.CollisionError"):
498
log.info("Local Zeroconf service name collision.")
482
logger.info("Local Zeroconf service name"
499
484
return self.rename(remove=False)
501
log.critical("D-Bus Exception", exc_info=error)
486
logger.critical("D-Bus Exception", exc_info=error)
505
490
if error is None:
506
log.debug("Unknown state: %r", state)
491
logger.debug("Unknown state: %r", state)
508
log.debug("Unknown state: %r: %r", state, error)
493
logger.debug("Unknown state: %r: %r", state, error)
510
495
def activate(self):
511
496
"""Derived from the Avahi example code"""
593
577
# gnutls.strerror()
595
579
if message is None and code is not None:
596
message = gnutls.strerror(code).decode(
597
"utf-8", errors="replace")
580
message = gnutls.strerror(code)
598
581
return super(gnutls.Error, self).__init__(
601
584
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_
630
class Credentials(With_from_param):
631
589
def __init__(self):
632
self._as_parameter_ = gnutls.certificate_credentials_t()
633
gnutls.certificate_allocate_credentials(self)
590
self._c_object = gnutls.certificate_credentials_t()
591
gnutls.certificate_allocate_credentials(
592
ctypes.byref(self._c_object))
634
593
self.type = gnutls.CRD_CERTIFICATE
636
595
def __del__(self):
637
gnutls.certificate_free_credentials(self)
596
gnutls.certificate_free_credentials(self._c_object)
639
class ClientSession(With_from_param):
640
599
def __init__(self, socket, credentials=None):
641
self._as_parameter_ = gnutls.session_t()
600
self._c_object = gnutls.session_t()
642
601
gnutls_flags = gnutls.CLIENT
643
602
if gnutls.check_version(b"3.5.6"):
644
603
gnutls_flags |= gnutls.NO_TICKETS
645
604
if gnutls.has_rawpk:
646
605
gnutls_flags |= gnutls.ENABLE_RAWPK
647
gnutls.init(self, gnutls_flags)
606
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
649
gnutls.set_default_priority(self)
650
gnutls.transport_set_ptr(self, socket.fileno())
651
gnutls.handshake_set_private_extensions(self, True)
608
gnutls.set_default_priority(self._c_object)
609
gnutls.transport_set_ptr(self._c_object, socket.fileno())
610
gnutls.handshake_set_private_extensions(self._c_object,
652
612
self.socket = socket
653
613
if credentials is None:
654
614
credentials = gnutls.Credentials()
655
gnutls.credentials_set(self, credentials.type,
615
gnutls.credentials_set(self._c_object, credentials.type,
616
ctypes.cast(credentials._c_object,
657
618
self.credentials = credentials
659
620
def __del__(self):
621
gnutls.deinit(self._c_object)
662
623
def handshake(self):
663
return gnutls.handshake(self)
624
return gnutls.handshake(self._c_object)
665
626
def send(self, data):
666
627
data = bytes(data)
667
628
data_len = len(data)
668
629
while data_len > 0:
669
data_len -= gnutls.record_send(self, data[-data_len:],
630
data_len -= gnutls.record_send(self._c_object,
673
return gnutls.bye(self, gnutls.SHUT_RDWR)
635
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
675
637
# Error handling functions
676
638
def _error_code(result):
677
639
"""A function to raise exceptions on errors, suitable
678
for the "restype" attribute on ctypes functions"""
679
if result >= gnutls.E_SUCCESS:
640
for the 'restype' attribute on ctypes functions"""
681
643
if result == gnutls.E_NO_CERTIFICATE_FOUND:
682
644
raise gnutls.CertificateSecurityError(code=result)
683
645
raise gnutls.Error(code=result)
685
def _retry_on_error(result, func, arguments,
686
_error_code=_error_code):
647
def _retry_on_error(result, func, arguments):
687
648
"""A function to retry on some errors, suitable
688
for the "errcheck" attribute on ctypes functions"""
689
while result < gnutls.E_SUCCESS:
649
for the 'errcheck' attribute on ctypes functions"""
690
651
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
691
652
return _error_code(result)
692
653
result = func(*arguments)
699
660
priority_set_direct = _library.gnutls_priority_set_direct
700
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
661
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
701
662
ctypes.POINTER(ctypes.c_char_p)]
702
663
priority_set_direct.restype = _error_code
704
665
init = _library.gnutls_init
705
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
666
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
706
667
init.restype = _error_code
708
669
set_default_priority = _library.gnutls_set_default_priority
709
set_default_priority.argtypes = [ClientSession]
670
set_default_priority.argtypes = [session_t]
710
671
set_default_priority.restype = _error_code
712
673
record_send = _library.gnutls_record_send
713
record_send.argtypes = [ClientSession, ctypes.c_void_p,
674
record_send.argtypes = [session_t, ctypes.c_void_p,
715
676
record_send.restype = ctypes.c_ssize_t
716
677
record_send.errcheck = _retry_on_error
718
679
certificate_allocate_credentials = (
719
680
_library.gnutls_certificate_allocate_credentials)
720
681
certificate_allocate_credentials.argtypes = [
721
PointerTo(Credentials)]
682
ctypes.POINTER(certificate_credentials_t)]
722
683
certificate_allocate_credentials.restype = _error_code
724
685
certificate_free_credentials = (
725
686
_library.gnutls_certificate_free_credentials)
726
certificate_free_credentials.argtypes = [Credentials]
687
certificate_free_credentials.argtypes = [
688
certificate_credentials_t]
727
689
certificate_free_credentials.restype = None
729
691
handshake_set_private_extensions = (
730
692
_library.gnutls_handshake_set_private_extensions)
731
handshake_set_private_extensions.argtypes = [ClientSession,
693
handshake_set_private_extensions.argtypes = [session_t,
733
695
handshake_set_private_extensions.restype = None
735
697
credentials_set = _library.gnutls_credentials_set
736
credentials_set.argtypes = [ClientSession, credentials_type_t,
737
CastToVoidPointer(Credentials)]
698
credentials_set.argtypes = [session_t, credentials_type_t,
738
700
credentials_set.restype = _error_code
740
702
strerror = _library.gnutls_strerror
759
721
global_set_log_function.restype = None
761
723
deinit = _library.gnutls_deinit
762
deinit.argtypes = [ClientSession]
724
deinit.argtypes = [session_t]
763
725
deinit.restype = None
765
727
handshake = _library.gnutls_handshake
766
handshake.argtypes = [ClientSession]
767
handshake.restype = ctypes.c_int
728
handshake.argtypes = [session_t]
729
handshake.restype = _error_code
768
730
handshake.errcheck = _retry_on_error
770
732
transport_set_ptr = _library.gnutls_transport_set_ptr
771
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
733
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
772
734
transport_set_ptr.restype = None
774
736
bye = _library.gnutls_bye
775
bye.argtypes = [ClientSession, close_request_t]
776
bye.restype = ctypes.c_int
737
bye.argtypes = [session_t, close_request_t]
738
bye.restype = _error_code
777
739
bye.errcheck = _retry_on_error
779
741
check_version = _library.gnutls_check_version
1079
1030
def __del__(self):
1082
def init_checker(self, randomize_start=False):
1083
# Schedule a new checker to be started a randomly selected
1084
# time (a fraction of 'interval') from now. This spreads out
1085
# the startup of checkers over time when the server is
1033
def init_checker(self):
1034
# Schedule a new checker to be started an 'interval' from now,
1035
# and every interval from then on.
1087
1036
if self.checker_initiator_tag is not None:
1088
1037
GLib.source_remove(self.checker_initiator_tag)
1089
interval_milliseconds = int(self.interval.total_seconds()
1092
delay_milliseconds = random.randrange(
1093
interval_milliseconds + 1)
1095
delay_milliseconds = interval_milliseconds
1096
1038
self.checker_initiator_tag = GLib.timeout_add(
1097
delay_milliseconds, self.start_checker, randomize_start)
1098
delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1099
# A checker might take up to an 'interval' of time, so we can
1100
# expire at the soonest one interval after a checker was
1101
# started. Since the initial checker is delayed, the expire
1102
# time might have to be extended.
1103
now = datetime.datetime.utcnow()
1104
self.expires = now + delay + self.interval
1105
# Schedule a disable() at expire time
1039
random.randrange(int(self.interval.total_seconds() * 1000
1042
# Schedule a disable() when 'timeout' has passed
1106
1043
if self.disable_initiator_tag is not None:
1107
1044
GLib.source_remove(self.disable_initiator_tag)
1108
1045
self.disable_initiator_tag = GLib.timeout_add(
1109
int((self.expires - now).total_seconds() * 1000),
1046
int(self.timeout.total_seconds() * 1000), self.disable)
1047
# Also start a new checker *right now*.
1048
self.start_checker()
1112
1050
def checker_callback(self, source, condition, connection,
1173
1113
if self.checker is not None and not self.checker.is_alive():
1174
log.warning("Checker was not alive; joining")
1114
logger.warning("Checker was not alive; joining")
1175
1115
self.checker.join()
1176
1116
self.checker = None
1177
1117
# Start a new checker if needed
1178
1118
if self.checker is None:
1179
1119
# Escape attributes for the shell
1180
1120
escaped_attrs = {
1181
attr: shlex.quote(str(getattr(self, attr)))
1121
attr: re.escape(str(getattr(self, attr)))
1182
1122
for attr in self.runtime_expansions}
1184
1124
command = self.checker_command % escaped_attrs
1185
1125
except TypeError as error:
1186
log.error('Could not format string "%s"',
1187
self.checker_command, exc_info=error)
1126
logger.error('Could not format string "%s"',
1127
self.checker_command,
1188
1129
return True # Try again later
1189
1130
self.current_checker_command = command
1190
log.info("Starting checker %r for %s", command, self.name)
1131
logger.info("Starting checker %r for %s", command,
1191
1133
# We don't need to redirect stdout and stderr, since
1192
1134
# in normal mode, that is already done by daemon(),
1193
1135
# and in debug mode we don't want to. (Stdin is
1212
1154
GLib.IOChannel.unix_new(pipe[0].fileno()),
1213
1155
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1214
1156
self.checker_callback, pipe[0], command)
1215
if start_was_randomized:
1216
# We were started after a random delay; Schedule a new
1217
# checker to be started an 'interval' from now, and every
1218
# interval from then on.
1219
now = datetime.datetime.utcnow()
1220
self.checker_initiator_tag = GLib.timeout_add(
1221
int(self.interval.total_seconds() * 1000),
1223
self.expires = max(self.expires, now + self.interval)
1224
# Don't start a new checker again after same random delay
1226
1157
# Re-run this periodically if run by GLib.timeout_add
2296
2227
class ProxyClient:
2297
2228
def __init__(self, child_pipe, key_id, fpr, address):
2298
2229
self._pipe = child_pipe
2299
self._pipe.send(("init", key_id, fpr, address))
2230
self._pipe.send(('init', key_id, fpr, address))
2300
2231
if not self._pipe.recv():
2301
2232
raise KeyError(key_id or fpr)
2303
2234
def __getattribute__(self, name):
2305
2236
return super(ProxyClient, self).__getattribute__(name)
2306
self._pipe.send(("getattr", name))
2237
self._pipe.send(('getattr', name))
2307
2238
data = self._pipe.recv()
2308
if data[0] == "data":
2239
if data[0] == 'data':
2310
if data[0] == "function":
2241
if data[0] == 'function':
2312
2243
def func(*args, **kwargs):
2313
self._pipe.send(("funcall", name, args, kwargs))
2244
self._pipe.send(('funcall', name, args, kwargs))
2314
2245
return self._pipe.recv()[1]
2318
2249
def __setattr__(self, name, value):
2320
2251
return super(ProxyClient, self).__setattr__(name, value)
2321
self._pipe.send(("setattr", name, value))
2252
self._pipe.send(('setattr', name, value))
2324
2255
class ClientHandler(socketserver.BaseRequestHandler, object):
2330
2261
def handle(self):
2331
2262
with contextlib.closing(self.server.child_pipe) as child_pipe:
2332
log.info("TCP connection from: %s",
2333
str(self.client_address))
2334
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2263
logger.info("TCP connection from: %s",
2264
str(self.client_address))
2265
logger.debug("Pipe FD: %d",
2266
self.server.child_pipe.fileno())
2336
2268
session = gnutls.ClientSession(self.request)
2338
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2270
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2339
2271
# "+AES-256-CBC", "+SHA1",
2340
2272
# "+COMP-NULL", "+CTYPE-OPENPGP",
2343
2275
priority = self.server.gnutls_priority
2344
2276
if priority is None:
2345
2277
priority = "NORMAL"
2346
gnutls.priority_set_direct(session,
2347
priority.encode("utf-8"), None)
2278
gnutls.priority_set_direct(session._c_object,
2279
priority.encode("utf-8"),
2349
2282
# Start communication using the Mandos protocol
2350
2283
# Get protocol number
2351
2284
line = self.request.makefile().readline()
2352
log.debug("Protocol version: %r", line)
2285
logger.debug("Protocol version: %r", line)
2354
2287
if int(line.strip().split()[0]) > 1:
2355
2288
raise RuntimeError(line)
2356
2289
except (ValueError, IndexError, RuntimeError) as error:
2357
log.error("Unknown protocol version: %s", error)
2290
logger.error("Unknown protocol version: %s", error)
2360
2293
# Start GnuTLS connection
2362
2295
session.handshake()
2363
2296
except gnutls.Error as error:
2364
log.warning("Handshake failed: %s", error)
2297
logger.warning("Handshake failed: %s", error)
2365
2298
# Do not run session.bye() here: the session is not
2366
2299
# established. Just abandon the request.
2368
log.debug("Handshake succeeded")
2301
logger.debug("Handshake succeeded")
2370
2303
approval_required = False
2470
2403
except gnutls.Error as error:
2471
log.warning("GnuTLS bye failed", exc_info=error)
2404
logger.warning("GnuTLS bye failed",
2474
2408
def peer_certificate(session):
2475
2409
"Return the peer's certificate as a bytestring"
2477
cert_type = gnutls.certificate_type_get2(
2478
session, gnutls.CTYPE_PEERS)
2411
cert_type = gnutls.certificate_type_get2(session._c_object,
2479
2413
except AttributeError:
2480
cert_type = gnutls.certificate_type_get(session)
2414
cert_type = gnutls.certificate_type_get(session._c_object)
2481
2415
if gnutls.has_rawpk:
2482
2416
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2484
2418
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2485
2419
# If not a valid certificate type...
2486
2420
if cert_type not in valid_cert_types:
2487
log.info("Cert type %r not in %r", cert_type,
2421
logger.info("Cert type %r not in %r", cert_type,
2489
2423
# ...return invalid data
2491
2425
list_size = ctypes.c_uint(1)
2492
2426
cert_list = (gnutls.certificate_get_peers
2493
(session, ctypes.byref(list_size)))
2427
(session._c_object, ctypes.byref(list_size)))
2494
2428
if not bool(cert_list) and list_size.value != 0:
2495
2429
raise gnutls.Error("error getting peer certificate")
2496
2430
if list_size.value == 0:
2675
2608
(self.interface + "\0").encode("utf-8"))
2676
2609
except socket.error as error:
2677
2610
if error.errno == errno.EPERM:
2678
log.error("No permission to bind to interface %s",
2611
logger.error("No permission to bind to"
2612
" interface %s", self.interface)
2680
2613
elif error.errno == errno.ENOPROTOOPT:
2681
log.error("SO_BINDTODEVICE not available; cannot"
2682
" bind to interface %s", self.interface)
2614
logger.error("SO_BINDTODEVICE not available;"
2615
" cannot bind to interface %s",
2683
2617
elif error.errno == errno.ENODEV:
2684
log.error("Interface %s does not exist, cannot"
2685
" bind", self.interface)
2618
logger.error("Interface %s does not exist,"
2619
" cannot bind", self.interface)
2688
2622
# Only bind(2) the socket if we really need to.
2803
2736
# remove the old hook in favor of the new above hook on
2806
if command == "funcall":
2739
if command == 'funcall':
2807
2740
funcname = request[1]
2808
2741
args = request[2]
2809
2742
kwargs = request[3]
2811
parent_pipe.send(("data", getattr(client_object,
2744
parent_pipe.send(('data', getattr(client_object,
2812
2745
funcname)(*args,
2815
if command == "getattr":
2748
if command == 'getattr':
2816
2749
attrname = request[1]
2817
2750
if isinstance(client_object.__getattribute__(attrname),
2818
collections.abc.Callable):
2819
parent_pipe.send(("function", ))
2751
collections.Callable):
2752
parent_pipe.send(('function', ))
2821
2754
parent_pipe.send((
2822
"data", client_object.__getattribute__(attrname)))
2755
'data', client_object.__getattribute__(attrname)))
2824
if command == "setattr":
2757
if command == 'setattr':
2825
2758
attrname = request[1]
2826
2759
value = request[2]
2827
2760
setattr(client_object, attrname, value)
2832
2765
def rfc3339_duration_to_delta(duration):
2833
2766
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2835
>>> timedelta = datetime.timedelta
2836
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2838
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2840
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2842
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2844
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2846
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2848
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2768
>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2770
>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2772
>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2774
>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2776
>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2778
>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2780
>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2853
2784
# Parsing an RFC 3339 duration with regular expressions is not
2933
2864
def string_to_delta(interval):
2934
2865
"""Parse a string and return a datetime.timedelta
2936
>>> string_to_delta("7d") == datetime.timedelta(7)
2938
>>> string_to_delta("60s") == datetime.timedelta(0, 60)
2940
>>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2942
>>> string_to_delta("24h") == datetime.timedelta(1)
2944
>>> string_to_delta("1w") == datetime.timedelta(7)
2946
>>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
2867
>>> string_to_delta('7d') == datetime.timedelta(7)
2869
>>> string_to_delta('60s') == datetime.timedelta(0, 60)
2871
>>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2873
>>> string_to_delta('24h') == datetime.timedelta(1)
2875
>>> string_to_delta('1w') == datetime.timedelta(7)
2877
>>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
3386
3319
if client["enabled"]:
3387
3320
if datetime.datetime.utcnow() >= client["expires"]:
3388
3321
if not client["last_checked_ok"]:
3389
log.warning("disabling client %s - Client"
3390
" never performed a successful"
3391
" checker", client_name)
3323
"disabling client {} - Client never "
3324
"performed a successful checker".format(
3392
3326
client["enabled"] = False
3393
3327
elif client["last_checker_status"] != 0:
3394
log.warning("disabling client %s - Client"
3395
" last checker failed with error"
3396
" code %s", client_name,
3397
client["last_checker_status"])
3329
"disabling client {} - Client last"
3330
" checker failed with error code"
3333
client["last_checker_status"]))
3398
3334
client["enabled"] = False
3400
3336
client["expires"] = (
3401
3337
datetime.datetime.utcnow()
3402
3338
+ client["timeout"])
3403
log.debug("Last checker succeeded, keeping %s"
3404
" enabled", client_name)
3339
logger.debug("Last checker succeeded,"
3340
" keeping {} enabled".format(
3406
3343
client["secret"] = pgp.decrypt(
3407
3344
client["encrypted_secret"],
3408
3345
client_settings[client_name]["secret"])
3409
3346
except PGPError:
3410
3347
# If decryption fails, we use secret from new settings
3411
log.debug("Failed to decrypt %s old secret",
3348
logger.debug("Failed to decrypt {} old secret".format(
3413
3350
client["secret"] = (client_settings[client_name]
3648
3585
service.port = tcp_server.socket.getsockname()[1]
3650
log.info("Now listening on address %r, port %d, flowinfo %d,"
3651
" scope_id %d", *tcp_server.socket.getsockname())
3587
logger.info("Now listening on address %r, port %d,"
3588
" flowinfo %d, scope_id %d",
3589
*tcp_server.socket.getsockname())
3653
log.info("Now listening on address %r, port %d",
3654
*tcp_server.socket.getsockname())
3591
logger.info("Now listening on address %r, port %d",
3592
*tcp_server.socket.getsockname())
3656
3594
# service.interface = tcp_server.socket.getsockname()[3]
3672
3610
lambda *args, **kwargs: (tcp_server.handle_request
3673
3611
(*args[2:], **kwargs) or True))
3675
log.debug("Starting main loop")
3613
logger.debug("Starting main loop")
3676
3614
main_loop.run()
3677
3615
except AvahiError as error:
3678
log.critical("Avahi Error", exc_info=error)
3616
logger.critical("Avahi Error", exc_info=error)
3681
3619
except KeyboardInterrupt:
3683
3621
print("", file=sys.stderr)
3684
log.debug("Server received KeyboardInterrupt")
3685
log.debug("Server exiting")
3622
logger.debug("Server received KeyboardInterrupt")
3623
logger.debug("Server exiting")
3686
3624
# Must run before the D-Bus bus name gets deregistered
3690
def parse_test_args():
3691
# type: () -> argparse.Namespace
3628
def should_only_run_tests():
3692
3629
parser = argparse.ArgumentParser(add_help=False)
3693
parser.add_argument("--check", action="store_true")
3694
parser.add_argument("--prefix", )
3630
parser.add_argument("--check", action='store_true')
3695
3631
args, unknown_args = parser.parse_known_args()
3697
# Remove test options from sys.argv
3632
run_tests = args.check
3634
# Remove --check argument from sys.argv
3698
3635
sys.argv[1:] = unknown_args
3701
3638
# Add all tests from doctest strings
3702
3639
def load_tests(loader, tests, none):
3704
3641
tests.addTests(doctest.DocTestSuite())
3707
if __name__ == "__main__":
3708
options = parse_test_args()
3644
if __name__ == '__main__':
3711
extra_test_prefix = options.prefix
3712
if extra_test_prefix is not None:
3713
if not (unittest.main(argv=[""], exit=False)
3714
.result.wasSuccessful()):
3716
class ExtraTestLoader(unittest.TestLoader):
3717
testMethodPrefix = extra_test_prefix
3718
# Call using ./scriptname --test [--verbose]
3719
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3721
unittest.main(argv=[""])
3646
if should_only_run_tests():
3647
# Call using ./mandos --check [--verbose]
3725
3652
logging.shutdown()
3729
# (lambda (&optional extra)
3730
# (if (not (funcall run-tests-in-test-buffer default-directory
3732
# (funcall show-test-buffer-in-test-window)
3733
# (funcall remove-test-window)
3734
# (if extra (message "Extra tests run successfully!"))))
3735
# run-tests-in-test-buffer:
3736
# (lambda (dir &optional extra)
3737
# (with-current-buffer (get-buffer-create "*Test*")
3738
# (setq buffer-read-only nil
3739
# default-directory dir)
3741
# (compilation-mode))
3742
# (let ((process-result
3743
# (let ((inhibit-read-only t))
3744
# (process-file-shell-command
3745
# (funcall get-command-line extra) nil "*Test*"))))
3746
# (and (numberp process-result)
3747
# (= process-result 0))))
3749
# (lambda (&optional extra)
3750
# (let ((quoted-script
3751
# (shell-quote-argument (funcall get-script-name))))
3753
# (concat "%s --check" (if extra " --prefix=atest" ""))
3757
# (if (fboundp 'file-local-name)
3758
# (file-local-name (buffer-file-name))
3759
# (or (file-remote-p (buffer-file-name) 'localname)
3760
# (buffer-file-name))))
3761
# remove-test-window:
3763
# (let ((test-window (get-buffer-window "*Test*")))
3764
# (if test-window (delete-window test-window))))
3765
# show-test-buffer-in-test-window:
3767
# (when (not (get-buffer-window-list "*Test*"))
3768
# (setq next-error-last-buffer (get-buffer "*Test*"))
3769
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3770
# (display-buffer-overriding-action
3771
# `((display-buffer-in-side-window) (side . ,side)
3772
# (window-height . fit-window-to-buffer)
3773
# (window-width . fit-window-to-buffer))))
3774
# (display-buffer "*Test*"))))
3777
# (let* ((run-extra-tests (lambda () (interactive)
3778
# (funcall run-tests t)))
3779
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3780
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3781
# (setq minor-mode-overriding-map-alist
3782
# (cons `(run-tests . ,outer-keymap)
3783
# minor-mode-overriding-map-alist)))
3784
# (add-hook 'after-save-hook run-tests 90 t))