64
64
"ApprovalDelay": "Approval Delay",
65
65
"ApprovalDuration": "Approval Duration",
66
66
"Checker": "Checker",
67
"ExtendedTimeout": "Extended Timeout",
69
"LastCheckerStatus": "Last Checker Status",
67
"ExtendedTimeout" : "Extended Timeout"
71
69
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
72
70
domain = "se.recompile"
73
71
busname = domain + ".Mandos"
75
73
server_interface = domain + ".Mandos"
76
74
client_interface = domain + ".Mandos.Client"
81
dbus.OBJECT_MANAGER_IFACE
82
except AttributeError:
83
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
77
def timedelta_to_milliseconds(td):
78
"""Convert a datetime.timedelta object to milliseconds"""
79
return ((td.days * 24 * 60 * 60 * 1000)
81
+ (td.microseconds // 1000))
86
83
def milliseconds_to_string(ms):
87
84
td = datetime.timedelta(0, 0, 0, ms)
88
85
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))
86
.format(days = "{0}T".format(td.days) if td.days else "",
87
hours = td.seconds // 3600,
88
minutes = (td.seconds % 3600) // 60,
89
seconds = td.seconds % 60,
95
93
def rfc3339_duration_to_delta(duration):
96
94
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
98
96
>>> rfc3339_duration_to_delta("P7D")
99
97
datetime.timedelta(7)
100
98
>>> rfc3339_duration_to_delta("PT60S")
110
108
>>> rfc3339_duration_to_delta("P1DT3M20S")
111
109
datetime.timedelta(1, 200)
114
112
# Parsing an RFC 3339 duration with regular expressions is not
115
113
# possible - there would have to be multiple places for the same
116
114
# values, like seconds. The current code, while more esoteric, is
117
115
# cleaner without depending on a parsing library. If Python had a
118
116
# built-in library for parsing we would use it, but we'd like to
119
117
# avoid excessive use of external libraries.
121
119
# 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
120
Token = collections.namedtuple("Token",
121
("regexp", # To match token; if
122
# "value" is not None,
123
# must have a "group"
125
"value", # datetime.timedelta or
127
"followers")) # Tokens valid after
127
129
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
128
130
# the "duration" ABNF definition in RFC 3339, Appendix A.
129
131
token_end = Token(re.compile(r"$"), None, frozenset())
130
132
token_second = Token(re.compile(r"(\d+)S"),
131
133
datetime.timedelta(seconds=1),
132
frozenset((token_end, )))
134
frozenset((token_end,)))
133
135
token_minute = Token(re.compile(r"(\d+)M"),
134
136
datetime.timedelta(minutes=1),
135
137
frozenset((token_second, token_end)))
151
153
frozenset((token_month, token_end)))
152
154
token_week = Token(re.compile(r"(\d+)W"),
153
155
datetime.timedelta(weeks=1),
154
frozenset((token_end, )))
156
frozenset((token_end,)))
155
157
token_duration = Token(re.compile(r"P"), None,
156
158
frozenset((token_year, token_month,
157
159
token_day, token_time,
159
# Define starting values:
161
value = datetime.timedelta()
161
# Define starting values
162
value = datetime.timedelta() # Value so far
162
163
found_token = None
163
# Following valid tokens
164
followers = frozenset((token_duration, ))
165
# String left to parse
164
followers = frozenset(token_duration,) # Following valid tokens
165
s = duration # String left to parse
167
166
# Loop until end token is found
168
167
while found_token is not token_end:
169
168
# Search for any currently valid tokens
187
186
# No currently valid tokens were found
188
raise ValueError("Invalid RFC 3339 duration: {!r}"
187
raise ValueError("Invalid RFC 3339 duration")
190
188
# End token found
194
192
def string_to_delta(interval):
195
193
"""Parse a string and return a datetime.timedelta
197
>>> string_to_delta('7d')
195
>>> string_to_delta("7d")
198
196
datetime.timedelta(7)
199
>>> string_to_delta('60s')
197
>>> string_to_delta("60s")
200
198
datetime.timedelta(0, 60)
201
>>> string_to_delta('60m')
199
>>> string_to_delta("60m")
202
200
datetime.timedelta(0, 3600)
203
>>> string_to_delta('24h')
201
>>> string_to_delta("24h")
204
202
datetime.timedelta(1)
205
>>> string_to_delta('1w')
203
>>> string_to_delta("1w")
206
204
datetime.timedelta(7)
207
>>> string_to_delta('5m 30s')
205
>>> string_to_delta("5m 30s")
208
206
datetime.timedelta(0, 330)
212
210
return rfc3339_duration_to_delta(interval)
213
211
except ValueError:
216
214
value = datetime.timedelta(0)
217
215
regexp = re.compile(r"(\d+)([dsmhw]?)")
219
217
for num, suffix in regexp.findall(interval):
220
218
if suffix == "d":
221
219
value += datetime.timedelta(int(num))
281
278
parser = argparse.ArgumentParser()
282
279
parser.add_argument("--version", action="version",
283
version="%(prog)s {}".format(version),
280
version = "%(prog)s {0}".format(version),
284
281
help="show version number and exit")
285
282
parser.add_argument("-a", "--all", action="store_true",
286
283
help="Select all clients")
287
284
parser.add_argument("-v", "--verbose", action="store_true",
288
285
help="Print all fields")
289
parser.add_argument("-j", "--dump-json", action="store_true",
290
help="Dump client data in JSON format")
291
286
parser.add_argument("-e", "--enable", action="store_true",
292
287
help="Enable client")
293
288
parser.add_argument("-d", "--disable", action="store_true",
332
327
help="Run self-test")
333
328
parser.add_argument("client", nargs="*", help="Client name")
334
329
options = parser.parse_args()
336
331
if has_actions(options) and not (options.client or options.all):
337
332
parser.error("Options require clients names or --all.")
338
333
if options.verbose and has_actions(options):
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.")
334
parser.error("--verbose can only be used alone or with"
343
336
if options.all and not has_actions(options):
344
337
parser.error("--all requires an action.")
346
339
if options.check:
348
340
fail_count, test_count = doctest.testmod()
349
341
sys.exit(os.EX_OK if fail_count == 0 else 1)
352
344
bus = dbus.SystemBus()
353
345
mandos_dbus_objc = bus.get_object(busname, server_path)
354
346
except dbus.exceptions.DBusException:
355
print("Could not connect to Mandos server", file=sys.stderr)
347
print("Could not connect to Mandos server",
358
351
mandos_serv = dbus.Interface(mandos_dbus_objc,
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
352
dbus_interface = server_interface)
354
#block stderr since dbus library prints to stderr
364
355
null = os.open(os.path.devnull, os.O_RDWR)
365
356
stderrcopy = os.dup(sys.stderr.fileno())
366
357
os.dup2(null, sys.stderr.fileno())
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}
361
mandos_clients = mandos_serv.GetAllClientsWithProperties()
377
364
os.dup2(stderrcopy, sys.stderr.fileno())
378
365
os.close(stderrcopy)
379
except dbus.exceptions.DBusException as e:
380
print("Access denied: "
381
"Accessing mandos server through D-Bus: {}".format(e),
366
except dbus.exceptions.DBusException:
367
print("Access denied: Accessing mandos server through dbus.",
385
371
# Compile dict of (clients: properties) to process
388
374
if options.all or not options.client:
389
clients = {bus.get_object(busname, path): properties
390
for path, properties in mandos_clients.items()}
375
clients = dict((bus.get_object(busname, path), properties)
376
for path, properties in
377
mandos_clients.items())
392
379
for name in options.client:
393
for path, client in mandos_clients.items():
380
for path, client in mandos_clients.iteritems():
394
381
if client["Name"] == name:
395
382
client_objc = bus.get_object(busname, path)
396
383
clients[client_objc] = client
399
print("Client not found on server: {!r}"
386
print("Client not found on server: {0!r}"
400
387
.format(name), file=sys.stderr)
403
390
if not has_actions(options) and clients:
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",
392
keywords = ("Name", "Enabled", "Timeout",
393
"LastCheckedOK", "Created", "Interval",
394
"Host", "Fingerprint", "CheckerRunning",
395
"LastEnabled", "ApprovalPending",
409
397
"LastApprovalRequest", "ApprovalDelay",
410
398
"ApprovalDuration", "Checker",
411
"ExtendedTimeout", "Expires",
414
401
keywords = defaultkeywords
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)
403
print_clients(clients.values(), keywords)
430
405
# Process each client in the list by all selected options
431
406
for client in clients:
433
407
def set_client_prop(prop, value):
434
408
"""Set a Client D-Bus property"""
435
409
client.Set(client_interface, prop, value,
436
410
dbus_interface=dbus.PROPERTIES_IFACE)
438
411
def set_client_prop_ms(prop, value):
439
412
"""Set a Client D-Bus property, converted
440
413
from a string to milliseconds."""
441
414
set_client_prop(prop,
442
string_to_delta(value).total_seconds()
415
timedelta_to_milliseconds
416
(string_to_delta(value)))
445
417
if options.remove:
446
418
mandos_serv.RemoveClient(client.__dbus_object_path__)
447
419
if options.enable: