67
52
"ApprovalDelay": "Approval Delay",
68
53
"ApprovalDuration": "Approval Duration",
69
54
"Checker": "Checker",
70
"ExtendedTimeout": "Extended Timeout",
72
"LastCheckerStatus": "Last Checker Status",
74
56
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
75
domain = "se.recompile"
57
domain = "se.bsnet.fukt"
76
58
busname = domain + ".Mandos"
78
60
server_interface = domain + ".Mandos"
79
61
client_interface = domain + ".Mandos.Client"
84
dbus.OBJECT_MANAGER_IFACE
85
except AttributeError:
86
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))
89
70
def milliseconds_to_string(ms):
90
71
td = datetime.timedelta(0, 0, 0, ms)
91
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
92
.format(days="{}T".format(td.days) if td.days else "",
93
hours=td.seconds // 3600,
94
minutes=(td.seconds % 3600) // 60,
95
seconds=td.seconds % 60))
98
def rfc3339_duration_to_delta(duration):
99
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
101
>>> rfc3339_duration_to_delta("P7D")
102
datetime.timedelta(7)
103
>>> rfc3339_duration_to_delta("PT60S")
104
datetime.timedelta(0, 60)
105
>>> rfc3339_duration_to_delta("PT60M")
106
datetime.timedelta(0, 3600)
107
>>> rfc3339_duration_to_delta("PT24H")
108
datetime.timedelta(1)
109
>>> rfc3339_duration_to_delta("P1W")
110
datetime.timedelta(7)
111
>>> rfc3339_duration_to_delta("PT5M30S")
112
datetime.timedelta(0, 330)
113
>>> rfc3339_duration_to_delta("P1DT3M20S")
114
datetime.timedelta(1, 200)
117
# Parsing an RFC 3339 duration with regular expressions is not
118
# possible - there would have to be multiple places for the same
119
# values, like seconds. The current code, while more esoteric, is
120
# cleaner without depending on a parsing library. If Python had a
121
# built-in library for parsing we would use it, but we'd like to
122
# avoid excessive use of external libraries.
124
# New type for defining tokens, syntax, and semantics all-in-one
125
Token = collections.namedtuple("Token", (
126
"regexp", # To match token; if "value" is not None, must have
127
# a "group" containing digits
128
"value", # datetime.timedelta or None
129
"followers")) # Tokens valid after this token
130
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
131
# the "duration" ABNF definition in RFC 3339, Appendix A.
132
token_end = Token(re.compile(r"$"), None, frozenset())
133
token_second = Token(re.compile(r"(\d+)S"),
134
datetime.timedelta(seconds=1),
135
frozenset((token_end, )))
136
token_minute = Token(re.compile(r"(\d+)M"),
137
datetime.timedelta(minutes=1),
138
frozenset((token_second, token_end)))
139
token_hour = Token(re.compile(r"(\d+)H"),
140
datetime.timedelta(hours=1),
141
frozenset((token_minute, token_end)))
142
token_time = Token(re.compile(r"T"),
144
frozenset((token_hour, token_minute,
146
token_day = Token(re.compile(r"(\d+)D"),
147
datetime.timedelta(days=1),
148
frozenset((token_time, token_end)))
149
token_month = Token(re.compile(r"(\d+)M"),
150
datetime.timedelta(weeks=4),
151
frozenset((token_day, token_end)))
152
token_year = Token(re.compile(r"(\d+)Y"),
153
datetime.timedelta(weeks=52),
154
frozenset((token_month, token_end)))
155
token_week = Token(re.compile(r"(\d+)W"),
156
datetime.timedelta(weeks=1),
157
frozenset((token_end, )))
158
token_duration = Token(re.compile(r"P"), None,
159
frozenset((token_year, token_month,
160
token_day, token_time,
162
# Define starting values:
164
value = datetime.timedelta()
166
# Following valid tokens
167
followers = frozenset((token_duration, ))
168
# String left to parse
170
# Loop until end token is found
171
while found_token is not token_end:
172
# Search for any currently valid tokens
173
for token in followers:
174
match = token.regexp.match(s)
175
if match is not None:
177
if token.value is not None:
178
# Value found, parse digits
179
factor = int(match.group(1), 10)
180
# Add to value so far
181
value += factor * token.value
182
# Strip token from string
183
s = token.regexp.sub("", s, 1)
186
# Set valid next tokens
187
followers = found_token.followers
190
# No currently valid tokens were found
191
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,
197
79
def string_to_delta(interval):
198
80
"""Parse a string and return a datetime.timedelta
200
>>> string_to_delta('7d')
82
>>> string_to_delta("7d")
201
83
datetime.timedelta(7)
202
>>> string_to_delta('60s')
84
>>> string_to_delta("60s")
203
85
datetime.timedelta(0, 60)
204
>>> string_to_delta('60m')
86
>>> string_to_delta("60m")
205
87
datetime.timedelta(0, 3600)
206
>>> string_to_delta('24h')
88
>>> string_to_delta("24h")
207
89
datetime.timedelta(1)
208
>>> string_to_delta('1w')
90
>>> string_to_delta("1w")
209
91
datetime.timedelta(7)
210
>>> string_to_delta('5m 30s')
92
>>> string_to_delta("5m 30s")
211
93
datetime.timedelta(0, 330)
215
return rfc3339_duration_to_delta(interval)
219
value = datetime.timedelta(0)
220
regexp = re.compile(r"(\d+)([dsmhw]?)")
222
for num, suffix in regexp.findall(interval):
224
value += datetime.timedelta(int(num))
226
value += datetime.timedelta(0, int(num))
228
value += datetime.timedelta(0, 0, 0, 0, int(num))
230
value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
232
value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
234
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):
238
119
def print_clients(clients, keywords):
239
120
def valuetostring(value, keyword):
240
121
if type(value) is dbus.Boolean:
241
122
return "Yes" if value else "No"
242
123
if keyword in ("Timeout", "Interval", "ApprovalDelay",
243
"ApprovalDuration", "ExtendedTimeout"):
244
125
return milliseconds_to_string(value)
126
return unicode(value)
247
128
# Create format string to print table rows
248
format_string = " ".join("{{{key}:{width}}}".format(
249
width=max(len(tablewords[key]),
250
max(len(valuetostring(client[key], key))
251
for client in clients)),
129
format_string = " ".join("%%-%ds" %
130
max(len(tablewords[key]),
131
max(len(valuetostring(client[key],
253
135
for key in keywords)
254
136
# Print header line
255
print(format_string.format(**tablewords))
137
print(format_string % tuple(tablewords[key] for key in keywords))
256
138
for client in clients:
258
.format(**{key: valuetostring(client[key], key)
259
for key in keywords}))
139
print(format_string % tuple(valuetostring(client[key], key)
140
for key in keywords))
262
142
def has_actions(options):
263
143
return any((options.enable,
324
198
parser.add_argument("--approval-duration",
325
199
help="Set duration of one client approval")
326
200
parser.add_argument("-H", "--host", help="Set host for client")
327
parser.add_argument("-s", "--secret",
328
type=argparse.FileType(mode="rb"),
201
parser.add_argument("-s", "--secret", type=file,
329
202
help="Set password blob (file) for client")
330
203
parser.add_argument("-A", "--approve", action="store_true",
331
204
help="Approve any current client request")
332
205
parser.add_argument("-D", "--deny", action="store_true",
333
206
help="Deny any current client request")
334
parser.add_argument("--check", action="store_true",
335
help="Run self-test")
336
207
parser.add_argument("client", nargs="*", help="Client name")
337
208
options = parser.parse_args()
339
if has_actions(options) and not (options.client or options.all):
210
if has_actions(options) and not options.client and not options.all:
340
211
parser.error("Options require clients names or --all.")
341
212
if options.verbose and has_actions(options):
342
parser.error("--verbose can only be used alone.")
343
if options.dump_json and (options.verbose
344
or has_actions(options)):
345
parser.error("--dump-json can only be used alone.")
213
parser.error("--verbose can only be used alone or with"
346
215
if options.all and not has_actions(options):
347
216
parser.error("--all requires an action.")
350
219
bus = dbus.SystemBus()
351
220
mandos_dbus_objc = bus.get_object(busname, server_path)
352
221
except dbus.exceptions.DBusException:
353
print("Could not connect to Mandos server", file=sys.stderr)
222
print("Could not connect to Mandos server",
356
226
mandos_serv = dbus.Interface(mandos_dbus_objc,
357
dbus_interface=server_interface)
358
mandos_serv_object_manager = dbus.Interface(
359
mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
361
# block stderr since dbus library prints to stderr
227
dbus_interface = server_interface)
229
#block stderr since dbus library prints to stderr
362
230
null = os.open(os.path.devnull, os.O_RDWR)
363
231
stderrcopy = os.dup(sys.stderr.fileno())
364
232
os.dup2(null, sys.stderr.fileno())
368
mandos_clients = {path: ifs_and_props[client_interface]
369
for path, ifs_and_props in
370
mandos_serv_object_manager
371
.GetManagedObjects().items()
372
if client_interface in ifs_and_props}
236
mandos_clients = mandos_serv.GetAllClientsWithProperties()
375
239
os.dup2(stderrcopy, sys.stderr.fileno())
376
240
os.close(stderrcopy)
377
except dbus.exceptions.DBusException as e:
378
print("Access denied: "
379
"Accessing mandos server through D-Bus: {}".format(e),
241
except dbus.exceptions.DBusException, e:
242
print("Access denied: Accessing mandos server through dbus.",
383
246
# Compile dict of (clients: properties) to process
386
249
if options.all or not options.client:
387
clients = {bus.get_object(busname, path): properties
388
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())
390
254
for name in options.client:
391
for path, client in mandos_clients.items():
255
for path, client in mandos_clients.iteritems():
392
256
if client["Name"] == name:
393
257
client_objc = bus.get_object(busname, path)
394
258
clients[client_objc] = client
397
print("Client not found on server: {!r}"
398
.format(name), file=sys.stderr)
261
print("Client not found on server: %r" % name,
401
265
if not has_actions(options) and clients:
402
if options.verbose or options.dump_json:
403
keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
404
"Created", "Interval", "Host", "KeyID",
405
"Fingerprint", "CheckerRunning",
267
keywords = ("Name", "Enabled", "Timeout",
268
"LastCheckedOK", "Created", "Interval",
269
"Host", "Fingerprint", "CheckerRunning",
406
270
"LastEnabled", "ApprovalPending",
407
"ApprovedByDefault", "LastApprovalRequest",
408
"ApprovalDelay", "ApprovalDuration",
409
"Checker", "ExtendedTimeout", "Expires",
272
"LastApprovalRequest", "ApprovalDelay",
273
"ApprovalDuration", "Checker")
412
275
keywords = defaultkeywords
414
if options.dump_json:
415
json.dump({client["Name"]: {key:
417
if isinstance(client[key],
421
for client in clients.values()},
422
fp=sys.stdout, indent=4,
423
separators=(',', ': '))
426
print_clients(clients.values(), keywords)
277
print_clients(clients.values(), keywords)
428
279
# Process each client in the list by all selected options
429
280
for client in clients:
431
def set_client_prop(prop, value):
432
"""Set a Client D-Bus property"""
433
client.Set(client_interface, prop, value,
434
dbus_interface=dbus.PROPERTIES_IFACE)
436
def set_client_prop_ms(prop, value):
437
"""Set a Client D-Bus property, converted
438
from a string to milliseconds."""
439
set_client_prop(prop,
440
string_to_delta(value).total_seconds()
443
281
if options.remove:
444
282
mandos_serv.RemoveClient(client.__dbus_object_path__)
445
283
if options.enable:
446
set_client_prop("Enabled", dbus.Boolean(True))
284
client.Enable(dbus_interface=client_interface)
447
285
if options.disable:
448
set_client_prop("Enabled", dbus.Boolean(False))
286
client.Disable(dbus_interface=client_interface)
449
287
if options.bump_timeout:
450
set_client_prop("LastCheckedOK", "")
288
client.CheckedOK(dbus_interface=client_interface)
451
289
if options.start_checker:
452
set_client_prop("CheckerRunning", dbus.Boolean(True))
290
client.StartChecker(dbus_interface=client_interface)
453
291
if options.stop_checker:
454
set_client_prop("CheckerRunning", dbus.Boolean(False))
292
client.StopChecker(dbus_interface=client_interface)
455
293
if options.is_enabled:
456
if client.Get(client_interface, "Enabled",
457
dbus_interface=dbus.PROPERTIES_IFACE):
461
if options.checker is not None:
462
set_client_prop("Checker", options.checker)
463
if options.host is not None:
464
set_client_prop("Host", options.host)
465
if options.interval is not None:
466
set_client_prop_ms("Interval", options.interval)
467
if options.approval_delay is not None:
468
set_client_prop_ms("ApprovalDelay",
469
options.approval_delay)
470
if options.approval_duration is not None:
471
set_client_prop_ms("ApprovalDuration",
472
options.approval_duration)
473
if options.timeout is not None:
474
set_client_prop_ms("Timeout", options.timeout)
475
if options.extended_timeout is not None:
476
set_client_prop_ms("ExtendedTimeout",
477
options.extended_timeout)
478
if options.secret is not None:
479
set_client_prop("Secret",
480
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)
481
333
if options.approved_by_default is not None:
482
set_client_prop("ApprovedByDefault",
484
.approved_by_default))
334
client.Set(client_interface, "ApprovedByDefault",
336
.approved_by_default),
337
dbus_interface=dbus.PROPERTIES_IFACE)
485
338
if options.approve:
486
339
client.Approve(dbus.Boolean(True),
487
340
dbus_interface=client_interface)