51
65
"ApprovalDelay": "Approval Delay",
52
66
"ApprovalDuration": "Approval Duration",
53
67
"Checker": "Checker",
68
"ExtendedTimeout": "Extended Timeout",
70
"LastCheckerStatus": "Last Checker Status",
55
72
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
56
domain = "se.bsnet.fukt"
73
domain = "se.recompile"
57
74
busname = domain + ".Mandos"
59
76
server_interface = domain + ".Mandos"
60
77
client_interface = domain + ".Mandos.Client"
63
def timedelta_to_milliseconds(td):
64
"""Convert a datetime.timedelta object to milliseconds"""
65
return ((td.days * 24 * 60 * 60 * 1000)
67
+ (td.microseconds // 1000))
82
dbus.OBJECT_MANAGER_IFACE
83
except AttributeError:
84
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
69
87
def milliseconds_to_string(ms):
70
88
td = datetime.timedelta(0, 0, 0, ms)
71
return ("%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
72
% { "days": "%dT" % td.days if td.days else "",
73
"hours": td.seconds // 3600,
74
"minutes": (td.seconds % 3600) // 60,
75
"seconds": td.seconds % 60,
89
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
90
.format(days="{}T".format(td.days) if td.days else "",
91
hours=td.seconds // 3600,
92
minutes=(td.seconds % 3600) // 60,
93
seconds=td.seconds % 60))
96
def rfc3339_duration_to_delta(duration):
97
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
99
>>> rfc3339_duration_to_delta("P7D")
100
datetime.timedelta(7)
101
>>> rfc3339_duration_to_delta("PT60S")
102
datetime.timedelta(0, 60)
103
>>> rfc3339_duration_to_delta("PT60M")
104
datetime.timedelta(0, 3600)
105
>>> rfc3339_duration_to_delta("PT24H")
106
datetime.timedelta(1)
107
>>> rfc3339_duration_to_delta("P1W")
108
datetime.timedelta(7)
109
>>> rfc3339_duration_to_delta("PT5M30S")
110
datetime.timedelta(0, 330)
111
>>> rfc3339_duration_to_delta("P1DT3M20S")
112
datetime.timedelta(1, 200)
115
# Parsing an RFC 3339 duration with regular expressions is not
116
# possible - there would have to be multiple places for the same
117
# values, like seconds. The current code, while more esoteric, is
118
# cleaner without depending on a parsing library. If Python had a
119
# built-in library for parsing we would use it, but we'd like to
120
# avoid excessive use of external libraries.
122
# New type for defining tokens, syntax, and semantics all-in-one
123
Token = collections.namedtuple("Token", (
124
"regexp", # To match token; if "value" is not None, must have
125
# a "group" containing digits
126
"value", # datetime.timedelta or None
127
"followers")) # Tokens valid after this token
128
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
129
# the "duration" ABNF definition in RFC 3339, Appendix A.
130
token_end = Token(re.compile(r"$"), None, frozenset())
131
token_second = Token(re.compile(r"(\d+)S"),
132
datetime.timedelta(seconds=1),
133
frozenset((token_end, )))
134
token_minute = Token(re.compile(r"(\d+)M"),
135
datetime.timedelta(minutes=1),
136
frozenset((token_second, token_end)))
137
token_hour = Token(re.compile(r"(\d+)H"),
138
datetime.timedelta(hours=1),
139
frozenset((token_minute, token_end)))
140
token_time = Token(re.compile(r"T"),
142
frozenset((token_hour, token_minute,
144
token_day = Token(re.compile(r"(\d+)D"),
145
datetime.timedelta(days=1),
146
frozenset((token_time, token_end)))
147
token_month = Token(re.compile(r"(\d+)M"),
148
datetime.timedelta(weeks=4),
149
frozenset((token_day, token_end)))
150
token_year = Token(re.compile(r"(\d+)Y"),
151
datetime.timedelta(weeks=52),
152
frozenset((token_month, token_end)))
153
token_week = Token(re.compile(r"(\d+)W"),
154
datetime.timedelta(weeks=1),
155
frozenset((token_end, )))
156
token_duration = Token(re.compile(r"P"), None,
157
frozenset((token_year, token_month,
158
token_day, token_time,
160
# Define starting values:
162
value = datetime.timedelta()
164
# Following valid tokens
165
followers = frozenset((token_duration, ))
166
# String left to parse
168
# Loop until end token is found
169
while found_token is not token_end:
170
# Search for any currently valid tokens
171
for token in followers:
172
match = token.regexp.match(s)
173
if match is not None:
175
if token.value is not None:
176
# Value found, parse digits
177
factor = int(match.group(1), 10)
178
# Add to value so far
179
value += factor * token.value
180
# Strip token from string
181
s = token.regexp.sub("", s, 1)
184
# Set valid next tokens
185
followers = found_token.followers
188
# No currently valid tokens were found
189
raise ValueError("Invalid RFC 3339 duration: {!r}"
79
195
def string_to_delta(interval):
80
196
"""Parse a string and return a datetime.timedelta
82
>>> string_to_delta("7d")
198
>>> string_to_delta('7d')
83
199
datetime.timedelta(7)
84
>>> string_to_delta("60s")
200
>>> string_to_delta('60s')
85
201
datetime.timedelta(0, 60)
86
>>> string_to_delta("60m")
202
>>> string_to_delta('60m')
87
203
datetime.timedelta(0, 3600)
88
>>> string_to_delta("24h")
204
>>> string_to_delta('24h')
89
205
datetime.timedelta(1)
90
>>> string_to_delta("1w")
206
>>> string_to_delta('1w')
91
207
datetime.timedelta(7)
92
>>> string_to_delta("5m 30s")
208
>>> string_to_delta('5m 30s')
93
209
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):
213
return rfc3339_duration_to_delta(interval)
217
value = datetime.timedelta(0)
218
regexp = re.compile(r"(\d+)([dsmhw]?)")
220
for num, suffix in regexp.findall(interval):
222
value += datetime.timedelta(int(num))
224
value += datetime.timedelta(0, int(num))
226
value += datetime.timedelta(0, 0, 0, 0, int(num))
228
value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
230
value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
232
value += datetime.timedelta(0, 0, 0, int(num))
119
236
def print_clients(clients, keywords):
120
237
def valuetostring(value, keyword):
121
238
if type(value) is dbus.Boolean:
122
239
return "Yes" if value else "No"
123
240
if keyword in ("Timeout", "Interval", "ApprovalDelay",
241
"ApprovalDuration", "ExtendedTimeout"):
125
242
return milliseconds_to_string(value)
126
return unicode(value)
128
245
# Create format string to print table rows
129
format_string = " ".join("%%-%ds" %
130
max(len(tablewords[key]),
131
max(len(valuetostring(client[key],
246
format_string = " ".join("{{{key}:{width}}}".format(
247
width=max(len(tablewords[key]),
248
max(len(valuetostring(client[key], key))
249
for client in clients)),
135
251
for key in keywords)
136
252
# Print header line
137
print format_string % tuple(tablewords[key] for key in keywords)
253
print(format_string.format(**tablewords))
138
254
for client in clients:
139
print format_string % tuple(valuetostring(client[key], key)
256
.format(**{key: valuetostring(client[key], key)
257
for key in keywords}))
142
260
def has_actions(options):
143
261
return any((options.enable,
157
276
options.secret is not None,
162
parser = OptionParser(version = "%%prog %s" % version)
163
parser.add_option("-a", "--all", action="store_true",
164
help="Select all clients")
165
parser.add_option("-v", "--verbose", action="store_true",
166
help="Print all fields")
167
parser.add_option("-e", "--enable", action="store_true",
168
help="Enable client")
169
parser.add_option("-d", "--disable", action="store_true",
170
help="disable client")
171
parser.add_option("-b", "--bump-timeout", action="store_true",
172
help="Bump timeout for client")
173
parser.add_option("--start-checker", action="store_true",
174
help="Start checker for client")
175
parser.add_option("--stop-checker", action="store_true",
176
help="Stop checker for client")
177
parser.add_option("-V", "--is-enabled", action="store_true",
178
help="Check if client is enabled")
179
parser.add_option("-r", "--remove", action="store_true",
180
help="Remove client")
181
parser.add_option("-c", "--checker", type="string",
182
help="Set checker command for client")
183
parser.add_option("-t", "--timeout", type="string",
184
help="Set timeout for client")
185
parser.add_option("-i", "--interval", type="string",
186
help="Set checker interval for client")
187
parser.add_option("--approve-by-default", action="store_true",
188
dest="approved_by_default",
189
help="Set client to be approved by default")
190
parser.add_option("--deny-by-default", action="store_false",
191
dest="approved_by_default",
192
help="Set client to be denied by default")
193
parser.add_option("--approval-delay", type="string",
194
help="Set delay before client approve/deny")
195
parser.add_option("--approval-duration", type="string",
196
help="Set duration of one client approval")
197
parser.add_option("-H", "--host", type="string",
198
help="Set host for client")
199
parser.add_option("-s", "--secret", type="string",
200
help="Set password blob (file) for client")
201
parser.add_option("-A", "--approve", action="store_true",
202
help="Approve any current client request")
203
parser.add_option("-D", "--deny", action="store_true",
204
help="Deny any current client request")
205
options, client_names = parser.parse_args()
207
if has_actions(options) and not client_names and not options.all:
208
parser.error("Options require clients names or --all.")
209
if options.verbose and has_actions(options):
210
parser.error("--verbose can only be used alone or with"
212
if options.all and not has_actions(options):
213
parser.error("--all requires an action.")
216
bus = dbus.SystemBus()
217
mandos_dbus_objc = bus.get_object(busname, server_path)
218
except dbus.exceptions.DBusException:
219
print >> sys.stderr, "Could not connect to Mandos server"
222
mandos_serv = dbus.Interface(mandos_dbus_objc,
223
dbus_interface = server_interface)
225
#block stderr since dbus library prints to stderr
226
null = os.open(os.path.devnull, os.O_RDWR)
227
stderrcopy = os.dup(sys.stderr.fileno())
228
os.dup2(null, sys.stderr.fileno())
232
mandos_clients = mandos_serv.GetAllClientsWithProperties()
235
os.dup2(stderrcopy, sys.stderr.fileno())
237
except dbus.exceptions.DBusException, e:
238
print >> sys.stderr, "Access denied: Accessing mandos server through dbus."
241
# Compile dict of (clients: properties) to process
244
if options.all or not client_names:
245
clients = dict((bus.get_object(busname, path), properties)
246
for path, properties in
247
mandos_clients.iteritems())
249
for name in client_names:
250
for path, client in mandos_clients.iteritems():
251
if client["Name"] == name:
252
client_objc = bus.get_object(busname, path)
253
clients[client_objc] = client
282
parser = argparse.ArgumentParser()
283
parser.add_argument("--version", action="version",
284
version="%(prog)s {}".format(version),
285
help="show version number and exit")
286
parser.add_argument("-a", "--all", action="store_true",
287
help="Select all clients")
288
parser.add_argument("-v", "--verbose", action="store_true",
289
help="Print all fields")
290
parser.add_argument("-j", "--dump-json", action="store_true",
291
help="Dump client data in JSON format")
292
parser.add_argument("-e", "--enable", action="store_true",
293
help="Enable client")
294
parser.add_argument("-d", "--disable", action="store_true",
295
help="disable client")
296
parser.add_argument("-b", "--bump-timeout", action="store_true",
297
help="Bump timeout for client")
298
parser.add_argument("--start-checker", action="store_true",
299
help="Start checker for client")
300
parser.add_argument("--stop-checker", action="store_true",
301
help="Stop checker for client")
302
parser.add_argument("-V", "--is-enabled", action="store_true",
303
help="Check if client is enabled")
304
parser.add_argument("-r", "--remove", action="store_true",
305
help="Remove client")
306
parser.add_argument("-c", "--checker",
307
help="Set checker command for client")
308
parser.add_argument("-t", "--timeout",
309
help="Set timeout for client")
310
parser.add_argument("--extended-timeout",
311
help="Set extended timeout for client")
312
parser.add_argument("-i", "--interval",
313
help="Set checker interval for client")
314
parser.add_argument("--approve-by-default", action="store_true",
315
default=None, dest="approved_by_default",
316
help="Set client to be approved by default")
317
parser.add_argument("--deny-by-default", action="store_false",
318
dest="approved_by_default",
319
help="Set client to be denied by default")
320
parser.add_argument("--approval-delay",
321
help="Set delay before client approve/deny")
322
parser.add_argument("--approval-duration",
323
help="Set duration of one client approval")
324
parser.add_argument("-H", "--host", help="Set host for client")
325
parser.add_argument("-s", "--secret",
326
type=argparse.FileType(mode="rb"),
327
help="Set password blob (file) for client")
328
parser.add_argument("-A", "--approve", action="store_true",
329
help="Approve any current client request")
330
parser.add_argument("-D", "--deny", action="store_true",
331
help="Deny any current client request")
332
parser.add_argument("--check", action="store_true",
333
help="Run self-test")
334
parser.add_argument("client", nargs="*", help="Client name")
335
options = parser.parse_args()
337
if has_actions(options) and not (options.client or options.all):
338
parser.error("Options require clients names or --all.")
339
if options.verbose and has_actions(options):
340
parser.error("--verbose can only be used alone.")
341
if options.dump_json and (options.verbose
342
or has_actions(options)):
343
parser.error("--dump-json can only be used alone.")
344
if options.all and not has_actions(options):
345
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)
352
bus = dbus.SystemBus()
353
mandos_dbus_objc = bus.get_object(busname, server_path)
354
except dbus.exceptions.DBusException:
355
print("Could not connect to Mandos server", file=sys.stderr)
358
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
364
null = os.open(os.path.devnull, os.O_RDWR)
365
stderrcopy = os.dup(sys.stderr.fileno())
366
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}
377
os.dup2(stderrcopy, sys.stderr.fileno())
379
except dbus.exceptions.DBusException as e:
380
print("Access denied: "
381
"Accessing mandos server through D-Bus: {}".format(e),
385
# Compile dict of (clients: properties) to process
388
if options.all or not options.client:
389
clients = {bus.get_object(busname, path): properties
390
for path, properties in mandos_clients.items()}
392
for name in options.client:
393
for path, client in mandos_clients.items():
394
if client["Name"] == name:
395
client_objc = bus.get_object(busname, path)
396
clients[client_objc] = client
399
print("Client not found on server: {!r}"
400
.format(name), file=sys.stderr)
403
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",
409
"LastApprovalRequest", "ApprovalDelay",
410
"ApprovalDuration", "Checker",
411
"ExtendedTimeout", "Expires",
414
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)
430
# Process each client in the list by all selected options
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()
446
mandos_serv.RemoveClient(client.__dbus_object_path__)
448
set_client_prop("Enabled", dbus.Boolean(True))
450
set_client_prop("Enabled", dbus.Boolean(False))
451
if options.bump_timeout:
452
set_client_prop("LastCheckedOK", "")
453
if options.start_checker:
454
set_client_prop("CheckerRunning", dbus.Boolean(True))
455
if options.stop_checker:
456
set_client_prop("CheckerRunning", dbus.Boolean(False))
457
if options.is_enabled:
458
if client.Get(client_interface, "Enabled",
459
dbus_interface=dbus.PROPERTIES_IFACE):
256
print >> sys.stderr, "Client not found on server: %r" % name
259
if not has_actions(options) and clients:
261
keywords = ("Name", "Enabled", "Timeout",
262
"LastCheckedOK", "Created", "Interval",
263
"Host", "Fingerprint", "CheckerRunning",
264
"LastEnabled", "ApprovalPending",
266
"LastApprovalRequest", "ApprovalDelay",
267
"ApprovalDuration", "Checker")
269
keywords = defaultkeywords
271
print_clients(clients.values(), keywords)
273
# Process each client in the list by all selected options
274
for client in clients:
276
mandos_serv.RemoveClient(client.__dbus_object_path__)
278
client.Enable(dbus_interface=client_interface)
280
client.Disable(dbus_interface=client_interface)
281
if options.bump_timeout:
282
client.CheckedOK(dbus_interface=client_interface)
283
if options.start_checker:
284
client.StartChecker(dbus_interface=client_interface)
285
if options.stop_checker:
286
client.StopChecker(dbus_interface=client_interface)
287
if options.is_enabled:
288
sys.exit(0 if client.Get(client_interface,
290
dbus_interface=dbus.PROPERTIES_IFACE)
293
client.Set(client_interface, "Checker", options.checker,
294
dbus_interface=dbus.PROPERTIES_IFACE)
296
client.Set(client_interface, "Host", options.host,
297
dbus_interface=dbus.PROPERTIES_IFACE)
299
client.Set(client_interface, "Interval",
300
timedelta_to_milliseconds
301
(string_to_delta(options.interval)),
302
dbus_interface=dbus.PROPERTIES_IFACE)
303
if options.approval_delay:
304
client.Set(client_interface, "ApprovalDelay",
305
timedelta_to_milliseconds
306
(string_to_delta(options.
308
dbus_interface=dbus.PROPERTIES_IFACE)
309
if options.approval_duration:
310
client.Set(client_interface, "ApprovalDuration",
311
timedelta_to_milliseconds
312
(string_to_delta(options.
314
dbus_interface=dbus.PROPERTIES_IFACE)
316
client.Set(client_interface, "Timeout",
317
timedelta_to_milliseconds
318
(string_to_delta(options.timeout)),
319
dbus_interface=dbus.PROPERTIES_IFACE)
321
client.Set(client_interface, "Secret",
322
dbus.ByteArray(open(options.secret,
324
dbus_interface=dbus.PROPERTIES_IFACE)
325
if options.approved_by_default is not None:
326
client.Set(client_interface, "ApprovedByDefault",
328
.approved_by_default),
329
dbus_interface=dbus.PROPERTIES_IFACE)
331
client.Approve(dbus.Boolean(True),
332
dbus_interface=client_interface)
334
client.Approve(dbus.Boolean(False),
335
dbus_interface=client_interface)
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()))
483
if options.approved_by_default is not None:
484
set_client_prop("ApprovedByDefault",
486
.approved_by_default))
488
client.Approve(dbus.Boolean(True),
489
dbus_interface=client_interface)
491
client.Approve(dbus.Boolean(False),
492
dbus_interface=client_interface)
337
495
if __name__ == "__main__":