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