52
79
"ApprovalDelay": "Approval Delay",
53
80
"ApprovalDuration": "Approval Duration",
54
81
"Checker": "Checker",
82
"ExtendedTimeout": "Extended Timeout",
84
"LastCheckerStatus": "Last Checker Status",
56
86
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
57
domain = "se.bsnet.fukt"
87
domain = "se.recompile"
58
88
busname = domain + ".Mandos"
60
90
server_interface = domain + ".Mandos"
61
91
client_interface = domain + ".Mandos.Client"
64
def timedelta_to_milliseconds(td):
65
"""Convert a datetime.timedelta object to milliseconds"""
66
return ((td.days * 24 * 60 * 60 * 1000)
68
+ (td.microseconds // 1000))
96
dbus.OBJECT_MANAGER_IFACE
97
except AttributeError:
98
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
70
101
def milliseconds_to_string(ms):
71
102
td = datetime.timedelta(0, 0, 0, ms)
72
return ("%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
73
% { "days": "%dT" % td.days if td.days else "",
74
"hours": td.seconds // 3600,
75
"minutes": (td.seconds % 3600) // 60,
76
"seconds": td.seconds % 60,
103
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
104
.format(days="{}T".format(td.days) if td.days else "",
105
hours=td.seconds // 3600,
106
minutes=(td.seconds % 3600) // 60,
107
seconds=td.seconds % 60))
110
def rfc3339_duration_to_delta(duration):
111
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
113
>>> rfc3339_duration_to_delta("P7D")
114
datetime.timedelta(7)
115
>>> rfc3339_duration_to_delta("PT60S")
116
datetime.timedelta(0, 60)
117
>>> rfc3339_duration_to_delta("PT60M")
118
datetime.timedelta(0, 3600)
119
>>> rfc3339_duration_to_delta("P60M")
120
datetime.timedelta(1680)
121
>>> rfc3339_duration_to_delta("PT24H")
122
datetime.timedelta(1)
123
>>> rfc3339_duration_to_delta("P1W")
124
datetime.timedelta(7)
125
>>> rfc3339_duration_to_delta("PT5M30S")
126
datetime.timedelta(0, 330)
127
>>> rfc3339_duration_to_delta("P1DT3M20S")
128
datetime.timedelta(1, 200)
129
>>> # Can not be empty:
130
>>> rfc3339_duration_to_delta("")
131
Traceback (most recent call last):
133
ValueError: Invalid RFC 3339 duration: u''
134
>>> # Must start with "P":
135
>>> rfc3339_duration_to_delta("1D")
136
Traceback (most recent call last):
138
ValueError: Invalid RFC 3339 duration: u'1D'
139
>>> # Must use correct order
140
>>> rfc3339_duration_to_delta("PT1S2M")
141
Traceback (most recent call last):
143
ValueError: Invalid RFC 3339 duration: u'PT1S2M'
144
>>> # Time needs time marker
145
>>> rfc3339_duration_to_delta("P1H2S")
146
Traceback (most recent call last):
148
ValueError: Invalid RFC 3339 duration: u'P1H2S'
149
>>> # Weeks can not be combined with anything else
150
>>> rfc3339_duration_to_delta("P1D2W")
151
Traceback (most recent call last):
153
ValueError: Invalid RFC 3339 duration: u'P1D2W'
154
>>> rfc3339_duration_to_delta("P2W2H")
155
Traceback (most recent call last):
157
ValueError: Invalid RFC 3339 duration: u'P2W2H'
160
# Parsing an RFC 3339 duration with regular expressions is not
161
# possible - there would have to be multiple places for the same
162
# values, like seconds. The current code, while more esoteric, is
163
# cleaner without depending on a parsing library. If Python had a
164
# built-in library for parsing we would use it, but we'd like to
165
# avoid excessive use of external libraries.
167
# New type for defining tokens, syntax, and semantics all-in-one
168
Token = collections.namedtuple("Token", (
169
"regexp", # To match token; if "value" is not None, must have
170
# a "group" containing digits
171
"value", # datetime.timedelta or None
172
"followers")) # Tokens valid after this token
173
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
174
# the "duration" ABNF definition in RFC 3339, Appendix A.
175
token_end = Token(re.compile(r"$"), None, frozenset())
176
token_second = Token(re.compile(r"(\d+)S"),
177
datetime.timedelta(seconds=1),
178
frozenset((token_end, )))
179
token_minute = Token(re.compile(r"(\d+)M"),
180
datetime.timedelta(minutes=1),
181
frozenset((token_second, token_end)))
182
token_hour = Token(re.compile(r"(\d+)H"),
183
datetime.timedelta(hours=1),
184
frozenset((token_minute, token_end)))
185
token_time = Token(re.compile(r"T"),
187
frozenset((token_hour, token_minute,
189
token_day = Token(re.compile(r"(\d+)D"),
190
datetime.timedelta(days=1),
191
frozenset((token_time, token_end)))
192
token_month = Token(re.compile(r"(\d+)M"),
193
datetime.timedelta(weeks=4),
194
frozenset((token_day, token_end)))
195
token_year = Token(re.compile(r"(\d+)Y"),
196
datetime.timedelta(weeks=52),
197
frozenset((token_month, token_end)))
198
token_week = Token(re.compile(r"(\d+)W"),
199
datetime.timedelta(weeks=1),
200
frozenset((token_end, )))
201
token_duration = Token(re.compile(r"P"), None,
202
frozenset((token_year, token_month,
203
token_day, token_time,
205
# Define starting values:
207
value = datetime.timedelta()
209
# Following valid tokens
210
followers = frozenset((token_duration, ))
211
# String left to parse
213
# Loop until end token is found
214
while found_token is not token_end:
215
# Search for any currently valid tokens
216
for token in followers:
217
match = token.regexp.match(s)
218
if match is not None:
220
if token.value is not None:
221
# Value found, parse digits
222
factor = int(match.group(1), 10)
223
# Add to value so far
224
value += factor * token.value
225
# Strip token from string
226
s = token.regexp.sub("", s, 1)
229
# Set valid next tokens
230
followers = found_token.followers
233
# No currently valid tokens were found
234
raise ValueError("Invalid RFC 3339 duration: {!r}"
79
240
def string_to_delta(interval):
80
241
"""Parse a string and return a datetime.timedelta
82
>>> string_to_delta("7d")
245
return rfc3339_duration_to_delta(interval)
246
except ValueError as e:
247
log.warning("%s - Parsing as pre-1.6.1 interval instead",
249
return parse_pre_1_6_1_interval(interval)
252
def parse_pre_1_6_1_interval(interval):
253
"""Parse an interval string as documented by Mandos before 1.6.1, and
254
return a datetime.timedelta
255
>>> parse_pre_1_6_1_interval('7d')
83
256
datetime.timedelta(7)
84
>>> string_to_delta("60s")
257
>>> parse_pre_1_6_1_interval('60s')
85
258
datetime.timedelta(0, 60)
86
>>> string_to_delta("60m")
259
>>> parse_pre_1_6_1_interval('60m')
87
260
datetime.timedelta(0, 3600)
88
>>> string_to_delta("24h")
261
>>> parse_pre_1_6_1_interval('24h')
89
262
datetime.timedelta(1)
90
>>> string_to_delta("1w")
263
>>> parse_pre_1_6_1_interval('1w')
91
264
datetime.timedelta(7)
92
>>> string_to_delta("5m 30s")
265
>>> parse_pre_1_6_1_interval('5m 30s')
93
266
datetime.timedelta(0, 330)
267
>>> parse_pre_1_6_1_interval('')
268
datetime.timedelta(0)
269
>>> # Ignore unknown characters, allow any order and repetitions
270
>>> parse_pre_1_6_1_interval('2dxy7zz11y3m5m')
271
datetime.timedelta(2, 480, 18000)
95
timevalue = datetime.timedelta(0)
96
regexp = re.compile("\d+[dsmhw]")
98
for s in regexp.findall(interval):
100
suffix = unicode(s[-1])
103
delta = datetime.timedelta(value)
105
delta = datetime.timedelta(0, value)
107
delta = datetime.timedelta(0, 0, 0, 0, value)
109
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
111
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
114
except (ValueError, IndexError):
275
value = datetime.timedelta(0)
276
regexp = re.compile(r"(\d+)([dsmhw]?)")
278
for num, suffix in regexp.findall(interval):
280
value += datetime.timedelta(int(num))
282
value += datetime.timedelta(0, int(num))
284
value += datetime.timedelta(0, 0, 0, 0, int(num))
286
value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
288
value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
290
value += datetime.timedelta(0, 0, 0, int(num))
119
294
def print_clients(clients, keywords):
295
print('\n'.join(table_rows_of_clients(clients, keywords)))
297
def table_rows_of_clients(clients, keywords):
120
298
def valuetostring(value, keyword):
121
if type(value) is dbus.Boolean:
299
if isinstance(value, dbus.Boolean):
122
300
return "Yes" if value else "No"
123
301
if keyword in ("Timeout", "Interval", "ApprovalDelay",
302
"ApprovalDuration", "ExtendedTimeout"):
125
303
return milliseconds_to_string(value)
126
return unicode(value)
128
306
# Create format string to print table rows
129
format_string = " ".join("%%-%ds" %
130
max(len(tablewords[key]),
131
max(len(valuetostring(client[key],
307
format_string = " ".join("{{{key}:{width}}}".format(
308
width=max(len(tablewords[key]),
309
max(len(valuetostring(client[key], key))
310
for client in clients)),
135
312
for key in keywords)
137
print(format_string % tuple(tablewords[key] for key in keywords))
313
# Start with header line
314
rows = [format_string.format(**tablewords)]
138
315
for client in clients:
139
print(format_string % tuple(valuetostring(client[key], key)
140
for key in keywords))
316
rows.append(format_string
317
.format(**{key: valuetostring(client[key], key)
318
for key in keywords}))
142
322
def has_actions(options):
143
323
return any((options.enable,
198
384
parser.add_argument("--approval-duration",
199
385
help="Set duration of one client approval")
200
386
parser.add_argument("-H", "--host", help="Set host for client")
201
parser.add_argument("-s", "--secret", type=file,
387
parser.add_argument("-s", "--secret",
388
type=argparse.FileType(mode="rb"),
202
389
help="Set password blob (file) for client")
203
390
parser.add_argument("-A", "--approve", action="store_true",
204
391
help="Approve any current client request")
205
392
parser.add_argument("-D", "--deny", action="store_true",
206
393
help="Deny any current client request")
394
parser.add_argument("--check", action="store_true",
395
help="Run self-test")
207
396
parser.add_argument("client", nargs="*", help="Client name")
208
397
options = parser.parse_args()
210
if has_actions(options) and not options.client and not options.all:
399
if has_actions(options) and not (options.client or options.all):
211
400
parser.error("Options require clients names or --all.")
212
401
if options.verbose and has_actions(options):
213
parser.error("--verbose can only be used alone or with"
402
parser.error("--verbose can only be used alone.")
403
if options.dump_json and (options.verbose
404
or has_actions(options)):
405
parser.error("--dump-json can only be used alone.")
215
406
if options.all and not has_actions(options):
216
407
parser.error("--all requires an action.")
219
410
bus = dbus.SystemBus()
220
411
mandos_dbus_objc = bus.get_object(busname, server_path)
221
412
except dbus.exceptions.DBusException:
222
print("Could not connect to Mandos server",
413
log.critical("Could not connect to Mandos server")
226
416
mandos_serv = dbus.Interface(mandos_dbus_objc,
227
dbus_interface = server_interface)
229
#block stderr since dbus library prints to stderr
417
dbus_interface=server_interface)
418
mandos_serv_object_manager = dbus.Interface(
419
mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
421
# block stderr since dbus library prints to stderr
230
422
null = os.open(os.path.devnull, os.O_RDWR)
231
423
stderrcopy = os.dup(sys.stderr.fileno())
232
424
os.dup2(null, sys.stderr.fileno())
236
mandos_clients = mandos_serv.GetAllClientsWithProperties()
428
mandos_clients = {path: ifs_and_props[client_interface]
429
for path, ifs_and_props in
430
mandos_serv_object_manager
431
.GetManagedObjects().items()
432
if client_interface in ifs_and_props}
239
435
os.dup2(stderrcopy, sys.stderr.fileno())
240
436
os.close(stderrcopy)
241
except dbus.exceptions.DBusException, e:
242
print("Access denied: Accessing mandos server through dbus.",
437
except dbus.exceptions.DBusException as e:
438
log.critical("Failed to access Mandos server through D-Bus:"
246
442
# Compile dict of (clients: properties) to process
249
445
if options.all or not options.client:
250
clients = dict((bus.get_object(busname, path), properties)
251
for path, properties in
252
mandos_clients.iteritems())
446
clients = {bus.get_object(busname, path): properties
447
for path, properties in mandos_clients.items()}
254
449
for name in options.client:
255
for path, client in mandos_clients.iteritems():
450
for path, client in mandos_clients.items():
256
451
if client["Name"] == name:
257
452
client_objc = bus.get_object(busname, path)
258
453
clients[client_objc] = client
261
print("Client not found on server: %r" % name,
456
log.critical("Client not found on server: %r", name)
265
459
if not has_actions(options) and clients:
267
keywords = ("Name", "Enabled", "Timeout",
268
"LastCheckedOK", "Created", "Interval",
269
"Host", "Fingerprint", "CheckerRunning",
460
if options.verbose or options.dump_json:
461
keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
462
"Created", "Interval", "Host", "KeyID",
463
"Fingerprint", "CheckerRunning",
270
464
"LastEnabled", "ApprovalPending",
272
"LastApprovalRequest", "ApprovalDelay",
273
"ApprovalDuration", "Checker")
465
"ApprovedByDefault", "LastApprovalRequest",
466
"ApprovalDelay", "ApprovalDuration",
467
"Checker", "ExtendedTimeout", "Expires",
275
470
keywords = defaultkeywords
277
print_clients(clients.values(), keywords)
472
if options.dump_json:
473
json.dump({client["Name"]: {key:
475
if isinstance(client[key],
479
for client in clients.values()},
480
fp=sys.stdout, indent=4,
481
separators=(',', ': '))
484
print_clients(clients.values(), keywords)
279
486
# Process each client in the list by all selected options
280
487
for client in clients:
489
def set_client_prop(prop, value):
490
"""Set a Client D-Bus property"""
491
client.Set(client_interface, prop, value,
492
dbus_interface=dbus.PROPERTIES_IFACE)
494
def set_client_prop_ms(prop, value):
495
"""Set a Client D-Bus property, converted
496
from a string to milliseconds."""
497
set_client_prop(prop,
498
string_to_delta(value).total_seconds()
281
501
if options.remove:
282
502
mandos_serv.RemoveClient(client.__dbus_object_path__)
283
503
if options.enable:
284
client.Enable(dbus_interface=client_interface)
504
set_client_prop("Enabled", dbus.Boolean(True))
285
505
if options.disable:
286
client.Disable(dbus_interface=client_interface)
506
set_client_prop("Enabled", dbus.Boolean(False))
287
507
if options.bump_timeout:
288
client.CheckedOK(dbus_interface=client_interface)
508
set_client_prop("LastCheckedOK", "")
289
509
if options.start_checker:
290
client.StartChecker(dbus_interface=client_interface)
510
set_client_prop("CheckerRunning", dbus.Boolean(True))
291
511
if options.stop_checker:
292
client.StopChecker(dbus_interface=client_interface)
512
set_client_prop("CheckerRunning", dbus.Boolean(False))
293
513
if options.is_enabled:
294
sys.exit(0 if client.Get(client_interface,
297
dbus.PROPERTIES_IFACE)
300
client.Set(client_interface, "Checker",
302
dbus_interface=dbus.PROPERTIES_IFACE)
304
client.Set(client_interface, "Host", options.host,
305
dbus_interface=dbus.PROPERTIES_IFACE)
307
client.Set(client_interface, "Interval",
308
timedelta_to_milliseconds
309
(string_to_delta(options.interval)),
310
dbus_interface=dbus.PROPERTIES_IFACE)
311
if options.approval_delay:
312
client.Set(client_interface, "ApprovalDelay",
313
timedelta_to_milliseconds
314
(string_to_delta(options.
316
dbus_interface=dbus.PROPERTIES_IFACE)
317
if options.approval_duration:
318
client.Set(client_interface, "ApprovalDuration",
319
timedelta_to_milliseconds
320
(string_to_delta(options.
322
dbus_interface=dbus.PROPERTIES_IFACE)
324
client.Set(client_interface, "Timeout",
325
timedelta_to_milliseconds
326
(string_to_delta(options.timeout)),
327
dbus_interface=dbus.PROPERTIES_IFACE)
329
client.Set(client_interface, "Secret",
330
dbus.ByteArray(open(options.secret,
332
dbus_interface=dbus.PROPERTIES_IFACE)
514
if client.Get(client_interface, "Enabled",
515
dbus_interface=dbus.PROPERTIES_IFACE):
519
if options.checker is not None:
520
set_client_prop("Checker", options.checker)
521
if options.host is not None:
522
set_client_prop("Host", options.host)
523
if options.interval is not None:
524
set_client_prop_ms("Interval", options.interval)
525
if options.approval_delay is not None:
526
set_client_prop_ms("ApprovalDelay",
527
options.approval_delay)
528
if options.approval_duration is not None:
529
set_client_prop_ms("ApprovalDuration",
530
options.approval_duration)
531
if options.timeout is not None:
532
set_client_prop_ms("Timeout", options.timeout)
533
if options.extended_timeout is not None:
534
set_client_prop_ms("ExtendedTimeout",
535
options.extended_timeout)
536
if options.secret is not None:
537
set_client_prop("Secret",
538
dbus.ByteArray(options.secret.read()))
333
539
if options.approved_by_default is not None:
334
client.Set(client_interface, "ApprovedByDefault",
336
.approved_by_default),
337
dbus_interface=dbus.PROPERTIES_IFACE)
540
set_client_prop("ApprovedByDefault",
542
.approved_by_default))
338
543
if options.approve:
339
544
client.Approve(dbus.Boolean(True),
340
545
dbus_interface=client_interface)
342
547
client.Approve(dbus.Boolean(False),
343
548
dbus_interface=client_interface)
551
class Test_milliseconds_to_string(unittest.TestCase):
553
self.assertEqual(milliseconds_to_string(93785000),
555
def test_no_days(self):
556
self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
557
def test_all_zero(self):
558
self.assertEqual(milliseconds_to_string(0), "00:00:00")
559
def test_no_fractional_seconds(self):
560
self.assertEqual(milliseconds_to_string(400), "00:00:00")
561
self.assertEqual(milliseconds_to_string(900), "00:00:00")
562
self.assertEqual(milliseconds_to_string(1900), "00:00:01")
564
class Test_string_to_delta(unittest.TestCase):
565
def test_handles_basic_rfc3339(self):
566
self.assertEqual(string_to_delta("PT2H"),
567
datetime.timedelta(0, 7200))
568
def test_falls_back_to_pre_1_6_1_with_warning(self):
569
# assertLogs only exists in Python 3.4
570
if hasattr(self, "assertLogs"):
571
with self.assertLogs(log, logging.WARNING):
572
value = string_to_delta("2h")
574
value = string_to_delta("2h")
575
self.assertEqual(value, datetime.timedelta(0, 7200))
577
class Test_table_rows_of_clients(unittest.TestCase):
580
self.old_tablewords = tablewords
585
"Bool": "A D-BUS Boolean",
586
"NonDbusBoolean": "A Non-D-BUS Boolean",
587
"Integer": "An Integer",
588
"Timeout": "Timedelta 1",
589
"Interval": "Timedelta 2",
590
"ApprovalDelay": "Timedelta 3",
591
"ApprovalDuration": "Timedelta 4",
592
"ExtendedTimeout": "Timedelta 5",
593
"String": "A String",
595
self.keywords = ["Attr1", "AttrTwo"]
601
"Bool": dbus.Boolean(False),
602
"NonDbusBoolean": False,
606
"ApprovalDelay": 2000,
607
"ApprovalDuration": 3000,
608
"ExtendedTimeout": 4000,
615
"Bool": dbus.Boolean(True),
616
"NonDbusBoolean": True,
619
"Interval": 93786000,
620
"ApprovalDelay": 93787000,
621
"ApprovalDuration": 93788000,
622
"ExtendedTimeout": 93789000,
623
"String": "A huge string which will not fit," * 10,
628
tablewords = self.old_tablewords
629
def test_short_header(self):
630
rows = table_rows_of_clients(self.clients, self.keywords)
635
self.assertEqual(rows, expected_rows)
636
def test_booleans(self):
637
keywords = ["Bool", "NonDbusBoolean"]
638
rows = table_rows_of_clients(self.clients, keywords)
640
"A D-BUS Boolean A Non-D-BUS Boolean",
644
self.assertEqual(rows, expected_rows)
645
def test_milliseconds_detection(self):
646
keywords = ["Integer", "Timeout", "Interval", "ApprovalDelay",
647
"ApprovalDuration", "ExtendedTimeout"]
648
rows = table_rows_of_clients(self.clients, keywords)
650
An Integer Timedelta 1 Timedelta 2 Timedelta 3 Timedelta 4 Timedelta 5
651
0 00:00:00 00:00:01 00:00:02 00:00:03 00:00:04
652
1 1T02:03:05 1T02:03:06 1T02:03:07 1T02:03:08 1T02:03:09
655
self.assertEqual(rows, expected_rows)
656
def test_empty_and_long_string_values(self):
657
keywords = ["String"]
658
rows = table_rows_of_clients(self.clients, keywords)
662
A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,
665
self.assertEqual(rows, expected_rows)
669
def should_only_run_tests():
670
parser = argparse.ArgumentParser(add_help=False)
671
parser.add_argument("--check", action='store_true')
672
args, unknown_args = parser.parse_known_args()
673
run_tests = args.check
675
# Remove --check argument from sys.argv
676
sys.argv[1:] = unknown_args
679
# Add all tests from doctest strings
680
def load_tests(loader, tests, none):
682
tests.addTests(doctest.DocTestSuite())
345
685
if __name__ == "__main__":
686
if should_only_run_tests():
687
# Call using ./tdd-python-script --check [--verbose]