/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 00:26:04 UTC
  • Revision ID: teddy@recompile.se-20190302002604-r9kpfc7n8qllwg62
mandos-ctl (print_clients): Factor out making strings from printing

* mandos-ctl (table_rows_of_clients): New.

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 <http://www.gnu.org/licenses/>.
21
 
# 
 
22
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
23
#
22
24
# Contact the authors at <mandos@recompile.se>.
23
 
# 
 
25
#
24
26
 
25
27
from __future__ import (division, absolute_import, print_function,
26
28
                        unicode_literals)
27
29
 
 
30
try:
 
31
    from future_builtins import *
 
32
except ImportError:
 
33
    pass
 
34
 
28
35
import sys
29
 
import dbus
30
36
import argparse
31
37
import locale
32
38
import datetime
33
39
import re
34
40
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
35
61
 
36
62
locale.setlocale(locale.LC_ALL, "")
37
63
 
45
71
    "Interval": "Interval",
46
72
    "Host": "Host",
47
73
    "Fingerprint": "Fingerprint",
 
74
    "KeyID": "Key ID",
48
75
    "CheckerRunning": "Check Is Running",
49
76
    "LastEnabled": "Last Enabled",
50
77
    "ApprovalPending": "Approval Is Pending",
52
79
    "ApprovalDelay": "Approval Delay",
53
80
    "ApprovalDuration": "Approval Duration",
54
81
    "Checker": "Checker",
55
 
    "ExtendedTimeout" : "Extended Timeout"
56
 
    }
 
82
    "ExtendedTimeout": "Extended Timeout",
 
83
    "Expires": "Expires",
 
84
    "LastCheckerStatus": "Last Checker Status",
 
85
}
57
86
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
58
87
domain = "se.recompile"
59
88
busname = domain + ".Mandos"
60
89
server_path = "/"
61
90
server_interface = domain + ".Mandos"
62
91
client_interface = domain + ".Mandos.Client"
63
 
version = "1.5.2"
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))
 
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
 
70
100
 
71
101
def milliseconds_to_string(ms):
72
102
    td = datetime.timedelta(0, 0, 0, ms)
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
 
                })
 
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
 
79
239
 
80
240
def string_to_delta(interval):
81
241
    """Parse a string and return a datetime.timedelta
82
 
    
83
 
    >>> string_to_delta("7d")
 
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')
84
256
    datetime.timedelta(7)
85
 
    >>> string_to_delta("60s")
 
257
    >>> parse_pre_1_6_1_interval('60s')
86
258
    datetime.timedelta(0, 60)
87
 
    >>> string_to_delta("60m")
 
259
    >>> parse_pre_1_6_1_interval('60m')
88
260
    datetime.timedelta(0, 3600)
89
 
    >>> string_to_delta("24h")
 
261
    >>> parse_pre_1_6_1_interval('24h')
90
262
    datetime.timedelta(1)
91
 
    >>> string_to_delta("1w")
 
263
    >>> parse_pre_1_6_1_interval('1w')
92
264
    datetime.timedelta(7)
93
 
    >>> string_to_delta("5m 30s")
 
265
    >>> parse_pre_1_6_1_interval('5m 30s')
94
266
    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
 
95
273
    """
 
274
 
96
275
    value = datetime.timedelta(0)
97
 
    regexp = re.compile("(\d+)([dsmhw]?)")
98
 
    
 
276
    regexp = re.compile(r"(\d+)([dsmhw]?)")
 
277
 
99
278
    for num, suffix in regexp.findall(interval):
100
279
        if suffix == "d":
101
280
            value += datetime.timedelta(int(num))
111
290
            value += datetime.timedelta(0, 0, 0, int(num))
112
291
    return value
113
292
 
 
293
 
114
294
def print_clients(clients, keywords):
 
295
    print('\n'.join(table_rows_of_clients(clients, keywords)))
 
296
 
 
297
def table_rows_of_clients(clients, keywords):
115
298
    def valuetostring(value, keyword):
116
 
        if type(value) is dbus.Boolean:
 
299
        if isinstance(value, dbus.Boolean):
117
300
            return "Yes" if value else "No"
118
301
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
119
 
                       "ApprovalDuration"):
 
302
                       "ApprovalDuration", "ExtendedTimeout"):
120
303
            return milliseconds_to_string(value)
121
 
        return unicode(value)
122
 
    
 
304
        return str(value)
 
305
 
123
306
    # Create format string to print table rows
124
 
    format_string = " ".join("%%-%ds" %
125
 
                             max(len(tablewords[key]),
126
 
                                 max(len(valuetostring(client[key],
127
 
                                                       key))
128
 
                                     for client in
129
 
                                     clients))
 
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
312
                             for key in keywords)
131
 
    # Print header line
132
 
    print(format_string % tuple(tablewords[key] for key in keywords))
 
313
    # Start with header line
 
314
    rows = [format_string.format(**tablewords)]
133
315
    for client in clients:
134
 
        print(format_string % tuple(valuetostring(client[key], key)
135
 
                                    for key in keywords))
 
316
        rows.append(format_string
 
317
                    .format(**{key: valuetostring(client[key], key)
 
318
                               for key in keywords}))
 
319
    return rows
 
320
 
136
321
 
137
322
def has_actions(options):
138
323
    return any((options.enable,
154
339
                options.approve,
155
340
                options.deny))
156
341
 
 
342
 
157
343
def main():
158
344
    parser = argparse.ArgumentParser()
159
345
    parser.add_argument("--version", action="version",
160
 
                        version = "%%prog %s" % version,
 
346
                        version="%(prog)s {}".format(version),
161
347
                        help="show version number and exit")
162
348
    parser.add_argument("-a", "--all", action="store_true",
163
349
                        help="Select all clients")
164
350
    parser.add_argument("-v", "--verbose", action="store_true",
165
351
                        help="Print all fields")
 
352
    parser.add_argument("-j", "--dump-json", action="store_true",
 
353
                        help="Dump client data in JSON format")
166
354
    parser.add_argument("-e", "--enable", action="store_true",
167
355
                        help="Enable client")
168
356
    parser.add_argument("-d", "--disable", action="store_true",
196
384
    parser.add_argument("--approval-duration",
197
385
                        help="Set duration of one client approval")
198
386
    parser.add_argument("-H", "--host", help="Set host for client")
199
 
    parser.add_argument("-s", "--secret", type=file,
 
387
    parser.add_argument("-s", "--secret",
 
388
                        type=argparse.FileType(mode="rb"),
200
389
                        help="Set password blob (file) for client")
201
390
    parser.add_argument("-A", "--approve", action="store_true",
202
391
                        help="Approve any current client request")
203
392
    parser.add_argument("-D", "--deny", action="store_true",
204
393
                        help="Deny any current client request")
 
394
    parser.add_argument("--check", action="store_true",
 
395
                        help="Run self-test")
205
396
    parser.add_argument("client", nargs="*", help="Client name")
206
397
    options = parser.parse_args()
207
 
    
208
 
    if has_actions(options) and not options.client and not options.all:
 
398
 
 
399
    if has_actions(options) and not (options.client or options.all):
209
400
        parser.error("Options require clients names or --all.")
210
401
    if options.verbose and has_actions(options):
211
 
        parser.error("--verbose can only be used alone or with"
212
 
                     " --all.")
 
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.")
213
406
    if options.all and not has_actions(options):
214
407
        parser.error("--all requires an action.")
215
 
    
 
408
 
216
409
    try:
217
410
        bus = dbus.SystemBus()
218
411
        mandos_dbus_objc = bus.get_object(busname, server_path)
219
412
    except dbus.exceptions.DBusException:
220
 
        print("Could not connect to Mandos server",
221
 
              file=sys.stderr)
 
413
        log.critical("Could not connect to Mandos server")
222
414
        sys.exit(1)
223
 
    
 
415
 
224
416
    mandos_serv = dbus.Interface(mandos_dbus_objc,
225
 
                                 dbus_interface = server_interface)
226
 
    
227
 
    #block stderr since dbus library prints to stderr
 
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
228
422
    null = os.open(os.path.devnull, os.O_RDWR)
229
423
    stderrcopy = os.dup(sys.stderr.fileno())
230
424
    os.dup2(null, sys.stderr.fileno())
231
425
    os.close(null)
232
426
    try:
233
427
        try:
234
 
            mandos_clients = mandos_serv.GetAllClientsWithProperties()
 
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}
235
433
        finally:
236
 
            #restore stderr
 
434
            # restore stderr
237
435
            os.dup2(stderrcopy, sys.stderr.fileno())
238
436
            os.close(stderrcopy)
239
 
    except dbus.exceptions.DBusException:
240
 
        print("Access denied: Accessing mandos server through dbus.",
241
 
              file=sys.stderr)
 
437
    except dbus.exceptions.DBusException as e:
 
438
        log.critical("Failed to access Mandos server through D-Bus:"
 
439
                     "\n%s", e)
242
440
        sys.exit(1)
243
 
    
 
441
 
244
442
    # Compile dict of (clients: properties) to process
245
 
    clients={}
246
 
    
 
443
    clients = {}
 
444
 
247
445
    if options.all or not options.client:
248
 
        clients = dict((bus.get_object(busname, path), properties)
249
 
                       for path, properties in
250
 
                       mandos_clients.iteritems())
 
446
        clients = {bus.get_object(busname, path): properties
 
447
                   for path, properties in mandos_clients.items()}
251
448
    else:
252
449
        for name in options.client:
253
 
            for path, client in mandos_clients.iteritems():
 
450
            for path, client in mandos_clients.items():
254
451
                if client["Name"] == name:
255
452
                    client_objc = bus.get_object(busname, path)
256
453
                    clients[client_objc] = client
257
454
                    break
258
455
            else:
259
 
                print("Client not found on server: %r" % name,
260
 
                      file=sys.stderr)
 
456
                log.critical("Client not found on server: %r", name)
261
457
                sys.exit(1)
262
 
    
 
458
 
263
459
    if not has_actions(options) and clients:
264
 
        if options.verbose:
265
 
            keywords = ("Name", "Enabled", "Timeout",
266
 
                        "LastCheckedOK", "Created", "Interval",
267
 
                        "Host", "Fingerprint", "CheckerRunning",
 
460
        if options.verbose or options.dump_json:
 
461
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
 
462
                        "Created", "Interval", "Host", "KeyID",
 
463
                        "Fingerprint", "CheckerRunning",
268
464
                        "LastEnabled", "ApprovalPending",
269
 
                        "ApprovedByDefault",
270
 
                        "LastApprovalRequest", "ApprovalDelay",
271
 
                        "ApprovalDuration", "Checker",
272
 
                        "ExtendedTimeout")
 
465
                        "ApprovedByDefault", "LastApprovalRequest",
 
466
                        "ApprovalDelay", "ApprovalDuration",
 
467
                        "Checker", "ExtendedTimeout", "Expires",
 
468
                        "LastCheckerStatus")
273
469
        else:
274
470
            keywords = defaultkeywords
275
 
        
276
 
        print_clients(clients.values(), keywords)
 
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)
277
485
    else:
278
486
        # Process each client in the list by all selected options
279
487
        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
 
280
501
            if options.remove:
281
502
                mandos_serv.RemoveClient(client.__dbus_object_path__)
282
503
            if options.enable:
283
 
                client.Enable(dbus_interface=client_interface)
 
504
                set_client_prop("Enabled", dbus.Boolean(True))
284
505
            if options.disable:
285
 
                client.Disable(dbus_interface=client_interface)
 
506
                set_client_prop("Enabled", dbus.Boolean(False))
286
507
            if options.bump_timeout:
287
 
                client.CheckedOK(dbus_interface=client_interface)
 
508
                set_client_prop("LastCheckedOK", "")
288
509
            if options.start_checker:
289
 
                client.StartChecker(dbus_interface=client_interface)
 
510
                set_client_prop("CheckerRunning", dbus.Boolean(True))
290
511
            if options.stop_checker:
291
 
                client.StopChecker(dbus_interface=client_interface)
 
512
                set_client_prop("CheckerRunning", dbus.Boolean(False))
292
513
            if options.is_enabled:
293
 
                sys.exit(0 if client.Get(client_interface,
294
 
                                         "Enabled",
295
 
                                         dbus_interface=
296
 
                                         dbus.PROPERTIES_IFACE)
297
 
                         else 1)
 
514
                if client.Get(client_interface, "Enabled",
 
515
                              dbus_interface=dbus.PROPERTIES_IFACE):
 
516
                    sys.exit(0)
 
517
                else:
 
518
                    sys.exit(1)
298
519
            if options.checker is not None:
299
 
                client.Set(client_interface, "Checker",
300
 
                           options.checker,
301
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
520
                set_client_prop("Checker", options.checker)
302
521
            if options.host is not None:
303
 
                client.Set(client_interface, "Host", options.host,
304
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
522
                set_client_prop("Host", options.host)
305
523
            if options.interval is not None:
306
 
                client.Set(client_interface, "Interval",
307
 
                           timedelta_to_milliseconds
308
 
                           (string_to_delta(options.interval)),
309
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
524
                set_client_prop_ms("Interval", options.interval)
310
525
            if options.approval_delay is not None:
311
 
                client.Set(client_interface, "ApprovalDelay",
312
 
                           timedelta_to_milliseconds
313
 
                           (string_to_delta(options.
314
 
                                            approval_delay)),
315
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
526
                set_client_prop_ms("ApprovalDelay",
 
527
                                   options.approval_delay)
316
528
            if options.approval_duration is not None:
317
 
                client.Set(client_interface, "ApprovalDuration",
318
 
                           timedelta_to_milliseconds
319
 
                           (string_to_delta(options.
320
 
                                            approval_duration)),
321
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
529
                set_client_prop_ms("ApprovalDuration",
 
530
                                   options.approval_duration)
322
531
            if options.timeout is not None:
323
 
                client.Set(client_interface, "Timeout",
324
 
                           timedelta_to_milliseconds
325
 
                           (string_to_delta(options.timeout)),
326
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
532
                set_client_prop_ms("Timeout", options.timeout)
327
533
            if options.extended_timeout is not None:
328
 
                client.Set(client_interface, "ExtendedTimeout",
329
 
                           timedelta_to_milliseconds
330
 
                           (string_to_delta(options.extended_timeout)),
331
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
534
                set_client_prop_ms("ExtendedTimeout",
 
535
                                   options.extended_timeout)
332
536
            if options.secret is not None:
333
 
                client.Set(client_interface, "Secret",
334
 
                           dbus.ByteArray(options.secret.read()),
335
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
537
                set_client_prop("Secret",
 
538
                                dbus.ByteArray(options.secret.read()))
336
539
            if options.approved_by_default is not None:
337
 
                client.Set(client_interface, "ApprovedByDefault",
338
 
                           dbus.Boolean(options
339
 
                                        .approved_by_default),
340
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
540
                set_client_prop("ApprovedByDefault",
 
541
                                dbus.Boolean(options
 
542
                                             .approved_by_default))
341
543
            if options.approve:
342
544
                client.Approve(dbus.Boolean(True),
343
545
                               dbus_interface=client_interface)
345
547
                client.Approve(dbus.Boolean(False),
346
548
                               dbus_interface=client_interface)
347
549
 
 
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
 
348
594
if __name__ == "__main__":
349
 
    main()
 
595
    if should_only_run_tests():
 
596
        # Call using ./tdd-python-script --check [--verbose]
 
597
        unittest.main()
 
598
    else:
 
599
        main()