71
71
def milliseconds_to_string(ms):
72
72
td = datetime.timedelta(0, 0, 0, ms)
73
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
74
.format(days = "{0}T".format(td.days) if td.days else "",
75
hours = td.seconds // 3600,
76
minutes = (td.seconds % 3600) // 60,
77
seconds = td.seconds % 60,
73
return ("%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
74
% { "days": "%dT" % td.days if td.days else "",
75
"hours": td.seconds // 3600,
76
"minutes": (td.seconds % 3600) // 60,
77
"seconds": td.seconds % 60,
80
80
def string_to_delta(interval):
81
81
"""Parse a string and return a datetime.timedelta
93
93
>>> string_to_delta("5m 30s")
94
94
datetime.timedelta(0, 330)
96
value = datetime.timedelta(0)
97
regexp = re.compile("(\d+)([dsmhw]?)")
96
timevalue = datetime.timedelta(0)
97
regexp = re.compile("\d+[dsmhw]")
99
for num, suffix in regexp.findall(interval):
101
value += datetime.timedelta(int(num))
103
value += datetime.timedelta(0, int(num))
105
value += datetime.timedelta(0, 0, 0, 0, int(num))
107
value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
109
value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
111
value += datetime.timedelta(0, 0, 0, int(num))
99
for s in regexp.findall(interval):
101
suffix = unicode(s[-1])
104
delta = datetime.timedelta(value)
106
delta = datetime.timedelta(0, value)
108
delta = datetime.timedelta(0, 0, 0, 0, value)
110
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
112
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
115
except (ValueError, IndexError):
114
120
def print_clients(clients, keywords):
115
121
def valuetostring(value, keyword):
116
122
if type(value) is dbus.Boolean:
117
123
return "Yes" if value else "No"
118
124
if keyword in ("Timeout", "Interval", "ApprovalDelay",
119
"ApprovalDuration", "ExtendedTimeout"):
120
126
return milliseconds_to_string(value)
121
127
return unicode(value)
123
129
# Create format string to print table rows
124
format_string = " ".join("{{{key}:{width}}}".format(
125
width = max(len(tablewords[key]),
126
max(len(valuetostring(client[key],
130
key = key) for key in keywords)
130
format_string = " ".join("%%-%ds" %
131
max(len(tablewords[key]),
132
max(len(valuetostring(client[key],
131
137
# Print header line
132
print(format_string.format(**tablewords))
138
print(format_string % tuple(tablewords[key] for key in keywords))
133
139
for client in clients:
134
print(format_string.format(**dict((key,
135
valuetostring(client[key],
137
for key in keywords)))
140
print(format_string % tuple(valuetostring(client[key], key)
141
for key in keywords))
139
143
def has_actions(options):
140
144
return any((options.enable,
280
284
# Process each client in the list by all selected options
281
285
for client in clients:
282
def set_client_prop(prop, value):
283
"""Set a Client D-Bus property"""
284
client.Set(client_interface, prop, value,
285
dbus_interface=dbus.PROPERTIES_IFACE)
286
def set_client_prop_ms(prop, value):
287
"""Set a Client D-Bus property, converted
288
from a string to milliseconds."""
289
set_client_prop(prop,
290
timedelta_to_milliseconds
291
(string_to_delta(value)))
292
286
if options.remove:
293
287
mandos_serv.RemoveClient(client.__dbus_object_path__)
294
288
if options.enable:
295
set_client_prop("Enabled", dbus.Boolean(True))
289
client.Enable(dbus_interface=client_interface)
296
290
if options.disable:
297
set_client_prop("Enabled", dbus.Boolean(False))
291
client.Disable(dbus_interface=client_interface)
298
292
if options.bump_timeout:
299
set_client_prop("LastCheckedOK", "")
293
client.CheckedOK(dbus_interface=client_interface)
300
294
if options.start_checker:
301
set_client_prop("CheckerRunning", dbus.Boolean(True))
295
client.StartChecker(dbus_interface=client_interface)
302
296
if options.stop_checker:
303
set_client_prop("CheckerRunning", dbus.Boolean(False))
297
client.StopChecker(dbus_interface=client_interface)
304
298
if options.is_enabled:
305
299
sys.exit(0 if client.Get(client_interface,
308
302
dbus.PROPERTIES_IFACE)
310
if options.checker is not None:
311
set_client_prop("Checker", options.checker)
312
if options.host is not None:
313
set_client_prop("Host", options.host)
314
if options.interval is not None:
315
set_client_prop_ms("Interval", options.interval)
316
if options.approval_delay is not None:
317
set_client_prop_ms("ApprovalDelay",
318
options.approval_delay)
319
if options.approval_duration is not None:
320
set_client_prop_ms("ApprovalDuration",
321
options.approval_duration)
322
if options.timeout is not None:
323
set_client_prop_ms("Timeout", options.timeout)
324
if options.extended_timeout is not None:
325
set_client_prop_ms("ExtendedTimeout",
326
options.extended_timeout)
327
if options.secret is not None:
328
set_client_prop("Secret",
329
dbus.ByteArray(options.secret.read()))
305
client.Set(client_interface, "Checker",
307
dbus_interface=dbus.PROPERTIES_IFACE)
309
client.Set(client_interface, "Host", options.host,
310
dbus_interface=dbus.PROPERTIES_IFACE)
312
client.Set(client_interface, "Interval",
313
timedelta_to_milliseconds
314
(string_to_delta(options.interval)),
315
dbus_interface=dbus.PROPERTIES_IFACE)
316
if options.approval_delay:
317
client.Set(client_interface, "ApprovalDelay",
318
timedelta_to_milliseconds
319
(string_to_delta(options.
321
dbus_interface=dbus.PROPERTIES_IFACE)
322
if options.approval_duration:
323
client.Set(client_interface, "ApprovalDuration",
324
timedelta_to_milliseconds
325
(string_to_delta(options.
327
dbus_interface=dbus.PROPERTIES_IFACE)
329
client.Set(client_interface, "Timeout",
330
timedelta_to_milliseconds
331
(string_to_delta(options.timeout)),
332
dbus_interface=dbus.PROPERTIES_IFACE)
333
if options.extended_timeout:
334
client.Set(client_interface, "ExtendedTimeout",
335
timedelta_to_milliseconds
336
(string_to_delta(options.extended_timeout)),
337
dbus_interface=dbus.PROPERTIES_IFACE)
339
client.Set(client_interface, "Secret",
340
dbus.ByteArray(open(options.secret,
342
dbus_interface=dbus.PROPERTIES_IFACE)
330
343
if options.approved_by_default is not None:
331
set_client_prop("ApprovedByDefault",
333
.approved_by_default))
344
client.Set(client_interface, "ApprovedByDefault",
346
.approved_by_default),
347
dbus_interface=dbus.PROPERTIES_IFACE)
334
348
if options.approve:
335
349
client.Approve(dbus.Boolean(True),
336
350
dbus_interface=client_interface)
added
removed
mandos-ctl
