79
52
"ApprovalDelay": "Approval Delay",
80
53
"ApprovalDuration": "Approval Duration",
81
54
"Checker": "Checker",
82
"ExtendedTimeout": "Extended Timeout",
84
"LastCheckerStatus": "Last Checker Status",
86
56
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
87
domain = "se.recompile"
57
domain = "se.bsnet.fukt"
88
58
busname = domain + ".Mandos"
90
60
server_interface = domain + ".Mandos"
91
61
client_interface = domain + ".Mandos.Client"
96
dbus.OBJECT_MANAGER_IFACE
97
except AttributeError:
98
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
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))
101
70
def milliseconds_to_string(ms):
102
71
td = datetime.timedelta(0, 0, 0, ms)
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}"
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,
240
79
def string_to_delta(interval):
241
80
"""Parse a string and return a datetime.timedelta
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')
82
>>> string_to_delta("7d")
256
83
datetime.timedelta(7)
257
>>> parse_pre_1_6_1_interval('60s')
84
>>> string_to_delta("60s")
258
85
datetime.timedelta(0, 60)
259
>>> parse_pre_1_6_1_interval('60m')
86
>>> string_to_delta("60m")
260
87
datetime.timedelta(0, 3600)
261
>>> parse_pre_1_6_1_interval('24h')
88
>>> string_to_delta("24h")
262
89
datetime.timedelta(1)
263
>>> parse_pre_1_6_1_interval('1w')
90
>>> string_to_delta("1w")
264
91
datetime.timedelta(7)
265
>>> parse_pre_1_6_1_interval('5m 30s')
92
>>> string_to_delta("5m 30s")
266
93
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)
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))
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):
294
119
def print_clients(clients, keywords):
295
print('\n'.join(TableOfClients(clients, keywords).rows()))
297
class TableOfClients(object):
298
def __init__(self, clients, keywords):
299
self.clients = clients
300
self.keywords = keywords
303
120
def valuetostring(value, keyword):
304
if isinstance(value, dbus.Boolean):
121
if type(value) is dbus.Boolean:
305
122
return "Yes" if value else "No"
306
123
if keyword in ("Timeout", "Interval", "ApprovalDelay",
307
"ApprovalDuration", "ExtendedTimeout"):
308
125
return milliseconds_to_string(value)
312
# Create format string to format table rows
313
format_string = " ".join("{{{key}:{width}}}".format(
314
width=max(len(tablewords[key]),
315
max(len(self.valuetostring(client[key], key))
316
for client in self.clients)),
318
for key in self.keywords)
319
# Start with header line
320
rows = [format_string.format(**tablewords)]
321
for client in self.clients:
322
rows.append(format_string
323
.format(**{key: self.valuetostring(client[key], key)
324
for key in self.keywords}))
126
return unicode(value)
128
# Create format string to print table rows
129
format_string = " ".join("%%-%ds" %
130
max(len(tablewords[key]),
131
max(len(valuetostring(client[key],
137
print(format_string % tuple(tablewords[key] for key in keywords))
138
for client in clients:
139
print(format_string % tuple(valuetostring(client[key], key)
140
for key in keywords))
328
142
def has_actions(options):
329
143
return any((options.enable,
390
198
parser.add_argument("--approval-duration",
391
199
help="Set duration of one client approval")
392
200
parser.add_argument("-H", "--host", help="Set host for client")
393
parser.add_argument("-s", "--secret",
394
type=argparse.FileType(mode="rb"),
201
parser.add_argument("-s", "--secret", type=file,
395
202
help="Set password blob (file) for client")
396
203
parser.add_argument("-A", "--approve", action="store_true",
397
204
help="Approve any current client request")
398
205
parser.add_argument("-D", "--deny", action="store_true",
399
206
help="Deny any current client request")
400
parser.add_argument("--check", action="store_true",
401
help="Run self-test")
402
207
parser.add_argument("client", nargs="*", help="Client name")
403
208
options = parser.parse_args()
405
if has_actions(options) and not (options.client or options.all):
210
if has_actions(options) and not options.client and not options.all:
406
211
parser.error("Options require clients names or --all.")
407
212
if options.verbose and has_actions(options):
408
parser.error("--verbose can only be used alone.")
409
if options.dump_json and (options.verbose
410
or has_actions(options)):
411
parser.error("--dump-json can only be used alone.")
213
parser.error("--verbose can only be used alone or with"
412
215
if options.all and not has_actions(options):
413
216
parser.error("--all requires an action.")
416
219
bus = dbus.SystemBus()
417
220
mandos_dbus_objc = bus.get_object(busname, server_path)
418
221
except dbus.exceptions.DBusException:
419
log.critical("Could not connect to Mandos server")
222
print("Could not connect to Mandos server",
422
226
mandos_serv = dbus.Interface(mandos_dbus_objc,
423
dbus_interface=server_interface)
424
mandos_serv_object_manager = dbus.Interface(
425
mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
427
# block stderr since dbus library prints to stderr
227
dbus_interface = server_interface)
229
#block stderr since dbus library prints to stderr
428
230
null = os.open(os.path.devnull, os.O_RDWR)
429
231
stderrcopy = os.dup(sys.stderr.fileno())
430
232
os.dup2(null, sys.stderr.fileno())
434
mandos_clients = {path: ifs_and_props[client_interface]
435
for path, ifs_and_props in
436
mandos_serv_object_manager
437
.GetManagedObjects().items()
438
if client_interface in ifs_and_props}
236
mandos_clients = mandos_serv.GetAllClientsWithProperties()
441
239
os.dup2(stderrcopy, sys.stderr.fileno())
442
240
os.close(stderrcopy)
443
except dbus.exceptions.DBusException as e:
444
log.critical("Failed to access Mandos server through D-Bus:"
241
except dbus.exceptions.DBusException, e:
242
print("Access denied: Accessing mandos server through dbus.",
448
246
# Compile dict of (clients: properties) to process
451
249
if options.all or not options.client:
452
clients = {bus.get_object(busname, path): properties
453
for path, properties in mandos_clients.items()}
250
clients = dict((bus.get_object(busname, path), properties)
251
for path, properties in
252
mandos_clients.iteritems())
455
254
for name in options.client:
456
for path, client in mandos_clients.items():
255
for path, client in mandos_clients.iteritems():
457
256
if client["Name"] == name:
458
257
client_objc = bus.get_object(busname, path)
459
258
clients[client_objc] = client
462
log.critical("Client not found on server: %r", name)
261
print("Client not found on server: %r" % name,
465
265
if not has_actions(options) and clients:
466
if options.verbose or options.dump_json:
467
keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
468
"Created", "Interval", "Host", "KeyID",
469
"Fingerprint", "CheckerRunning",
267
keywords = ("Name", "Enabled", "Timeout",
268
"LastCheckedOK", "Created", "Interval",
269
"Host", "Fingerprint", "CheckerRunning",
470
270
"LastEnabled", "ApprovalPending",
471
"ApprovedByDefault", "LastApprovalRequest",
472
"ApprovalDelay", "ApprovalDuration",
473
"Checker", "ExtendedTimeout", "Expires",
272
"LastApprovalRequest", "ApprovalDelay",
273
"ApprovalDuration", "Checker")
476
275
keywords = defaultkeywords
478
if options.dump_json:
479
json.dump({client["Name"]: {key:
481
if isinstance(client[key],
485
for client in clients.values()},
486
fp=sys.stdout, indent=4,
487
separators=(',', ': '))
490
print_clients(clients.values(), keywords)
277
print_clients(clients.values(), keywords)
492
279
# Process each client in the list by all selected options
493
280
for client in clients:
495
def set_client_prop(prop, value):
496
"""Set a Client D-Bus property"""
497
client.Set(client_interface, prop, value,
498
dbus_interface=dbus.PROPERTIES_IFACE)
500
def set_client_prop_ms(prop, value):
501
"""Set a Client D-Bus property, converted
502
from a string to milliseconds."""
503
set_client_prop(prop,
504
string_to_delta(value).total_seconds()
507
281
if options.remove:
508
282
mandos_serv.RemoveClient(client.__dbus_object_path__)
509
283
if options.enable:
510
set_client_prop("Enabled", dbus.Boolean(True))
284
client.Enable(dbus_interface=client_interface)
511
285
if options.disable:
512
set_client_prop("Enabled", dbus.Boolean(False))
286
client.Disable(dbus_interface=client_interface)
513
287
if options.bump_timeout:
514
set_client_prop("LastCheckedOK", "")
288
client.CheckedOK(dbus_interface=client_interface)
515
289
if options.start_checker:
516
set_client_prop("CheckerRunning", dbus.Boolean(True))
290
client.StartChecker(dbus_interface=client_interface)
517
291
if options.stop_checker:
518
set_client_prop("CheckerRunning", dbus.Boolean(False))
292
client.StopChecker(dbus_interface=client_interface)
519
293
if options.is_enabled:
520
if client.Get(client_interface, "Enabled",
521
dbus_interface=dbus.PROPERTIES_IFACE):
525
if options.checker is not None:
526
set_client_prop("Checker", options.checker)
527
if options.host is not None:
528
set_client_prop("Host", options.host)
529
if options.interval is not None:
530
set_client_prop_ms("Interval", options.interval)
531
if options.approval_delay is not None:
532
set_client_prop_ms("ApprovalDelay",
533
options.approval_delay)
534
if options.approval_duration is not None:
535
set_client_prop_ms("ApprovalDuration",
536
options.approval_duration)
537
if options.timeout is not None:
538
set_client_prop_ms("Timeout", options.timeout)
539
if options.extended_timeout is not None:
540
set_client_prop_ms("ExtendedTimeout",
541
options.extended_timeout)
542
if options.secret is not None:
543
set_client_prop("Secret",
544
dbus.ByteArray(options.secret.read()))
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)
545
333
if options.approved_by_default is not None:
546
set_client_prop("ApprovedByDefault",
548
.approved_by_default))
334
client.Set(client_interface, "ApprovedByDefault",
336
.approved_by_default),
337
dbus_interface=dbus.PROPERTIES_IFACE)
549
338
if options.approve:
550
339
client.Approve(dbus.Boolean(True),
551
340
dbus_interface=client_interface)
553
342
client.Approve(dbus.Boolean(False),
554
343
dbus_interface=client_interface)
557
class Test_milliseconds_to_string(unittest.TestCase):
559
self.assertEqual(milliseconds_to_string(93785000),
561
def test_no_days(self):
562
self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
563
def test_all_zero(self):
564
self.assertEqual(milliseconds_to_string(0), "00:00:00")
565
def test_no_fractional_seconds(self):
566
self.assertEqual(milliseconds_to_string(400), "00:00:00")
567
self.assertEqual(milliseconds_to_string(900), "00:00:00")
568
self.assertEqual(milliseconds_to_string(1900), "00:00:01")
570
class Test_string_to_delta(unittest.TestCase):
571
def test_handles_basic_rfc3339(self):
572
self.assertEqual(string_to_delta("PT2H"),
573
datetime.timedelta(0, 7200))
574
def test_falls_back_to_pre_1_6_1_with_warning(self):
575
# assertLogs only exists in Python 3.4
576
if hasattr(self, "assertLogs"):
577
with self.assertLogs(log, logging.WARNING):
578
value = string_to_delta("2h")
580
value = string_to_delta("2h")
581
self.assertEqual(value, datetime.timedelta(0, 7200))
583
class Test_TableOfClients(unittest.TestCase):
586
self.old_tablewords = tablewords
591
"Bool": "A D-BUS Boolean",
592
"NonDbusBoolean": "A Non-D-BUS Boolean",
593
"Integer": "An Integer",
594
"Timeout": "Timedelta 1",
595
"Interval": "Timedelta 2",
596
"ApprovalDelay": "Timedelta 3",
597
"ApprovalDuration": "Timedelta 4",
598
"ExtendedTimeout": "Timedelta 5",
599
"String": "A String",
601
self.keywords = ["Attr1", "AttrTwo"]
607
"Bool": dbus.Boolean(False),
608
"NonDbusBoolean": False,
612
"ApprovalDelay": 2000,
613
"ApprovalDuration": 3000,
614
"ExtendedTimeout": 4000,
621
"Bool": dbus.Boolean(True),
622
"NonDbusBoolean": True,
625
"Interval": 93786000,
626
"ApprovalDelay": 93787000,
627
"ApprovalDuration": 93788000,
628
"ExtendedTimeout": 93789000,
629
"String": "A huge string which will not fit," * 10,
634
tablewords = self.old_tablewords
635
def test_short_header(self):
636
rows = TableOfClients(self.clients, self.keywords).rows()
641
self.assertEqual(rows, expected_rows)
642
def test_booleans(self):
643
keywords = ["Bool", "NonDbusBoolean"]
644
rows = TableOfClients(self.clients, keywords).rows()
646
"A D-BUS Boolean A Non-D-BUS Boolean",
650
self.assertEqual(rows, expected_rows)
651
def test_milliseconds_detection(self):
652
keywords = ["Integer", "Timeout", "Interval", "ApprovalDelay",
653
"ApprovalDuration", "ExtendedTimeout"]
654
rows = TableOfClients(self.clients, keywords).rows()
656
An Integer Timedelta 1 Timedelta 2 Timedelta 3 Timedelta 4 Timedelta 5
657
0 00:00:00 00:00:01 00:00:02 00:00:03 00:00:04
658
1 1T02:03:05 1T02:03:06 1T02:03:07 1T02:03:08 1T02:03:09
661
self.assertEqual(rows, expected_rows)
662
def test_empty_and_long_string_values(self):
663
keywords = ["String"]
664
rows = TableOfClients(self.clients, keywords).rows()
668
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,
671
self.assertEqual(rows, expected_rows)
675
def should_only_run_tests():
676
parser = argparse.ArgumentParser(add_help=False)
677
parser.add_argument("--check", action='store_true')
678
args, unknown_args = parser.parse_known_args()
679
run_tests = args.check
681
# Remove --check argument from sys.argv
682
sys.argv[1:] = unknown_args
685
# Add all tests from doctest strings
686
def load_tests(loader, tests, none):
688
tests.addTests(doctest.DocTestSuite())
691
345
if __name__ == "__main__":
692
if should_only_run_tests():
693
# Call using ./tdd-python-script --check [--verbose]