83
68
def milliseconds_to_string(ms):
84
69
td = datetime.timedelta(0, 0, 0, ms)
85
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
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,
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
122
# "value" is not None,
123
# must have a "group"
125
"value", # datetime.timedelta or
127
"followers")) # Tokens valid after
129
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
130
# the "duration" ABNF definition in RFC 3339, Appendix A.
131
token_end = Token(re.compile(r"$"), None, frozenset())
132
token_second = Token(re.compile(r"(\d+)S"),
133
datetime.timedelta(seconds=1),
134
frozenset((token_end,)))
135
token_minute = Token(re.compile(r"(\d+)M"),
136
datetime.timedelta(minutes=1),
137
frozenset((token_second, token_end)))
138
token_hour = Token(re.compile(r"(\d+)H"),
139
datetime.timedelta(hours=1),
140
frozenset((token_minute, token_end)))
141
token_time = Token(re.compile(r"T"),
143
frozenset((token_hour, token_minute,
145
token_day = Token(re.compile(r"(\d+)D"),
146
datetime.timedelta(days=1),
147
frozenset((token_time, token_end)))
148
token_month = Token(re.compile(r"(\d+)M"),
149
datetime.timedelta(weeks=4),
150
frozenset((token_day, token_end)))
151
token_year = Token(re.compile(r"(\d+)Y"),
152
datetime.timedelta(weeks=52),
153
frozenset((token_month, token_end)))
154
token_week = Token(re.compile(r"(\d+)W"),
155
datetime.timedelta(weeks=1),
156
frozenset((token_end,)))
157
token_duration = Token(re.compile(r"P"), None,
158
frozenset((token_year, token_month,
159
token_day, token_time,
161
# Define starting values
162
value = datetime.timedelta() # Value so far
164
followers = frozenset((token_duration,)) # Following valid tokens
165
s = duration # String left to parse
166
# Loop until end token is found
167
while found_token is not token_end:
168
# Search for any currently valid tokens
169
for token in followers:
170
match = token.regexp.match(s)
171
if match is not None:
173
if token.value is not None:
174
# Value found, parse digits
175
factor = int(match.group(1), 10)
176
# Add to value so far
177
value += factor * token.value
178
# Strip token from string
179
s = token.regexp.sub("", s, 1)
182
# Set valid next tokens
183
followers = found_token.followers
186
# No currently valid tokens were found
187
raise ValueError("Invalid RFC 3339 duration")
70
return (u"%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
71
% { u"days": u"%dT" % td.days if td.days else u"",
72
u"hours": td.seconds // 3600,
73
u"minutes": (td.seconds % 3600) // 60,
74
u"seconds": td.seconds % 60,
192
78
def string_to_delta(interval):
193
79
"""Parse a string and return a datetime.timedelta
195
81
>>> string_to_delta("7d")
196
82
datetime.timedelta(7)
197
83
>>> string_to_delta("60s")
200
86
datetime.timedelta(0, 3600)
201
87
>>> string_to_delta("24h")
202
88
datetime.timedelta(1)
203
>>> string_to_delta("1w")
89
>>> string_to_delta(u"1w")
204
90
datetime.timedelta(7)
205
91
>>> string_to_delta("5m 30s")
206
92
datetime.timedelta(0, 330)
210
return rfc3339_duration_to_delta(interval)
214
value = datetime.timedelta(0)
215
regexp = re.compile(r"(\d+)([dsmhw]?)")
217
for num, suffix in regexp.findall(interval):
219
value += datetime.timedelta(int(num))
221
value += datetime.timedelta(0, int(num))
223
value += datetime.timedelta(0, 0, 0, 0, int(num))
225
value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
227
value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
229
value += datetime.timedelta(0, 0, 0, int(num))
94
timevalue = datetime.timedelta(0)
95
regexp = re.compile(u"\d+[dsmhw]")
97
for s in regexp.findall(interval):
99
suffix = unicode(s[-1])
102
delta = datetime.timedelta(value)
104
delta = datetime.timedelta(0, value)
106
delta = datetime.timedelta(0, 0, 0, 0, value)
108
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
110
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
113
except (ValueError, IndexError):
232
118
def print_clients(clients, keywords):
233
119
def valuetostring(value, keyword):
234
120
if type(value) is dbus.Boolean:
235
return "Yes" if value else "No"
236
if keyword in ("Timeout", "Interval", "ApprovalDelay",
237
"ApprovalDuration", "ExtendedTimeout"):
121
return u"Yes" if value else u"No"
122
if keyword in (u"Timeout", u"Interval", u"ApprovalDelay",
123
u"ApprovalDuration"):
238
124
return milliseconds_to_string(value)
125
return unicode(value)
241
127
# Create format string to print table rows
242
format_string = " ".join("{{{key}:{width}}}".format(
243
width = max(len(tablewords[key]),
244
max(len(valuetostring(client[key],
248
key = key) for key in keywords)
128
format_string = u" ".join(u"%%-%ds" %
129
max(len(tablewords[key]),
130
max(len(valuetostring(client[key],
249
135
# Print header line
250
print(format_string.format(**tablewords))
136
print format_string % tuple(tablewords[key] for key in keywords)
251
137
for client in clients:
252
print(format_string.format(**dict((key,
253
valuetostring(client[key],
255
for key in keywords)))
138
print format_string % tuple(valuetostring(client[key], key)
257
141
def has_actions(options):
258
142
return any((options.enable,
273
156
options.secret is not None,
278
parser = argparse.ArgumentParser()
279
parser.add_argument("--version", action="version",
280
version = "%(prog)s {0}".format(version),
281
help="show version number and exit")
282
parser.add_argument("-a", "--all", action="store_true",
283
help="Select all clients")
284
parser.add_argument("-v", "--verbose", action="store_true",
285
help="Print all fields")
286
parser.add_argument("-e", "--enable", action="store_true",
287
help="Enable client")
288
parser.add_argument("-d", "--disable", action="store_true",
289
help="disable client")
290
parser.add_argument("-b", "--bump-timeout", action="store_true",
291
help="Bump timeout for client")
292
parser.add_argument("--start-checker", action="store_true",
293
help="Start checker for client")
294
parser.add_argument("--stop-checker", action="store_true",
295
help="Stop checker for client")
296
parser.add_argument("-V", "--is-enabled", action="store_true",
297
help="Check if client is enabled")
298
parser.add_argument("-r", "--remove", action="store_true",
299
help="Remove client")
300
parser.add_argument("-c", "--checker",
301
help="Set checker command for client")
302
parser.add_argument("-t", "--timeout",
303
help="Set timeout for client")
304
parser.add_argument("--extended-timeout",
305
help="Set extended timeout for client")
306
parser.add_argument("-i", "--interval",
307
help="Set checker interval for client")
308
parser.add_argument("--approve-by-default", action="store_true",
309
default=None, dest="approved_by_default",
310
help="Set client to be approved by default")
311
parser.add_argument("--deny-by-default", action="store_false",
312
dest="approved_by_default",
313
help="Set client to be denied by default")
314
parser.add_argument("--approval-delay",
315
help="Set delay before client approve/deny")
316
parser.add_argument("--approval-duration",
317
help="Set duration of one client approval")
318
parser.add_argument("-H", "--host", help="Set host for client")
319
parser.add_argument("-s", "--secret",
320
type=argparse.FileType(mode="rb"),
321
help="Set password blob (file) for client")
322
parser.add_argument("-A", "--approve", action="store_true",
323
help="Approve any current client request")
324
parser.add_argument("-D", "--deny", action="store_true",
325
help="Deny any current client request")
326
parser.add_argument("--check", action="store_true",
327
help="Run self-test")
328
parser.add_argument("client", nargs="*", help="Client name")
329
options = parser.parse_args()
161
parser = OptionParser(version = u"%%prog %s" % version)
162
parser.add_option(u"-a", u"--all", action=u"store_true",
163
help=u"Select all clients")
164
parser.add_option(u"-v", u"--verbose", action=u"store_true",
165
help=u"Print all fields")
166
parser.add_option(u"-e", u"--enable", action=u"store_true",
167
help=u"Enable client")
168
parser.add_option(u"-d", u"--disable", action=u"store_true",
169
help=u"disable client")
170
parser.add_option(u"-b", u"--bump-timeout", action=u"store_true",
171
help=u"Bump timeout for client")
172
parser.add_option(u"--start-checker", action=u"store_true",
173
help=u"Start checker for client")
174
parser.add_option(u"--stop-checker", action=u"store_true",
175
help=u"Stop checker for client")
176
parser.add_option(u"-V", u"--is-enabled", action=u"store_true",
177
help=u"Check if client is enabled")
178
parser.add_option(u"-r", u"--remove", action=u"store_true",
179
help=u"Remove client")
180
parser.add_option(u"-c", u"--checker", type=u"string",
181
help=u"Set checker command for client")
182
parser.add_option(u"-t", u"--timeout", type=u"string",
183
help=u"Set timeout for client")
184
parser.add_option(u"-i", u"--interval", type=u"string",
185
help=u"Set checker interval for client")
186
parser.add_option(u"--approve-by-default", action=u"store_true",
187
dest=u"approved_by_default",
188
help=u"Set client to be approved by default")
189
parser.add_option(u"--deny-by-default", action=u"store_false",
190
dest=u"approved_by_default",
191
help=u"Set client to be denied by default")
192
parser.add_option(u"--approval-delay", type=u"string",
193
help=u"Set delay before client approve/deny")
194
parser.add_option(u"--approval-duration", type=u"string",
195
help=u"Set duration of one client approval")
196
parser.add_option(u"-H", u"--host", type=u"string",
197
help=u"Set host for client")
198
parser.add_option(u"-s", u"--secret", type=u"string",
199
help=u"Set password blob (file) for client")
200
parser.add_option(u"-A", u"--approve", action=u"store_true",
201
help=u"Approve any current client request")
202
parser.add_option(u"-D", u"--deny", action=u"store_true",
203
help=u"Deny any current client request")
204
options, client_names = parser.parse_args()
206
if has_actions(options) and not client_names and not options.all:
207
parser.error(u"Options require clients names or --all.")
208
if options.verbose and has_actions(options):
209
parser.error(u"--verbose can only be used alone or with"
211
if options.all and not has_actions(options):
212
parser.error(u"--all requires an action.")
215
bus = dbus.SystemBus()
216
mandos_dbus_objc = bus.get_object(busname, server_path)
217
except dbus.exceptions.DBusException:
218
print >> sys.stderr, u"Could not connect to Mandos server"
331
if has_actions(options) and not (options.client or options.all):
332
parser.error("Options require clients names or --all.")
333
if options.verbose and has_actions(options):
334
parser.error("--verbose can only be used alone or with"
336
if options.all and not has_actions(options):
337
parser.error("--all requires an action.")
221
mandos_serv = dbus.Interface(mandos_dbus_objc,
222
dbus_interface = server_interface)
340
fail_count, test_count = doctest.testmod()
341
sys.exit(os.EX_OK if fail_count == 0 else 1)
344
bus = dbus.SystemBus()
345
mandos_dbus_objc = bus.get_object(busname, server_path)
346
except dbus.exceptions.DBusException:
347
print("Could not connect to Mandos server",
351
mandos_serv = dbus.Interface(mandos_dbus_objc,
352
dbus_interface = server_interface)
354
#block stderr since dbus library prints to stderr
355
null = os.open(os.path.devnull, os.O_RDWR)
356
stderrcopy = os.dup(sys.stderr.fileno())
357
os.dup2(null, sys.stderr.fileno())
224
#block stderr since dbus library prints to stderr
225
null = os.open(os.path.devnull, os.O_RDWR)
226
stderrcopy = os.dup(sys.stderr.fileno())
227
os.dup2(null, sys.stderr.fileno())
361
mandos_clients = mandos_serv.GetAllClientsWithProperties()
364
os.dup2(stderrcopy, sys.stderr.fileno())
366
except dbus.exceptions.DBusException:
367
print("Access denied: Accessing mandos server through dbus.",
371
# Compile dict of (clients: properties) to process
374
if options.all or not options.client:
375
clients = dict((bus.get_object(busname, path), properties)
376
for path, properties in
377
mandos_clients.items())
379
for name in options.client:
380
for path, client in mandos_clients.iteritems():
381
if client["Name"] == name:
382
client_objc = bus.get_object(busname, path)
383
clients[client_objc] = client
231
mandos_clients = mandos_serv.GetAllClientsWithProperties()
234
os.dup2(stderrcopy, sys.stderr.fileno())
236
except dbus.exceptions.DBusException, e:
237
print >> sys.stderr, u"Access denied: Accessing mandos server through dbus."
240
# Compile dict of (clients: properties) to process
243
if options.all or not client_names:
244
clients = dict((bus.get_object(busname, path), properties)
245
for path, properties in
246
mandos_clients.iteritems())
248
for name in client_names:
249
for path, client in mandos_clients.iteritems():
250
if client[u"Name"] == name:
251
client_objc = bus.get_object(busname, path)
252
clients[client_objc] = client
255
print >> sys.stderr, u"Client not found on server: %r" % name
258
if not has_actions(options) and clients:
260
keywords = (u"Name", u"Enabled", u"Timeout",
261
u"LastCheckedOK", u"Created", u"Interval",
262
u"Host", u"Fingerprint", u"CheckerRunning",
263
u"LastEnabled", u"ApprovalPending",
264
u"ApprovedByDefault",
265
u"LastApprovalRequest", u"ApprovalDelay",
266
u"ApprovalDuration", u"Checker")
386
print("Client not found on server: {0!r}"
387
.format(name), file=sys.stderr)
390
if not has_actions(options) and clients:
392
keywords = ("Name", "Enabled", "Timeout",
393
"LastCheckedOK", "Created", "Interval",
394
"Host", "Fingerprint", "CheckerRunning",
395
"LastEnabled", "ApprovalPending",
397
"LastApprovalRequest", "ApprovalDelay",
398
"ApprovalDuration", "Checker",
268
keywords = defaultkeywords
270
print_clients(clients.values(), keywords)
401
keywords = defaultkeywords
403
print_clients(clients.values(), keywords)
405
# Process each client in the list by all selected options
406
for client in clients:
407
def set_client_prop(prop, value):
408
"""Set a Client D-Bus property"""
409
client.Set(client_interface, prop, value,
410
dbus_interface=dbus.PROPERTIES_IFACE)
411
def set_client_prop_ms(prop, value):
412
"""Set a Client D-Bus property, converted
413
from a string to milliseconds."""
414
set_client_prop(prop,
415
timedelta_to_milliseconds
416
(string_to_delta(value)))
418
mandos_serv.RemoveClient(client.__dbus_object_path__)
420
set_client_prop("Enabled", dbus.Boolean(True))
422
set_client_prop("Enabled", dbus.Boolean(False))
423
if options.bump_timeout:
424
set_client_prop("LastCheckedOK", "")
425
if options.start_checker:
426
set_client_prop("CheckerRunning", dbus.Boolean(True))
427
if options.stop_checker:
428
set_client_prop("CheckerRunning", dbus.Boolean(False))
429
if options.is_enabled:
430
sys.exit(0 if client.Get(client_interface,
433
dbus.PROPERTIES_IFACE)
435
if options.checker is not None:
436
set_client_prop("Checker", options.checker)
437
if options.host is not None:
438
set_client_prop("Host", options.host)
439
if options.interval is not None:
440
set_client_prop_ms("Interval", options.interval)
441
if options.approval_delay is not None:
442
set_client_prop_ms("ApprovalDelay",
443
options.approval_delay)
444
if options.approval_duration is not None:
445
set_client_prop_ms("ApprovalDuration",
446
options.approval_duration)
447
if options.timeout is not None:
448
set_client_prop_ms("Timeout", options.timeout)
449
if options.extended_timeout is not None:
450
set_client_prop_ms("ExtendedTimeout",
451
options.extended_timeout)
452
if options.secret is not None:
453
set_client_prop("Secret",
454
dbus.ByteArray(options.secret.read()))
455
if options.approved_by_default is not None:
456
set_client_prop("ApprovedByDefault",
458
.approved_by_default))
460
client.Approve(dbus.Boolean(True),
461
dbus_interface=client_interface)
463
client.Approve(dbus.Boolean(False),
464
dbus_interface=client_interface)
272
# Process each client in the list by all selected options
273
for client in clients:
275
mandos_serv.RemoveClient(client.__dbus_object_path__)
277
client.Enable(dbus_interface=client_interface)
279
client.Disable(dbus_interface=client_interface)
280
if options.bump_timeout:
281
client.CheckedOK(dbus_interface=client_interface)
282
if options.start_checker:
283
client.StartChecker(dbus_interface=client_interface)
284
if options.stop_checker:
285
client.StopChecker(dbus_interface=client_interface)
286
if options.is_enabled:
287
sys.exit(0 if client.Get(client_interface,
289
dbus_interface=dbus.PROPERTIES_IFACE)
292
client.Set(client_interface, u"Checker", options.checker,
293
dbus_interface=dbus.PROPERTIES_IFACE)
295
client.Set(client_interface, u"Host", options.host,
296
dbus_interface=dbus.PROPERTIES_IFACE)
298
client.Set(client_interface, u"Interval",
299
timedelta_to_milliseconds
300
(string_to_delta(options.interval)),
301
dbus_interface=dbus.PROPERTIES_IFACE)
302
if options.approval_delay:
303
client.Set(client_interface, u"ApprovalDelay",
304
timedelta_to_milliseconds
305
(string_to_delta(options.
307
dbus_interface=dbus.PROPERTIES_IFACE)
308
if options.approval_duration:
309
client.Set(client_interface, u"ApprovalDuration",
310
timedelta_to_milliseconds
311
(string_to_delta(options.
313
dbus_interface=dbus.PROPERTIES_IFACE)
315
client.Set(client_interface, u"Timeout",
316
timedelta_to_milliseconds
317
(string_to_delta(options.timeout)),
318
dbus_interface=dbus.PROPERTIES_IFACE)
320
client.Set(client_interface, u"Secret",
321
dbus.ByteArray(open(options.secret,
323
dbus_interface=dbus.PROPERTIES_IFACE)
324
if options.approved_by_default is not None:
325
client.Set(client_interface, u"ApprovedByDefault",
327
.approved_by_default),
328
dbus_interface=dbus.PROPERTIES_IFACE)
330
client.Approve(dbus.Boolean(True),
331
dbus_interface=client_interface)
333
client.Approve(dbus.Boolean(False),
334
dbus_interface=client_interface)
466
if __name__ == "__main__":
336
if __name__ == u"__main__":