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
80
def string_to_delta(interval):
241
81
"""Parse a string and return a datetime.timedelta
243
>>> string_to_delta('7d')
83
>>> string_to_delta("7d")
244
84
datetime.timedelta(7)
245
>>> string_to_delta('60s')
85
>>> string_to_delta("60s")
246
86
datetime.timedelta(0, 60)
247
>>> string_to_delta('60m')
87
>>> string_to_delta("60m")
248
88
datetime.timedelta(0, 3600)
249
>>> string_to_delta('24h')
89
>>> string_to_delta("24h")
250
90
datetime.timedelta(1)
251
>>> string_to_delta('1w')
91
>>> string_to_delta("1w")
252
92
datetime.timedelta(7)
253
>>> string_to_delta('5m 30s')
93
>>> string_to_delta("5m 30s")
254
94
datetime.timedelta(0, 330)
258
return rfc3339_duration_to_delta(interval)
262
value = datetime.timedelta(0)
263
regexp = re.compile(r"(\d+)([dsmhw]?)")
265
for num, suffix in regexp.findall(interval):
267
value += datetime.timedelta(int(num))
269
value += datetime.timedelta(0, int(num))
271
value += datetime.timedelta(0, 0, 0, 0, int(num))
273
value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
275
value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
277
value += datetime.timedelta(0, 0, 0, int(num))
96
timevalue = datetime.timedelta(0)
97
regexp = re.compile("\d+[dsmhw]")
99
for s in regexp.findall(interval):
101
suffix = unicode(s[-1])
104
delta = datetime.timedelta(value)
106
delta = datetime.timedelta(0, value)
108
delta = datetime.timedelta(0, 0, 0, 0, value)
110
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
112
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
115
except (ValueError, IndexError):
281
120
def print_clients(clients, keywords):
282
121
def valuetostring(value, keyword):
283
if isinstance(value, dbus.Boolean):
122
if type(value) is dbus.Boolean:
284
123
return "Yes" if value else "No"
285
124
if keyword in ("Timeout", "Interval", "ApprovalDelay",
286
"ApprovalDuration", "ExtendedTimeout"):
287
126
return milliseconds_to_string(value)
127
return unicode(value)
290
129
# Create format string to print table rows
291
format_string = " ".join("{{{key}:{width}}}".format(
292
width=max(len(tablewords[key]),
293
max(len(valuetostring(client[key], key))
294
for client in clients)),
130
format_string = " ".join("%%-%ds" %
131
max(len(tablewords[key]),
132
max(len(valuetostring(client[key],
296
136
for key in keywords)
297
137
# Print header line
298
print(format_string.format(**tablewords))
138
print(format_string % tuple(tablewords[key] for key in keywords))
299
139
for client in clients:
301
.format(**{key: valuetostring(client[key], key)
302
for key in keywords}))
140
print(format_string % tuple(valuetostring(client[key], key)
141
for key in keywords))
305
143
def has_actions(options):
306
144
return any((options.enable,
321
158
options.secret is not None,
327
parser = argparse.ArgumentParser()
328
parser.add_argument("--version", action="version",
329
version="%(prog)s {}".format(version),
330
help="show version number and exit")
331
parser.add_argument("-a", "--all", action="store_true",
332
help="Select all clients")
333
parser.add_argument("-v", "--verbose", action="store_true",
334
help="Print all fields")
335
parser.add_argument("-j", "--dump-json", action="store_true",
336
help="Dump client data in JSON format")
337
parser.add_argument("-e", "--enable", action="store_true",
338
help="Enable client")
339
parser.add_argument("-d", "--disable", action="store_true",
340
help="disable client")
341
parser.add_argument("-b", "--bump-timeout", action="store_true",
342
help="Bump timeout for client")
343
parser.add_argument("--start-checker", action="store_true",
344
help="Start checker for client")
345
parser.add_argument("--stop-checker", action="store_true",
346
help="Stop checker for client")
347
parser.add_argument("-V", "--is-enabled", action="store_true",
348
help="Check if client is enabled")
349
parser.add_argument("-r", "--remove", action="store_true",
350
help="Remove client")
351
parser.add_argument("-c", "--checker",
352
help="Set checker command for client")
353
parser.add_argument("-t", "--timeout",
354
help="Set timeout for client")
355
parser.add_argument("--extended-timeout",
356
help="Set extended timeout for client")
357
parser.add_argument("-i", "--interval",
358
help="Set checker interval for client")
359
parser.add_argument("--approve-by-default", action="store_true",
360
default=None, dest="approved_by_default",
361
help="Set client to be approved by default")
362
parser.add_argument("--deny-by-default", action="store_false",
363
dest="approved_by_default",
364
help="Set client to be denied by default")
365
parser.add_argument("--approval-delay",
366
help="Set delay before client approve/deny")
367
parser.add_argument("--approval-duration",
368
help="Set duration of one client approval")
369
parser.add_argument("-H", "--host", help="Set host for client")
370
parser.add_argument("-s", "--secret",
371
type=argparse.FileType(mode="rb"),
372
help="Set password blob (file) for client")
373
parser.add_argument("-A", "--approve", action="store_true",
374
help="Approve any current client request")
375
parser.add_argument("-D", "--deny", action="store_true",
376
help="Deny any current client request")
377
parser.add_argument("--check", action="store_true",
378
help="Run self-test")
379
parser.add_argument("client", nargs="*", help="Client name")
380
options = parser.parse_args()
382
if has_actions(options) and not (options.client or options.all):
383
parser.error("Options require clients names or --all.")
384
if options.verbose and has_actions(options):
385
parser.error("--verbose can only be used alone.")
386
if options.dump_json and (options.verbose
387
or has_actions(options)):
388
parser.error("--dump-json can only be used alone.")
389
if options.all and not has_actions(options):
390
parser.error("--all requires an action.")
393
bus = dbus.SystemBus()
394
mandos_dbus_objc = bus.get_object(busname, server_path)
395
except dbus.exceptions.DBusException:
396
log.critical("Could not connect to Mandos server")
399
mandos_serv = dbus.Interface(mandos_dbus_objc,
400
dbus_interface=server_interface)
401
mandos_serv_object_manager = dbus.Interface(
402
mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
404
# block stderr since dbus library prints to stderr
405
null = os.open(os.path.devnull, os.O_RDWR)
406
stderrcopy = os.dup(sys.stderr.fileno())
407
os.dup2(null, sys.stderr.fileno())
411
mandos_clients = {path: ifs_and_props[client_interface]
412
for path, ifs_and_props in
413
mandos_serv_object_manager
414
.GetManagedObjects().items()
415
if client_interface in ifs_and_props}
418
os.dup2(stderrcopy, sys.stderr.fileno())
420
except dbus.exceptions.DBusException as e:
421
log.critical("Failed to access Mandos server through D-Bus:"
425
# Compile dict of (clients: properties) to process
428
if options.all or not options.client:
429
clients = {bus.get_object(busname, path): properties
430
for path, properties in mandos_clients.items()}
432
for name in options.client:
433
for path, client in mandos_clients.items():
434
if client["Name"] == name:
435
client_objc = bus.get_object(busname, path)
436
clients[client_objc] = client
439
log.critical("Client not found on server: %r", name)
442
if not has_actions(options) and clients:
443
if options.verbose or options.dump_json:
444
keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
445
"Created", "Interval", "Host", "KeyID",
446
"Fingerprint", "CheckerRunning",
447
"LastEnabled", "ApprovalPending",
448
"ApprovedByDefault", "LastApprovalRequest",
449
"ApprovalDelay", "ApprovalDuration",
450
"Checker", "ExtendedTimeout", "Expires",
453
keywords = defaultkeywords
455
if options.dump_json:
456
json.dump({client["Name"]: {key:
458
if isinstance(client[key],
462
for client in clients.values()},
463
fp=sys.stdout, indent=4,
464
separators=(',', ': '))
467
print_clients(clients.values(), keywords)
469
# Process each client in the list by all selected options
470
for client in clients:
472
def set_client_prop(prop, value):
473
"""Set a Client D-Bus property"""
474
client.Set(client_interface, prop, value,
475
dbus_interface=dbus.PROPERTIES_IFACE)
477
def set_client_prop_ms(prop, value):
478
"""Set a Client D-Bus property, converted
479
from a string to milliseconds."""
480
set_client_prop(prop,
481
string_to_delta(value).total_seconds()
485
mandos_serv.RemoveClient(client.__dbus_object_path__)
487
set_client_prop("Enabled", dbus.Boolean(True))
489
set_client_prop("Enabled", dbus.Boolean(False))
490
if options.bump_timeout:
491
set_client_prop("LastCheckedOK", "")
492
if options.start_checker:
493
set_client_prop("CheckerRunning", dbus.Boolean(True))
494
if options.stop_checker:
495
set_client_prop("CheckerRunning", dbus.Boolean(False))
496
if options.is_enabled:
497
if client.Get(client_interface, "Enabled",
498
dbus_interface=dbus.PROPERTIES_IFACE):
163
parser = OptionParser(version = "%%prog %s" % version)
164
parser.add_option("-a", "--all", action="store_true",
165
help="Select all clients")
166
parser.add_option("-v", "--verbose", action="store_true",
167
help="Print all fields")
168
parser.add_option("-e", "--enable", action="store_true",
169
help="Enable client")
170
parser.add_option("-d", "--disable", action="store_true",
171
help="disable client")
172
parser.add_option("-b", "--bump-timeout", action="store_true",
173
help="Bump timeout for client")
174
parser.add_option("--start-checker", action="store_true",
175
help="Start checker for client")
176
parser.add_option("--stop-checker", action="store_true",
177
help="Stop checker for client")
178
parser.add_option("-V", "--is-enabled", action="store_true",
179
help="Check if client is enabled")
180
parser.add_option("-r", "--remove", action="store_true",
181
help="Remove client")
182
parser.add_option("-c", "--checker", type="string",
183
help="Set checker command for client")
184
parser.add_option("-t", "--timeout", type="string",
185
help="Set timeout for client")
186
parser.add_option("-i", "--interval", type="string",
187
help="Set checker interval for client")
188
parser.add_option("--approve-by-default", action="store_true",
189
dest="approved_by_default",
190
help="Set client to be approved by default")
191
parser.add_option("--deny-by-default", action="store_false",
192
dest="approved_by_default",
193
help="Set client to be denied by default")
194
parser.add_option("--approval-delay", type="string",
195
help="Set delay before client approve/deny")
196
parser.add_option("--approval-duration", type="string",
197
help="Set duration of one client approval")
198
parser.add_option("-H", "--host", type="string",
199
help="Set host for client")
200
parser.add_option("-s", "--secret", type="string",
201
help="Set password blob (file) for client")
202
parser.add_option("-A", "--approve", action="store_true",
203
help="Approve any current client request")
204
parser.add_option("-D", "--deny", action="store_true",
205
help="Deny any current client request")
206
options, client_names = parser.parse_args()
208
if has_actions(options) and not client_names and not options.all:
209
parser.error("Options require clients names or --all.")
210
if options.verbose and has_actions(options):
211
parser.error("--verbose can only be used alone or with"
213
if options.all and not has_actions(options):
214
parser.error("--all requires an action.")
217
bus = dbus.SystemBus()
218
mandos_dbus_objc = bus.get_object(busname, server_path)
219
except dbus.exceptions.DBusException:
220
print("Could not connect to Mandos server",
224
mandos_serv = dbus.Interface(mandos_dbus_objc,
225
dbus_interface = server_interface)
227
#block stderr since dbus library prints to stderr
228
null = os.open(os.path.devnull, os.O_RDWR)
229
stderrcopy = os.dup(sys.stderr.fileno())
230
os.dup2(null, sys.stderr.fileno())
234
mandos_clients = mandos_serv.GetAllClientsWithProperties()
237
os.dup2(stderrcopy, sys.stderr.fileno())
239
except dbus.exceptions.DBusException, e:
240
print("Access denied: Accessing mandos server through dbus.",
244
# Compile dict of (clients: properties) to process
247
if options.all or not client_names:
248
clients = dict((bus.get_object(busname, path), properties)
249
for path, properties in
250
mandos_clients.iteritems())
252
for name in client_names:
253
for path, client in mandos_clients.iteritems():
254
if client["Name"] == name:
255
client_objc = bus.get_object(busname, path)
256
clients[client_objc] = client
259
print("Client not found on server: %r" % name,
502
if options.checker is not None:
503
set_client_prop("Checker", options.checker)
504
if options.host is not None:
505
set_client_prop("Host", options.host)
506
if options.interval is not None:
507
set_client_prop_ms("Interval", options.interval)
508
if options.approval_delay is not None:
509
set_client_prop_ms("ApprovalDelay",
510
options.approval_delay)
511
if options.approval_duration is not None:
512
set_client_prop_ms("ApprovalDuration",
513
options.approval_duration)
514
if options.timeout is not None:
515
set_client_prop_ms("Timeout", options.timeout)
516
if options.extended_timeout is not None:
517
set_client_prop_ms("ExtendedTimeout",
518
options.extended_timeout)
519
if options.secret is not None:
520
set_client_prop("Secret",
521
dbus.ByteArray(options.secret.read()))
522
if options.approved_by_default is not None:
523
set_client_prop("ApprovedByDefault",
525
.approved_by_default))
527
client.Approve(dbus.Boolean(True),
528
dbus_interface=client_interface)
530
client.Approve(dbus.Boolean(False),
531
dbus_interface=client_interface)
534
class Test_milliseconds_to_string(unittest.TestCase):
536
self.assertEqual(milliseconds_to_string(93785000),
538
def test_no_days(self):
539
self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
540
def test_all_zero(self):
541
self.assertEqual(milliseconds_to_string(0), "00:00:00")
542
def test_no_fractional_seconds(self):
543
self.assertEqual(milliseconds_to_string(400), "00:00:00")
544
self.assertEqual(milliseconds_to_string(900), "00:00:00")
545
self.assertEqual(milliseconds_to_string(1900), "00:00:01")
548
def should_only_run_tests():
549
parser = argparse.ArgumentParser(add_help=False)
550
parser.add_argument("--check", action='store_true')
551
args, unknown_args = parser.parse_known_args()
552
run_tests = args.check
554
# Remove --check argument from sys.argv
555
sys.argv[1:] = unknown_args
558
# Add all tests from doctest strings
559
def load_tests(loader, tests, none):
561
tests.addTests(doctest.DocTestSuite())
263
if not has_actions(options) and clients:
265
keywords = ("Name", "Enabled", "Timeout",
266
"LastCheckedOK", "Created", "Interval",
267
"Host", "Fingerprint", "CheckerRunning",
268
"LastEnabled", "ApprovalPending",
270
"LastApprovalRequest", "ApprovalDelay",
271
"ApprovalDuration", "Checker")
273
keywords = defaultkeywords
275
print_clients(clients.values(), keywords)
277
# Process each client in the list by all selected options
278
for client in clients:
280
mandos_serv.RemoveClient(client.__dbus_object_path__)
282
client.Enable(dbus_interface=client_interface)
284
client.Disable(dbus_interface=client_interface)
285
if options.bump_timeout:
286
client.CheckedOK(dbus_interface=client_interface)
287
if options.start_checker:
288
client.StartChecker(dbus_interface=client_interface)
289
if options.stop_checker:
290
client.StopChecker(dbus_interface=client_interface)
291
if options.is_enabled:
292
sys.exit(0 if client.Get(client_interface,
294
dbus_interface=dbus.PROPERTIES_IFACE)
297
client.Set(client_interface, "Checker", options.checker,
298
dbus_interface=dbus.PROPERTIES_IFACE)
300
client.Set(client_interface, "Host", options.host,
301
dbus_interface=dbus.PROPERTIES_IFACE)
303
client.Set(client_interface, "Interval",
304
timedelta_to_milliseconds
305
(string_to_delta(options.interval)),
306
dbus_interface=dbus.PROPERTIES_IFACE)
307
if options.approval_delay:
308
client.Set(client_interface, "ApprovalDelay",
309
timedelta_to_milliseconds
310
(string_to_delta(options.
312
dbus_interface=dbus.PROPERTIES_IFACE)
313
if options.approval_duration:
314
client.Set(client_interface, "ApprovalDuration",
315
timedelta_to_milliseconds
316
(string_to_delta(options.
318
dbus_interface=dbus.PROPERTIES_IFACE)
320
client.Set(client_interface, "Timeout",
321
timedelta_to_milliseconds
322
(string_to_delta(options.timeout)),
323
dbus_interface=dbus.PROPERTIES_IFACE)
325
client.Set(client_interface, "Secret",
326
dbus.ByteArray(open(options.secret,
328
dbus_interface=dbus.PROPERTIES_IFACE)
329
if options.approved_by_default is not None:
330
client.Set(client_interface, "ApprovedByDefault",
332
.approved_by_default),
333
dbus_interface=dbus.PROPERTIES_IFACE)
335
client.Approve(dbus.Boolean(True),
336
dbus_interface=client_interface)
338
client.Approve(dbus.Boolean(False),
339
dbus_interface=client_interface)
564
341
if __name__ == "__main__":
565
if should_only_run_tests():
566
# Call using ./tdd-python-script --check [--verbose]