/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2012-05-06 16:13:00 UTC
  • Revision ID: teddy@recompile.se-20120506161300-43rls2rr4qub3zhw
* mandos: Use a class decorator instead of a metaclass to provide
          alternate D-Bus interface names on D-Bus object attributes.
  (alternate_dbus_interfaces): New class decorator.
  (AlternateDBusNamesMetaclass, ClientDBusTransitional,
   MandosDBusServiceTransitional): Removed; all users changed.
  (ClientDbus, MandosDBusService): Use new "alternate_dbus_interfaces"
                                   class decorator.

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-2015 Teddy Hogeborn
7
 
# Copyright © 2008-2015 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
 
64
53
    "ApprovalDelay": "Approval Delay",
65
54
    "ApprovalDuration": "Approval Duration",
66
55
    "Checker": "Checker",
67
 
    "ExtendedTimeout": "Extended Timeout"
68
 
}
 
56
    "ExtendedTimeout" : "Extended Timeout"
 
57
    }
69
58
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
70
59
domain = "se.recompile"
71
60
busname = domain + ".Mandos"
72
61
server_path = "/"
73
62
server_interface = domain + ".Mandos"
74
63
client_interface = domain + ".Mandos.Client"
75
 
version = "1.6.9"
 
64
version = "1.5.3"
76
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))
77
71
 
78
72
def milliseconds_to_string(ms):
79
73
    td = datetime.timedelta(0, 0, 0, ms)
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))
85
 
 
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 "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"),
132
 
                       None,
133
 
                       frozenset((token_hour, token_minute,
134
 
                                  token_second)))
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,
150
 
                                      token_week)))
151
 
    # Define starting values
152
 
    value = datetime.timedelta() # Value so far
153
 
    found_token = None
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:
162
 
                # Token found
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)
170
 
                # Go to found token
171
 
                found_token = token
172
 
                # Set valid next tokens
173
 
                followers = found_token.followers
174
 
                break
175
 
        else:
176
 
            # No currently valid tokens were found
177
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
178
 
                             .format(duration))
179
 
    # End token found
180
 
    return value
181
 
 
 
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,
 
79
                    ))
182
80
 
183
81
def string_to_delta(interval):
184
82
    """Parse a string and return a datetime.timedelta
185
83
    
186
 
    >>> string_to_delta('7d')
 
84
    >>> string_to_delta("7d")
187
85
    datetime.timedelta(7)
188
 
    >>> string_to_delta('60s')
 
86
    >>> string_to_delta("60s")
189
87
    datetime.timedelta(0, 60)
190
 
    >>> string_to_delta('60m')
 
88
    >>> string_to_delta("60m")
191
89
    datetime.timedelta(0, 3600)
192
 
    >>> string_to_delta('24h')
 
90
    >>> string_to_delta("24h")
193
91
    datetime.timedelta(1)
194
 
    >>> string_to_delta('1w')
 
92
    >>> string_to_delta("1w")
195
93
    datetime.timedelta(7)
196
 
    >>> string_to_delta('5m 30s')
 
94
    >>> string_to_delta("5m 30s")
197
95
    datetime.timedelta(0, 330)
198
96
    """
199
 
    
200
 
    try:
201
 
        return rfc3339_duration_to_delta(interval)
202
 
    except ValueError:
203
 
        pass
204
 
    
205
97
    value = datetime.timedelta(0)
206
 
    regexp = re.compile(r"(\d+)([dsmhw]?)")
 
98
    regexp = re.compile("(\d+)([dsmhw]?)")
207
99
    
208
100
    for num, suffix in regexp.findall(interval):
209
101
        if suffix == "d":
220
112
            value += datetime.timedelta(0, 0, 0, int(num))
221
113
    return value
222
114
 
223
 
 
224
115
def print_clients(clients, keywords):
225
116
    def valuetostring(value, keyword):
226
117
        if type(value) is dbus.Boolean:
228
119
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
229
120
                       "ApprovalDuration", "ExtendedTimeout"):
230
121
            return milliseconds_to_string(value)
231
 
        return str(value)
 
122
        return unicode(value)
232
123
    
233
124
    # Create format string to print table rows
234
125
    format_string = " ".join("{{{key}:{width}}}".format(
235
 
        width = max(len(tablewords[key]),
236
 
                    max(len(valuetostring(client[key], key))
237
 
                        for client in clients)),
238
 
        key = key)
239
 
                             for key in keywords)
 
126
            width = max(len(tablewords[key]),
 
127
                        max(len(valuetostring(client[key],
 
128
                                              key))
 
129
                            for client in
 
130
                            clients)),
 
131
            key = key) for key in keywords)
240
132
    # Print header line
241
133
    print(format_string.format(**tablewords))
242
134
    for client in clients:
243
 
        print(format_string.format(**{
244
 
            key: valuetostring(client[key], key)
245
 
            for key in keywords }))
246
 
 
 
135
        print(format_string.format(**dict((key,
 
136
                                           valuetostring(client[key],
 
137
                                                         key))
 
138
                                          for key in keywords)))
247
139
 
248
140
def has_actions(options):
249
141
    return any((options.enable,
265
157
                options.approve,
266
158
                options.deny))
267
159
 
268
 
 
269
160
def main():
270
161
    parser = argparse.ArgumentParser()
271
162
    parser.add_argument("--version", action="version",
272
 
                        version = "%(prog)s {}".format(version),
 
163
                        version = "%(prog)s {0}".format(version),
273
164
                        help="show version number and exit")
274
165
    parser.add_argument("-a", "--all", action="store_true",
275
166
                        help="Select all clients")
308
199
    parser.add_argument("--approval-duration",
309
200
                        help="Set duration of one client approval")
310
201
    parser.add_argument("-H", "--host", help="Set host for client")
311
 
    parser.add_argument("-s", "--secret",
312
 
                        type=argparse.FileType(mode="rb"),
 
202
    parser.add_argument("-s", "--secret", type=file,
313
203
                        help="Set password blob (file) for client")
314
204
    parser.add_argument("-A", "--approve", action="store_true",
315
205
                        help="Approve any current client request")
316
206
    parser.add_argument("-D", "--deny", action="store_true",
317
207
                        help="Deny any current client request")
318
 
    parser.add_argument("--check", action="store_true",
319
 
                        help="Run self-test")
320
208
    parser.add_argument("client", nargs="*", help="Client name")
321
209
    options = parser.parse_args()
322
210
    
327
215
                     " --all.")
328
216
    if options.all and not has_actions(options):
329
217
        parser.error("--all requires an action.")
330
 
 
331
 
    if options.check:
332
 
        fail_count, test_count = doctest.testmod()
333
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
334
218
    
335
219
    try:
336
220
        bus = dbus.SystemBus()
337
221
        mandos_dbus_objc = bus.get_object(busname, server_path)
338
222
    except dbus.exceptions.DBusException:
339
 
        print("Could not connect to Mandos server", file=sys.stderr)
 
223
        print("Could not connect to Mandos server",
 
224
              file=sys.stderr)
340
225
        sys.exit(1)
341
226
    
342
227
    mandos_serv = dbus.Interface(mandos_dbus_objc,
363
248
    clients={}
364
249
    
365
250
    if options.all or not options.client:
366
 
        clients = { bus.get_object(busname, path): properties
367
 
                    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())
368
254
    else:
369
255
        for name in options.client:
370
 
            for path, client in mandos_clients.items():
 
256
            for path, client in mandos_clients.iteritems():
371
257
                if client["Name"] == name:
372
258
                    client_objc = bus.get_object(busname, path)
373
259
                    clients[client_objc] = client
374
260
                    break
375
261
            else:
376
 
                print("Client not found on server: {!r}"
 
262
                print("Client not found on server: {0!r}"
377
263
                      .format(name), file=sys.stderr)
378
264
                sys.exit(1)
379
265
    
380
266
    if not has_actions(options) and clients:
381
267
        if options.verbose:
382
 
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
383
 
                        "Created", "Interval", "Host", "Fingerprint",
384
 
                        "CheckerRunning", "LastEnabled",
385
 
                        "ApprovalPending", "ApprovedByDefault",
 
268
            keywords = ("Name", "Enabled", "Timeout",
 
269
                        "LastCheckedOK", "Created", "Interval",
 
270
                        "Host", "Fingerprint", "CheckerRunning",
 
271
                        "LastEnabled", "ApprovalPending",
 
272
                        "ApprovedByDefault",
386
273
                        "LastApprovalRequest", "ApprovalDelay",
387
274
                        "ApprovalDuration", "Checker",
388
275
                        "ExtendedTimeout")
393
280
    else:
394
281
        # Process each client in the list by all selected options
395
282
        for client in clients:
396
 
            
397
283
            def set_client_prop(prop, value):
398
284
                """Set a Client D-Bus property"""
399
285
                client.Set(client_interface, prop, value,
400
286
                           dbus_interface=dbus.PROPERTIES_IFACE)
401
 
            
402
287
            def set_client_prop_ms(prop, value):
403
288
                """Set a Client D-Bus property, converted
404
289
                from a string to milliseconds."""
405
290
                set_client_prop(prop,
406
 
                                string_to_delta(value).total_seconds()
407
 
                                * 1000)
408
 
            
 
291
                                timedelta_to_milliseconds
 
292
                                (string_to_delta(value)))
409
293
            if options.remove:
410
294
                mandos_serv.RemoveClient(client.__dbus_object_path__)
411
295
            if options.enable:
455
339
                client.Approve(dbus.Boolean(False),
456
340
                               dbus_interface=client_interface)
457
341
 
458
 
 
459
342
if __name__ == "__main__":
460
343
    main()