/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: 2019-03-02 19:59:16 UTC
  • Revision ID: teddy@recompile.se-20190302195916-mya36qr865qqujnz
mandos-ctl: White space changes only

* mandos-ctl: Fix some white space, wrapping, and indentation.

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 -*-
3
 
# 
 
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
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
 
# 
6
 
# Copyright © 2008-2012 Teddy Hogeborn
7
 
# Copyright © 2008-2012 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
 
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
11
13
# the Free Software Foundation, either version 3 of the License, or
12
14
# (at your option) any later version.
13
15
#
14
 
#     This program is distributed in the hope that it will be useful,
15
 
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
16
#     Mandos is distributed in the hope that it will be useful, but
 
17
#     WITHOUT ANY WARRANTY; without even the implied warranty of
16
18
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
19
#     GNU General Public License for more details.
18
 
# 
 
20
#
19
21
# You should have received a copy of the GNU General Public License
20
 
# along with this program.  If not, see
21
 
# <http://www.gnu.org/licenses/>.
22
 
# 
 
22
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
23
#
23
24
# Contact the authors at <mandos@recompile.se>.
24
 
# 
 
25
#
25
26
 
26
27
from __future__ import (division, absolute_import, print_function,
27
28
                        unicode_literals)
28
29
 
29
 
from future_builtins import *
 
30
try:
 
31
    from future_builtins import *
 
32
except ImportError:
 
33
    pass
30
34
 
31
35
import sys
32
36
import argparse
35
39
import re
36
40
import os
37
41
import collections
38
 
import doctest
 
42
import json
 
43
import unittest
 
44
import logging
39
45
 
40
46
import dbus
41
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
 
42
62
locale.setlocale(locale.LC_ALL, "")
43
63
 
44
 
tablewords = {
45
 
    "Name": "Name",
46
 
    "Enabled": "Enabled",
47
 
    "Timeout": "Timeout",
48
 
    "LastCheckedOK": "Last Successful Check",
49
 
    "LastApprovalRequest": "Last Approval Request",
50
 
    "Created": "Created",
51
 
    "Interval": "Interval",
52
 
    "Host": "Host",
53
 
    "Fingerprint": "Fingerprint",
54
 
    "CheckerRunning": "Check Is Running",
55
 
    "LastEnabled": "Last Enabled",
56
 
    "ApprovalPending": "Approval Is Pending",
57
 
    "ApprovedByDefault": "Approved By Default",
58
 
    "ApprovalDelay": "Approval Delay",
59
 
    "ApprovalDuration": "Approval Duration",
60
 
    "Checker": "Checker",
61
 
    "ExtendedTimeout" : "Extended Timeout"
62
 
    }
63
64
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
64
65
domain = "se.recompile"
65
66
busname = domain + ".Mandos"
66
67
server_path = "/"
67
68
server_interface = domain + ".Mandos"
68
69
client_interface = domain + ".Mandos.Client"
69
 
version = "1.6.1"
70
 
 
71
 
def timedelta_to_milliseconds(td):
72
 
    """Convert a datetime.timedelta object to milliseconds"""
73
 
    return ((td.days * 24 * 60 * 60 * 1000)
74
 
            + (td.seconds * 1000)
75
 
            + (td.microseconds // 1000))
 
70
version = "1.8.3"
 
71
 
 
72
 
 
73
try:
 
74
    dbus.OBJECT_MANAGER_IFACE
 
75
except AttributeError:
 
76
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
77
 
76
78
 
77
79
def milliseconds_to_string(ms):
78
80
    td = datetime.timedelta(0, 0, 0, ms)
79
81
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
80
 
            .format(days = "{0}T".format(td.days) if td.days else "",
81
 
                    hours = td.seconds // 3600,
82
 
                    minutes = (td.seconds % 3600) // 60,
83
 
                    seconds = td.seconds % 60,
84
 
                    ))
 
82
            .format(days="{}T".format(td.days) if td.days else "",
 
83
                    hours=td.seconds // 3600,
 
84
                    minutes=(td.seconds % 3600) // 60,
 
85
                    seconds=td.seconds % 60))
85
86
 
86
87
 
87
88
def rfc3339_duration_to_delta(duration):
88
89
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
89
 
    
 
90
 
90
91
    >>> rfc3339_duration_to_delta("P7D")
91
92
    datetime.timedelta(7)
92
93
    >>> rfc3339_duration_to_delta("PT60S")
93
94
    datetime.timedelta(0, 60)
94
95
    >>> rfc3339_duration_to_delta("PT60M")
95
96
    datetime.timedelta(0, 3600)
 
97
    >>> rfc3339_duration_to_delta("P60M")
 
98
    datetime.timedelta(1680)
96
99
    >>> rfc3339_duration_to_delta("PT24H")
97
100
    datetime.timedelta(1)
98
101
    >>> rfc3339_duration_to_delta("P1W")
101
104
    datetime.timedelta(0, 330)
102
105
    >>> rfc3339_duration_to_delta("P1DT3M20S")
103
106
    datetime.timedelta(1, 200)
 
107
    >>> # Can not be empty:
 
108
    >>> rfc3339_duration_to_delta("")
 
109
    Traceback (most recent call last):
 
110
    ...
 
111
    ValueError: Invalid RFC 3339 duration: u''
 
112
    >>> # Must start with "P":
 
113
    >>> rfc3339_duration_to_delta("1D")
 
114
    Traceback (most recent call last):
 
115
    ...
 
116
    ValueError: Invalid RFC 3339 duration: u'1D'
 
117
    >>> # Must use correct order
 
118
    >>> rfc3339_duration_to_delta("PT1S2M")
 
119
    Traceback (most recent call last):
 
120
    ...
 
121
    ValueError: Invalid RFC 3339 duration: u'PT1S2M'
 
122
    >>> # Time needs time marker
 
123
    >>> rfc3339_duration_to_delta("P1H2S")
 
124
    Traceback (most recent call last):
 
125
    ...
 
126
    ValueError: Invalid RFC 3339 duration: u'P1H2S'
 
127
    >>> # Weeks can not be combined with anything else
 
128
    >>> rfc3339_duration_to_delta("P1D2W")
 
129
    Traceback (most recent call last):
 
130
    ...
 
131
    ValueError: Invalid RFC 3339 duration: u'P1D2W'
 
132
    >>> rfc3339_duration_to_delta("P2W2H")
 
133
    Traceback (most recent call last):
 
134
    ...
 
135
    ValueError: Invalid RFC 3339 duration: u'P2W2H'
104
136
    """
105
 
    
 
137
 
106
138
    # Parsing an RFC 3339 duration with regular expressions is not
107
139
    # possible - there would have to be multiple places for the same
108
140
    # values, like seconds.  The current code, while more esoteric, is
109
141
    # cleaner without depending on a parsing library.  If Python had a
110
142
    # built-in library for parsing we would use it, but we'd like to
111
143
    # avoid excessive use of external libraries.
112
 
    
 
144
 
113
145
    # 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
 
146
    Token = collections.namedtuple("Token", (
 
147
        "regexp",  # To match token; if "value" is not None, must have
 
148
                   # a "group" containing digits
 
149
        "value",   # datetime.timedelta or None
 
150
        "followers"))           # Tokens valid after this token
123
151
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
124
152
    # the "duration" ABNF definition in RFC 3339, Appendix A.
125
153
    token_end = Token(re.compile(r"$"), None, frozenset())
126
154
    token_second = Token(re.compile(r"(\d+)S"),
127
155
                         datetime.timedelta(seconds=1),
128
 
                         frozenset((token_end,)))
 
156
                         frozenset((token_end, )))
129
157
    token_minute = Token(re.compile(r"(\d+)M"),
130
158
                         datetime.timedelta(minutes=1),
131
159
                         frozenset((token_second, token_end)))
147
175
                       frozenset((token_month, token_end)))
148
176
    token_week = Token(re.compile(r"(\d+)W"),
149
177
                       datetime.timedelta(weeks=1),
150
 
                       frozenset((token_end,)))
 
178
                       frozenset((token_end, )))
151
179
    token_duration = Token(re.compile(r"P"), None,
152
180
                           frozenset((token_year, token_month,
153
181
                                      token_day, token_time,
154
 
                                      token_week))),
155
 
    # Define starting values
156
 
    value = datetime.timedelta() # Value so far
 
182
                                      token_week)))
 
183
    # Define starting values:
 
184
    # Value so far
 
185
    value = datetime.timedelta()
157
186
    found_token = None
158
 
    followers = frozenset(token_duration,) # Following valid tokens
159
 
    s = duration                # String left to parse
 
187
    # Following valid tokens
 
188
    followers = frozenset((token_duration, ))
 
189
    # String left to parse
 
190
    s = duration
160
191
    # Loop until end token is found
161
192
    while found_token is not token_end:
162
193
        # Search for any currently valid tokens
178
209
                break
179
210
        else:
180
211
            # No currently valid tokens were found
181
 
            raise ValueError("Invalid RFC 3339 duration")
 
212
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
213
                             .format(duration))
182
214
    # End token found
183
215
    return value
184
216
 
185
217
 
186
218
def string_to_delta(interval):
187
 
    """Parse a string and return a datetime.timedelta
188
 
    
189
 
    >>> string_to_delta("7d")
190
 
    datetime.timedelta(7)
191
 
    >>> string_to_delta("60s")
192
 
    datetime.timedelta(0, 60)
193
 
    >>> string_to_delta("60m")
194
 
    datetime.timedelta(0, 3600)
195
 
    >>> string_to_delta("24h")
196
 
    datetime.timedelta(1)
197
 
    >>> string_to_delta("1w")
198
 
    datetime.timedelta(7)
199
 
    >>> string_to_delta("5m 30s")
200
 
    datetime.timedelta(0, 330)
201
 
    """
202
 
    
 
219
    """Parse a string and return a datetime.timedelta"""
 
220
 
203
221
    try:
204
222
        return rfc3339_duration_to_delta(interval)
205
 
    except ValueError:
206
 
        pass
207
 
    
 
223
    except ValueError as e:
 
224
        log.warning("%s - Parsing as pre-1.6.1 interval instead",
 
225
                    ' '.join(e.args))
 
226
    return parse_pre_1_6_1_interval(interval)
 
227
 
 
228
 
 
229
def parse_pre_1_6_1_interval(interval):
 
230
    """Parse an interval string as documented by Mandos before 1.6.1,
 
231
    and return a datetime.timedelta
 
232
 
 
233
    >>> parse_pre_1_6_1_interval('7d')
 
234
    datetime.timedelta(7)
 
235
    >>> parse_pre_1_6_1_interval('60s')
 
236
    datetime.timedelta(0, 60)
 
237
    >>> parse_pre_1_6_1_interval('60m')
 
238
    datetime.timedelta(0, 3600)
 
239
    >>> parse_pre_1_6_1_interval('24h')
 
240
    datetime.timedelta(1)
 
241
    >>> parse_pre_1_6_1_interval('1w')
 
242
    datetime.timedelta(7)
 
243
    >>> parse_pre_1_6_1_interval('5m 30s')
 
244
    datetime.timedelta(0, 330)
 
245
    >>> parse_pre_1_6_1_interval('')
 
246
    datetime.timedelta(0)
 
247
    >>> # Ignore unknown characters, allow any order and repetitions
 
248
    >>> parse_pre_1_6_1_interval('2dxy7zz11y3m5m')
 
249
    datetime.timedelta(2, 480, 18000)
 
250
 
 
251
    """
 
252
 
208
253
    value = datetime.timedelta(0)
209
254
    regexp = re.compile(r"(\d+)([dsmhw]?)")
210
 
    
 
255
 
211
256
    for num, suffix in regexp.findall(interval):
212
257
        if suffix == "d":
213
258
            value += datetime.timedelta(int(num))
223
268
            value += datetime.timedelta(0, 0, 0, int(num))
224
269
    return value
225
270
 
226
 
def print_clients(clients, keywords):
 
271
 
 
272
class TableOfClients(object):
 
273
    tablewords = {
 
274
        "Name": "Name",
 
275
        "Enabled": "Enabled",
 
276
        "Timeout": "Timeout",
 
277
        "LastCheckedOK": "Last Successful Check",
 
278
        "LastApprovalRequest": "Last Approval Request",
 
279
        "Created": "Created",
 
280
        "Interval": "Interval",
 
281
        "Host": "Host",
 
282
        "Fingerprint": "Fingerprint",
 
283
        "KeyID": "Key ID",
 
284
        "CheckerRunning": "Check Is Running",
 
285
        "LastEnabled": "Last Enabled",
 
286
        "ApprovalPending": "Approval Is Pending",
 
287
        "ApprovedByDefault": "Approved By Default",
 
288
        "ApprovalDelay": "Approval Delay",
 
289
        "ApprovalDuration": "Approval Duration",
 
290
        "Checker": "Checker",
 
291
        "ExtendedTimeout": "Extended Timeout",
 
292
        "Expires": "Expires",
 
293
        "LastCheckerStatus": "Last Checker Status",
 
294
    }
 
295
 
 
296
    def __init__(self, clients, keywords, tablewords=None):
 
297
        self.clients = clients
 
298
        self.keywords = keywords
 
299
        if tablewords is not None:
 
300
            self.tablewords = tablewords
 
301
 
 
302
    def __str__(self):
 
303
        return "\n".join(self.rows())
 
304
 
 
305
    if sys.version_info.major == 2:
 
306
        __unicode__ = __str__
 
307
        def __str__(self):
 
308
            return str(self).encode(locale.getpreferredencoding())
 
309
 
 
310
    def rows(self):
 
311
        format_string = self.row_formatting_string()
 
312
        rows = [self.header_line(format_string)]
 
313
        rows.extend(self.client_line(client, format_string)
 
314
                    for client in self.clients)
 
315
        return rows
 
316
 
 
317
    def row_formatting_string(self):
 
318
        "Format string used to format table rows"
 
319
        return " ".join("{{{key}:{width}}}".format(
 
320
            width=max(len(self.tablewords[key]),
 
321
                      *(len(self.string_from_client(client, key))
 
322
                        for client in self.clients)),
 
323
            key=key)
 
324
                        for key in self.keywords)
 
325
 
 
326
    def string_from_client(self, client, key):
 
327
        return self.valuetostring(client[key], key)
 
328
 
 
329
    @staticmethod
227
330
    def valuetostring(value, keyword):
228
 
        if type(value) is dbus.Boolean:
 
331
        if isinstance(value, dbus.Boolean):
229
332
            return "Yes" if value else "No"
230
333
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
231
334
                       "ApprovalDuration", "ExtendedTimeout"):
232
335
            return milliseconds_to_string(value)
233
 
        return unicode(value)
234
 
    
235
 
    # Create format string to print table rows
236
 
    format_string = " ".join("{{{key}:{width}}}".format(
237
 
            width = max(len(tablewords[key]),
238
 
                        max(len(valuetostring(client[key],
239
 
                                              key))
240
 
                            for client in
241
 
                            clients)),
242
 
            key = key) for key in keywords)
243
 
    # Print header line
244
 
    print(format_string.format(**tablewords))
245
 
    for client in clients:
246
 
        print(format_string.format(**dict((key,
247
 
                                           valuetostring(client[key],
248
 
                                                         key))
249
 
                                          for key in keywords)))
 
336
        return str(value)
 
337
 
 
338
    def header_line(self, format_string):
 
339
        return format_string.format(**self.tablewords)
 
340
 
 
341
    def client_line(self, client, format_string):
 
342
        return format_string.format(
 
343
            **{key: self.string_from_client(client, key)
 
344
               for key in self.keywords})
 
345
 
250
346
 
251
347
def has_actions(options):
252
348
    return any((options.enable,
268
364
                options.approve,
269
365
                options.deny))
270
366
 
 
367
 
271
368
def main():
272
369
    parser = argparse.ArgumentParser()
273
370
    parser.add_argument("--version", action="version",
274
 
                        version = "%(prog)s {0}".format(version),
 
371
                        version="%(prog)s {}".format(version),
275
372
                        help="show version number and exit")
276
373
    parser.add_argument("-a", "--all", action="store_true",
277
374
                        help="Select all clients")
278
375
    parser.add_argument("-v", "--verbose", action="store_true",
279
376
                        help="Print all fields")
 
377
    parser.add_argument("-j", "--dump-json", action="store_true",
 
378
                        help="Dump client data in JSON format")
280
379
    parser.add_argument("-e", "--enable", action="store_true",
281
380
                        help="Enable client")
282
381
    parser.add_argument("-d", "--disable", action="store_true",
310
409
    parser.add_argument("--approval-duration",
311
410
                        help="Set duration of one client approval")
312
411
    parser.add_argument("-H", "--host", help="Set host for client")
313
 
    parser.add_argument("-s", "--secret", type=file,
 
412
    parser.add_argument("-s", "--secret",
 
413
                        type=argparse.FileType(mode="rb"),
314
414
                        help="Set password blob (file) for client")
315
415
    parser.add_argument("-A", "--approve", action="store_true",
316
416
                        help="Approve any current client request")
320
420
                        help="Run self-test")
321
421
    parser.add_argument("client", nargs="*", help="Client name")
322
422
    options = parser.parse_args()
323
 
    
 
423
 
324
424
    if has_actions(options) and not (options.client or options.all):
325
425
        parser.error("Options require clients names or --all.")
326
426
    if options.verbose and has_actions(options):
327
 
        parser.error("--verbose can only be used alone or with"
328
 
                     " --all.")
 
427
        parser.error("--verbose can only be used alone.")
 
428
    if options.dump_json and (options.verbose
 
429
                              or has_actions(options)):
 
430
        parser.error("--dump-json can only be used alone.")
329
431
    if options.all and not has_actions(options):
330
432
        parser.error("--all requires an action.")
331
433
 
332
 
    if options.check:
333
 
        fail_count, test_count = doctest.testmod()
334
 
        sys.exit(0 if fail_count == 0 else 1)
335
 
    
336
434
    try:
337
435
        bus = dbus.SystemBus()
338
436
        mandos_dbus_objc = bus.get_object(busname, server_path)
339
437
    except dbus.exceptions.DBusException:
340
 
        print("Could not connect to Mandos server",
341
 
              file=sys.stderr)
 
438
        log.critical("Could not connect to Mandos server")
342
439
        sys.exit(1)
343
 
    
 
440
 
344
441
    mandos_serv = dbus.Interface(mandos_dbus_objc,
345
 
                                 dbus_interface = server_interface)
346
 
    
347
 
    #block stderr since dbus library prints to stderr
 
442
                                 dbus_interface=server_interface)
 
443
    mandos_serv_object_manager = dbus.Interface(
 
444
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
 
445
 
 
446
    # block stderr since dbus library prints to stderr
348
447
    null = os.open(os.path.devnull, os.O_RDWR)
349
448
    stderrcopy = os.dup(sys.stderr.fileno())
350
449
    os.dup2(null, sys.stderr.fileno())
351
450
    os.close(null)
352
451
    try:
353
452
        try:
354
 
            mandos_clients = mandos_serv.GetAllClientsWithProperties()
 
453
            mandos_clients = {path: ifs_and_props[client_interface]
 
454
                              for path, ifs_and_props in
 
455
                              mandos_serv_object_manager
 
456
                              .GetManagedObjects().items()
 
457
                              if client_interface in ifs_and_props}
355
458
        finally:
356
 
            #restore stderr
 
459
            # restore stderr
357
460
            os.dup2(stderrcopy, sys.stderr.fileno())
358
461
            os.close(stderrcopy)
359
 
    except dbus.exceptions.DBusException:
360
 
        print("Access denied: Accessing mandos server through dbus.",
361
 
              file=sys.stderr)
 
462
    except dbus.exceptions.DBusException as e:
 
463
        log.critical("Failed to access Mandos server through D-Bus:"
 
464
                     "\n%s", e)
362
465
        sys.exit(1)
363
 
    
 
466
 
364
467
    # Compile dict of (clients: properties) to process
365
 
    clients={}
366
 
    
 
468
    clients = {}
 
469
 
367
470
    if options.all or not options.client:
368
 
        clients = dict((bus.get_object(busname, path), properties)
369
 
                       for path, properties in
370
 
                       mandos_clients.iteritems())
 
471
        clients = {bus.get_object(busname, path): properties
 
472
                   for path, properties in mandos_clients.items()}
371
473
    else:
372
474
        for name in options.client:
373
 
            for path, client in mandos_clients.iteritems():
 
475
            for path, client in mandos_clients.items():
374
476
                if client["Name"] == name:
375
477
                    client_objc = bus.get_object(busname, path)
376
478
                    clients[client_objc] = client
377
479
                    break
378
480
            else:
379
 
                print("Client not found on server: {0!r}"
380
 
                      .format(name), file=sys.stderr)
 
481
                log.critical("Client not found on server: %r", name)
381
482
                sys.exit(1)
382
 
    
 
483
 
383
484
    if not has_actions(options) and clients:
384
 
        if options.verbose:
385
 
            keywords = ("Name", "Enabled", "Timeout",
386
 
                        "LastCheckedOK", "Created", "Interval",
387
 
                        "Host", "Fingerprint", "CheckerRunning",
 
485
        if options.verbose or options.dump_json:
 
486
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
 
487
                        "Created", "Interval", "Host", "KeyID",
 
488
                        "Fingerprint", "CheckerRunning",
388
489
                        "LastEnabled", "ApprovalPending",
389
 
                        "ApprovedByDefault",
390
 
                        "LastApprovalRequest", "ApprovalDelay",
391
 
                        "ApprovalDuration", "Checker",
392
 
                        "ExtendedTimeout")
 
490
                        "ApprovedByDefault", "LastApprovalRequest",
 
491
                        "ApprovalDelay", "ApprovalDuration",
 
492
                        "Checker", "ExtendedTimeout", "Expires",
 
493
                        "LastCheckerStatus")
393
494
        else:
394
495
            keywords = defaultkeywords
395
 
        
396
 
        print_clients(clients.values(), keywords)
 
496
 
 
497
        if options.dump_json:
 
498
            json.dump({client["Name"]: {key:
 
499
                                        bool(client[key])
 
500
                                        if isinstance(client[key],
 
501
                                                      dbus.Boolean)
 
502
                                        else client[key]
 
503
                                        for key in keywords}
 
504
                       for client in clients.values()},
 
505
                      fp=sys.stdout, indent=4,
 
506
                      separators=(',', ': '))
 
507
            print()
 
508
        else:
 
509
            print(TableOfClients(clients.values(), keywords))
397
510
    else:
398
511
        # Process each client in the list by all selected options
399
512
        for client in clients:
 
513
 
400
514
            def set_client_prop(prop, value):
401
515
                """Set a Client D-Bus property"""
402
516
                client.Set(client_interface, prop, value,
403
517
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
518
 
404
519
            def set_client_prop_ms(prop, value):
405
520
                """Set a Client D-Bus property, converted
406
521
                from a string to milliseconds."""
407
522
                set_client_prop(prop,
408
 
                                timedelta_to_milliseconds
409
 
                                (string_to_delta(value)))
 
523
                                string_to_delta(value).total_seconds()
 
524
                                * 1000)
 
525
 
410
526
            if options.remove:
411
527
                mandos_serv.RemoveClient(client.__dbus_object_path__)
412
528
            if options.enable:
420
536
            if options.stop_checker:
421
537
                set_client_prop("CheckerRunning", dbus.Boolean(False))
422
538
            if options.is_enabled:
423
 
                sys.exit(0 if client.Get(client_interface,
424
 
                                         "Enabled",
425
 
                                         dbus_interface=
426
 
                                         dbus.PROPERTIES_IFACE)
427
 
                         else 1)
 
539
                if client.Get(client_interface, "Enabled",
 
540
                              dbus_interface=dbus.PROPERTIES_IFACE):
 
541
                    sys.exit(0)
 
542
                else:
 
543
                    sys.exit(1)
428
544
            if options.checker is not None:
429
545
                set_client_prop("Checker", options.checker)
430
546
            if options.host is not None:
456
572
                client.Approve(dbus.Boolean(False),
457
573
                               dbus_interface=client_interface)
458
574
 
 
575
 
 
576
class Test_milliseconds_to_string(unittest.TestCase):
 
577
    def test_all(self):
 
578
        self.assertEqual(milliseconds_to_string(93785000),
 
579
                         "1T02:03:05")
 
580
    def test_no_days(self):
 
581
        self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
 
582
    def test_all_zero(self):
 
583
        self.assertEqual(milliseconds_to_string(0), "00:00:00")
 
584
    def test_no_fractional_seconds(self):
 
585
        self.assertEqual(milliseconds_to_string(400), "00:00:00")
 
586
        self.assertEqual(milliseconds_to_string(900), "00:00:00")
 
587
        self.assertEqual(milliseconds_to_string(1900), "00:00:01")
 
588
 
 
589
class Test_string_to_delta(unittest.TestCase):
 
590
    def test_handles_basic_rfc3339(self):
 
591
        self.assertEqual(string_to_delta("PT2H"),
 
592
                         datetime.timedelta(0, 7200))
 
593
    def test_falls_back_to_pre_1_6_1_with_warning(self):
 
594
        # assertLogs only exists in Python 3.4
 
595
        if hasattr(self, "assertLogs"):
 
596
            with self.assertLogs(log, logging.WARNING):
 
597
                value = string_to_delta("2h")
 
598
        else:
 
599
            value = string_to_delta("2h")
 
600
        self.assertEqual(value, datetime.timedelta(0, 7200))
 
601
 
 
602
class Test_TableOfClients(unittest.TestCase):
 
603
    def setUp(self):
 
604
        self.tablewords = {
 
605
            "Attr1": "X",
 
606
            "AttrTwo": "Yy",
 
607
            "AttrThree": "Zzz",
 
608
            "Bool": "A D-BUS Boolean",
 
609
            "NonDbusBoolean": "A Non-D-BUS Boolean",
 
610
            "Integer": "An Integer",
 
611
            "Timeout": "Timedelta 1",
 
612
            "Interval": "Timedelta 2",
 
613
            "ApprovalDelay": "Timedelta 3",
 
614
            "ApprovalDuration": "Timedelta 4",
 
615
            "ExtendedTimeout": "Timedelta 5",
 
616
            "String": "A String",
 
617
        }
 
618
        self.keywords = ["Attr1", "AttrTwo"]
 
619
        self.clients = [
 
620
            {
 
621
                "Attr1": "x1",
 
622
                "AttrTwo": "y1",
 
623
                "AttrThree": "z1",
 
624
                "Bool": dbus.Boolean(False),
 
625
                "NonDbusBoolean": False,
 
626
                "Integer": 0,
 
627
                "Timeout": 0,
 
628
                "Interval": 1000,
 
629
                "ApprovalDelay": 2000,
 
630
                "ApprovalDuration": 3000,
 
631
                "ExtendedTimeout": 4000,
 
632
                "String": "",
 
633
            },
 
634
            {
 
635
                "Attr1": "x2",
 
636
                "AttrTwo": "y2",
 
637
                "AttrThree": "z2",
 
638
                "Bool": dbus.Boolean(True),
 
639
                "NonDbusBoolean": True,
 
640
                "Integer": 1,
 
641
                "Timeout": 93785000,
 
642
                "Interval": 93786000,
 
643
                "ApprovalDelay": 93787000,
 
644
                "ApprovalDuration": 93788000,
 
645
                "ExtendedTimeout": 93789000,
 
646
                "String": "A huge string which will not fit," * 10,
 
647
            },
 
648
        ]
 
649
    def test_short_header(self):
 
650
        text = str(TableOfClients(self.clients, self.keywords,
 
651
                                  self.tablewords))
 
652
        expected_text = """
 
653
X  Yy
 
654
x1 y1
 
655
x2 y2
 
656
"""[1:-1]
 
657
        self.assertEqual(text, expected_text)
 
658
    def test_booleans(self):
 
659
        keywords = ["Bool", "NonDbusBoolean"]
 
660
        text = str(TableOfClients(self.clients, keywords,
 
661
                                  self.tablewords))
 
662
        expected_text = """
 
663
A D-BUS Boolean A Non-D-BUS Boolean
 
664
No              False              
 
665
Yes             True               
 
666
"""[1:-1]
 
667
        self.assertEqual(text, expected_text)
 
668
    def test_milliseconds_detection(self):
 
669
        keywords = ["Integer", "Timeout", "Interval", "ApprovalDelay",
 
670
                    "ApprovalDuration", "ExtendedTimeout"]
 
671
        text = str(TableOfClients(self.clients, keywords,
 
672
                                  self.tablewords))
 
673
        expected_text = """
 
674
An Integer Timedelta 1 Timedelta 2 Timedelta 3 Timedelta 4 Timedelta 5
 
675
0          00:00:00    00:00:01    00:00:02    00:00:03    00:00:04   
 
676
1          1T02:03:05  1T02:03:06  1T02:03:07  1T02:03:08  1T02:03:09 
 
677
"""[1:-1]
 
678
        self.assertEqual(text, expected_text)
 
679
    def test_empty_and_long_string_values(self):
 
680
        keywords = ["String"]
 
681
        text = str(TableOfClients(self.clients, keywords,
 
682
                                  self.tablewords))
 
683
        expected_text = """
 
684
A String                                                                                                                                                                                                                                                                                                                                  
 
685
                                                                                                                                                                                                                                                                                                                                          
 
686
A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,
 
687
"""[1:-1]
 
688
        self.assertEqual(text, expected_text)
 
689
 
 
690
 
 
691
 
 
692
def should_only_run_tests():
 
693
    parser = argparse.ArgumentParser(add_help=False)
 
694
    parser.add_argument("--check", action='store_true')
 
695
    args, unknown_args = parser.parse_known_args()
 
696
    run_tests = args.check
 
697
    if run_tests:
 
698
        # Remove --check argument from sys.argv
 
699
        sys.argv[1:] = unknown_args
 
700
    return run_tests
 
701
 
 
702
# Add all tests from doctest strings
 
703
def load_tests(loader, tests, none):
 
704
    import doctest
 
705
    tests.addTests(doctest.DocTestSuite())
 
706
    return tests
 
707
 
459
708
if __name__ == "__main__":
460
 
    main()
 
709
    if should_only_run_tests():
 
710
        # Call using ./tdd-python-script --check [--verbose]
 
711
        unittest.main()
 
712
    else:
 
713
        main()