/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-02-28 19:24:48 UTC
  • Revision ID: teddy@recompile.se-20190228192448-d5xrjokh5tfuh55y
mandos-ctl: Show warnings

* mandos-ctl: Show warnings (via the logging system).

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-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
 
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.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))
 
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("PT24H")
 
120
    datetime.timedelta(1)
 
121
    >>> rfc3339_duration_to_delta("P1W")
 
122
    datetime.timedelta(7)
 
123
    >>> rfc3339_duration_to_delta("PT5M30S")
 
124
    datetime.timedelta(0, 330)
 
125
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
126
    datetime.timedelta(1, 200)
 
127
    """
 
128
 
 
129
    # Parsing an RFC 3339 duration with regular expressions is not
 
130
    # possible - there would have to be multiple places for the same
 
131
    # values, like seconds.  The current code, while more esoteric, is
 
132
    # cleaner without depending on a parsing library.  If Python had a
 
133
    # built-in library for parsing we would use it, but we'd like to
 
134
    # avoid excessive use of external libraries.
 
135
 
 
136
    # New type for defining tokens, syntax, and semantics all-in-one
 
137
    Token = collections.namedtuple("Token", (
 
138
        "regexp",  # To match token; if "value" is not None, must have
 
139
                   # a "group" containing digits
 
140
        "value",   # datetime.timedelta or None
 
141
        "followers"))           # Tokens valid after this token
 
142
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
143
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
144
    token_end = Token(re.compile(r"$"), None, frozenset())
 
145
    token_second = Token(re.compile(r"(\d+)S"),
 
146
                         datetime.timedelta(seconds=1),
 
147
                         frozenset((token_end, )))
 
148
    token_minute = Token(re.compile(r"(\d+)M"),
 
149
                         datetime.timedelta(minutes=1),
 
150
                         frozenset((token_second, token_end)))
 
151
    token_hour = Token(re.compile(r"(\d+)H"),
 
152
                       datetime.timedelta(hours=1),
 
153
                       frozenset((token_minute, token_end)))
 
154
    token_time = Token(re.compile(r"T"),
 
155
                       None,
 
156
                       frozenset((token_hour, token_minute,
 
157
                                  token_second)))
 
158
    token_day = Token(re.compile(r"(\d+)D"),
 
159
                      datetime.timedelta(days=1),
 
160
                      frozenset((token_time, token_end)))
 
161
    token_month = Token(re.compile(r"(\d+)M"),
 
162
                        datetime.timedelta(weeks=4),
 
163
                        frozenset((token_day, token_end)))
 
164
    token_year = Token(re.compile(r"(\d+)Y"),
 
165
                       datetime.timedelta(weeks=52),
 
166
                       frozenset((token_month, token_end)))
 
167
    token_week = Token(re.compile(r"(\d+)W"),
 
168
                       datetime.timedelta(weeks=1),
 
169
                       frozenset((token_end, )))
 
170
    token_duration = Token(re.compile(r"P"), None,
 
171
                           frozenset((token_year, token_month,
 
172
                                      token_day, token_time,
 
173
                                      token_week)))
 
174
    # Define starting values:
 
175
    # Value so far
 
176
    value = datetime.timedelta()
 
177
    found_token = None
 
178
    # Following valid tokens
 
179
    followers = frozenset((token_duration, ))
 
180
    # String left to parse
 
181
    s = duration
 
182
    # Loop until end token is found
 
183
    while found_token is not token_end:
 
184
        # Search for any currently valid tokens
 
185
        for token in followers:
 
186
            match = token.regexp.match(s)
 
187
            if match is not None:
 
188
                # Token found
 
189
                if token.value is not None:
 
190
                    # Value found, parse digits
 
191
                    factor = int(match.group(1), 10)
 
192
                    # Add to value so far
 
193
                    value += factor * token.value
 
194
                # Strip token from string
 
195
                s = token.regexp.sub("", s, 1)
 
196
                # Go to found token
 
197
                found_token = token
 
198
                # Set valid next tokens
 
199
                followers = found_token.followers
 
200
                break
 
201
        else:
 
202
            # No currently valid tokens were found
 
203
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
204
                             .format(duration))
 
205
    # End token found
 
206
    return value
 
207
 
79
208
 
80
209
def string_to_delta(interval):
81
210
    """Parse a string and return a datetime.timedelta
82
 
    
83
 
    >>> string_to_delta("7d")
 
211
 
 
212
    >>> string_to_delta('7d')
84
213
    datetime.timedelta(7)
85
 
    >>> string_to_delta("60s")
 
214
    >>> string_to_delta('60s')
86
215
    datetime.timedelta(0, 60)
87
 
    >>> string_to_delta("60m")
 
216
    >>> string_to_delta('60m')
88
217
    datetime.timedelta(0, 3600)
89
 
    >>> string_to_delta("24h")
 
218
    >>> string_to_delta('24h')
90
219
    datetime.timedelta(1)
91
 
    >>> string_to_delta("1w")
 
220
    >>> string_to_delta('1w')
92
221
    datetime.timedelta(7)
93
 
    >>> string_to_delta("5m 30s")
 
222
    >>> string_to_delta('5m 30s')
94
223
    datetime.timedelta(0, 330)
95
224
    """
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
 
225
 
 
226
    try:
 
227
        return rfc3339_duration_to_delta(interval)
 
228
    except ValueError:
 
229
        pass
 
230
 
 
231
    value = datetime.timedelta(0)
 
232
    regexp = re.compile(r"(\d+)([dsmhw]?)")
 
233
 
 
234
    for num, suffix in regexp.findall(interval):
 
235
        if suffix == "d":
 
236
            value += datetime.timedelta(int(num))
 
237
        elif suffix == "s":
 
238
            value += datetime.timedelta(0, int(num))
 
239
        elif suffix == "m":
 
240
            value += datetime.timedelta(0, 0, 0, 0, int(num))
 
241
        elif suffix == "h":
 
242
            value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
 
243
        elif suffix == "w":
 
244
            value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
 
245
        elif suffix == "":
 
246
            value += datetime.timedelta(0, 0, 0, int(num))
 
247
    return value
 
248
 
119
249
 
120
250
def print_clients(clients, keywords):
121
251
    def valuetostring(value, keyword):
122
252
        if type(value) is dbus.Boolean:
123
253
            return "Yes" if value else "No"
124
254
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
125
 
                       "ApprovalDuration"):
 
255
                       "ApprovalDuration", "ExtendedTimeout"):
126
256
            return milliseconds_to_string(value)
127
 
        return unicode(value)
128
 
    
 
257
        return str(value)
 
258
 
129
259
    # Create format string to print table rows
130
 
    format_string = " ".join("%%-%ds" %
131
 
                             max(len(tablewords[key]),
132
 
                                 max(len(valuetostring(client[key],
133
 
                                                       key))
134
 
                                     for client in
135
 
                                     clients))
 
260
    format_string = " ".join("{{{key}:{width}}}".format(
 
261
        width=max(len(tablewords[key]),
 
262
                  max(len(valuetostring(client[key], key))
 
263
                      for client in clients)),
 
264
        key=key)
136
265
                             for key in keywords)
137
266
    # Print header line
138
 
    print(format_string % tuple(tablewords[key] for key in keywords))
 
267
    print(format_string.format(**tablewords))
139
268
    for client in clients:
140
 
        print(format_string % tuple(valuetostring(client[key], key)
141
 
                                    for key in keywords))
 
269
        print(format_string
 
270
              .format(**{key: valuetostring(client[key], key)
 
271
                         for key in keywords}))
 
272
 
142
273
 
143
274
def has_actions(options):
144
275
    return any((options.enable,
160
291
                options.approve,
161
292
                options.deny))
162
293
 
 
294
 
163
295
def main():
164
296
    parser = argparse.ArgumentParser()
165
297
    parser.add_argument("--version", action="version",
166
 
                        version = "%%prog %s" % version,
 
298
                        version="%(prog)s {}".format(version),
167
299
                        help="show version number and exit")
168
300
    parser.add_argument("-a", "--all", action="store_true",
169
301
                        help="Select all clients")
170
302
    parser.add_argument("-v", "--verbose", action="store_true",
171
303
                        help="Print all fields")
 
304
    parser.add_argument("-j", "--dump-json", action="store_true",
 
305
                        help="Dump client data in JSON format")
172
306
    parser.add_argument("-e", "--enable", action="store_true",
173
307
                        help="Enable client")
174
308
    parser.add_argument("-d", "--disable", action="store_true",
202
336
    parser.add_argument("--approval-duration",
203
337
                        help="Set duration of one client approval")
204
338
    parser.add_argument("-H", "--host", help="Set host for client")
205
 
    parser.add_argument("-s", "--secret", type=file,
 
339
    parser.add_argument("-s", "--secret",
 
340
                        type=argparse.FileType(mode="rb"),
206
341
                        help="Set password blob (file) for client")
207
342
    parser.add_argument("-A", "--approve", action="store_true",
208
343
                        help="Approve any current client request")
209
344
    parser.add_argument("-D", "--deny", action="store_true",
210
345
                        help="Deny any current client request")
 
346
    parser.add_argument("--check", action="store_true",
 
347
                        help="Run self-test")
211
348
    parser.add_argument("client", nargs="*", help="Client name")
212
349
    options = parser.parse_args()
213
 
    
214
 
    if has_actions(options) and not options.client and not options.all:
 
350
 
 
351
    if has_actions(options) and not (options.client or options.all):
215
352
        parser.error("Options require clients names or --all.")
216
353
    if options.verbose and has_actions(options):
217
 
        parser.error("--verbose can only be used alone or with"
218
 
                     " --all.")
 
354
        parser.error("--verbose can only be used alone.")
 
355
    if options.dump_json and (options.verbose
 
356
                              or has_actions(options)):
 
357
        parser.error("--dump-json can only be used alone.")
219
358
    if options.all and not has_actions(options):
220
359
        parser.error("--all requires an action.")
221
 
    
 
360
 
222
361
    try:
223
362
        bus = dbus.SystemBus()
224
363
        mandos_dbus_objc = bus.get_object(busname, server_path)
225
364
    except dbus.exceptions.DBusException:
226
 
        print("Could not connect to Mandos server",
227
 
              file=sys.stderr)
 
365
        log.critical("Could not connect to Mandos server")
228
366
        sys.exit(1)
229
 
    
 
367
 
230
368
    mandos_serv = dbus.Interface(mandos_dbus_objc,
231
 
                                 dbus_interface = server_interface)
232
 
    
233
 
    #block stderr since dbus library prints to stderr
 
369
                                 dbus_interface=server_interface)
 
370
    mandos_serv_object_manager = dbus.Interface(
 
371
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
 
372
 
 
373
    # block stderr since dbus library prints to stderr
234
374
    null = os.open(os.path.devnull, os.O_RDWR)
235
375
    stderrcopy = os.dup(sys.stderr.fileno())
236
376
    os.dup2(null, sys.stderr.fileno())
237
377
    os.close(null)
238
378
    try:
239
379
        try:
240
 
            mandos_clients = mandos_serv.GetAllClientsWithProperties()
 
380
            mandos_clients = {path: ifs_and_props[client_interface]
 
381
                              for path, ifs_and_props in
 
382
                              mandos_serv_object_manager
 
383
                              .GetManagedObjects().items()
 
384
                              if client_interface in ifs_and_props}
241
385
        finally:
242
 
            #restore stderr
 
386
            # restore stderr
243
387
            os.dup2(stderrcopy, sys.stderr.fileno())
244
388
            os.close(stderrcopy)
245
 
    except dbus.exceptions.DBusException, e:
246
 
        print("Access denied: Accessing mandos server through dbus.",
247
 
              file=sys.stderr)
 
389
    except dbus.exceptions.DBusException as e:
 
390
        log.critical("Failed to access Mandos server through D-Bus:"
 
391
                     "\n%s", e)
248
392
        sys.exit(1)
249
 
    
 
393
 
250
394
    # Compile dict of (clients: properties) to process
251
 
    clients={}
252
 
    
 
395
    clients = {}
 
396
 
253
397
    if options.all or not options.client:
254
 
        clients = dict((bus.get_object(busname, path), properties)
255
 
                       for path, properties in
256
 
                       mandos_clients.iteritems())
 
398
        clients = {bus.get_object(busname, path): properties
 
399
                   for path, properties in mandos_clients.items()}
257
400
    else:
258
401
        for name in options.client:
259
 
            for path, client in mandos_clients.iteritems():
 
402
            for path, client in mandos_clients.items():
260
403
                if client["Name"] == name:
261
404
                    client_objc = bus.get_object(busname, path)
262
405
                    clients[client_objc] = client
263
406
                    break
264
407
            else:
265
 
                print("Client not found on server: %r" % name,
266
 
                      file=sys.stderr)
 
408
                log.critical("Client not found on server: %r", name)
267
409
                sys.exit(1)
268
 
    
 
410
 
269
411
    if not has_actions(options) and clients:
270
 
        if options.verbose:
271
 
            keywords = ("Name", "Enabled", "Timeout",
272
 
                        "LastCheckedOK", "Created", "Interval",
273
 
                        "Host", "Fingerprint", "CheckerRunning",
 
412
        if options.verbose or options.dump_json:
 
413
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
 
414
                        "Created", "Interval", "Host", "KeyID",
 
415
                        "Fingerprint", "CheckerRunning",
274
416
                        "LastEnabled", "ApprovalPending",
275
 
                        "ApprovedByDefault",
276
 
                        "LastApprovalRequest", "ApprovalDelay",
277
 
                        "ApprovalDuration", "Checker",
278
 
                        "ExtendedTimeout")
 
417
                        "ApprovedByDefault", "LastApprovalRequest",
 
418
                        "ApprovalDelay", "ApprovalDuration",
 
419
                        "Checker", "ExtendedTimeout", "Expires",
 
420
                        "LastCheckerStatus")
279
421
        else:
280
422
            keywords = defaultkeywords
281
 
        
282
 
        print_clients(clients.values(), keywords)
 
423
 
 
424
        if options.dump_json:
 
425
            json.dump({client["Name"]: {key:
 
426
                                        bool(client[key])
 
427
                                        if isinstance(client[key],
 
428
                                                      dbus.Boolean)
 
429
                                        else client[key]
 
430
                                        for key in keywords}
 
431
                       for client in clients.values()},
 
432
                      fp=sys.stdout, indent=4,
 
433
                      separators=(',', ': '))
 
434
            print()
 
435
        else:
 
436
            print_clients(clients.values(), keywords)
283
437
    else:
284
438
        # Process each client in the list by all selected options
285
439
        for client in clients:
 
440
 
 
441
            def set_client_prop(prop, value):
 
442
                """Set a Client D-Bus property"""
 
443
                client.Set(client_interface, prop, value,
 
444
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
445
 
 
446
            def set_client_prop_ms(prop, value):
 
447
                """Set a Client D-Bus property, converted
 
448
                from a string to milliseconds."""
 
449
                set_client_prop(prop,
 
450
                                string_to_delta(value).total_seconds()
 
451
                                * 1000)
 
452
 
286
453
            if options.remove:
287
454
                mandos_serv.RemoveClient(client.__dbus_object_path__)
288
455
            if options.enable:
289
 
                client.Enable(dbus_interface=client_interface)
 
456
                set_client_prop("Enabled", dbus.Boolean(True))
290
457
            if options.disable:
291
 
                client.Disable(dbus_interface=client_interface)
 
458
                set_client_prop("Enabled", dbus.Boolean(False))
292
459
            if options.bump_timeout:
293
 
                client.CheckedOK(dbus_interface=client_interface)
 
460
                set_client_prop("LastCheckedOK", "")
294
461
            if options.start_checker:
295
 
                client.StartChecker(dbus_interface=client_interface)
 
462
                set_client_prop("CheckerRunning", dbus.Boolean(True))
296
463
            if options.stop_checker:
297
 
                client.StopChecker(dbus_interface=client_interface)
 
464
                set_client_prop("CheckerRunning", dbus.Boolean(False))
298
465
            if options.is_enabled:
299
 
                sys.exit(0 if client.Get(client_interface,
300
 
                                         "Enabled",
301
 
                                         dbus_interface=
302
 
                                         dbus.PROPERTIES_IFACE)
303
 
                         else 1)
 
466
                if client.Get(client_interface, "Enabled",
 
467
                              dbus_interface=dbus.PROPERTIES_IFACE):
 
468
                    sys.exit(0)
 
469
                else:
 
470
                    sys.exit(1)
304
471
            if options.checker is not None:
305
 
                client.Set(client_interface, "Checker",
306
 
                           options.checker,
307
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
472
                set_client_prop("Checker", options.checker)
308
473
            if options.host is not None:
309
 
                client.Set(client_interface, "Host", options.host,
310
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
474
                set_client_prop("Host", options.host)
311
475
            if options.interval is not None:
312
 
                client.Set(client_interface, "Interval",
313
 
                           timedelta_to_milliseconds
314
 
                           (string_to_delta(options.interval)),
315
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
476
                set_client_prop_ms("Interval", options.interval)
316
477
            if options.approval_delay is not None:
317
 
                client.Set(client_interface, "ApprovalDelay",
318
 
                           timedelta_to_milliseconds
319
 
                           (string_to_delta(options.
320
 
                                            approval_delay)),
321
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
478
                set_client_prop_ms("ApprovalDelay",
 
479
                                   options.approval_delay)
322
480
            if options.approval_duration is not None:
323
 
                client.Set(client_interface, "ApprovalDuration",
324
 
                           timedelta_to_milliseconds
325
 
                           (string_to_delta(options.
326
 
                                            approval_duration)),
327
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
481
                set_client_prop_ms("ApprovalDuration",
 
482
                                   options.approval_duration)
328
483
            if options.timeout is not None:
329
 
                client.Set(client_interface, "Timeout",
330
 
                           timedelta_to_milliseconds
331
 
                           (string_to_delta(options.timeout)),
332
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
484
                set_client_prop_ms("Timeout", options.timeout)
333
485
            if options.extended_timeout is not None:
334
 
                client.Set(client_interface, "ExtendedTimeout",
335
 
                           timedelta_to_milliseconds
336
 
                           (string_to_delta(options.extended_timeout)),
337
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
486
                set_client_prop_ms("ExtendedTimeout",
 
487
                                   options.extended_timeout)
338
488
            if options.secret is not None:
339
 
                client.Set(client_interface, "Secret",
340
 
                           dbus.ByteArray(open(options.secret,
341
 
                                               "rb").read()),
342
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
489
                set_client_prop("Secret",
 
490
                                dbus.ByteArray(options.secret.read()))
343
491
            if options.approved_by_default is not None:
344
 
                client.Set(client_interface, "ApprovedByDefault",
345
 
                           dbus.Boolean(options
346
 
                                        .approved_by_default),
347
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
492
                set_client_prop("ApprovedByDefault",
 
493
                                dbus.Boolean(options
 
494
                                             .approved_by_default))
348
495
            if options.approve:
349
496
                client.Approve(dbus.Boolean(True),
350
497
                               dbus_interface=client_interface)
352
499
                client.Approve(dbus.Boolean(False),
353
500
                               dbus_interface=client_interface)
354
501
 
 
502
 
 
503
class Test_milliseconds_to_string(unittest.TestCase):
 
504
    def test_all(self):
 
505
        self.assertEqual(milliseconds_to_string(93785000),
 
506
                         "1T02:03:05")
 
507
    def test_no_days(self):
 
508
        self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
 
509
    def test_all_zero(self):
 
510
        self.assertEqual(milliseconds_to_string(0), "00:00:00")
 
511
    def test_no_fractional_seconds(self):
 
512
        self.assertEqual(milliseconds_to_string(400), "00:00:00")
 
513
        self.assertEqual(milliseconds_to_string(900), "00:00:00")
 
514
        self.assertEqual(milliseconds_to_string(1900), "00:00:01")
 
515
 
 
516
 
 
517
def should_only_run_tests():
 
518
    parser = argparse.ArgumentParser(add_help=False)
 
519
    parser.add_argument("--check", action='store_true')
 
520
    args, unknown_args = parser.parse_known_args()
 
521
    run_tests = args.check
 
522
    if run_tests:
 
523
        # Remove --check argument from sys.argv
 
524
        sys.argv[1:] = unknown_args
 
525
    return run_tests
 
526
 
 
527
# Add all tests from doctest strings
 
528
def load_tests(loader, tests, none):
 
529
    import doctest
 
530
    tests.addTests(doctest.DocTestSuite())
 
531
    return tests
 
532
 
355
533
if __name__ == "__main__":
356
 
    main()
 
534
    if should_only_run_tests():
 
535
        # Call using ./tdd-python-script --check [--verbose]
 
536
        unittest.main()
 
537
    else:
 
538
        main()