53
64
"ApprovalDelay": "Approval Delay",
54
65
"ApprovalDuration": "Approval Duration",
55
66
"Checker": "Checker",
56
"ExtendedTimeout" : "Extended Timeout"
67
"ExtendedTimeout": "Extended Timeout"
58
69
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
59
70
domain = "se.recompile"
60
71
busname = domain + ".Mandos"
62
73
server_interface = domain + ".Mandos"
63
74
client_interface = domain + ".Mandos.Client"
66
def timedelta_to_milliseconds(td):
67
"""Convert a datetime.timedelta object to milliseconds"""
68
return ((td.days * 24 * 60 * 60 * 1000)
70
+ (td.microseconds // 1000))
72
78
def milliseconds_to_string(ms):
73
79
td = datetime.timedelta(0, 0, 0, ms)
74
return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
75
.format(days = "{0}T".format(td.days) if td.days else "",
76
hours = td.seconds // 3600,
77
minutes = (td.seconds % 3600) // 60,
78
seconds = td.seconds % 60,
80
return ("{days}{hours:02}:{minutes:02}:{seconds:02}".format(
81
days = "{}T".format(td.days) if td.days else "",
82
hours = td.seconds // 3600,
83
minutes = (td.seconds % 3600) // 60,
84
seconds = td.seconds % 60))
87
def rfc3339_duration_to_delta(duration):
88
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
90
>>> rfc3339_duration_to_delta("P7D")
92
>>> rfc3339_duration_to_delta("PT60S")
93
datetime.timedelta(0, 60)
94
>>> rfc3339_duration_to_delta("PT60M")
95
datetime.timedelta(0, 3600)
96
>>> rfc3339_duration_to_delta("PT24H")
98
>>> rfc3339_duration_to_delta("P1W")
100
>>> rfc3339_duration_to_delta("PT5M30S")
101
datetime.timedelta(0, 330)
102
>>> rfc3339_duration_to_delta("P1DT3M20S")
103
datetime.timedelta(1, 200)
106
# Parsing an RFC 3339 duration with regular expressions is not
107
# possible - there would have to be multiple places for the same
108
# values, like seconds. The current code, while more esoteric, is
109
# cleaner without depending on a parsing library. If Python had a
110
# built-in library for parsing we would use it, but we'd like to
111
# avoid excessive use of external libraries.
113
# New type for defining tokens, syntax, and semantics all-in-one
114
Token = collections.namedtuple("Token", (
115
"regexp", # To match token; if "value" is not None, must have
116
# a "group" containing digits
117
"value", # datetime.timedelta or None
118
"followers")) # Tokens valid after this token
119
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
120
# the "duration" ABNF definition in RFC 3339, Appendix A.
121
token_end = Token(re.compile(r"$"), None, frozenset())
122
token_second = Token(re.compile(r"(\d+)S"),
123
datetime.timedelta(seconds=1),
124
frozenset((token_end, )))
125
token_minute = Token(re.compile(r"(\d+)M"),
126
datetime.timedelta(minutes=1),
127
frozenset((token_second, token_end)))
128
token_hour = Token(re.compile(r"(\d+)H"),
129
datetime.timedelta(hours=1),
130
frozenset((token_minute, token_end)))
131
token_time = Token(re.compile(r"T"),
133
frozenset((token_hour, token_minute,
135
token_day = Token(re.compile(r"(\d+)D"),
136
datetime.timedelta(days=1),
137
frozenset((token_time, token_end)))
138
token_month = Token(re.compile(r"(\d+)M"),
139
datetime.timedelta(weeks=4),
140
frozenset((token_day, token_end)))
141
token_year = Token(re.compile(r"(\d+)Y"),
142
datetime.timedelta(weeks=52),
143
frozenset((token_month, token_end)))
144
token_week = Token(re.compile(r"(\d+)W"),
145
datetime.timedelta(weeks=1),
146
frozenset((token_end, )))
147
token_duration = Token(re.compile(r"P"), None,
148
frozenset((token_year, token_month,
149
token_day, token_time,
151
# Define starting values
152
value = datetime.timedelta() # Value so far
154
followers = frozenset((token_duration, )) # Following valid tokens
155
s = duration # String left to parse
156
# Loop until end token is found
157
while found_token is not token_end:
158
# Search for any currently valid tokens
159
for token in followers:
160
match = token.regexp.match(s)
161
if match is not None:
163
if token.value is not None:
164
# Value found, parse digits
165
factor = int(match.group(1), 10)
166
# Add to value so far
167
value += factor * token.value
168
# Strip token from string
169
s = token.regexp.sub("", s, 1)
172
# Set valid next tokens
173
followers = found_token.followers
176
# No currently valid tokens were found
177
raise ValueError("Invalid RFC 3339 duration: {!r}"
81
183
def string_to_delta(interval):
82
184
"""Parse a string and return a datetime.timedelta
84
>>> string_to_delta("7d")
186
>>> string_to_delta('7d')
85
187
datetime.timedelta(7)
86
>>> string_to_delta("60s")
188
>>> string_to_delta('60s')
87
189
datetime.timedelta(0, 60)
88
>>> string_to_delta("60m")
190
>>> string_to_delta('60m')
89
191
datetime.timedelta(0, 3600)
90
>>> string_to_delta("24h")
192
>>> string_to_delta('24h')
91
193
datetime.timedelta(1)
92
>>> string_to_delta("1w")
194
>>> string_to_delta('1w')
93
195
datetime.timedelta(7)
94
>>> string_to_delta("5m 30s")
196
>>> string_to_delta('5m 30s')
95
197
datetime.timedelta(0, 330)
201
return rfc3339_duration_to_delta(interval)
97
205
value = datetime.timedelta(0)
98
regexp = re.compile("(\d+)([dsmhw]?)")
206
regexp = re.compile(r"(\d+)([dsmhw]?)")
100
208
for num, suffix in regexp.findall(interval):
101
209
if suffix == "d":
250
365
if options.all or not options.client:
251
clients = dict((bus.get_object(busname, path), properties)
252
for path, properties in
253
mandos_clients.iteritems())
366
clients = { bus.get_object(busname, path): properties
367
for path, properties in mandos_clients.items() }
255
369
for name in options.client:
256
for path, client in mandos_clients.iteritems():
370
for path, client in mandos_clients.items():
257
371
if client["Name"] == name:
258
372
client_objc = bus.get_object(busname, path)
259
373
clients[client_objc] = client
262
print("Client not found on server: {0!r}"
376
print("Client not found on server: {!r}"
263
377
.format(name), file=sys.stderr)
266
380
if not has_actions(options) and clients:
267
381
if options.verbose:
268
keywords = ("Name", "Enabled", "Timeout",
269
"LastCheckedOK", "Created", "Interval",
270
"Host", "Fingerprint", "CheckerRunning",
271
"LastEnabled", "ApprovalPending",
382
keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
383
"Created", "Interval", "Host", "Fingerprint",
384
"CheckerRunning", "LastEnabled",
385
"ApprovalPending", "ApprovedByDefault",
273
386
"LastApprovalRequest", "ApprovalDelay",
274
387
"ApprovalDuration", "Checker",
275
388
"ExtendedTimeout")
added
removed
mandos-ctl
