/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-ctl

* mandos: White space and other misc. format fixes only.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
3
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
# 
6
 
# Copyright © 2008-2014 Teddy Hogeborn
7
 
# Copyright © 2008-2014 Björn Påhlsson
 
6
# Copyright © 2008-2012 Teddy Hogeborn
 
7
# Copyright © 2008-2012 Björn Påhlsson
8
8
# 
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
26
26
from __future__ import (division, absolute_import, print_function,
27
27
                        unicode_literals)
28
28
 
29
 
try:
30
 
    from future_builtins import *
31
 
except ImportError:
32
 
    pass
33
 
 
34
29
import sys
 
30
import dbus
35
31
import argparse
36
32
import locale
37
33
import datetime
38
34
import re
39
35
import os
40
 
import collections
41
 
import doctest
42
 
 
43
 
import dbus
44
 
 
45
 
if sys.version_info.major == 2:
46
 
    str = unicode
47
36
 
48
37
locale.setlocale(locale.LC_ALL, "")
49
38
 
72
61
server_path = "/"
73
62
server_interface = domain + ".Mandos"
74
63
client_interface = domain + ".Mandos.Client"
75
 
version = "1.6.7"
 
64
version = "1.5.3"
 
65
 
 
66
def timedelta_to_milliseconds(td):
 
67
    """Convert a datetime.timedelta object to milliseconds"""
 
68
    return ((td.days * 24 * 60 * 60 * 1000)
 
69
            + (td.seconds * 1000)
 
70
            + (td.microseconds // 1000))
76
71
 
77
72
def milliseconds_to_string(ms):
78
73
    td = datetime.timedelta(0, 0, 0, ms)
79
74
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
80
 
            .format(days = "{}T".format(td.days) if td.days else "",
 
75
            .format(days = "{0}T".format(td.days) if td.days else "",
81
76
                    hours = td.seconds // 3600,
82
77
                    minutes = (td.seconds % 3600) // 60,
83
78
                    seconds = td.seconds % 60,
84
79
                    ))
85
80
 
86
 
 
87
 
def rfc3339_duration_to_delta(duration):
88
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
89
 
    
90
 
    >>> rfc3339_duration_to_delta("P7D")
91
 
    datetime.timedelta(7)
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")
97
 
    datetime.timedelta(1)
98
 
    >>> rfc3339_duration_to_delta("P1W")
99
 
    datetime.timedelta(7)
100
 
    >>> rfc3339_duration_to_delta("PT5M30S")
101
 
    datetime.timedelta(0, 330)
102
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
103
 
    datetime.timedelta(1, 200)
104
 
    """
105
 
    
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.
112
 
    
113
 
    # New type for defining tokens, syntax, and semantics all-in-one
114
 
    Token = collections.namedtuple("Token",
115
 
                                   ("regexp", # To match token; if
116
 
                                              # "value" is not None,
117
 
                                              # must have a "group"
118
 
                                              # containing digits
119
 
                                    "value",  # datetime.timedelta or
120
 
                                              # None
121
 
                                    "followers")) # Tokens valid after
122
 
                                                  # this token
123
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
124
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
125
 
    token_end = Token(re.compile(r"$"), None, frozenset())
126
 
    token_second = Token(re.compile(r"(\d+)S"),
127
 
                         datetime.timedelta(seconds=1),
128
 
                         frozenset((token_end,)))
129
 
    token_minute = Token(re.compile(r"(\d+)M"),
130
 
                         datetime.timedelta(minutes=1),
131
 
                         frozenset((token_second, token_end)))
132
 
    token_hour = Token(re.compile(r"(\d+)H"),
133
 
                       datetime.timedelta(hours=1),
134
 
                       frozenset((token_minute, token_end)))
135
 
    token_time = Token(re.compile(r"T"),
136
 
                       None,
137
 
                       frozenset((token_hour, token_minute,
138
 
                                  token_second)))
139
 
    token_day = Token(re.compile(r"(\d+)D"),
140
 
                      datetime.timedelta(days=1),
141
 
                      frozenset((token_time, token_end)))
142
 
    token_month = Token(re.compile(r"(\d+)M"),
143
 
                        datetime.timedelta(weeks=4),
144
 
                        frozenset((token_day, token_end)))
145
 
    token_year = Token(re.compile(r"(\d+)Y"),
146
 
                       datetime.timedelta(weeks=52),
147
 
                       frozenset((token_month, token_end)))
148
 
    token_week = Token(re.compile(r"(\d+)W"),
149
 
                       datetime.timedelta(weeks=1),
150
 
                       frozenset((token_end,)))
151
 
    token_duration = Token(re.compile(r"P"), None,
152
 
                           frozenset((token_year, token_month,
153
 
                                      token_day, token_time,
154
 
                                      token_week)))
155
 
    # Define starting values
156
 
    value = datetime.timedelta() # Value so far
157
 
    found_token = None
158
 
    followers = frozenset((token_duration,)) # Following valid tokens
159
 
    s = duration                # String left to parse
160
 
    # Loop until end token is found
161
 
    while found_token is not token_end:
162
 
        # Search for any currently valid tokens
163
 
        for token in followers:
164
 
            match = token.regexp.match(s)
165
 
            if match is not None:
166
 
                # Token found
167
 
                if token.value is not None:
168
 
                    # Value found, parse digits
169
 
                    factor = int(match.group(1), 10)
170
 
                    # Add to value so far
171
 
                    value += factor * token.value
172
 
                # Strip token from string
173
 
                s = token.regexp.sub("", s, 1)
174
 
                # Go to found token
175
 
                found_token = token
176
 
                # Set valid next tokens
177
 
                followers = found_token.followers
178
 
                break
179
 
        else:
180
 
            # No currently valid tokens were found
181
 
            raise ValueError("Invalid RFC 3339 duration")
182
 
    # End token found
183
 
    return value
184
 
 
185
 
 
186
81
def string_to_delta(interval):
187
82
    """Parse a string and return a datetime.timedelta
188
83
    
199
94
    >>> string_to_delta("5m 30s")
200
95
    datetime.timedelta(0, 330)
201
96
    """
202
 
    
203
 
    try:
204
 
        return rfc3339_duration_to_delta(interval)
205
 
    except ValueError:
206
 
        pass
207
 
    
208
97
    value = datetime.timedelta(0)
209
 
    regexp = re.compile(r"(\d+)([dsmhw]?)")
 
98
    regexp = re.compile("(\d+)([dsmhw]?)")
210
99
    
211
100
    for num, suffix in regexp.findall(interval):
212
101
        if suffix == "d":
230
119
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
231
120
                       "ApprovalDuration", "ExtendedTimeout"):
232
121
            return milliseconds_to_string(value)
233
 
        return str(value)
 
122
        return unicode(value)
234
123
    
235
124
    # Create format string to print table rows
236
125
    format_string = " ".join("{{{key}:{width}}}".format(
243
132
    # Print header line
244
133
    print(format_string.format(**tablewords))
245
134
    for client in clients:
246
 
        print(format_string.format(**{ key:
 
135
        print(format_string.format(**dict((key,
247
136
                                           valuetostring(client[key],
248
 
                                                         key)
249
 
                                       for key in keywords }))
 
137
                                                         key))
 
138
                                          for key in keywords)))
250
139
 
251
140
def has_actions(options):
252
141
    return any((options.enable,
271
160
def main():
272
161
    parser = argparse.ArgumentParser()
273
162
    parser.add_argument("--version", action="version",
274
 
                        version = "%(prog)s {}".format(version),
 
163
                        version = "%(prog)s {0}".format(version),
275
164
                        help="show version number and exit")
276
165
    parser.add_argument("-a", "--all", action="store_true",
277
166
                        help="Select all clients")
310
199
    parser.add_argument("--approval-duration",
311
200
                        help="Set duration of one client approval")
312
201
    parser.add_argument("-H", "--host", help="Set host for client")
313
 
    parser.add_argument("-s", "--secret",
314
 
                        type=argparse.FileType(mode="rb"),
 
202
    parser.add_argument("-s", "--secret", type=file,
315
203
                        help="Set password blob (file) for client")
316
204
    parser.add_argument("-A", "--approve", action="store_true",
317
205
                        help="Approve any current client request")
318
206
    parser.add_argument("-D", "--deny", action="store_true",
319
207
                        help="Deny any current client request")
320
 
    parser.add_argument("--check", action="store_true",
321
 
                        help="Run self-test")
322
208
    parser.add_argument("client", nargs="*", help="Client name")
323
209
    options = parser.parse_args()
324
210
    
329
215
                     " --all.")
330
216
    if options.all and not has_actions(options):
331
217
        parser.error("--all requires an action.")
332
 
 
333
 
    if options.check:
334
 
        fail_count, test_count = doctest.testmod()
335
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
336
218
    
337
219
    try:
338
220
        bus = dbus.SystemBus()
366
248
    clients={}
367
249
    
368
250
    if options.all or not options.client:
369
 
        clients = { bus.get_object(busname, path): properties
370
 
                    for path, properties in mandos_clients.items() }
 
251
        clients = dict((bus.get_object(busname, path), properties)
 
252
                       for path, properties in
 
253
                       mandos_clients.iteritems())
371
254
    else:
372
255
        for name in options.client:
373
 
            for path, client in mandos_clients.items():
 
256
            for path, client in mandos_clients.iteritems():
374
257
                if client["Name"] == name:
375
258
                    client_objc = bus.get_object(busname, path)
376
259
                    clients[client_objc] = client
377
260
                    break
378
261
            else:
379
 
                print("Client not found on server: {!r}"
 
262
                print("Client not found on server: {0!r}"
380
263
                      .format(name), file=sys.stderr)
381
264
                sys.exit(1)
382
265
    
405
288
                """Set a Client D-Bus property, converted
406
289
                from a string to milliseconds."""
407
290
                set_client_prop(prop,
408
 
                                string_to_delta(value).total_seconds()
409
 
                                * 1000)
 
291
                                timedelta_to_milliseconds
 
292
                                (string_to_delta(value)))
410
293
            if options.remove:
411
294
                mandos_serv.RemoveClient(client.__dbus_object_path__)
412
295
            if options.enable: