/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 18:54:11 UTC
  • Revision ID: teddy@recompile.se-20190228185411-71f49cg8plsvdkub
Add tests to mandos-ctl's milliseconds_to_string function

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