523
496
class AvahiServiceToSyslog(AvahiService):
524
497
def rename(self, *args, **kwargs):
525
498
"""Add the new name to the syslog messages"""
526
ret = super(AvahiServiceToSyslog, self).rename(*args,
499
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
528
500
syslogger.setFormatter(logging.Formatter(
529
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
501
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
530
502
.format(self.name)))
534
506
# Pretend that we have a GnuTLS module
536
"""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."""
538
511
library = ctypes.util.find_library("gnutls")
539
512
if library is None:
540
513
library = ctypes.util.find_library("gnutls-deb0")
541
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))
544
526
# Unless otherwise indicated, the constants and types below are
545
527
# all from the gnutls/gnutls.h C header file.
589
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.
590
576
def __init__(self, message=None, code=None, args=()):
591
577
# Default usage is by a message string, but if a return
592
578
# code is passed, convert it to a string with
593
579
# gnutls.strerror()
595
581
if message is None and code is not None:
596
message = gnutls.strerror(code).decode(
597
"utf-8", errors="replace")
598
return super(gnutls.Error, self).__init__(
582
message = GnuTLS.strerror(code)
583
return super(GnuTLS.Error, self).__init__(
601
586
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):
590
class Credentials(object):
631
591
def __init__(self):
632
self._as_parameter_ = gnutls.certificate_credentials_t()
633
gnutls.certificate_allocate_credentials(self)
592
self._c_object = gnutls.certificate_credentials_t()
593
gnutls.certificate_allocate_credentials(
594
ctypes.byref(self._c_object))
634
595
self.type = gnutls.CRD_CERTIFICATE
636
597
def __del__(self):
637
gnutls.certificate_free_credentials(self)
598
gnutls.certificate_free_credentials(self._c_object)
639
class ClientSession(With_from_param):
600
class ClientSession(object):
640
601
def __init__(self, socket, credentials=None):
641
self._as_parameter_ = gnutls.session_t()
602
self._c_object = gnutls.session_t()
642
603
gnutls_flags = gnutls.CLIENT
643
if gnutls.check_version(b"3.5.6"):
604
if gnutls.check_version("3.5.6"):
644
605
gnutls_flags |= gnutls.NO_TICKETS
645
606
if gnutls.has_rawpk:
646
607
gnutls_flags |= gnutls.ENABLE_RAWPK
647
gnutls.init(self, gnutls_flags)
608
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)
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,
652
614
self.socket = socket
653
615
if credentials is None:
654
616
credentials = gnutls.Credentials()
655
gnutls.credentials_set(self, credentials.type,
617
gnutls.credentials_set(self._c_object, credentials.type,
618
ctypes.cast(credentials._c_object,
657
620
self.credentials = credentials
659
622
def __del__(self):
623
gnutls.deinit(self._c_object)
662
625
def handshake(self):
663
return gnutls.handshake(self)
626
return gnutls.handshake(self._c_object)
665
628
def send(self, data):
666
629
data = bytes(data)
667
630
data_len = len(data)
668
631
while data_len > 0:
669
data_len -= gnutls.record_send(self, data[-data_len:],
632
data_len -= gnutls.record_send(self._c_object,
673
return gnutls.bye(self, gnutls.SHUT_RDWR)
637
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
675
639
# Error handling functions
676
640
def _error_code(result):
677
641
"""A function to raise exceptions on errors, suitable
678
for the "restype" attribute on ctypes functions"""
679
if result >= gnutls.E_SUCCESS:
642
for the 'restype' attribute on ctypes functions"""
681
645
if result == gnutls.E_NO_CERTIFICATE_FOUND:
682
646
raise gnutls.CertificateSecurityError(code=result)
683
647
raise gnutls.Error(code=result)
685
def _retry_on_error(result, func, arguments,
686
_error_code=_error_code):
649
def _retry_on_error(result, func, arguments):
687
650
"""A function to retry on some errors, suitable
688
for the "errcheck" attribute on ctypes functions"""
689
while result < gnutls.E_SUCCESS:
651
for the 'errcheck' attribute on ctypes functions"""
690
653
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
691
654
return _error_code(result)
692
655
result = func(*arguments)
699
662
priority_set_direct = _library.gnutls_priority_set_direct
700
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
663
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
701
664
ctypes.POINTER(ctypes.c_char_p)]
702
665
priority_set_direct.restype = _error_code
704
667
init = _library.gnutls_init
705
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
668
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
706
669
init.restype = _error_code
708
671
set_default_priority = _library.gnutls_set_default_priority
709
set_default_priority.argtypes = [ClientSession]
672
set_default_priority.argtypes = [session_t]
710
673
set_default_priority.restype = _error_code
712
675
record_send = _library.gnutls_record_send
713
record_send.argtypes = [ClientSession, ctypes.c_void_p,
676
record_send.argtypes = [session_t, ctypes.c_void_p,
715
678
record_send.restype = ctypes.c_ssize_t
716
679
record_send.errcheck = _retry_on_error
718
681
certificate_allocate_credentials = (
719
682
_library.gnutls_certificate_allocate_credentials)
720
683
certificate_allocate_credentials.argtypes = [
721
PointerTo(Credentials)]
684
ctypes.POINTER(certificate_credentials_t)]
722
685
certificate_allocate_credentials.restype = _error_code
724
687
certificate_free_credentials = (
725
688
_library.gnutls_certificate_free_credentials)
726
certificate_free_credentials.argtypes = [Credentials]
689
certificate_free_credentials.argtypes = [
690
certificate_credentials_t]
727
691
certificate_free_credentials.restype = None
729
693
handshake_set_private_extensions = (
730
694
_library.gnutls_handshake_set_private_extensions)
731
handshake_set_private_extensions.argtypes = [ClientSession,
695
handshake_set_private_extensions.argtypes = [session_t,
733
697
handshake_set_private_extensions.restype = None
735
699
credentials_set = _library.gnutls_credentials_set
736
credentials_set.argtypes = [ClientSession, credentials_type_t,
737
CastToVoidPointer(Credentials)]
700
credentials_set.argtypes = [session_t, credentials_type_t,
738
702
credentials_set.restype = _error_code
740
704
strerror = _library.gnutls_strerror
759
723
global_set_log_function.restype = None
761
725
deinit = _library.gnutls_deinit
762
deinit.argtypes = [ClientSession]
726
deinit.argtypes = [session_t]
763
727
deinit.restype = None
765
729
handshake = _library.gnutls_handshake
766
handshake.argtypes = [ClientSession]
767
handshake.restype = ctypes.c_int
730
handshake.argtypes = [session_t]
731
handshake.restype = _error_code
768
732
handshake.errcheck = _retry_on_error
770
734
transport_set_ptr = _library.gnutls_transport_set_ptr
771
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
735
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
772
736
transport_set_ptr.restype = None
774
738
bye = _library.gnutls_bye
775
bye.argtypes = [ClientSession, close_request_t]
776
bye.restype = ctypes.c_int
739
bye.argtypes = [session_t, close_request_t]
740
bye.restype = _error_code
777
741
bye.errcheck = _retry_on_error
779
743
check_version = _library.gnutls_check_version
780
744
check_version.argtypes = [ctypes.c_char_p]
781
745
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"
789
747
has_rawpk = bool(check_version(_tls_rawpk_version))
1094
1047
def checker_callback(self, source, condition, connection,
1096
1049
"""The checker has completed, so take appropriate actions."""
1050
self.checker_callback_tag = None
1097
1052
# Read return code from connection (see call_pipe)
1098
1053
returncode = connection.recv()
1099
1054
connection.close()
1100
if self.checker is not None:
1102
self.checker_callback_tag = None
1105
1056
if returncode >= 0:
1106
1057
self.last_checker_status = returncode
1107
1058
self.last_checker_signal = None
1108
1059
if self.last_checker_status == 0:
1109
log.info("Checker for %(name)s succeeded", vars(self))
1060
logger.info("Checker for %(name)s succeeded",
1110
1062
self.checked_ok()
1112
log.info("Checker for %(name)s failed", vars(self))
1064
logger.info("Checker for %(name)s failed", vars(self))
1114
1066
self.last_checker_status = -1
1115
1067
self.last_checker_signal = -returncode
1116
log.warning("Checker for %(name)s crashed?", vars(self))
1068
logger.warning("Checker for %(name)s crashed?",
1119
1072
def checked_ok(self):
1155
1108
if self.checker is not None and not self.checker.is_alive():
1156
log.warning("Checker was not alive; joining")
1109
logger.warning("Checker was not alive; joining")
1157
1110
self.checker.join()
1158
1111
self.checker = None
1159
1112
# Start a new checker if needed
1160
1113
if self.checker is None:
1161
1114
# Escape attributes for the shell
1162
1115
escaped_attrs = {
1163
attr: shlex.quote(str(getattr(self, attr)))
1116
attr: re.escape(str(getattr(self, attr)))
1164
1117
for attr in self.runtime_expansions}
1166
1119
command = self.checker_command % escaped_attrs
1167
1120
except TypeError as error:
1168
log.error('Could not format string "%s"',
1169
self.checker_command, exc_info=error)
1121
logger.error('Could not format string "%s"',
1122
self.checker_command,
1170
1124
return True # Try again later
1171
1125
self.current_checker_command = command
1172
log.info("Starting checker %r for %s", command, self.name)
1126
logger.info("Starting checker %r for %s", command,
1173
1128
# We don't need to redirect stdout and stderr, since
1174
1129
# in normal mode, that is already done by daemon(),
1175
1130
# and in debug mode we don't want to. (Stdin is
2222
class ProxyClient(object):
2268
2223
def __init__(self, child_pipe, key_id, fpr, address):
2269
2224
self._pipe = child_pipe
2270
self._pipe.send(("init", key_id, fpr, address))
2225
self._pipe.send(('init', key_id, fpr, address))
2271
2226
if not self._pipe.recv():
2272
2227
raise KeyError(key_id or fpr)
2274
2229
def __getattribute__(self, name):
2276
2231
return super(ProxyClient, self).__getattribute__(name)
2277
self._pipe.send(("getattr", name))
2232
self._pipe.send(('getattr', name))
2278
2233
data = self._pipe.recv()
2279
if data[0] == "data":
2234
if data[0] == 'data':
2281
if data[0] == "function":
2236
if data[0] == 'function':
2283
2238
def func(*args, **kwargs):
2284
self._pipe.send(("funcall", name, args, kwargs))
2239
self._pipe.send(('funcall', name, args, kwargs))
2285
2240
return self._pipe.recv()[1]
2289
2244
def __setattr__(self, name, value):
2291
2246
return super(ProxyClient, self).__setattr__(name, value)
2292
self._pipe.send(("setattr", name, value))
2247
self._pipe.send(('setattr', name, value))
2295
2250
class ClientHandler(socketserver.BaseRequestHandler, object):
2301
2256
def handle(self):
2302
2257
with contextlib.closing(self.server.child_pipe) as child_pipe:
2303
log.info("TCP connection from: %s",
2304
str(self.client_address))
2305
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2258
logger.info("TCP connection from: %s",
2259
str(self.client_address))
2260
logger.debug("Pipe FD: %d",
2261
self.server.child_pipe.fileno())
2307
2263
session = gnutls.ClientSession(self.request)
2309
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2265
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2310
2266
# "+AES-256-CBC", "+SHA1",
2311
2267
# "+COMP-NULL", "+CTYPE-OPENPGP",
2314
2270
priority = self.server.gnutls_priority
2315
2271
if priority is None:
2316
2272
priority = "NORMAL"
2317
gnutls.priority_set_direct(session,
2318
priority.encode("utf-8"), None)
2273
gnutls.priority_set_direct(session._c_object,
2274
priority.encode("utf-8"),
2320
2277
# Start communication using the Mandos protocol
2321
2278
# Get protocol number
2322
2279
line = self.request.makefile().readline()
2323
log.debug("Protocol version: %r", line)
2280
logger.debug("Protocol version: %r", line)
2325
2282
if int(line.strip().split()[0]) > 1:
2326
2283
raise RuntimeError(line)
2327
2284
except (ValueError, IndexError, RuntimeError) as error:
2328
log.error("Unknown protocol version: %s", error)
2285
logger.error("Unknown protocol version: %s", error)
2331
2288
# Start GnuTLS connection
2333
2290
session.handshake()
2334
2291
except gnutls.Error as error:
2335
log.warning("Handshake failed: %s", error)
2292
logger.warning("Handshake failed: %s", error)
2336
2293
# Do not run session.bye() here: the session is not
2337
2294
# established. Just abandon the request.
2339
log.debug("Handshake succeeded")
2296
logger.debug("Handshake succeeded")
2341
2298
approval_required = False
2343
2300
if gnutls.has_rawpk:
2346
2303
key_id = self.key_id(
2347
2304
self.peer_certificate(session))
2348
2305
except (TypeError, gnutls.Error) as error:
2349
log.warning("Bad certificate: %s", error)
2306
logger.warning("Bad certificate: %s", error)
2351
log.debug("Key ID: %s",
2352
key_id.decode("utf-8",
2308
logger.debug("Key ID: %s", key_id)
2358
2313
fpr = self.fingerprint(
2359
2314
self.peer_certificate(session))
2360
2315
except (TypeError, gnutls.Error) as error:
2361
log.warning("Bad certificate: %s", error)
2316
logger.warning("Bad certificate: %s", error)
2363
log.debug("Fingerprint: %s", fpr)
2318
logger.debug("Fingerprint: %s", fpr)
2366
2321
client = ProxyClient(child_pipe, key_id, fpr,
2441
2398
except gnutls.Error as error:
2442
log.warning("GnuTLS bye failed", exc_info=error)
2399
logger.warning("GnuTLS bye failed",
2445
2403
def peer_certificate(session):
2446
2404
"Return the peer's certificate as a bytestring"
2448
cert_type = gnutls.certificate_type_get2(
2449
session, gnutls.CTYPE_PEERS)
2406
cert_type = gnutls.certificate_type_get2(session._c_object,
2450
2408
except AttributeError:
2451
cert_type = gnutls.certificate_type_get(session)
2409
cert_type = gnutls.certificate_type_get(session._c_object)
2452
2410
if gnutls.has_rawpk:
2453
2411
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2455
2413
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2456
2414
# If not a valid certificate type...
2457
2415
if cert_type not in valid_cert_types:
2458
log.info("Cert type %r not in %r", cert_type,
2416
logger.info("Cert type %r not in %r", cert_type,
2460
2418
# ...return invalid data
2462
2420
list_size = ctypes.c_uint(1)
2463
2421
cert_list = (gnutls.certificate_get_peers
2464
(session, ctypes.byref(list_size)))
2422
(session._c_object, ctypes.byref(list_size)))
2465
2423
if not bool(cert_list) and list_size.value != 0:
2466
2424
raise gnutls.Error("error getting peer certificate")
2467
2425
if list_size.value == 0:
2646
2603
(self.interface + "\0").encode("utf-8"))
2647
2604
except socket.error as error:
2648
2605
if error.errno == errno.EPERM:
2649
log.error("No permission to bind to interface %s",
2606
logger.error("No permission to bind to"
2607
" interface %s", self.interface)
2651
2608
elif error.errno == errno.ENOPROTOOPT:
2652
log.error("SO_BINDTODEVICE not available; cannot"
2653
" bind to interface %s", self.interface)
2609
logger.error("SO_BINDTODEVICE not available;"
2610
" cannot bind to interface %s",
2654
2612
elif error.errno == errno.ENODEV:
2655
log.error("Interface %s does not exist, cannot"
2656
" bind", self.interface)
2613
logger.error("Interface %s does not exist,"
2614
" cannot bind", self.interface)
2659
2617
# Only bind(2) the socket if we really need to.
2660
2618
if self.server_address[0] or self.server_address[1]:
2661
if self.server_address[1]:
2662
self.allow_reuse_address = True
2663
2619
if not self.server_address[0]:
2664
2620
if self.address_family == socket.AF_INET6:
2665
2621
any_address = "::" # in6addr_any
2803
2758
def rfc3339_duration_to_delta(duration):
2804
2759
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2806
>>> timedelta = datetime.timedelta
2807
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2809
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2811
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2813
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2815
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2817
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2819
>>> 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)
2824
2777
# Parsing an RFC 3339 duration with regular expressions is not
2904
2857
def string_to_delta(interval):
2905
2858
"""Parse a string and return a datetime.timedelta
2907
>>> string_to_delta("7d") == datetime.timedelta(7)
2909
>>> string_to_delta("60s") == datetime.timedelta(0, 60)
2911
>>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2913
>>> string_to_delta("24h") == datetime.timedelta(1)
2915
>>> string_to_delta("1w") == datetime.timedelta(7)
2917
>>> 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)
3307
3266
for key, value in
3308
3267
bytes_old_client_settings.items()}
3309
3268
del bytes_old_client_settings
3310
# .host and .checker_command
3311
3270
for value in old_client_settings.values():
3312
for attribute in ("host", "checker_command"):
3313
if isinstance(value[attribute], bytes):
3314
value[attribute] = (value[attribute]
3271
if isinstance(value["host"], bytes):
3272
value["host"] = (value["host"]
3316
3274
os.remove(stored_state_path)
3317
3275
except IOError as e:
3318
3276
if e.errno == errno.ENOENT:
3319
log.warning("Could not load persistent state:"
3320
" %s", os.strerror(e.errno))
3277
logger.warning("Could not load persistent state:"
3278
" {}".format(os.strerror(e.errno)))
3322
log.critical("Could not load persistent state:",
3280
logger.critical("Could not load persistent state:",
3325
3283
except EOFError as e:
3326
log.warning("Could not load persistent state: EOFError:",
3284
logger.warning("Could not load persistent state: "
3329
3288
with PGPEngine() as pgp:
3330
3289
for client_name, client in clients_data.items():
3357
3316
if client["enabled"]:
3358
3317
if datetime.datetime.utcnow() >= client["expires"]:
3359
3318
if not client["last_checked_ok"]:
3360
log.warning("disabling client %s - Client"
3361
" never performed a successful"
3362
" checker", client_name)
3320
"disabling client {} - Client never "
3321
"performed a successful checker".format(
3363
3323
client["enabled"] = False
3364
3324
elif client["last_checker_status"] != 0:
3365
log.warning("disabling client %s - Client"
3366
" last checker failed with error"
3367
" code %s", client_name,
3368
client["last_checker_status"])
3326
"disabling client {} - Client last"
3327
" checker failed with error code"
3330
client["last_checker_status"]))
3369
3331
client["enabled"] = False
3371
3333
client["expires"] = (
3372
3334
datetime.datetime.utcnow()
3373
3335
+ client["timeout"])
3374
log.debug("Last checker succeeded, keeping %s"
3375
" enabled", client_name)
3336
logger.debug("Last checker succeeded,"
3337
" keeping {} enabled".format(
3377
3340
client["secret"] = pgp.decrypt(
3378
3341
client["encrypted_secret"],
3379
3342
client_settings[client_name]["secret"])
3380
3343
except PGPError:
3381
3344
# If decryption fails, we use secret from new settings
3382
log.debug("Failed to decrypt %s old secret",
3345
logger.debug("Failed to decrypt {} old secret".format(
3384
3347
client["secret"] = (client_settings[client_name]
3633
3597
service.activate()
3634
3598
except dbus.exceptions.DBusException as error:
3635
log.critical("D-Bus Exception", exc_info=error)
3599
logger.critical("D-Bus Exception", exc_info=error)
3638
3602
# End of Avahi example code
3641
GLib.IOChannel.unix_new(tcp_server.fileno()),
3642
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3643
lambda *args, **kwargs: (tcp_server.handle_request
3644
(*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))
3646
log.debug("Starting main loop")
3609
logger.debug("Starting main loop")
3647
3610
main_loop.run()
3648
3611
except AvahiError as error:
3649
log.critical("Avahi Error", exc_info=error)
3612
logger.critical("Avahi Error", exc_info=error)
3652
3615
except KeyboardInterrupt:
3654
3617
print("", file=sys.stderr)
3655
log.debug("Server received KeyboardInterrupt")
3656
log.debug("Server exiting")
3618
logger.debug("Server received KeyboardInterrupt")
3619
logger.debug("Server exiting")
3657
3620
# Must run before the D-Bus bus name gets deregistered
3661
def parse_test_args():
3662
# type: () -> argparse.Namespace
3663
parser = argparse.ArgumentParser(add_help=False)
3664
parser.add_argument("--check", action="store_true")
3665
parser.add_argument("--prefix", )
3666
args, unknown_args = parser.parse_known_args()
3668
# Remove test options from sys.argv
3669
sys.argv[1:] = unknown_args
3672
# Add all tests from doctest strings
3673
def load_tests(loader, tests, none):
3675
tests.addTests(doctest.DocTestSuite())
3678
if __name__ == "__main__":
3679
options = parse_test_args()
3682
extra_test_prefix = options.prefix
3683
if extra_test_prefix is not None:
3684
if not (unittest.main(argv=[""], exit=False)
3685
.result.wasSuccessful()):
3687
class ExtraTestLoader(unittest.TestLoader):
3688
testMethodPrefix = extra_test_prefix
3689
# Call using ./scriptname --test [--verbose]
3690
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3692
unittest.main(argv=[""])
3700
# (lambda (&optional extra)
3701
# (if (not (funcall run-tests-in-test-buffer default-directory
3703
# (funcall show-test-buffer-in-test-window)
3704
# (funcall remove-test-window)
3705
# (if extra (message "Extra tests run successfully!"))))
3706
# run-tests-in-test-buffer:
3707
# (lambda (dir &optional extra)
3708
# (with-current-buffer (get-buffer-create "*Test*")
3709
# (setq buffer-read-only nil
3710
# default-directory dir)
3712
# (compilation-mode))
3713
# (let ((process-result
3714
# (let ((inhibit-read-only t))
3715
# (process-file-shell-command
3716
# (funcall get-command-line extra) nil "*Test*"))))
3717
# (and (numberp process-result)
3718
# (= process-result 0))))
3720
# (lambda (&optional extra)
3721
# (let ((quoted-script
3722
# (shell-quote-argument (funcall get-script-name))))
3724
# (concat "%s --check" (if extra " --prefix=atest" ""))
3728
# (if (fboundp 'file-local-name)
3729
# (file-local-name (buffer-file-name))
3730
# (or (file-remote-p (buffer-file-name) 'localname)
3731
# (buffer-file-name))))
3732
# remove-test-window:
3734
# (let ((test-window (get-buffer-window "*Test*")))
3735
# (if test-window (delete-window test-window))))
3736
# show-test-buffer-in-test-window:
3738
# (when (not (get-buffer-window-list "*Test*"))
3739
# (setq next-error-last-buffer (get-buffer "*Test*"))
3740
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3741
# (display-buffer-overriding-action
3742
# `((display-buffer-in-side-window) (side . ,side)
3743
# (window-height . fit-window-to-buffer)
3744
# (window-width . fit-window-to-buffer))))
3745
# (display-buffer "*Test*"))))
3748
# (let* ((run-extra-tests (lambda () (interactive)
3749
# (funcall run-tests t)))
3750
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3751
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3752
# (setq minor-mode-overriding-map-alist
3753
# (cons `(run-tests . ,outer-keymap)
3754
# minor-mode-overriding-map-alist)))
3755
# (add-hook 'after-save-hook run-tests 90 t))
3624
if __name__ == '__main__':