79
52
"ApprovalDelay": "Approval Delay",
80
53
"ApprovalDuration": "Approval Duration",
81
54
"Checker": "Checker",
82
"ExtendedTimeout": "Extended Timeout",
84
"LastCheckerStatus": "Last Checker Status",
55
"ExtendedTimeout" : "Extended Timeout"
86
57
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
87
58
domain = "se.recompile"
88
59
busname = domain + ".Mandos"
90
61
server_interface = domain + ".Mandos"
91
62
client_interface = domain + ".Mandos.Client"
96
dbus.OBJECT_MANAGER_IFACE
97
except AttributeError:
98
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
65
def timedelta_to_milliseconds(td):
66
"""Convert a datetime.timedelta object to milliseconds"""
67
return ((td.days * 24 * 60 * 60 * 1000)
69
+ (td.microseconds // 1000))
101
71
def milliseconds_to_string(ms):
102
72
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}"
73
return ("%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
74
% { "days": "%dT" % td.days if td.days else "",
75
"hours": td.seconds // 3600,
76
"minutes": (td.seconds % 3600) // 60,
77
"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,
367
202
parser.add_argument("--approval-duration",
368
203
help="Set duration of one client approval")
369
204
parser.add_argument("-H", "--host", help="Set host for client")
370
parser.add_argument("-s", "--secret",
371
type=argparse.FileType(mode="rb"),
205
parser.add_argument("-s", "--secret", type=file,
372
206
help="Set password blob (file) for client")
373
207
parser.add_argument("-A", "--approve", action="store_true",
374
208
help="Approve any current client request")
375
209
parser.add_argument("-D", "--deny", action="store_true",
376
210
help="Deny any current client request")
377
parser.add_argument("--check", action="store_true",
378
help="Run self-test")
379
211
parser.add_argument("client", nargs="*", help="Client name")
380
212
options = parser.parse_args()
382
if has_actions(options) and not (options.client or options.all):
214
if has_actions(options) and not options.client and not options.all:
383
215
parser.error("Options require clients names or --all.")
384
216
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.")
217
parser.error("--verbose can only be used alone or with"
389
219
if options.all and not has_actions(options):
390
220
parser.error("--all requires an action.")
393
223
bus = dbus.SystemBus()
394
224
mandos_dbus_objc = bus.get_object(busname, server_path)
395
225
except dbus.exceptions.DBusException:
396
log.critical("Could not connect to Mandos server")
226
print("Could not connect to Mandos server",
399
230
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
231
dbus_interface = server_interface)
233
#block stderr since dbus library prints to stderr
405
234
null = os.open(os.path.devnull, os.O_RDWR)
406
235
stderrcopy = os.dup(sys.stderr.fileno())
407
236
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}
240
mandos_clients = mandos_serv.GetAllClientsWithProperties()
418
243
os.dup2(stderrcopy, sys.stderr.fileno())
419
244
os.close(stderrcopy)
420
except dbus.exceptions.DBusException as e:
421
log.critical("Failed to access Mandos server through D-Bus:"
245
except dbus.exceptions.DBusException, e:
246
print("Access denied: Accessing mandos server through dbus.",
425
250
# Compile dict of (clients: properties) to process
428
253
if options.all or not options.client:
429
clients = {bus.get_object(busname, path): properties
430
for path, properties in mandos_clients.items()}
254
clients = dict((bus.get_object(busname, path), properties)
255
for path, properties in
256
mandos_clients.iteritems())
432
258
for name in options.client:
433
for path, client in mandos_clients.items():
259
for path, client in mandos_clients.iteritems():
434
260
if client["Name"] == name:
435
261
client_objc = bus.get_object(busname, path)
436
262
clients[client_objc] = client
439
log.critical("Client not found on server: %r", name)
265
print("Client not found on server: %r" % name,
442
269
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",
271
keywords = ("Name", "Enabled", "Timeout",
272
"LastCheckedOK", "Created", "Interval",
273
"Host", "Fingerprint", "CheckerRunning",
447
274
"LastEnabled", "ApprovalPending",
448
"ApprovedByDefault", "LastApprovalRequest",
449
"ApprovalDelay", "ApprovalDuration",
450
"Checker", "ExtendedTimeout", "Expires",
276
"LastApprovalRequest", "ApprovalDelay",
277
"ApprovalDuration", "Checker",
453
280
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)
282
print_clients(clients.values(), keywords)
469
284
# Process each client in the list by all selected options
470
285
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()
484
286
if options.remove:
485
287
mandos_serv.RemoveClient(client.__dbus_object_path__)
486
288
if options.enable:
487
set_client_prop("Enabled", dbus.Boolean(True))
289
client.Enable(dbus_interface=client_interface)
488
290
if options.disable:
489
set_client_prop("Enabled", dbus.Boolean(False))
291
client.Disable(dbus_interface=client_interface)
490
292
if options.bump_timeout:
491
set_client_prop("LastCheckedOK", "")
293
client.CheckedOK(dbus_interface=client_interface)
492
294
if options.start_checker:
493
set_client_prop("CheckerRunning", dbus.Boolean(True))
295
client.StartChecker(dbus_interface=client_interface)
494
296
if options.stop_checker:
495
set_client_prop("CheckerRunning", dbus.Boolean(False))
297
client.StopChecker(dbus_interface=client_interface)
496
298
if options.is_enabled:
497
if client.Get(client_interface, "Enabled",
498
dbus_interface=dbus.PROPERTIES_IFACE):
299
sys.exit(0 if client.Get(client_interface,
302
dbus.PROPERTIES_IFACE)
502
304
if options.checker is not None:
503
set_client_prop("Checker", options.checker)
305
client.Set(client_interface, "Checker",
307
dbus_interface=dbus.PROPERTIES_IFACE)
504
308
if options.host is not None:
505
set_client_prop("Host", options.host)
309
client.Set(client_interface, "Host", options.host,
310
dbus_interface=dbus.PROPERTIES_IFACE)
506
311
if options.interval is not None:
507
set_client_prop_ms("Interval", options.interval)
312
client.Set(client_interface, "Interval",
313
timedelta_to_milliseconds
314
(string_to_delta(options.interval)),
315
dbus_interface=dbus.PROPERTIES_IFACE)
508
316
if options.approval_delay is not None:
509
set_client_prop_ms("ApprovalDelay",
510
options.approval_delay)
317
client.Set(client_interface, "ApprovalDelay",
318
timedelta_to_milliseconds
319
(string_to_delta(options.
321
dbus_interface=dbus.PROPERTIES_IFACE)
511
322
if options.approval_duration is not None:
512
set_client_prop_ms("ApprovalDuration",
513
options.approval_duration)
323
client.Set(client_interface, "ApprovalDuration",
324
timedelta_to_milliseconds
325
(string_to_delta(options.
327
dbus_interface=dbus.PROPERTIES_IFACE)
514
328
if options.timeout is not None:
515
set_client_prop_ms("Timeout", options.timeout)
329
client.Set(client_interface, "Timeout",
330
timedelta_to_milliseconds
331
(string_to_delta(options.timeout)),
332
dbus_interface=dbus.PROPERTIES_IFACE)
516
333
if options.extended_timeout is not None:
517
set_client_prop_ms("ExtendedTimeout",
518
options.extended_timeout)
334
client.Set(client_interface, "ExtendedTimeout",
335
timedelta_to_milliseconds
336
(string_to_delta(options.extended_timeout)),
337
dbus_interface=dbus.PROPERTIES_IFACE)
519
338
if options.secret is not None:
520
set_client_prop("Secret",
521
dbus.ByteArray(options.secret.read()))
339
client.Set(client_interface, "Secret",
340
dbus.ByteArray(open(options.secret,
342
dbus_interface=dbus.PROPERTIES_IFACE)
522
343
if options.approved_by_default is not None:
523
set_client_prop("ApprovedByDefault",
525
.approved_by_default))
344
client.Set(client_interface, "ApprovedByDefault",
346
.approved_by_default),
347
dbus_interface=dbus.PROPERTIES_IFACE)
526
348
if options.approve:
527
349
client.Approve(dbus.Boolean(True),
528
350
dbus_interface=client_interface)