/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

* network-hooks.d/openvpn: Tolerate relative MANDOSNETHOOKDIR path.
  (stop): Bug fix: Fix quote escapes.
* network-hooks.d/openvpn.conf: Remove compression.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
1
1
#!/usr/bin/python
2
 
# -*- mode: python; coding: utf-8; after-save-hook: (lambda () (let ((command (if (and (boundp 'tramp-file-name-structure) (string-match (car tramp-file-name-structure) (buffer-file-name))) (tramp-file-name-localname (tramp-dissect-file-name (buffer-file-name))) (buffer-file-name)))) (if (= (shell-command (format "%s --check" (shell-quote-argument command)) "*Test*") 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w)) (kill-buffer "*Test*")) (display-buffer "*Test*")))); -*-
3
 
#
 
2
# -*- mode: python; coding: utf-8 -*-
 
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
 
#
6
 
# Copyright © 2008-2019 Teddy Hogeborn
7
 
# Copyright © 2008-2019 Björn Påhlsson
8
 
#
9
 
# This file is part of Mandos.
10
 
#
11
 
# Mandos is free software: you can redistribute it and/or modify it
12
 
# under the terms of the GNU General Public License as published by
 
5
# 
 
6
# Copyright © 2008-2011 Teddy Hogeborn
 
7
# Copyright © 2008-2011 Björn Påhlsson
 
8
# 
 
9
# This program is free software: you can redistribute it and/or modify
 
10
# it under the terms of the GNU General Public License as published by
13
11
# the Free Software Foundation, either version 3 of the License, or
14
12
# (at your option) any later version.
15
13
#
16
 
#     Mandos is distributed in the hope that it will be useful, but
17
 
#     WITHOUT ANY WARRANTY; without even the implied warranty of
 
14
#     This program is distributed in the hope that it will be useful,
 
15
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
18
16
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
19
17
#     GNU General Public License for more details.
20
 
#
 
18
# 
21
19
# You should have received a copy of the GNU General Public License
22
 
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
23
 
#
 
20
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
21
# 
24
22
# Contact the authors at <mandos@recompile.se>.
25
 
#
 
23
# 
26
24
 
27
25
from __future__ import (division, absolute_import, print_function,
28
26
                        unicode_literals)
29
27
 
30
 
try:
31
 
    from future_builtins import *
32
 
except ImportError:
33
 
    pass
34
 
 
35
28
import sys
 
29
import dbus
36
30
import argparse
37
31
import locale
38
32
import datetime
39
33
import re
40
34
import os
41
 
import collections
42
 
import json
43
 
import unittest
44
 
import logging
45
 
 
46
 
import dbus
47
 
 
48
 
# Show warnings by default
49
 
if not sys.warnoptions:
50
 
    import warnings
51
 
    warnings.simplefilter("default")
52
 
 
53
 
log = logging.getLogger(sys.argv[0])
54
 
logging.basicConfig(level="INFO", # Show info level messages
55
 
                    format="%(message)s") # Show basic log messages
56
 
 
57
 
logging.captureWarnings(True)   # Show warnings via the logging system
58
 
 
59
 
if sys.version_info.major == 2:
60
 
    str = unicode
61
35
 
62
36
locale.setlocale(locale.LC_ALL, "")
63
37
 
71
45
    "Interval": "Interval",
72
46
    "Host": "Host",
73
47
    "Fingerprint": "Fingerprint",
74
 
    "KeyID": "Key ID",
75
48
    "CheckerRunning": "Check Is Running",
76
49
    "LastEnabled": "Last Enabled",
77
50
    "ApprovalPending": "Approval Is Pending",
79
52
    "ApprovalDelay": "Approval Delay",
80
53
    "ApprovalDuration": "Approval Duration",
81
54
    "Checker": "Checker",
82
 
    "ExtendedTimeout": "Extended Timeout",
83
 
    "Expires": "Expires",
84
 
    "LastCheckerStatus": "Last Checker Status",
85
 
}
 
55
    "ExtendedTimeout" : "Extended Timeout"
 
56
    }
86
57
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
87
58
domain = "se.recompile"
88
59
busname = domain + ".Mandos"
89
60
server_path = "/"
90
61
server_interface = domain + ".Mandos"
91
62
client_interface = domain + ".Mandos.Client"
92
 
version = "1.8.3"
93
 
 
94
 
 
95
 
try:
96
 
    dbus.OBJECT_MANAGER_IFACE
97
 
except AttributeError:
98
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
99
 
 
 
63
version = "1.4.1"
 
64
 
 
65
def timedelta_to_milliseconds(td):
 
66
    """Convert a datetime.timedelta object to milliseconds"""
 
67
    return ((td.days * 24 * 60 * 60 * 1000)
 
68
            + (td.seconds * 1000)
 
69
            + (td.microseconds // 1000))
100
70
 
101
71
def milliseconds_to_string(ms):
102
72
    td = datetime.timedelta(0, 0, 0, ms)
103
 
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
104
 
            .format(days="{}T".format(td.days) if td.days else "",
105
 
                    hours=td.seconds // 3600,
106
 
                    minutes=(td.seconds % 3600) // 60,
107
 
                    seconds=td.seconds % 60))
108
 
 
109
 
 
110
 
def rfc3339_duration_to_delta(duration):
111
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
112
 
 
113
 
    >>> rfc3339_duration_to_delta("P7D")
114
 
    datetime.timedelta(7)
115
 
    >>> rfc3339_duration_to_delta("PT60S")
116
 
    datetime.timedelta(0, 60)
117
 
    >>> rfc3339_duration_to_delta("PT60M")
118
 
    datetime.timedelta(0, 3600)
119
 
    >>> rfc3339_duration_to_delta("P60M")
120
 
    datetime.timedelta(1680)
121
 
    >>> rfc3339_duration_to_delta("PT24H")
122
 
    datetime.timedelta(1)
123
 
    >>> rfc3339_duration_to_delta("P1W")
124
 
    datetime.timedelta(7)
125
 
    >>> rfc3339_duration_to_delta("PT5M30S")
126
 
    datetime.timedelta(0, 330)
127
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
128
 
    datetime.timedelta(1, 200)
129
 
    >>> # Can not be empty:
130
 
    >>> rfc3339_duration_to_delta("")
131
 
    Traceback (most recent call last):
132
 
    ...
133
 
    ValueError: Invalid RFC 3339 duration: u''
134
 
    >>> # Must start with "P":
135
 
    >>> rfc3339_duration_to_delta("1D")
136
 
    Traceback (most recent call last):
137
 
    ...
138
 
    ValueError: Invalid RFC 3339 duration: u'1D'
139
 
    >>> # Must use correct order
140
 
    >>> rfc3339_duration_to_delta("PT1S2M")
141
 
    Traceback (most recent call last):
142
 
    ...
143
 
    ValueError: Invalid RFC 3339 duration: u'PT1S2M'
144
 
    >>> # Time needs time marker
145
 
    >>> rfc3339_duration_to_delta("P1H2S")
146
 
    Traceback (most recent call last):
147
 
    ...
148
 
    ValueError: Invalid RFC 3339 duration: u'P1H2S'
149
 
    >>> # Weeks can not be combined with anything else
150
 
    >>> rfc3339_duration_to_delta("P1D2W")
151
 
    Traceback (most recent call last):
152
 
    ...
153
 
    ValueError: Invalid RFC 3339 duration: u'P1D2W'
154
 
    >>> rfc3339_duration_to_delta("P2W2H")
155
 
    Traceback (most recent call last):
156
 
    ...
157
 
    ValueError: Invalid RFC 3339 duration: u'P2W2H'
158
 
    """
159
 
 
160
 
    # Parsing an RFC 3339 duration with regular expressions is not
161
 
    # possible - there would have to be multiple places for the same
162
 
    # values, like seconds.  The current code, while more esoteric, is
163
 
    # cleaner without depending on a parsing library.  If Python had a
164
 
    # built-in library for parsing we would use it, but we'd like to
165
 
    # avoid excessive use of external libraries.
166
 
 
167
 
    # New type for defining tokens, syntax, and semantics all-in-one
168
 
    Token = collections.namedtuple("Token", (
169
 
        "regexp",  # To match token; if "value" is not None, must have
170
 
                   # a "group" containing digits
171
 
        "value",   # datetime.timedelta or None
172
 
        "followers"))           # Tokens valid after this token
173
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
174
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
175
 
    token_end = Token(re.compile(r"$"), None, frozenset())
176
 
    token_second = Token(re.compile(r"(\d+)S"),
177
 
                         datetime.timedelta(seconds=1),
178
 
                         frozenset((token_end, )))
179
 
    token_minute = Token(re.compile(r"(\d+)M"),
180
 
                         datetime.timedelta(minutes=1),
181
 
                         frozenset((token_second, token_end)))
182
 
    token_hour = Token(re.compile(r"(\d+)H"),
183
 
                       datetime.timedelta(hours=1),
184
 
                       frozenset((token_minute, token_end)))
185
 
    token_time = Token(re.compile(r"T"),
186
 
                       None,
187
 
                       frozenset((token_hour, token_minute,
188
 
                                  token_second)))
189
 
    token_day = Token(re.compile(r"(\d+)D"),
190
 
                      datetime.timedelta(days=1),
191
 
                      frozenset((token_time, token_end)))
192
 
    token_month = Token(re.compile(r"(\d+)M"),
193
 
                        datetime.timedelta(weeks=4),
194
 
                        frozenset((token_day, token_end)))
195
 
    token_year = Token(re.compile(r"(\d+)Y"),
196
 
                       datetime.timedelta(weeks=52),
197
 
                       frozenset((token_month, token_end)))
198
 
    token_week = Token(re.compile(r"(\d+)W"),
199
 
                       datetime.timedelta(weeks=1),
200
 
                       frozenset((token_end, )))
201
 
    token_duration = Token(re.compile(r"P"), None,
202
 
                           frozenset((token_year, token_month,
203
 
                                      token_day, token_time,
204
 
                                      token_week)))
205
 
    # Define starting values:
206
 
    # Value so far
207
 
    value = datetime.timedelta()
208
 
    found_token = None
209
 
    # Following valid tokens
210
 
    followers = frozenset((token_duration, ))
211
 
    # String left to parse
212
 
    s = duration
213
 
    # Loop until end token is found
214
 
    while found_token is not token_end:
215
 
        # Search for any currently valid tokens
216
 
        for token in followers:
217
 
            match = token.regexp.match(s)
218
 
            if match is not None:
219
 
                # Token found
220
 
                if token.value is not None:
221
 
                    # Value found, parse digits
222
 
                    factor = int(match.group(1), 10)
223
 
                    # Add to value so far
224
 
                    value += factor * token.value
225
 
                # Strip token from string
226
 
                s = token.regexp.sub("", s, 1)
227
 
                # Go to found token
228
 
                found_token = token
229
 
                # Set valid next tokens
230
 
                followers = found_token.followers
231
 
                break
232
 
        else:
233
 
            # No currently valid tokens were found
234
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
235
 
                             .format(duration))
236
 
    # End token found
237
 
    return value
238
 
 
 
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,
 
78
                })
239
79
 
240
80
def string_to_delta(interval):
241
81
    """Parse a string and return a datetime.timedelta
242
 
    """
243
 
 
244
 
    try:
245
 
        return rfc3339_duration_to_delta(interval)
246
 
    except ValueError as e:
247
 
        log.warning("%s - Parsing as pre-1.6.1 interval instead",
248
 
                    ' '.join(e.args))
249
 
    return parse_pre_1_6_1_interval(interval)
250
 
 
251
 
 
252
 
def parse_pre_1_6_1_interval(interval):
253
 
    """Parse an interval string as documented by Mandos before 1.6.1, and
254
 
    return a datetime.timedelta
255
 
    >>> parse_pre_1_6_1_interval('7d')
 
82
    
 
83
    >>> string_to_delta("7d")
256
84
    datetime.timedelta(7)
257
 
    >>> parse_pre_1_6_1_interval('60s')
 
85
    >>> string_to_delta("60s")
258
86
    datetime.timedelta(0, 60)
259
 
    >>> parse_pre_1_6_1_interval('60m')
 
87
    >>> string_to_delta("60m")
260
88
    datetime.timedelta(0, 3600)
261
 
    >>> parse_pre_1_6_1_interval('24h')
 
89
    >>> string_to_delta("24h")
262
90
    datetime.timedelta(1)
263
 
    >>> parse_pre_1_6_1_interval('1w')
 
91
    >>> string_to_delta("1w")
264
92
    datetime.timedelta(7)
265
 
    >>> parse_pre_1_6_1_interval('5m 30s')
 
93
    >>> string_to_delta("5m 30s")
266
94
    datetime.timedelta(0, 330)
267
 
    >>> parse_pre_1_6_1_interval('')
268
 
    datetime.timedelta(0)
269
 
    >>> # Ignore unknown characters, allow any order and repetitions
270
 
    >>> parse_pre_1_6_1_interval('2dxy7zz11y3m5m')
271
 
    datetime.timedelta(2, 480, 18000)
272
 
 
273
95
    """
274
 
 
275
 
    value = datetime.timedelta(0)
276
 
    regexp = re.compile(r"(\d+)([dsmhw]?)")
277
 
 
278
 
    for num, suffix in regexp.findall(interval):
279
 
        if suffix == "d":
280
 
            value += datetime.timedelta(int(num))
281
 
        elif suffix == "s":
282
 
            value += datetime.timedelta(0, int(num))
283
 
        elif suffix == "m":
284
 
            value += datetime.timedelta(0, 0, 0, 0, int(num))
285
 
        elif suffix == "h":
286
 
            value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
287
 
        elif suffix == "w":
288
 
            value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
289
 
        elif suffix == "":
290
 
            value += datetime.timedelta(0, 0, 0, int(num))
291
 
    return value
292
 
 
 
96
    timevalue = datetime.timedelta(0)
 
97
    regexp = re.compile("\d+[dsmhw]")
 
98
    
 
99
    for s in regexp.findall(interval):
 
100
        try:
 
101
            suffix = unicode(s[-1])
 
102
            value = int(s[:-1])
 
103
            if suffix == "d":
 
104
                delta = datetime.timedelta(value)
 
105
            elif suffix == "s":
 
106
                delta = datetime.timedelta(0, value)
 
107
            elif suffix == "m":
 
108
                delta = datetime.timedelta(0, 0, 0, 0, value)
 
109
            elif suffix == "h":
 
110
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
111
            elif suffix == "w":
 
112
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
113
            else:
 
114
                raise ValueError
 
115
        except (ValueError, IndexError):
 
116
            raise ValueError
 
117
        timevalue += delta
 
118
    return timevalue
293
119
 
294
120
def print_clients(clients, keywords):
295
 
    print('\n'.join(table_rows_of_clients(clients, keywords)))
296
 
 
297
 
def table_rows_of_clients(clients, keywords):
298
121
    def valuetostring(value, keyword):
299
 
        if isinstance(value, dbus.Boolean):
 
122
        if type(value) is dbus.Boolean:
300
123
            return "Yes" if value else "No"
301
124
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
302
 
                       "ApprovalDuration", "ExtendedTimeout"):
 
125
                       "ApprovalDuration"):
303
126
            return milliseconds_to_string(value)
304
 
        return str(value)
305
 
 
 
127
        return unicode(value)
 
128
    
306
129
    # Create format string to print table rows
307
 
    format_string = " ".join("{{{key}:{width}}}".format(
308
 
        width=max(len(tablewords[key]),
309
 
                  max(len(valuetostring(client[key], key))
310
 
                      for client in clients)),
311
 
        key=key)
 
130
    format_string = " ".join("%%-%ds" %
 
131
                             max(len(tablewords[key]),
 
132
                                 max(len(valuetostring(client[key],
 
133
                                                       key))
 
134
                                     for client in
 
135
                                     clients))
312
136
                             for key in keywords)
313
 
    # Start with header line
314
 
    rows = [format_string.format(**tablewords)]
 
137
    # Print header line
 
138
    print(format_string % tuple(tablewords[key] for key in keywords))
315
139
    for client in clients:
316
 
        rows.append(format_string
317
 
                    .format(**{key: valuetostring(client[key], key)
318
 
                               for key in keywords}))
319
 
    return rows
320
 
 
 
140
        print(format_string % tuple(valuetostring(client[key], key)
 
141
                                    for key in keywords))
321
142
 
322
143
def has_actions(options):
323
144
    return any((options.enable,
339
160
                options.approve,
340
161
                options.deny))
341
162
 
342
 
 
343
163
def main():
344
164
    parser = argparse.ArgumentParser()
345
165
    parser.add_argument("--version", action="version",
346
 
                        version="%(prog)s {}".format(version),
 
166
                        version = "%%prog %s" % version,
347
167
                        help="show version number and exit")
348
168
    parser.add_argument("-a", "--all", action="store_true",
349
169
                        help="Select all clients")
350
170
    parser.add_argument("-v", "--verbose", action="store_true",
351
171
                        help="Print all fields")
352
 
    parser.add_argument("-j", "--dump-json", action="store_true",
353
 
                        help="Dump client data in JSON format")
354
172
    parser.add_argument("-e", "--enable", action="store_true",
355
173
                        help="Enable client")
356
174
    parser.add_argument("-d", "--disable", action="store_true",
384
202
    parser.add_argument("--approval-duration",
385
203
                        help="Set duration of one client approval")
386
204
    parser.add_argument("-H", "--host", help="Set host for client")
387
 
    parser.add_argument("-s", "--secret",
388
 
                        type=argparse.FileType(mode="rb"),
 
205
    parser.add_argument("-s", "--secret", type=file,
389
206
                        help="Set password blob (file) for client")
390
207
    parser.add_argument("-A", "--approve", action="store_true",
391
208
                        help="Approve any current client request")
392
209
    parser.add_argument("-D", "--deny", action="store_true",
393
210
                        help="Deny any current client request")
394
 
    parser.add_argument("--check", action="store_true",
395
 
                        help="Run self-test")
396
211
    parser.add_argument("client", nargs="*", help="Client name")
397
212
    options = parser.parse_args()
398
 
 
399
 
    if has_actions(options) and not (options.client or options.all):
 
213
    
 
214
    if has_actions(options) and not options.client and not options.all:
400
215
        parser.error("Options require clients names or --all.")
401
216
    if options.verbose and has_actions(options):
402
 
        parser.error("--verbose can only be used alone.")
403
 
    if options.dump_json and (options.verbose
404
 
                              or has_actions(options)):
405
 
        parser.error("--dump-json can only be used alone.")
 
217
        parser.error("--verbose can only be used alone or with"
 
218
                     " --all.")
406
219
    if options.all and not has_actions(options):
407
220
        parser.error("--all requires an action.")
408
 
 
 
221
    
409
222
    try:
410
223
        bus = dbus.SystemBus()
411
224
        mandos_dbus_objc = bus.get_object(busname, server_path)
412
225
    except dbus.exceptions.DBusException:
413
 
        log.critical("Could not connect to Mandos server")
 
226
        print("Could not connect to Mandos server",
 
227
              file=sys.stderr)
414
228
        sys.exit(1)
415
 
 
 
229
    
416
230
    mandos_serv = dbus.Interface(mandos_dbus_objc,
417
 
                                 dbus_interface=server_interface)
418
 
    mandos_serv_object_manager = dbus.Interface(
419
 
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
420
 
 
421
 
    # block stderr since dbus library prints to stderr
 
231
                                 dbus_interface = server_interface)
 
232
    
 
233
    #block stderr since dbus library prints to stderr
422
234
    null = os.open(os.path.devnull, os.O_RDWR)
423
235
    stderrcopy = os.dup(sys.stderr.fileno())
424
236
    os.dup2(null, sys.stderr.fileno())
425
237
    os.close(null)
426
238
    try:
427
239
        try:
428
 
            mandos_clients = {path: ifs_and_props[client_interface]
429
 
                              for path, ifs_and_props in
430
 
                              mandos_serv_object_manager
431
 
                              .GetManagedObjects().items()
432
 
                              if client_interface in ifs_and_props}
 
240
            mandos_clients = mandos_serv.GetAllClientsWithProperties()
433
241
        finally:
434
 
            # restore stderr
 
242
            #restore stderr
435
243
            os.dup2(stderrcopy, sys.stderr.fileno())
436
244
            os.close(stderrcopy)
437
 
    except dbus.exceptions.DBusException as e:
438
 
        log.critical("Failed to access Mandos server through D-Bus:"
439
 
                     "\n%s", e)
 
245
    except dbus.exceptions.DBusException, e:
 
246
        print("Access denied: Accessing mandos server through dbus.",
 
247
              file=sys.stderr)
440
248
        sys.exit(1)
441
 
 
 
249
    
442
250
    # Compile dict of (clients: properties) to process
443
 
    clients = {}
444
 
 
 
251
    clients={}
 
252
    
445
253
    if options.all or not options.client:
446
 
        clients = {bus.get_object(busname, path): properties
447
 
                   for path, properties in mandos_clients.items()}
 
254
        clients = dict((bus.get_object(busname, path), properties)
 
255
                       for path, properties in
 
256
                       mandos_clients.iteritems())
448
257
    else:
449
258
        for name in options.client:
450
 
            for path, client in mandos_clients.items():
 
259
            for path, client in mandos_clients.iteritems():
451
260
                if client["Name"] == name:
452
261
                    client_objc = bus.get_object(busname, path)
453
262
                    clients[client_objc] = client
454
263
                    break
455
264
            else:
456
 
                log.critical("Client not found on server: %r", name)
 
265
                print("Client not found on server: %r" % name,
 
266
                      file=sys.stderr)
457
267
                sys.exit(1)
458
 
 
 
268
    
459
269
    if not has_actions(options) and clients:
460
 
        if options.verbose or options.dump_json:
461
 
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
462
 
                        "Created", "Interval", "Host", "KeyID",
463
 
                        "Fingerprint", "CheckerRunning",
 
270
        if options.verbose:
 
271
            keywords = ("Name", "Enabled", "Timeout",
 
272
                        "LastCheckedOK", "Created", "Interval",
 
273
                        "Host", "Fingerprint", "CheckerRunning",
464
274
                        "LastEnabled", "ApprovalPending",
465
 
                        "ApprovedByDefault", "LastApprovalRequest",
466
 
                        "ApprovalDelay", "ApprovalDuration",
467
 
                        "Checker", "ExtendedTimeout", "Expires",
468
 
                        "LastCheckerStatus")
 
275
                        "ApprovedByDefault",
 
276
                        "LastApprovalRequest", "ApprovalDelay",
 
277
                        "ApprovalDuration", "Checker",
 
278
                        "ExtendedTimeout")
469
279
        else:
470
280
            keywords = defaultkeywords
471
 
 
472
 
        if options.dump_json:
473
 
            json.dump({client["Name"]: {key:
474
 
                                        bool(client[key])
475
 
                                        if isinstance(client[key],
476
 
                                                      dbus.Boolean)
477
 
                                        else client[key]
478
 
                                        for key in keywords}
479
 
                       for client in clients.values()},
480
 
                      fp=sys.stdout, indent=4,
481
 
                      separators=(',', ': '))
482
 
            print()
483
 
        else:
484
 
            print_clients(clients.values(), keywords)
 
281
        
 
282
        print_clients(clients.values(), keywords)
485
283
    else:
486
284
        # Process each client in the list by all selected options
487
285
        for client in clients:
488
 
 
489
 
            def set_client_prop(prop, value):
490
 
                """Set a Client D-Bus property"""
491
 
                client.Set(client_interface, prop, value,
492
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
493
 
 
494
 
            def set_client_prop_ms(prop, value):
495
 
                """Set a Client D-Bus property, converted
496
 
                from a string to milliseconds."""
497
 
                set_client_prop(prop,
498
 
                                string_to_delta(value).total_seconds()
499
 
                                * 1000)
500
 
 
501
286
            if options.remove:
502
287
                mandos_serv.RemoveClient(client.__dbus_object_path__)
503
288
            if options.enable:
504
 
                set_client_prop("Enabled", dbus.Boolean(True))
 
289
                client.Enable(dbus_interface=client_interface)
505
290
            if options.disable:
506
 
                set_client_prop("Enabled", dbus.Boolean(False))
 
291
                client.Disable(dbus_interface=client_interface)
507
292
            if options.bump_timeout:
508
 
                set_client_prop("LastCheckedOK", "")
 
293
                client.CheckedOK(dbus_interface=client_interface)
509
294
            if options.start_checker:
510
 
                set_client_prop("CheckerRunning", dbus.Boolean(True))
 
295
                client.StartChecker(dbus_interface=client_interface)
511
296
            if options.stop_checker:
512
 
                set_client_prop("CheckerRunning", dbus.Boolean(False))
 
297
                client.StopChecker(dbus_interface=client_interface)
513
298
            if options.is_enabled:
514
 
                if client.Get(client_interface, "Enabled",
515
 
                              dbus_interface=dbus.PROPERTIES_IFACE):
516
 
                    sys.exit(0)
517
 
                else:
518
 
                    sys.exit(1)
 
299
                sys.exit(0 if client.Get(client_interface,
 
300
                                         "Enabled",
 
301
                                         dbus_interface=
 
302
                                         dbus.PROPERTIES_IFACE)
 
303
                         else 1)
519
304
            if options.checker is not None:
520
 
                set_client_prop("Checker", options.checker)
 
305
                client.Set(client_interface, "Checker",
 
306
                           options.checker,
 
307
                           dbus_interface=dbus.PROPERTIES_IFACE)
521
308
            if options.host is not None:
522
 
                set_client_prop("Host", options.host)
 
309
                client.Set(client_interface, "Host", options.host,
 
310
                           dbus_interface=dbus.PROPERTIES_IFACE)
523
311
            if options.interval is not None:
524
 
                set_client_prop_ms("Interval", options.interval)
 
312
                client.Set(client_interface, "Interval",
 
313
                           timedelta_to_milliseconds
 
314
                           (string_to_delta(options.interval)),
 
315
                           dbus_interface=dbus.PROPERTIES_IFACE)
525
316
            if options.approval_delay is not None:
526
 
                set_client_prop_ms("ApprovalDelay",
527
 
                                   options.approval_delay)
 
317
                client.Set(client_interface, "ApprovalDelay",
 
318
                           timedelta_to_milliseconds
 
319
                           (string_to_delta(options.
 
320
                                            approval_delay)),
 
321
                           dbus_interface=dbus.PROPERTIES_IFACE)
528
322
            if options.approval_duration is not None:
529
 
                set_client_prop_ms("ApprovalDuration",
530
 
                                   options.approval_duration)
 
323
                client.Set(client_interface, "ApprovalDuration",
 
324
                           timedelta_to_milliseconds
 
325
                           (string_to_delta(options.
 
326
                                            approval_duration)),
 
327
                           dbus_interface=dbus.PROPERTIES_IFACE)
531
328
            if options.timeout is not None:
532
 
                set_client_prop_ms("Timeout", options.timeout)
 
329
                client.Set(client_interface, "Timeout",
 
330
                           timedelta_to_milliseconds
 
331
                           (string_to_delta(options.timeout)),
 
332
                           dbus_interface=dbus.PROPERTIES_IFACE)
533
333
            if options.extended_timeout is not None:
534
 
                set_client_prop_ms("ExtendedTimeout",
535
 
                                   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)
536
338
            if options.secret is not None:
537
 
                set_client_prop("Secret",
538
 
                                dbus.ByteArray(options.secret.read()))
 
339
                client.Set(client_interface, "Secret",
 
340
                           dbus.ByteArray(open(options.secret,
 
341
                                               "rb").read()),
 
342
                           dbus_interface=dbus.PROPERTIES_IFACE)
539
343
            if options.approved_by_default is not None:
540
 
                set_client_prop("ApprovedByDefault",
541
 
                                dbus.Boolean(options
542
 
                                             .approved_by_default))
 
344
                client.Set(client_interface, "ApprovedByDefault",
 
345
                           dbus.Boolean(options
 
346
                                        .approved_by_default),
 
347
                           dbus_interface=dbus.PROPERTIES_IFACE)
543
348
            if options.approve:
544
349
                client.Approve(dbus.Boolean(True),
545
350
                               dbus_interface=client_interface)
547
352
                client.Approve(dbus.Boolean(False),
548
353
                               dbus_interface=client_interface)
549
354
 
550
 
 
551
 
class Test_milliseconds_to_string(unittest.TestCase):
552
 
    def test_all(self):
553
 
        self.assertEqual(milliseconds_to_string(93785000),
554
 
                         "1T02:03:05")
555
 
    def test_no_days(self):
556
 
        self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
557
 
    def test_all_zero(self):
558
 
        self.assertEqual(milliseconds_to_string(0), "00:00:00")
559
 
    def test_no_fractional_seconds(self):
560
 
        self.assertEqual(milliseconds_to_string(400), "00:00:00")
561
 
        self.assertEqual(milliseconds_to_string(900), "00:00:00")
562
 
        self.assertEqual(milliseconds_to_string(1900), "00:00:01")
563
 
 
564
 
class Test_string_to_delta(unittest.TestCase):
565
 
    def test_handles_basic_rfc3339(self):
566
 
        self.assertEqual(string_to_delta("PT2H"),
567
 
                         datetime.timedelta(0, 7200))
568
 
    def test_falls_back_to_pre_1_6_1_with_warning(self):
569
 
        # assertLogs only exists in Python 3.4
570
 
        if hasattr(self, "assertLogs"):
571
 
            with self.assertLogs(log, logging.WARNING):
572
 
                value = string_to_delta("2h")
573
 
        else:
574
 
            value = string_to_delta("2h")
575
 
        self.assertEqual(value, datetime.timedelta(0, 7200))
576
 
 
577
 
 
578
 
def should_only_run_tests():
579
 
    parser = argparse.ArgumentParser(add_help=False)
580
 
    parser.add_argument("--check", action='store_true')
581
 
    args, unknown_args = parser.parse_known_args()
582
 
    run_tests = args.check
583
 
    if run_tests:
584
 
        # Remove --check argument from sys.argv
585
 
        sys.argv[1:] = unknown_args
586
 
    return run_tests
587
 
 
588
 
# Add all tests from doctest strings
589
 
def load_tests(loader, tests, none):
590
 
    import doctest
591
 
    tests.addTests(doctest.DocTestSuite())
592
 
    return tests
593
 
 
594
355
if __name__ == "__main__":
595
 
    if should_only_run_tests():
596
 
        # Call using ./tdd-python-script --check [--verbose]
597
 
        unittest.main()
598
 
    else:
599
 
        main()
 
356
    main()