434
451
def entry_group_state_changed(self, state, error):
435
452
"""Derived from the Avahi example code"""
436
logger.debug("Avahi entry group state change: %i", state)
453
log.debug("Avahi entry group state change: %i", state)
438
455
if state == avahi.ENTRY_GROUP_ESTABLISHED:
439
logger.debug("Zeroconf service established.")
456
log.debug("Zeroconf service established.")
440
457
elif state == avahi.ENTRY_GROUP_COLLISION:
441
logger.info("Zeroconf service name collision.")
458
log.info("Zeroconf service name collision.")
443
460
elif state == avahi.ENTRY_GROUP_FAILURE:
444
logger.critical("Avahi: Error in group state changed %s",
461
log.critical("Avahi: Error in group state changed %s",
446
463
raise AvahiGroupError("State changed: {!s}".format(error))
448
465
def cleanup(self):
478
495
except dbus.exceptions.DBusException as error:
479
496
if (error.get_dbus_name()
480
497
== "org.freedesktop.Avahi.CollisionError"):
481
logger.info("Local Zeroconf service name"
498
log.info("Local Zeroconf service name collision.")
483
499
return self.rename(remove=False)
485
logger.critical("D-Bus Exception", exc_info=error)
501
log.critical("D-Bus Exception", exc_info=error)
489
505
if error is None:
490
logger.debug("Unknown state: %r", state)
506
log.debug("Unknown state: %r", state)
492
logger.debug("Unknown state: %r: %r", state, error)
508
log.debug("Unknown state: %r: %r", state, error)
494
510
def activate(self):
495
511
"""Derived from the Avahi example code"""
576
593
# gnutls.strerror()
578
595
if message is None and code is not None:
579
message = gnutls.strerror(code)
596
message = gnutls.strerror(code).decode(
597
"utf-8", errors="replace")
580
598
return super(gnutls.Error, self).__init__(
583
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_
630
class Credentials(With_from_param):
588
631
def __init__(self):
589
self._c_object = gnutls.certificate_credentials_t()
590
gnutls.certificate_allocate_credentials(
591
ctypes.byref(self._c_object))
632
self._as_parameter_ = gnutls.certificate_credentials_t()
633
gnutls.certificate_allocate_credentials(self)
592
634
self.type = gnutls.CRD_CERTIFICATE
594
636
def __del__(self):
595
gnutls.certificate_free_credentials(self._c_object)
637
gnutls.certificate_free_credentials(self)
639
class ClientSession(With_from_param):
598
640
def __init__(self, socket, credentials=None):
599
self._c_object = gnutls.session_t()
641
self._as_parameter_ = gnutls.session_t()
600
642
gnutls_flags = gnutls.CLIENT
601
643
if gnutls.check_version(b"3.5.6"):
602
644
gnutls_flags |= gnutls.NO_TICKETS
603
645
if gnutls.has_rawpk:
604
646
gnutls_flags |= gnutls.ENABLE_RAWPK
605
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
647
gnutls.init(self, gnutls_flags)
607
gnutls.set_default_priority(self._c_object)
608
gnutls.transport_set_ptr(self._c_object, socket.fileno())
609
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)
611
652
self.socket = socket
612
653
if credentials is None:
613
654
credentials = gnutls.Credentials()
614
gnutls.credentials_set(self._c_object, credentials.type,
615
ctypes.cast(credentials._c_object,
655
gnutls.credentials_set(self, credentials.type,
617
657
self.credentials = credentials
619
659
def __del__(self):
620
gnutls.deinit(self._c_object)
622
662
def handshake(self):
623
return gnutls.handshake(self._c_object)
663
return gnutls.handshake(self)
625
665
def send(self, data):
626
666
data = bytes(data)
627
667
data_len = len(data)
628
668
while data_len > 0:
629
data_len -= gnutls.record_send(self._c_object,
669
data_len -= gnutls.record_send(self, data[-data_len:],
634
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
673
return gnutls.bye(self, gnutls.SHUT_RDWR)
636
675
# Error handling functions
637
676
def _error_code(result):
638
677
"""A function to raise exceptions on errors, suitable
639
for the 'restype' attribute on ctypes functions"""
678
for the "restype" attribute on ctypes functions"""
679
if result >= gnutls.E_SUCCESS:
642
681
if result == gnutls.E_NO_CERTIFICATE_FOUND:
643
682
raise gnutls.CertificateSecurityError(code=result)
644
683
raise gnutls.Error(code=result)
646
def _retry_on_error(result, func, arguments):
685
def _retry_on_error(result, func, arguments,
686
_error_code=_error_code):
647
687
"""A function to retry on some errors, suitable
648
for the 'errcheck' attribute on ctypes functions"""
688
for the "errcheck" attribute on ctypes functions"""
689
while result < gnutls.E_SUCCESS:
650
690
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
651
691
return _error_code(result)
652
692
result = func(*arguments)
659
699
priority_set_direct = _library.gnutls_priority_set_direct
660
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
700
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
661
701
ctypes.POINTER(ctypes.c_char_p)]
662
702
priority_set_direct.restype = _error_code
664
704
init = _library.gnutls_init
665
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
705
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
666
706
init.restype = _error_code
668
708
set_default_priority = _library.gnutls_set_default_priority
669
set_default_priority.argtypes = [session_t]
709
set_default_priority.argtypes = [ClientSession]
670
710
set_default_priority.restype = _error_code
672
712
record_send = _library.gnutls_record_send
673
record_send.argtypes = [session_t, ctypes.c_void_p,
713
record_send.argtypes = [ClientSession, ctypes.c_void_p,
675
715
record_send.restype = ctypes.c_ssize_t
676
716
record_send.errcheck = _retry_on_error
678
718
certificate_allocate_credentials = (
679
719
_library.gnutls_certificate_allocate_credentials)
680
720
certificate_allocate_credentials.argtypes = [
681
ctypes.POINTER(certificate_credentials_t)]
721
PointerTo(Credentials)]
682
722
certificate_allocate_credentials.restype = _error_code
684
724
certificate_free_credentials = (
685
725
_library.gnutls_certificate_free_credentials)
686
certificate_free_credentials.argtypes = [
687
certificate_credentials_t]
726
certificate_free_credentials.argtypes = [Credentials]
688
727
certificate_free_credentials.restype = None
690
729
handshake_set_private_extensions = (
691
730
_library.gnutls_handshake_set_private_extensions)
692
handshake_set_private_extensions.argtypes = [session_t,
731
handshake_set_private_extensions.argtypes = [ClientSession,
694
733
handshake_set_private_extensions.restype = None
696
735
credentials_set = _library.gnutls_credentials_set
697
credentials_set.argtypes = [session_t, credentials_type_t,
736
credentials_set.argtypes = [ClientSession, credentials_type_t,
737
CastToVoidPointer(Credentials)]
699
738
credentials_set.restype = _error_code
701
740
strerror = _library.gnutls_strerror
720
759
global_set_log_function.restype = None
722
761
deinit = _library.gnutls_deinit
723
deinit.argtypes = [session_t]
762
deinit.argtypes = [ClientSession]
724
763
deinit.restype = None
726
765
handshake = _library.gnutls_handshake
727
handshake.argtypes = [session_t]
728
handshake.restype = _error_code
766
handshake.argtypes = [ClientSession]
767
handshake.restype = ctypes.c_int
729
768
handshake.errcheck = _retry_on_error
731
770
transport_set_ptr = _library.gnutls_transport_set_ptr
732
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
771
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
733
772
transport_set_ptr.restype = None
735
774
bye = _library.gnutls_bye
736
bye.argtypes = [session_t, close_request_t]
737
bye.restype = _error_code
775
bye.argtypes = [ClientSession, close_request_t]
776
bye.restype = ctypes.c_int
738
777
bye.errcheck = _retry_on_error
740
779
check_version = _library.gnutls_check_version
1029
1073
def __del__(self):
1032
def init_checker(self):
1033
# Schedule a new checker to be started an 'interval' from now,
1034
# 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
1035
1081
if self.checker_initiator_tag is not None:
1036
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
1037
1090
self.checker_initiator_tag = GLib.timeout_add(
1038
int(self.interval.total_seconds() * 1000),
1040
# 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
1041
1100
if self.disable_initiator_tag is not None:
1042
1101
GLib.source_remove(self.disable_initiator_tag)
1043
1102
self.disable_initiator_tag = GLib.timeout_add(
1044
int(self.timeout.total_seconds() * 1000), self.disable)
1045
# Also start a new checker *right now*.
1046
self.start_checker()
1103
int((self.expires - now).total_seconds() * 1000),
1048
1106
def checker_callback(self, source, condition, connection,
1111
1167
if self.checker is not None and not self.checker.is_alive():
1112
logger.warning("Checker was not alive; joining")
1168
log.warning("Checker was not alive; joining")
1113
1169
self.checker.join()
1114
1170
self.checker = None
1115
1171
# Start a new checker if needed
1116
1172
if self.checker is None:
1117
1173
# Escape attributes for the shell
1118
1174
escaped_attrs = {
1119
attr: re.escape(str(getattr(self, attr)))
1175
attr: shlex.quote(str(getattr(self, attr)))
1120
1176
for attr in self.runtime_expansions}
1122
1178
command = self.checker_command % escaped_attrs
1123
1179
except TypeError as error:
1124
logger.error('Could not format string "%s"',
1125
self.checker_command,
1180
log.error('Could not format string "%s"',
1181
self.checker_command, exc_info=error)
1127
1182
return True # Try again later
1128
1183
self.current_checker_command = command
1129
logger.info("Starting checker %r for %s", command,
1184
log.info("Starting checker %r for %s", command, self.name)
1131
1185
# We don't need to redirect stdout and stderr, since
1132
1186
# in normal mode, that is already done by daemon(),
1133
1187
# and in debug mode we don't want to. (Stdin is
1152
1206
GLib.IOChannel.unix_new(pipe[0].fileno()),
1153
1207
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1154
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
1155
1220
# Re-run this periodically if run by GLib.timeout_add
2225
2290
class ProxyClient:
2226
2291
def __init__(self, child_pipe, key_id, fpr, address):
2227
2292
self._pipe = child_pipe
2228
self._pipe.send(('init', key_id, fpr, address))
2293
self._pipe.send(("init", key_id, fpr, address))
2229
2294
if not self._pipe.recv():
2230
2295
raise KeyError(key_id or fpr)
2232
2297
def __getattribute__(self, name):
2234
2299
return super(ProxyClient, self).__getattribute__(name)
2235
self._pipe.send(('getattr', name))
2300
self._pipe.send(("getattr", name))
2236
2301
data = self._pipe.recv()
2237
if data[0] == 'data':
2302
if data[0] == "data":
2239
if data[0] == 'function':
2304
if data[0] == "function":
2241
2306
def func(*args, **kwargs):
2242
self._pipe.send(('funcall', name, args, kwargs))
2307
self._pipe.send(("funcall", name, args, kwargs))
2243
2308
return self._pipe.recv()[1]
2247
2312
def __setattr__(self, name, value):
2249
2314
return super(ProxyClient, self).__setattr__(name, value)
2250
self._pipe.send(('setattr', name, value))
2315
self._pipe.send(("setattr", name, value))
2253
2318
class ClientHandler(socketserver.BaseRequestHandler, object):
2259
2324
def handle(self):
2260
2325
with contextlib.closing(self.server.child_pipe) as child_pipe:
2261
logger.info("TCP connection from: %s",
2262
str(self.client_address))
2263
logger.debug("Pipe FD: %d",
2264
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())
2266
2330
session = gnutls.ClientSession(self.request)
2268
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2332
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2269
2333
# "+AES-256-CBC", "+SHA1",
2270
2334
# "+COMP-NULL", "+CTYPE-OPENPGP",
2273
2337
priority = self.server.gnutls_priority
2274
2338
if priority is None:
2275
2339
priority = "NORMAL"
2276
gnutls.priority_set_direct(session._c_object,
2277
priority.encode("utf-8"),
2340
gnutls.priority_set_direct(session,
2341
priority.encode("utf-8"), None)
2280
2343
# Start communication using the Mandos protocol
2281
2344
# Get protocol number
2282
2345
line = self.request.makefile().readline()
2283
logger.debug("Protocol version: %r", line)
2346
log.debug("Protocol version: %r", line)
2285
2348
if int(line.strip().split()[0]) > 1:
2286
2349
raise RuntimeError(line)
2287
2350
except (ValueError, IndexError, RuntimeError) as error:
2288
logger.error("Unknown protocol version: %s", error)
2351
log.error("Unknown protocol version: %s", error)
2291
2354
# Start GnuTLS connection
2293
2356
session.handshake()
2294
2357
except gnutls.Error as error:
2295
logger.warning("Handshake failed: %s", error)
2358
log.warning("Handshake failed: %s", error)
2296
2359
# Do not run session.bye() here: the session is not
2297
2360
# established. Just abandon the request.
2299
logger.debug("Handshake succeeded")
2362
log.debug("Handshake succeeded")
2301
2364
approval_required = False
2401
2464
except gnutls.Error as error:
2402
logger.warning("GnuTLS bye failed",
2465
log.warning("GnuTLS bye failed", exc_info=error)
2406
2468
def peer_certificate(session):
2407
2469
"Return the peer's certificate as a bytestring"
2409
cert_type = gnutls.certificate_type_get2(session._c_object,
2471
cert_type = gnutls.certificate_type_get2(
2472
session, gnutls.CTYPE_PEERS)
2411
2473
except AttributeError:
2412
cert_type = gnutls.certificate_type_get(session._c_object)
2474
cert_type = gnutls.certificate_type_get(session)
2413
2475
if gnutls.has_rawpk:
2414
2476
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2416
2478
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2417
2479
# If not a valid certificate type...
2418
2480
if cert_type not in valid_cert_types:
2419
logger.info("Cert type %r not in %r", cert_type,
2481
log.info("Cert type %r not in %r", cert_type,
2421
2483
# ...return invalid data
2423
2485
list_size = ctypes.c_uint(1)
2424
2486
cert_list = (gnutls.certificate_get_peers
2425
(session._c_object, ctypes.byref(list_size)))
2487
(session, ctypes.byref(list_size)))
2426
2488
if not bool(cert_list) and list_size.value != 0:
2427
2489
raise gnutls.Error("error getting peer certificate")
2428
2490
if list_size.value == 0:
2606
2669
(self.interface + "\0").encode("utf-8"))
2607
2670
except socket.error as error:
2608
2671
if error.errno == errno.EPERM:
2609
logger.error("No permission to bind to"
2610
" interface %s", self.interface)
2672
log.error("No permission to bind to interface %s",
2611
2674
elif error.errno == errno.ENOPROTOOPT:
2612
logger.error("SO_BINDTODEVICE not available;"
2613
" cannot bind to interface %s",
2675
log.error("SO_BINDTODEVICE not available; cannot"
2676
" bind to interface %s", self.interface)
2615
2677
elif error.errno == errno.ENODEV:
2616
logger.error("Interface %s does not exist,"
2617
" cannot bind", self.interface)
2678
log.error("Interface %s does not exist, cannot"
2679
" bind", self.interface)
2620
2682
# Only bind(2) the socket if we really need to.
2734
2797
# remove the old hook in favor of the new above hook on
2737
if command == 'funcall':
2800
if command == "funcall":
2738
2801
funcname = request[1]
2739
2802
args = request[2]
2740
2803
kwargs = request[3]
2742
parent_pipe.send(('data', getattr(client_object,
2805
parent_pipe.send(("data", getattr(client_object,
2743
2806
funcname)(*args,
2746
if command == 'getattr':
2809
if command == "getattr":
2747
2810
attrname = request[1]
2748
2811
if isinstance(client_object.__getattribute__(attrname),
2749
collections.Callable):
2750
parent_pipe.send(('function', ))
2812
collections.abc.Callable):
2813
parent_pipe.send(("function", ))
2752
2815
parent_pipe.send((
2753
'data', client_object.__getattribute__(attrname)))
2816
"data", client_object.__getattribute__(attrname)))
2755
if command == 'setattr':
2818
if command == "setattr":
2756
2819
attrname = request[1]
2757
2820
value = request[2]
2758
2821
setattr(client_object, attrname, value)
2763
2826
def rfc3339_duration_to_delta(duration):
2764
2827
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2766
>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2768
>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2770
>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2772
>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2774
>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2776
>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2778
>>> rfc3339_duration_to_delta("P1DT3M20S") == 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)
2782
2847
# Parsing an RFC 3339 duration with regular expressions is not
2862
2927
def string_to_delta(interval):
2863
2928
"""Parse a string and return a datetime.timedelta
2865
>>> string_to_delta('7d') == datetime.timedelta(7)
2867
>>> string_to_delta('60s') == datetime.timedelta(0, 60)
2869
>>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2871
>>> string_to_delta('24h') == datetime.timedelta(1)
2873
>>> string_to_delta('1w') == datetime.timedelta(7)
2875
>>> string_to_delta('5m 30s') == 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)
3317
3380
if client["enabled"]:
3318
3381
if datetime.datetime.utcnow() >= client["expires"]:
3319
3382
if not client["last_checked_ok"]:
3321
"disabling client {} - Client never "
3322
"performed a successful checker".format(
3383
log.warning("disabling client %s - Client"
3384
" never performed a successful"
3385
" checker", client_name)
3324
3386
client["enabled"] = False
3325
3387
elif client["last_checker_status"] != 0:
3327
"disabling client {} - Client last"
3328
" checker failed with error code"
3331
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"])
3332
3392
client["enabled"] = False
3334
3394
client["expires"] = (
3335
3395
datetime.datetime.utcnow()
3336
3396
+ client["timeout"])
3337
logger.debug("Last checker succeeded,"
3338
" keeping {} enabled".format(
3397
log.debug("Last checker succeeded, keeping %s"
3398
" enabled", client_name)
3341
3400
client["secret"] = pgp.decrypt(
3342
3401
client["encrypted_secret"],
3343
3402
client_settings[client_name]["secret"])
3344
3403
except PGPError:
3345
3404
# If decryption fails, we use secret from new settings
3346
logger.debug("Failed to decrypt {} old secret".format(
3405
log.debug("Failed to decrypt %s old secret",
3348
3407
client["secret"] = (client_settings[client_name]
3583
3642
service.port = tcp_server.socket.getsockname()[1]
3585
logger.info("Now listening on address %r, port %d,"
3586
" flowinfo %d, scope_id %d",
3587
*tcp_server.socket.getsockname())
3644
log.info("Now listening on address %r, port %d, flowinfo %d,"
3645
" scope_id %d", *tcp_server.socket.getsockname())
3589
logger.info("Now listening on address %r, port %d",
3590
*tcp_server.socket.getsockname())
3647
log.info("Now listening on address %r, port %d",
3648
*tcp_server.socket.getsockname())
3592
3650
# service.interface = tcp_server.socket.getsockname()[3]
3608
3666
lambda *args, **kwargs: (tcp_server.handle_request
3609
3667
(*args[2:], **kwargs) or True))
3611
logger.debug("Starting main loop")
3669
log.debug("Starting main loop")
3612
3670
main_loop.run()
3613
3671
except AvahiError as error:
3614
logger.critical("Avahi Error", exc_info=error)
3672
log.critical("Avahi Error", exc_info=error)
3617
3675
except KeyboardInterrupt:
3619
3677
print("", file=sys.stderr)
3620
logger.debug("Server received KeyboardInterrupt")
3621
logger.debug("Server exiting")
3678
log.debug("Server received KeyboardInterrupt")
3679
log.debug("Server exiting")
3622
3680
# Must run before the D-Bus bus name gets deregistered
3626
def should_only_run_tests():
3684
def parse_test_args():
3685
# type: () -> argparse.Namespace
3627
3686
parser = argparse.ArgumentParser(add_help=False)
3628
parser.add_argument("--check", action='store_true')
3687
parser.add_argument("--check", action="store_true")
3688
parser.add_argument("--prefix", )
3629
3689
args, unknown_args = parser.parse_known_args()
3630
run_tests = args.check
3632
# Remove --check argument from sys.argv
3691
# Remove test options from sys.argv
3633
3692
sys.argv[1:] = unknown_args
3636
3695
# Add all tests from doctest strings
3637
3696
def load_tests(loader, tests, none):
3639
3698
tests.addTests(doctest.DocTestSuite())
3642
if __name__ == '__main__':
3701
if __name__ == "__main__":
3702
options = parse_test_args()
3644
if should_only_run_tests():
3645
# Call using ./mandos --check [--verbose]
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=[""])
3650
3719
logging.shutdown()
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))