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