93
91
if sys.version_info.major == 2:
94
92
__metaclass__ = type
98
# Add collections.abc.Callable if it does not exist
100
collections.abc.Callable
101
except AttributeError:
103
Callable = collections.Callable
104
collections.abc = abc
107
# Add shlex.quote if it does not exist
110
except AttributeError:
111
shlex.quote = re.escape
113
# Add os.set_inheritable if it does not exist
116
except AttributeError:
117
def set_inheritable(fd, inheritable):
118
flags = fcntl.fcntl(fd, fcntl.F_GETFD)
119
if inheritable and ((flags & fcntl.FD_CLOEXEC) != 0):
120
fcntl.fcntl(fd, fcntl.F_SETFL, flags & ~fcntl.FD_CLOEXEC)
121
elif (not inheritable) and ((flags & fcntl.FD_CLOEXEC) == 0):
122
fcntl.fcntl(fd, fcntl.F_SETFL, flags | fcntl.FD_CLOEXEC)
123
os.set_inheritable = set_inheritable
126
# Show warnings by default
127
if not sys.warnoptions:
129
warnings.simplefilter("default")
131
94
# Try to find the value of SO_BINDTODEVICE:
464
429
def entry_group_state_changed(self, state, error):
465
430
"""Derived from the Avahi example code"""
466
log.debug("Avahi entry group state change: %i", state)
431
logger.debug("Avahi entry group state change: %i", state)
468
433
if state == avahi.ENTRY_GROUP_ESTABLISHED:
469
log.debug("Zeroconf service established.")
434
logger.debug("Zeroconf service established.")
470
435
elif state == avahi.ENTRY_GROUP_COLLISION:
471
log.info("Zeroconf service name collision.")
436
logger.info("Zeroconf service name collision.")
473
438
elif state == avahi.ENTRY_GROUP_FAILURE:
474
log.critical("Avahi: Error in group state changed %s",
439
logger.critical("Avahi: Error in group state changed %s",
476
441
raise AvahiGroupError("State changed: {!s}".format(error))
478
443
def cleanup(self):
508
473
except dbus.exceptions.DBusException as error:
509
474
if (error.get_dbus_name()
510
475
== "org.freedesktop.Avahi.CollisionError"):
511
log.info("Local Zeroconf service name collision.")
476
logger.info("Local Zeroconf service name"
512
478
return self.rename(remove=False)
514
log.critical("D-Bus Exception", exc_info=error)
480
logger.critical("D-Bus Exception", exc_info=error)
518
484
if error is None:
519
log.debug("Unknown state: %r", state)
485
logger.debug("Unknown state: %r", state)
521
log.debug("Unknown state: %r: %r", state, error)
487
logger.debug("Unknown state: %r: %r", state, error)
523
489
def activate(self):
524
490
"""Derived from the Avahi example code"""
606
571
# gnutls.strerror()
608
573
if message is None and code is not None:
609
message = gnutls.strerror(code).decode(
610
"utf-8", errors="replace")
574
message = gnutls.strerror(code)
611
575
return super(gnutls.Error, self).__init__(
614
578
class CertificateSecurityError(Error):
618
def __init__(self, cls):
621
def from_param(self, obj):
622
if not isinstance(obj, self.cls):
623
raise TypeError("Not of type {}: {!r}"
624
.format(self.cls.__name__, obj))
625
return ctypes.byref(obj.from_param(obj))
627
class CastToVoidPointer:
628
def __init__(self, cls):
631
def from_param(self, obj):
632
if not isinstance(obj, self.cls):
633
raise TypeError("Not of type {}: {!r}"
634
.format(self.cls.__name__, obj))
635
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
637
class With_from_param:
639
def from_param(cls, obj):
640
return obj._as_parameter_
643
class Credentials(With_from_param):
644
583
def __init__(self):
645
self._as_parameter_ = gnutls.certificate_credentials_t()
646
gnutls.certificate_allocate_credentials(self)
584
self._c_object = gnutls.certificate_credentials_t()
585
gnutls.certificate_allocate_credentials(
586
ctypes.byref(self._c_object))
647
587
self.type = gnutls.CRD_CERTIFICATE
649
589
def __del__(self):
650
gnutls.certificate_free_credentials(self)
590
gnutls.certificate_free_credentials(self._c_object)
652
class ClientSession(With_from_param):
653
593
def __init__(self, socket, credentials=None):
654
self._as_parameter_ = gnutls.session_t()
594
self._c_object = gnutls.session_t()
655
595
gnutls_flags = gnutls.CLIENT
656
596
if gnutls.check_version(b"3.5.6"):
657
597
gnutls_flags |= gnutls.NO_TICKETS
658
598
if gnutls.has_rawpk:
659
599
gnutls_flags |= gnutls.ENABLE_RAWPK
660
gnutls.init(self, gnutls_flags)
600
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
662
gnutls.set_default_priority(self)
663
gnutls.transport_set_ptr(self, socket.fileno())
664
gnutls.handshake_set_private_extensions(self, True)
602
gnutls.set_default_priority(self._c_object)
603
gnutls.transport_set_ptr(self._c_object, socket.fileno())
604
gnutls.handshake_set_private_extensions(self._c_object,
665
606
self.socket = socket
666
607
if credentials is None:
667
608
credentials = gnutls.Credentials()
668
gnutls.credentials_set(self, credentials.type,
609
gnutls.credentials_set(self._c_object, credentials.type,
610
ctypes.cast(credentials._c_object,
670
612
self.credentials = credentials
672
614
def __del__(self):
615
gnutls.deinit(self._c_object)
675
617
def handshake(self):
676
return gnutls.handshake(self)
618
return gnutls.handshake(self._c_object)
678
620
def send(self, data):
679
621
data = bytes(data)
680
622
data_len = len(data)
681
623
while data_len > 0:
682
data_len -= gnutls.record_send(self, data[-data_len:],
624
data_len -= gnutls.record_send(self._c_object,
686
return gnutls.bye(self, gnutls.SHUT_RDWR)
629
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
688
631
# Error handling functions
689
632
def _error_code(result):
690
633
"""A function to raise exceptions on errors, suitable
691
for the "restype" attribute on ctypes functions"""
692
if result >= gnutls.E_SUCCESS:
634
for the 'restype' attribute on ctypes functions"""
694
637
if result == gnutls.E_NO_CERTIFICATE_FOUND:
695
638
raise gnutls.CertificateSecurityError(code=result)
696
639
raise gnutls.Error(code=result)
698
def _retry_on_error(result, func, arguments,
699
_error_code=_error_code):
641
def _retry_on_error(result, func, arguments):
700
642
"""A function to retry on some errors, suitable
701
for the "errcheck" attribute on ctypes functions"""
702
while result < gnutls.E_SUCCESS:
643
for the 'errcheck' attribute on ctypes functions"""
703
645
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
704
646
return _error_code(result)
705
647
result = func(*arguments)
712
654
priority_set_direct = _library.gnutls_priority_set_direct
713
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
655
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
714
656
ctypes.POINTER(ctypes.c_char_p)]
715
657
priority_set_direct.restype = _error_code
717
659
init = _library.gnutls_init
718
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
660
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
719
661
init.restype = _error_code
721
663
set_default_priority = _library.gnutls_set_default_priority
722
set_default_priority.argtypes = [ClientSession]
664
set_default_priority.argtypes = [session_t]
723
665
set_default_priority.restype = _error_code
725
667
record_send = _library.gnutls_record_send
726
record_send.argtypes = [ClientSession, ctypes.c_void_p,
668
record_send.argtypes = [session_t, ctypes.c_void_p,
728
670
record_send.restype = ctypes.c_ssize_t
729
671
record_send.errcheck = _retry_on_error
731
673
certificate_allocate_credentials = (
732
674
_library.gnutls_certificate_allocate_credentials)
733
675
certificate_allocate_credentials.argtypes = [
734
PointerTo(Credentials)]
676
ctypes.POINTER(certificate_credentials_t)]
735
677
certificate_allocate_credentials.restype = _error_code
737
679
certificate_free_credentials = (
738
680
_library.gnutls_certificate_free_credentials)
739
certificate_free_credentials.argtypes = [Credentials]
681
certificate_free_credentials.argtypes = [
682
certificate_credentials_t]
740
683
certificate_free_credentials.restype = None
742
685
handshake_set_private_extensions = (
743
686
_library.gnutls_handshake_set_private_extensions)
744
handshake_set_private_extensions.argtypes = [ClientSession,
687
handshake_set_private_extensions.argtypes = [session_t,
746
689
handshake_set_private_extensions.restype = None
748
691
credentials_set = _library.gnutls_credentials_set
749
credentials_set.argtypes = [ClientSession, credentials_type_t,
750
CastToVoidPointer(Credentials)]
692
credentials_set.argtypes = [session_t, credentials_type_t,
751
694
credentials_set.restype = _error_code
753
696
strerror = _library.gnutls_strerror
772
715
global_set_log_function.restype = None
774
717
deinit = _library.gnutls_deinit
775
deinit.argtypes = [ClientSession]
718
deinit.argtypes = [session_t]
776
719
deinit.restype = None
778
721
handshake = _library.gnutls_handshake
779
handshake.argtypes = [ClientSession]
780
handshake.restype = ctypes.c_int
722
handshake.argtypes = [session_t]
723
handshake.restype = _error_code
781
724
handshake.errcheck = _retry_on_error
783
726
transport_set_ptr = _library.gnutls_transport_set_ptr
784
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
727
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
785
728
transport_set_ptr.restype = None
787
730
bye = _library.gnutls_bye
788
bye.argtypes = [ClientSession, close_request_t]
789
bye.restype = ctypes.c_int
731
bye.argtypes = [session_t, close_request_t]
732
bye.restype = _error_code
790
733
bye.errcheck = _retry_on_error
792
735
check_version = _library.gnutls_check_version
1092
1024
def __del__(self):
1095
def init_checker(self, randomize_start=False):
1096
# Schedule a new checker to be started a randomly selected
1097
# time (a fraction of 'interval') from now. This spreads out
1098
# the startup of checkers over time when the server is
1027
def init_checker(self):
1028
# Schedule a new checker to be started an 'interval' from now,
1029
# and every interval from then on.
1100
1030
if self.checker_initiator_tag is not None:
1101
1031
GLib.source_remove(self.checker_initiator_tag)
1102
interval_milliseconds = int(self.interval.total_seconds()
1105
delay_milliseconds = random.randrange(
1106
interval_milliseconds + 1)
1108
delay_milliseconds = interval_milliseconds
1109
1032
self.checker_initiator_tag = GLib.timeout_add(
1110
delay_milliseconds, self.start_checker, randomize_start)
1111
delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1112
# A checker might take up to an 'interval' of time, so we can
1113
# expire at the soonest one interval after a checker was
1114
# started. Since the initial checker is delayed, the expire
1115
# time might have to be extended.
1116
now = datetime.datetime.utcnow()
1117
self.expires = now + delay + self.interval
1118
# Schedule a disable() at expire time
1033
int(self.interval.total_seconds() * 1000),
1035
# Schedule a disable() when 'timeout' has passed
1119
1036
if self.disable_initiator_tag is not None:
1120
1037
GLib.source_remove(self.disable_initiator_tag)
1121
1038
self.disable_initiator_tag = GLib.timeout_add(
1122
int((self.expires - now).total_seconds() * 1000),
1039
int(self.timeout.total_seconds() * 1000), self.disable)
1040
# Also start a new checker *right now*.
1041
self.start_checker()
1125
1043
def checker_callback(self, source, condition, connection,
1186
1105
if self.checker is not None and not self.checker.is_alive():
1187
log.warning("Checker was not alive; joining")
1106
logger.warning("Checker was not alive; joining")
1188
1107
self.checker.join()
1189
1108
self.checker = None
1190
1109
# Start a new checker if needed
1191
1110
if self.checker is None:
1192
1111
# Escape attributes for the shell
1193
1112
escaped_attrs = {
1194
attr: shlex.quote(str(getattr(self, attr)))
1113
attr: re.escape(str(getattr(self, attr)))
1195
1114
for attr in self.runtime_expansions}
1197
1116
command = self.checker_command % escaped_attrs
1198
1117
except TypeError as error:
1199
log.error('Could not format string "%s"',
1200
self.checker_command, exc_info=error)
1118
logger.error('Could not format string "%s"',
1119
self.checker_command,
1201
1121
return True # Try again later
1202
1122
self.current_checker_command = command
1203
log.info("Starting checker %r for %s", command, self.name)
1123
logger.info("Starting checker %r for %s", command,
1204
1125
# We don't need to redirect stdout and stderr, since
1205
1126
# in normal mode, that is already done by daemon(),
1206
1127
# and in debug mode we don't want to. (Stdin is
1222
1143
kwargs=popen_args)
1223
1144
self.checker.start()
1224
1145
self.checker_callback_tag = GLib.io_add_watch(
1225
GLib.IOChannel.unix_new(pipe[0].fileno()),
1226
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1146
pipe[0].fileno(), GLib.IO_IN,
1227
1147
self.checker_callback, pipe[0], command)
1228
if start_was_randomized:
1229
# We were started after a random delay; Schedule a new
1230
# checker to be started an 'interval' from now, and every
1231
# interval from then on.
1232
now = datetime.datetime.utcnow()
1233
self.checker_initiator_tag = GLib.timeout_add(
1234
int(self.interval.total_seconds() * 1000),
1236
self.expires = max(self.expires, now + self.interval)
1237
# Don't start a new checker again after same random delay
1239
1148
# Re-run this periodically if run by GLib.timeout_add
2309
2219
class ProxyClient:
2310
2220
def __init__(self, child_pipe, key_id, fpr, address):
2311
2221
self._pipe = child_pipe
2312
self._pipe.send(("init", key_id, fpr, address))
2222
self._pipe.send(('init', key_id, fpr, address))
2313
2223
if not self._pipe.recv():
2314
2224
raise KeyError(key_id or fpr)
2316
2226
def __getattribute__(self, name):
2318
2228
return super(ProxyClient, self).__getattribute__(name)
2319
self._pipe.send(("getattr", name))
2229
self._pipe.send(('getattr', name))
2320
2230
data = self._pipe.recv()
2321
if data[0] == "data":
2231
if data[0] == 'data':
2323
if data[0] == "function":
2233
if data[0] == 'function':
2325
2235
def func(*args, **kwargs):
2326
self._pipe.send(("funcall", name, args, kwargs))
2236
self._pipe.send(('funcall', name, args, kwargs))
2327
2237
return self._pipe.recv()[1]
2331
2241
def __setattr__(self, name, value):
2333
2243
return super(ProxyClient, self).__setattr__(name, value)
2334
self._pipe.send(("setattr", name, value))
2244
self._pipe.send(('setattr', name, value))
2337
2247
class ClientHandler(socketserver.BaseRequestHandler, object):
2343
2253
def handle(self):
2344
2254
with contextlib.closing(self.server.child_pipe) as child_pipe:
2345
log.info("TCP connection from: %s",
2346
str(self.client_address))
2347
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2255
logger.info("TCP connection from: %s",
2256
str(self.client_address))
2257
logger.debug("Pipe FD: %d",
2258
self.server.child_pipe.fileno())
2349
2260
session = gnutls.ClientSession(self.request)
2351
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2262
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2352
2263
# "+AES-256-CBC", "+SHA1",
2353
2264
# "+COMP-NULL", "+CTYPE-OPENPGP",
2356
2267
priority = self.server.gnutls_priority
2357
2268
if priority is None:
2358
2269
priority = "NORMAL"
2359
gnutls.priority_set_direct(session,
2360
priority.encode("utf-8"), None)
2270
gnutls.priority_set_direct(session._c_object,
2271
priority.encode("utf-8"),
2362
2274
# Start communication using the Mandos protocol
2363
2275
# Get protocol number
2364
2276
line = self.request.makefile().readline()
2365
log.debug("Protocol version: %r", line)
2277
logger.debug("Protocol version: %r", line)
2367
2279
if int(line.strip().split()[0]) > 1:
2368
2280
raise RuntimeError(line)
2369
2281
except (ValueError, IndexError, RuntimeError) as error:
2370
log.error("Unknown protocol version: %s", error)
2282
logger.error("Unknown protocol version: %s", error)
2373
2285
# Start GnuTLS connection
2375
2287
session.handshake()
2376
2288
except gnutls.Error as error:
2377
log.warning("Handshake failed: %s", error)
2289
logger.warning("Handshake failed: %s", error)
2378
2290
# Do not run session.bye() here: the session is not
2379
2291
# established. Just abandon the request.
2381
log.debug("Handshake succeeded")
2293
logger.debug("Handshake succeeded")
2383
2295
approval_required = False
2483
2395
except gnutls.Error as error:
2484
log.warning("GnuTLS bye failed", exc_info=error)
2396
logger.warning("GnuTLS bye failed",
2487
2400
def peer_certificate(session):
2488
2401
"Return the peer's certificate as a bytestring"
2490
cert_type = gnutls.certificate_type_get2(
2491
session, gnutls.CTYPE_PEERS)
2403
cert_type = gnutls.certificate_type_get2(session._c_object,
2492
2405
except AttributeError:
2493
cert_type = gnutls.certificate_type_get(session)
2406
cert_type = gnutls.certificate_type_get(session._c_object)
2494
2407
if gnutls.has_rawpk:
2495
2408
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2497
2410
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2498
2411
# If not a valid certificate type...
2499
2412
if cert_type not in valid_cert_types:
2500
log.info("Cert type %r not in %r", cert_type,
2413
logger.info("Cert type %r not in %r", cert_type,
2502
2415
# ...return invalid data
2504
2417
list_size = ctypes.c_uint(1)
2505
2418
cert_list = (gnutls.certificate_get_peers
2506
(session, ctypes.byref(list_size)))
2419
(session._c_object, ctypes.byref(list_size)))
2507
2420
if not bool(cert_list) and list_size.value != 0:
2508
2421
raise gnutls.Error("error getting peer certificate")
2509
2422
if list_size.value == 0:
2688
2600
(self.interface + "\0").encode("utf-8"))
2689
2601
except socket.error as error:
2690
2602
if error.errno == errno.EPERM:
2691
log.error("No permission to bind to interface %s",
2603
logger.error("No permission to bind to"
2604
" interface %s", self.interface)
2693
2605
elif error.errno == errno.ENOPROTOOPT:
2694
log.error("SO_BINDTODEVICE not available; cannot"
2695
" bind to interface %s", self.interface)
2606
logger.error("SO_BINDTODEVICE not available;"
2607
" cannot bind to interface %s",
2696
2609
elif error.errno == errno.ENODEV:
2697
log.error("Interface %s does not exist, cannot"
2698
" bind", self.interface)
2610
logger.error("Interface %s does not exist,"
2611
" cannot bind", self.interface)
2701
2614
# Only bind(2) the socket if we really need to.
2845
2757
def rfc3339_duration_to_delta(duration):
2846
2758
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2848
>>> timedelta = datetime.timedelta
2849
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2851
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2853
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2855
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2857
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2859
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2861
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2760
>>> rfc3339_duration_to_delta("P7D")
2761
datetime.timedelta(7)
2762
>>> rfc3339_duration_to_delta("PT60S")
2763
datetime.timedelta(0, 60)
2764
>>> rfc3339_duration_to_delta("PT60M")
2765
datetime.timedelta(0, 3600)
2766
>>> rfc3339_duration_to_delta("PT24H")
2767
datetime.timedelta(1)
2768
>>> rfc3339_duration_to_delta("P1W")
2769
datetime.timedelta(7)
2770
>>> rfc3339_duration_to_delta("PT5M30S")
2771
datetime.timedelta(0, 330)
2772
>>> rfc3339_duration_to_delta("P1DT3M20S")
2773
datetime.timedelta(1, 200)
2866
2776
# Parsing an RFC 3339 duration with regular expressions is not
2946
2856
def string_to_delta(interval):
2947
2857
"""Parse a string and return a datetime.timedelta
2949
>>> string_to_delta("7d") == datetime.timedelta(7)
2951
>>> string_to_delta("60s") == datetime.timedelta(0, 60)
2953
>>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2955
>>> string_to_delta("24h") == datetime.timedelta(1)
2957
>>> string_to_delta("1w") == datetime.timedelta(7)
2959
>>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
2859
>>> string_to_delta('7d')
2860
datetime.timedelta(7)
2861
>>> string_to_delta('60s')
2862
datetime.timedelta(0, 60)
2863
>>> string_to_delta('60m')
2864
datetime.timedelta(0, 3600)
2865
>>> string_to_delta('24h')
2866
datetime.timedelta(1)
2867
>>> string_to_delta('1w')
2868
datetime.timedelta(7)
2869
>>> string_to_delta('5m 30s')
2870
datetime.timedelta(0, 330)
3351
3265
for key, value in
3352
3266
bytes_old_client_settings.items()}
3353
3267
del bytes_old_client_settings
3354
# .host and .checker_command
3355
3269
for value in old_client_settings.values():
3356
for attribute in ("host", "checker_command"):
3357
if isinstance(value[attribute], bytes):
3358
value[attribute] = (value[attribute]
3270
if isinstance(value["host"], bytes):
3271
value["host"] = (value["host"]
3360
3273
os.remove(stored_state_path)
3361
3274
except IOError as e:
3362
3275
if e.errno == errno.ENOENT:
3363
log.warning("Could not load persistent state:"
3364
" %s", os.strerror(e.errno))
3276
logger.warning("Could not load persistent state:"
3277
" {}".format(os.strerror(e.errno)))
3366
log.critical("Could not load persistent state:",
3279
logger.critical("Could not load persistent state:",
3369
3282
except EOFError as e:
3370
log.warning("Could not load persistent state: EOFError:",
3283
logger.warning("Could not load persistent state: "
3373
3287
with PGPEngine() as pgp:
3374
3288
for client_name, client in clients_data.items():
3401
3315
if client["enabled"]:
3402
3316
if datetime.datetime.utcnow() >= client["expires"]:
3403
3317
if not client["last_checked_ok"]:
3404
log.warning("disabling client %s - Client"
3405
" never performed a successful"
3406
" checker", client_name)
3319
"disabling client {} - Client never "
3320
"performed a successful checker".format(
3407
3322
client["enabled"] = False
3408
3323
elif client["last_checker_status"] != 0:
3409
log.warning("disabling client %s - Client"
3410
" last checker failed with error"
3411
" code %s", client_name,
3412
client["last_checker_status"])
3325
"disabling client {} - Client last"
3326
" checker failed with error code"
3329
client["last_checker_status"]))
3413
3330
client["enabled"] = False
3415
3332
client["expires"] = (
3416
3333
datetime.datetime.utcnow()
3417
3334
+ client["timeout"])
3418
log.debug("Last checker succeeded, keeping %s"
3419
" enabled", client_name)
3335
logger.debug("Last checker succeeded,"
3336
" keeping {} enabled".format(
3421
3339
client["secret"] = pgp.decrypt(
3422
3340
client["encrypted_secret"],
3423
3341
client_settings[client_name]["secret"])
3424
3342
except PGPError:
3425
3343
# If decryption fails, we use secret from new settings
3426
log.debug("Failed to decrypt %s old secret",
3344
logger.debug("Failed to decrypt {} old secret".format(
3428
3346
client["secret"] = (client_settings[client_name]
3663
3581
service.port = tcp_server.socket.getsockname()[1]
3665
log.info("Now listening on address %r, port %d, flowinfo %d,"
3666
" scope_id %d", *tcp_server.socket.getsockname())
3583
logger.info("Now listening on address %r, port %d,"
3584
" flowinfo %d, scope_id %d",
3585
*tcp_server.socket.getsockname())
3668
log.info("Now listening on address %r, port %d",
3669
*tcp_server.socket.getsockname())
3587
logger.info("Now listening on address %r, port %d",
3588
*tcp_server.socket.getsockname())
3671
3590
# service.interface = tcp_server.socket.getsockname()[3]
3677
3596
service.activate()
3678
3597
except dbus.exceptions.DBusException as error:
3679
log.critical("D-Bus Exception", exc_info=error)
3598
logger.critical("D-Bus Exception", exc_info=error)
3682
3601
# End of Avahi example code
3685
GLib.IOChannel.unix_new(tcp_server.fileno()),
3686
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3687
lambda *args, **kwargs: (tcp_server.handle_request
3688
(*args[2:], **kwargs) or True))
3603
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3604
lambda *args, **kwargs:
3605
(tcp_server.handle_request
3606
(*args[2:], **kwargs) or True))
3690
log.debug("Starting main loop")
3608
logger.debug("Starting main loop")
3691
3609
main_loop.run()
3692
3610
except AvahiError as error:
3693
log.critical("Avahi Error", exc_info=error)
3611
logger.critical("Avahi Error", exc_info=error)
3696
3614
except KeyboardInterrupt:
3698
3616
print("", file=sys.stderr)
3699
log.debug("Server received KeyboardInterrupt")
3700
log.debug("Server exiting")
3617
logger.debug("Server received KeyboardInterrupt")
3618
logger.debug("Server exiting")
3701
3619
# Must run before the D-Bus bus name gets deregistered
3705
def parse_test_args():
3706
# type: () -> argparse.Namespace
3707
parser = argparse.ArgumentParser(add_help=False)
3708
parser.add_argument("--check", action="store_true")
3709
parser.add_argument("--prefix", )
3710
args, unknown_args = parser.parse_known_args()
3712
# Remove test options from sys.argv
3713
sys.argv[1:] = unknown_args
3716
# Add all tests from doctest strings
3717
def load_tests(loader, tests, none):
3719
tests.addTests(doctest.DocTestSuite())
3722
if __name__ == "__main__":
3723
options = parse_test_args()
3726
extra_test_prefix = options.prefix
3727
if extra_test_prefix is not None:
3728
if not (unittest.main(argv=[""], exit=False)
3729
.result.wasSuccessful()):
3731
class ExtraTestLoader(unittest.TestLoader):
3732
testMethodPrefix = extra_test_prefix
3733
# Call using ./scriptname --test [--verbose]
3734
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3736
unittest.main(argv=[""])
3744
# (lambda (&optional extra)
3745
# (if (not (funcall run-tests-in-test-buffer default-directory
3747
# (funcall show-test-buffer-in-test-window)
3748
# (funcall remove-test-window)
3749
# (if extra (message "Extra tests run successfully!"))))
3750
# run-tests-in-test-buffer:
3751
# (lambda (dir &optional extra)
3752
# (with-current-buffer (get-buffer-create "*Test*")
3753
# (setq buffer-read-only nil
3754
# default-directory dir)
3756
# (compilation-mode))
3757
# (let ((process-result
3758
# (let ((inhibit-read-only t))
3759
# (process-file-shell-command
3760
# (funcall get-command-line extra) nil "*Test*"))))
3761
# (and (numberp process-result)
3762
# (= process-result 0))))
3764
# (lambda (&optional extra)
3765
# (let ((quoted-script
3766
# (shell-quote-argument (funcall get-script-name))))
3768
# (concat "%s --check" (if extra " --prefix=atest" ""))
3772
# (if (fboundp 'file-local-name)
3773
# (file-local-name (buffer-file-name))
3774
# (or (file-remote-p (buffer-file-name) 'localname)
3775
# (buffer-file-name))))
3776
# remove-test-window:
3778
# (let ((test-window (get-buffer-window "*Test*")))
3779
# (if test-window (delete-window test-window))))
3780
# show-test-buffer-in-test-window:
3782
# (when (not (get-buffer-window-list "*Test*"))
3783
# (setq next-error-last-buffer (get-buffer "*Test*"))
3784
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3785
# (display-buffer-overriding-action
3786
# `((display-buffer-in-side-window) (side . ,side)
3787
# (window-height . fit-window-to-buffer)
3788
# (window-width . fit-window-to-buffer))))
3789
# (display-buffer "*Test*"))))
3792
# (let* ((run-extra-tests (lambda () (interactive)
3793
# (funcall run-tests t)))
3794
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3795
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3796
# (setq minor-mode-overriding-map-alist
3797
# (cons `(run-tests . ,outer-keymap)
3798
# minor-mode-overriding-map-alist)))
3799
# (add-hook 'after-save-hook run-tests 90 t))
3623
if __name__ == '__main__':