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("PT24H")
120
datetime.timedelta(1)
121
>>> rfc3339_duration_to_delta("P1W")
122
datetime.timedelta(7)
123
>>> rfc3339_duration_to_delta("PT5M30S")
124
datetime.timedelta(0, 330)
125
>>> rfc3339_duration_to_delta("P1DT3M20S")
126
datetime.timedelta(1, 200)
129
# Parsing an RFC 3339 duration with regular expressions is not
130
# possible - there would have to be multiple places for the same
131
# values, like seconds. The current code, while more esoteric, is
132
# cleaner without depending on a parsing library. If Python had a
133
# built-in library for parsing we would use it, but we'd like to
134
# avoid excessive use of external libraries.
136
# New type for defining tokens, syntax, and semantics all-in-one
137
Token = collections.namedtuple("Token", (
138
"regexp", # To match token; if "value" is not None, must have
139
# a "group" containing digits
140
"value", # datetime.timedelta or None
141
"followers")) # Tokens valid after this token
142
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
143
# the "duration" ABNF definition in RFC 3339, Appendix A.
144
token_end = Token(re.compile(r"$"), None, frozenset())
145
token_second = Token(re.compile(r"(\d+)S"),
146
datetime.timedelta(seconds=1),
147
frozenset((token_end, )))
148
token_minute = Token(re.compile(r"(\d+)M"),
149
datetime.timedelta(minutes=1),
150
frozenset((token_second, token_end)))
151
token_hour = Token(re.compile(r"(\d+)H"),
152
datetime.timedelta(hours=1),
153
frozenset((token_minute, token_end)))
154
token_time = Token(re.compile(r"T"),
156
frozenset((token_hour, token_minute,
158
token_day = Token(re.compile(r"(\d+)D"),
159
datetime.timedelta(days=1),
160
frozenset((token_time, token_end)))
161
token_month = Token(re.compile(r"(\d+)M"),
162
datetime.timedelta(weeks=4),
163
frozenset((token_day, token_end)))
164
token_year = Token(re.compile(r"(\d+)Y"),
165
datetime.timedelta(weeks=52),
166
frozenset((token_month, token_end)))
167
token_week = Token(re.compile(r"(\d+)W"),
168
datetime.timedelta(weeks=1),
169
frozenset((token_end, )))
170
token_duration = Token(re.compile(r"P"), None,
171
frozenset((token_year, token_month,
172
token_day, token_time,
174
# Define starting values:
176
value = datetime.timedelta()
178
# Following valid tokens
179
followers = frozenset((token_duration, ))
180
# String left to parse
182
# Loop until end token is found
183
while found_token is not token_end:
184
# Search for any currently valid tokens
185
for token in followers:
186
match = token.regexp.match(s)
187
if match is not None:
189
if token.value is not None:
190
# Value found, parse digits
191
factor = int(match.group(1), 10)
192
# Add to value so far
193
value += factor * token.value
194
# Strip token from string
195
s = token.regexp.sub("", s, 1)
198
# Set valid next tokens
199
followers = found_token.followers
202
# No currently valid tokens were found
203
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,
209
80
def string_to_delta(interval):
210
81
"""Parse a string and return a datetime.timedelta
212
>>> string_to_delta('7d')
83
>>> string_to_delta("7d")
213
84
datetime.timedelta(7)
214
>>> string_to_delta('60s')
85
>>> string_to_delta("60s")
215
86
datetime.timedelta(0, 60)
216
>>> string_to_delta('60m')
87
>>> string_to_delta("60m")
217
88
datetime.timedelta(0, 3600)
218
>>> string_to_delta('24h')
89
>>> string_to_delta("24h")
219
90
datetime.timedelta(1)
220
>>> string_to_delta('1w')
91
>>> string_to_delta("1w")
221
92
datetime.timedelta(7)
222
>>> string_to_delta('5m 30s')
93
>>> string_to_delta("5m 30s")
223
94
datetime.timedelta(0, 330)
227
return rfc3339_duration_to_delta(interval)
231
value = datetime.timedelta(0)
232
regexp = re.compile(r"(\d+)([dsmhw]?)")
234
for num, suffix in regexp.findall(interval):
236
value += datetime.timedelta(int(num))
238
value += datetime.timedelta(0, int(num))
240
value += datetime.timedelta(0, 0, 0, 0, int(num))
242
value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
244
value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
246
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):
250
120
def print_clients(clients, keywords):
251
121
def valuetostring(value, keyword):
252
if isinstance(value, dbus.Boolean):
122
if type(value) is dbus.Boolean:
253
123
return "Yes" if value else "No"
254
124
if keyword in ("Timeout", "Interval", "ApprovalDelay",
255
"ApprovalDuration", "ExtendedTimeout"):
256
126
return milliseconds_to_string(value)
127
return unicode(value)
259
129
# Create format string to print table rows
260
format_string = " ".join("{{{key}:{width}}}".format(
261
width=max(len(tablewords[key]),
262
max(len(valuetostring(client[key], key))
263
for client in clients)),
130
format_string = " ".join("%%-%ds" %
131
max(len(tablewords[key]),
132
max(len(valuetostring(client[key],
265
136
for key in keywords)
266
137
# Print header line
267
print(format_string.format(**tablewords))
138
print(format_string % tuple(tablewords[key] for key in keywords))
268
139
for client in clients:
270
.format(**{key: valuetostring(client[key], key)
271
for key in keywords}))
140
print(format_string % tuple(valuetostring(client[key], key)
141
for key in keywords))
274
143
def has_actions(options):
275
144
return any((options.enable,
290
158
options.secret is not None,
296
parser = argparse.ArgumentParser()
297
parser.add_argument("--version", action="version",
298
version="%(prog)s {}".format(version),
299
help="show version number and exit")
300
parser.add_argument("-a", "--all", action="store_true",
301
help="Select all clients")
302
parser.add_argument("-v", "--verbose", action="store_true",
303
help="Print all fields")
304
parser.add_argument("-j", "--dump-json", action="store_true",
305
help="Dump client data in JSON format")
306
parser.add_argument("-e", "--enable", action="store_true",
307
help="Enable client")
308
parser.add_argument("-d", "--disable", action="store_true",
309
help="disable client")
310
parser.add_argument("-b", "--bump-timeout", action="store_true",
311
help="Bump timeout for client")
312
parser.add_argument("--start-checker", action="store_true",
313
help="Start checker for client")
314
parser.add_argument("--stop-checker", action="store_true",
315
help="Stop checker for client")
316
parser.add_argument("-V", "--is-enabled", action="store_true",
317
help="Check if client is enabled")
318
parser.add_argument("-r", "--remove", action="store_true",
319
help="Remove client")
320
parser.add_argument("-c", "--checker",
321
help="Set checker command for client")
322
parser.add_argument("-t", "--timeout",
323
help="Set timeout for client")
324
parser.add_argument("--extended-timeout",
325
help="Set extended timeout for client")
326
parser.add_argument("-i", "--interval",
327
help="Set checker interval for client")
328
parser.add_argument("--approve-by-default", action="store_true",
329
default=None, dest="approved_by_default",
330
help="Set client to be approved by default")
331
parser.add_argument("--deny-by-default", action="store_false",
332
dest="approved_by_default",
333
help="Set client to be denied by default")
334
parser.add_argument("--approval-delay",
335
help="Set delay before client approve/deny")
336
parser.add_argument("--approval-duration",
337
help="Set duration of one client approval")
338
parser.add_argument("-H", "--host", help="Set host for client")
339
parser.add_argument("-s", "--secret",
340
type=argparse.FileType(mode="rb"),
341
help="Set password blob (file) for client")
342
parser.add_argument("-A", "--approve", action="store_true",
343
help="Approve any current client request")
344
parser.add_argument("-D", "--deny", action="store_true",
345
help="Deny any current client request")
346
parser.add_argument("--check", action="store_true",
347
help="Run self-test")
348
parser.add_argument("client", nargs="*", help="Client name")
349
options = parser.parse_args()
351
if has_actions(options) and not (options.client or options.all):
352
parser.error("Options require clients names or --all.")
353
if options.verbose and has_actions(options):
354
parser.error("--verbose can only be used alone.")
355
if options.dump_json and (options.verbose
356
or has_actions(options)):
357
parser.error("--dump-json can only be used alone.")
358
if options.all and not has_actions(options):
359
parser.error("--all requires an action.")
362
bus = dbus.SystemBus()
363
mandos_dbus_objc = bus.get_object(busname, server_path)
364
except dbus.exceptions.DBusException:
365
log.critical("Could not connect to Mandos server")
368
mandos_serv = dbus.Interface(mandos_dbus_objc,
369
dbus_interface=server_interface)
370
mandos_serv_object_manager = dbus.Interface(
371
mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
373
# block stderr since dbus library prints to stderr
374
null = os.open(os.path.devnull, os.O_RDWR)
375
stderrcopy = os.dup(sys.stderr.fileno())
376
os.dup2(null, sys.stderr.fileno())
380
mandos_clients = {path: ifs_and_props[client_interface]
381
for path, ifs_and_props in
382
mandos_serv_object_manager
383
.GetManagedObjects().items()
384
if client_interface in ifs_and_props}
387
os.dup2(stderrcopy, sys.stderr.fileno())
389
except dbus.exceptions.DBusException as e:
390
log.critical("Failed to access Mandos server through D-Bus:"
394
# Compile dict of (clients: properties) to process
397
if options.all or not options.client:
398
clients = {bus.get_object(busname, path): properties
399
for path, properties in mandos_clients.items()}
401
for name in options.client:
402
for path, client in mandos_clients.items():
403
if client["Name"] == name:
404
client_objc = bus.get_object(busname, path)
405
clients[client_objc] = client
408
log.critical("Client not found on server: %r", name)
411
if not has_actions(options) and clients:
412
if options.verbose or options.dump_json:
413
keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
414
"Created", "Interval", "Host", "KeyID",
415
"Fingerprint", "CheckerRunning",
416
"LastEnabled", "ApprovalPending",
417
"ApprovedByDefault", "LastApprovalRequest",
418
"ApprovalDelay", "ApprovalDuration",
419
"Checker", "ExtendedTimeout", "Expires",
422
keywords = defaultkeywords
424
if options.dump_json:
425
json.dump({client["Name"]: {key:
427
if isinstance(client[key],
431
for client in clients.values()},
432
fp=sys.stdout, indent=4,
433
separators=(',', ': '))
436
print_clients(clients.values(), keywords)
438
# Process each client in the list by all selected options
439
for client in clients:
441
def set_client_prop(prop, value):
442
"""Set a Client D-Bus property"""
443
client.Set(client_interface, prop, value,
444
dbus_interface=dbus.PROPERTIES_IFACE)
446
def set_client_prop_ms(prop, value):
447
"""Set a Client D-Bus property, converted
448
from a string to milliseconds."""
449
set_client_prop(prop,
450
string_to_delta(value).total_seconds()
454
mandos_serv.RemoveClient(client.__dbus_object_path__)
456
set_client_prop("Enabled", dbus.Boolean(True))
458
set_client_prop("Enabled", dbus.Boolean(False))
459
if options.bump_timeout:
460
set_client_prop("LastCheckedOK", "")
461
if options.start_checker:
462
set_client_prop("CheckerRunning", dbus.Boolean(True))
463
if options.stop_checker:
464
set_client_prop("CheckerRunning", dbus.Boolean(False))
465
if options.is_enabled:
466
if client.Get(client_interface, "Enabled",
467
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,
471
if options.checker is not None:
472
set_client_prop("Checker", options.checker)
473
if options.host is not None:
474
set_client_prop("Host", options.host)
475
if options.interval is not None:
476
set_client_prop_ms("Interval", options.interval)
477
if options.approval_delay is not None:
478
set_client_prop_ms("ApprovalDelay",
479
options.approval_delay)
480
if options.approval_duration is not None:
481
set_client_prop_ms("ApprovalDuration",
482
options.approval_duration)
483
if options.timeout is not None:
484
set_client_prop_ms("Timeout", options.timeout)
485
if options.extended_timeout is not None:
486
set_client_prop_ms("ExtendedTimeout",
487
options.extended_timeout)
488
if options.secret is not None:
489
set_client_prop("Secret",
490
dbus.ByteArray(options.secret.read()))
491
if options.approved_by_default is not None:
492
set_client_prop("ApprovedByDefault",
494
.approved_by_default))
496
client.Approve(dbus.Boolean(True),
497
dbus_interface=client_interface)
499
client.Approve(dbus.Boolean(False),
500
dbus_interface=client_interface)
503
class Test_milliseconds_to_string(unittest.TestCase):
505
self.assertEqual(milliseconds_to_string(93785000),
507
def test_no_days(self):
508
self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
509
def test_all_zero(self):
510
self.assertEqual(milliseconds_to_string(0), "00:00:00")
511
def test_no_fractional_seconds(self):
512
self.assertEqual(milliseconds_to_string(400), "00:00:00")
513
self.assertEqual(milliseconds_to_string(900), "00:00:00")
514
self.assertEqual(milliseconds_to_string(1900), "00:00:01")
517
def should_only_run_tests():
518
parser = argparse.ArgumentParser(add_help=False)
519
parser.add_argument("--check", action='store_true')
520
args, unknown_args = parser.parse_known_args()
521
run_tests = args.check
523
# Remove --check argument from sys.argv
524
sys.argv[1:] = unknown_args
527
# Add all tests from doctest strings
528
def load_tests(loader, tests, none):
530
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)
533
341
if __name__ == "__main__":
534
if should_only_run_tests():
535
# Call using ./tdd-python-script --check [--verbose]