117
124
SO_BINDTODEVICE = None
119
if sys.version_info.major == 2:
122
126
if sys.version_info < (3, 2):
123
127
configparser.Configparser = configparser.SafeConfigParser
126
130
stored_state_file = "clients.pickle"
128
132
logger = logging.getLogger()
133
logging.captureWarnings(True) # Show warnings via the logging system
1143
1149
kwargs=popen_args)
1144
1150
self.checker.start()
1145
1151
self.checker_callback_tag = GLib.io_add_watch(
1146
pipe[0].fileno(), GLib.IO_IN,
1152
GLib.IOChannel.unix_new(pipe[0].fileno()),
1153
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1147
1154
self.checker_callback, pipe[0], command)
1148
1155
# Re-run this periodically if run by GLib.timeout_add
1404
1411
raise ValueError("Byte arrays not supported for non-"
1405
1412
"'ay' signature {!r}"
1406
1413
.format(prop._dbus_signature))
1407
value = dbus.ByteArray(b''.join(chr(byte)
1414
value = dbus.ByteArray(bytes(value))
1411
1417
@dbus.service.method(dbus.PROPERTIES_IFACE,
2673
2679
def add_pipe(self, parent_pipe, proc):
2674
2680
# Call "handle_ipc" for both data and EOF events
2675
2681
GLib.io_add_watch(
2676
parent_pipe.fileno(),
2677
GLib.IO_IN | GLib.IO_HUP,
2682
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2683
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2678
2684
functools.partial(self.handle_ipc,
2679
2685
parent_pipe=parent_pipe,
2720
2726
GLib.io_add_watch(
2721
parent_pipe.fileno(),
2722
GLib.IO_IN | GLib.IO_HUP,
2727
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2728
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2723
2729
functools.partial(self.handle_ipc,
2724
2730
parent_pipe=parent_pipe,
2757
2763
def rfc3339_duration_to_delta(duration):
2758
2764
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
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)
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)
2776
2782
# Parsing an RFC 3339 duration with regular expressions is not
2856
2862
def string_to_delta(interval):
2857
2863
"""Parse a string and return a datetime.timedelta
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)
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)
2976
2982
options = parser.parse_args()
2980
fail_count, test_count = doctest.testmod()
2981
sys.exit(os.EX_OK if fail_count == 0 else 1)
2983
2984
# Default values for config file for server-global settings
2984
2985
if gnutls.has_rawpk:
2985
2986
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3248
3249
if isinstance(s, bytes)
3249
3250
else s) for s in
3250
3251
value["client_structure"]]
3252
for k in ("name", "host"):
3252
# .name, .host, and .checker_command
3253
for k in ("name", "host", "checker_command"):
3253
3254
if isinstance(value[k], bytes):
3254
3255
value[k] = value[k].decode("utf-8")
3255
3256
if "key_id" not in value:
3265
3266
for key, value in
3266
3267
bytes_old_client_settings.items()}
3267
3268
del bytes_old_client_settings
3269
# .host and .checker_command
3269
3270
for value in old_client_settings.values():
3270
if isinstance(value["host"], bytes):
3271
value["host"] = (value["host"]
3271
for attribute in ("host", "checker_command"):
3272
if isinstance(value[attribute], bytes):
3273
value[attribute] = (value[attribute]
3273
3275
os.remove(stored_state_path)
3274
3276
except IOError as e:
3275
3277
if e.errno == errno.ENOENT:
3601
3603
# End of Avahi example code
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))
3606
GLib.IOChannel.unix_new(tcp_server.fileno()),
3607
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3608
lambda *args, **kwargs: (tcp_server.handle_request
3609
(*args[2:], **kwargs) or True))
3608
3611
logger.debug("Starting main loop")
3609
3612
main_loop.run()
3619
3622
# Must run before the D-Bus bus name gets deregistered
3626
def should_only_run_tests():
3627
parser = argparse.ArgumentParser(add_help=False)
3628
parser.add_argument("--check", action='store_true')
3629
args, unknown_args = parser.parse_known_args()
3630
run_tests = args.check
3632
# Remove --check argument from sys.argv
3633
sys.argv[1:] = unknown_args
3636
# Add all tests from doctest strings
3637
def load_tests(loader, tests, none):
3639
tests.addTests(doctest.DocTestSuite())
3623
3642
if __name__ == '__main__':
3644
if should_only_run_tests():
3645
# Call using ./mandos --check [--verbose]