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
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
>>> string_to_delta("7d")
256
84
datetime.timedelta(7)
257
>>> parse_pre_1_6_1_interval('60s')
85
>>> string_to_delta("60s")
258
86
datetime.timedelta(0, 60)
259
>>> parse_pre_1_6_1_interval('60m')
87
>>> string_to_delta("60m")
260
88
datetime.timedelta(0, 3600)
261
>>> parse_pre_1_6_1_interval('24h')
89
>>> string_to_delta("24h")
262
90
datetime.timedelta(1)
263
>>> parse_pre_1_6_1_interval('1w')
91
>>> string_to_delta("1w")
264
92
datetime.timedelta(7)
265
>>> parse_pre_1_6_1_interval('5m 30s')
93
>>> string_to_delta("5m 30s")
266
94
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))
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):
294
120
def print_clients(clients, keywords):
295
121
def valuetostring(value, keyword):
296
if isinstance(value, dbus.Boolean):
122
if type(value) is dbus.Boolean:
297
123
return "Yes" if value else "No"
298
124
if keyword in ("Timeout", "Interval", "ApprovalDelay",
299
"ApprovalDuration", "ExtendedTimeout"):
300
126
return milliseconds_to_string(value)
127
return unicode(value)
303
129
# Create format string to print table rows
304
format_string = " ".join("{{{key}:{width}}}".format(
305
width=max(len(tablewords[key]),
306
max(len(valuetostring(client[key], key))
307
for client in clients)),
130
format_string = " ".join("%%-%ds" %
131
max(len(tablewords[key]),
132
max(len(valuetostring(client[key],
309
136
for key in keywords)
310
137
# Print header line
311
print(format_string.format(**tablewords))
138
print(format_string % tuple(tablewords[key] for key in keywords))
312
139
for client in clients:
314
.format(**{key: valuetostring(client[key], key)
315
for key in keywords}))
140
print(format_string % tuple(valuetostring(client[key], key)
141
for key in keywords))
318
143
def has_actions(options):
319
144
return any((options.enable,
380
202
parser.add_argument("--approval-duration",
381
203
help="Set duration of one client approval")
382
204
parser.add_argument("-H", "--host", help="Set host for client")
383
parser.add_argument("-s", "--secret",
384
type=argparse.FileType(mode="rb"),
205
parser.add_argument("-s", "--secret", type=file,
385
206
help="Set password blob (file) for client")
386
207
parser.add_argument("-A", "--approve", action="store_true",
387
208
help="Approve any current client request")
388
209
parser.add_argument("-D", "--deny", action="store_true",
389
210
help="Deny any current client request")
390
parser.add_argument("--check", action="store_true",
391
help="Run self-test")
392
211
parser.add_argument("client", nargs="*", help="Client name")
393
212
options = parser.parse_args()
395
if has_actions(options) and not (options.client or options.all):
214
if has_actions(options) and not options.client and not options.all:
396
215
parser.error("Options require clients names or --all.")
397
216
if options.verbose and has_actions(options):
398
parser.error("--verbose can only be used alone.")
399
if options.dump_json and (options.verbose
400
or has_actions(options)):
401
parser.error("--dump-json can only be used alone.")
217
parser.error("--verbose can only be used alone or with"
402
219
if options.all and not has_actions(options):
403
220
parser.error("--all requires an action.")
406
223
bus = dbus.SystemBus()
407
224
mandos_dbus_objc = bus.get_object(busname, server_path)
408
225
except dbus.exceptions.DBusException:
409
log.critical("Could not connect to Mandos server")
226
print("Could not connect to Mandos server",
412
230
mandos_serv = dbus.Interface(mandos_dbus_objc,
413
dbus_interface=server_interface)
414
mandos_serv_object_manager = dbus.Interface(
415
mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
417
# block stderr since dbus library prints to stderr
231
dbus_interface = server_interface)
233
#block stderr since dbus library prints to stderr
418
234
null = os.open(os.path.devnull, os.O_RDWR)
419
235
stderrcopy = os.dup(sys.stderr.fileno())
420
236
os.dup2(null, sys.stderr.fileno())
424
mandos_clients = {path: ifs_and_props[client_interface]
425
for path, ifs_and_props in
426
mandos_serv_object_manager
427
.GetManagedObjects().items()
428
if client_interface in ifs_and_props}
240
mandos_clients = mandos_serv.GetAllClientsWithProperties()
431
243
os.dup2(stderrcopy, sys.stderr.fileno())
432
244
os.close(stderrcopy)
433
except dbus.exceptions.DBusException as e:
434
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.",
438
250
# Compile dict of (clients: properties) to process
441
253
if options.all or not options.client:
442
clients = {bus.get_object(busname, path): properties
443
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())
445
258
for name in options.client:
446
for path, client in mandos_clients.items():
259
for path, client in mandos_clients.iteritems():
447
260
if client["Name"] == name:
448
261
client_objc = bus.get_object(busname, path)
449
262
clients[client_objc] = client
452
log.critical("Client not found on server: %r", name)
265
print("Client not found on server: %r" % name,
455
269
if not has_actions(options) and clients:
456
if options.verbose or options.dump_json:
457
keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
458
"Created", "Interval", "Host", "KeyID",
459
"Fingerprint", "CheckerRunning",
271
keywords = ("Name", "Enabled", "Timeout",
272
"LastCheckedOK", "Created", "Interval",
273
"Host", "Fingerprint", "CheckerRunning",
460
274
"LastEnabled", "ApprovalPending",
461
"ApprovedByDefault", "LastApprovalRequest",
462
"ApprovalDelay", "ApprovalDuration",
463
"Checker", "ExtendedTimeout", "Expires",
276
"LastApprovalRequest", "ApprovalDelay",
277
"ApprovalDuration", "Checker",
466
280
keywords = defaultkeywords
468
if options.dump_json:
469
json.dump({client["Name"]: {key:
471
if isinstance(client[key],
475
for client in clients.values()},
476
fp=sys.stdout, indent=4,
477
separators=(',', ': '))
480
print_clients(clients.values(), keywords)
282
print_clients(clients.values(), keywords)
482
284
# Process each client in the list by all selected options
483
285
for client in clients:
485
def set_client_prop(prop, value):
486
"""Set a Client D-Bus property"""
487
client.Set(client_interface, prop, value,
488
dbus_interface=dbus.PROPERTIES_IFACE)
490
def set_client_prop_ms(prop, value):
491
"""Set a Client D-Bus property, converted
492
from a string to milliseconds."""
493
set_client_prop(prop,
494
string_to_delta(value).total_seconds()
497
286
if options.remove:
498
287
mandos_serv.RemoveClient(client.__dbus_object_path__)
499
288
if options.enable:
500
set_client_prop("Enabled", dbus.Boolean(True))
289
client.Enable(dbus_interface=client_interface)
501
290
if options.disable:
502
set_client_prop("Enabled", dbus.Boolean(False))
291
client.Disable(dbus_interface=client_interface)
503
292
if options.bump_timeout:
504
set_client_prop("LastCheckedOK", "")
293
client.CheckedOK(dbus_interface=client_interface)
505
294
if options.start_checker:
506
set_client_prop("CheckerRunning", dbus.Boolean(True))
295
client.StartChecker(dbus_interface=client_interface)
507
296
if options.stop_checker:
508
set_client_prop("CheckerRunning", dbus.Boolean(False))
297
client.StopChecker(dbus_interface=client_interface)
509
298
if options.is_enabled:
510
if client.Get(client_interface, "Enabled",
511
dbus_interface=dbus.PROPERTIES_IFACE):
515
if options.checker is not None:
516
set_client_prop("Checker", options.checker)
517
if options.host is not None:
518
set_client_prop("Host", options.host)
519
if options.interval is not None:
520
set_client_prop_ms("Interval", options.interval)
521
if options.approval_delay is not None:
522
set_client_prop_ms("ApprovalDelay",
523
options.approval_delay)
524
if options.approval_duration is not None:
525
set_client_prop_ms("ApprovalDuration",
526
options.approval_duration)
527
if options.timeout is not None:
528
set_client_prop_ms("Timeout", options.timeout)
529
if options.extended_timeout is not None:
530
set_client_prop_ms("ExtendedTimeout",
531
options.extended_timeout)
532
if options.secret is not None:
533
set_client_prop("Secret",
534
dbus.ByteArray(options.secret.read()))
299
sys.exit(0 if client.Get(client_interface,
302
dbus.PROPERTIES_IFACE)
305
client.Set(client_interface, "Checker",
307
dbus_interface=dbus.PROPERTIES_IFACE)
309
client.Set(client_interface, "Host", options.host,
310
dbus_interface=dbus.PROPERTIES_IFACE)
312
client.Set(client_interface, "Interval",
313
timedelta_to_milliseconds
314
(string_to_delta(options.interval)),
315
dbus_interface=dbus.PROPERTIES_IFACE)
316
if options.approval_delay:
317
client.Set(client_interface, "ApprovalDelay",
318
timedelta_to_milliseconds
319
(string_to_delta(options.
321
dbus_interface=dbus.PROPERTIES_IFACE)
322
if options.approval_duration:
323
client.Set(client_interface, "ApprovalDuration",
324
timedelta_to_milliseconds
325
(string_to_delta(options.
327
dbus_interface=dbus.PROPERTIES_IFACE)
329
client.Set(client_interface, "Timeout",
330
timedelta_to_milliseconds
331
(string_to_delta(options.timeout)),
332
dbus_interface=dbus.PROPERTIES_IFACE)
333
if 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)
339
client.Set(client_interface, "Secret",
340
dbus.ByteArray(open(options.secret,
342
dbus_interface=dbus.PROPERTIES_IFACE)
535
343
if options.approved_by_default is not None:
536
set_client_prop("ApprovedByDefault",
538
.approved_by_default))
344
client.Set(client_interface, "ApprovedByDefault",
346
.approved_by_default),
347
dbus_interface=dbus.PROPERTIES_IFACE)
539
348
if options.approve:
540
349
client.Approve(dbus.Boolean(True),
541
350
dbus_interface=client_interface)