/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2019-02-28 18:54:11 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 382.
  • 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-2010 Teddy Hogeborn
7
 
# Copyright © 2008-2010 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
 
# Contact the authors at <mandos@fukt.bsnet.se>.
23
 
# 
 
22
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
23
#
 
24
# Contact the authors at <mandos@recompile.se>.
 
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
 
    }
 
70
    "ExtendedTimeout": "Extended Timeout",
 
71
    "Expires": "Expires",
 
72
    "LastCheckerStatus": "Last Checker Status",
 
73
}
56
74
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
57
 
domain = "se.bsnet.fukt"
 
75
domain = "se.recompile"
58
76
busname = domain + ".Mandos"
59
77
server_path = "/"
60
78
server_interface = domain + ".Mandos"
61
79
client_interface = domain + ".Mandos.Client"
62
 
version = "1.3.1"
63
 
 
64
 
def timedelta_to_milliseconds(td):
65
 
    """Convert a datetime.timedelta object to milliseconds"""
66
 
    return ((td.days * 24 * 60 * 60 * 1000)
67
 
            + (td.seconds * 1000)
68
 
            + (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
 
69
88
 
70
89
def milliseconds_to_string(ms):
71
90
    td = datetime.timedelta(0, 0, 0, ms)
72
 
    return ("%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
73
 
            % { "days": "%dT" % td.days if td.days else "",
74
 
                "hours": td.seconds // 3600,
75
 
                "minutes": (td.seconds % 3600) // 60,
76
 
                "seconds": td.seconds % 60,
77
 
                })
 
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
 
78
196
 
79
197
def string_to_delta(interval):
80
198
    """Parse a string and return a datetime.timedelta
81
 
    
82
 
    >>> string_to_delta("7d")
 
199
 
 
200
    >>> string_to_delta('7d')
83
201
    datetime.timedelta(7)
84
 
    >>> string_to_delta("60s")
 
202
    >>> string_to_delta('60s')
85
203
    datetime.timedelta(0, 60)
86
 
    >>> string_to_delta("60m")
 
204
    >>> string_to_delta('60m')
87
205
    datetime.timedelta(0, 3600)
88
 
    >>> string_to_delta("24h")
 
206
    >>> string_to_delta('24h')
89
207
    datetime.timedelta(1)
90
 
    >>> string_to_delta("1w")
 
208
    >>> string_to_delta('1w')
91
209
    datetime.timedelta(7)
92
 
    >>> string_to_delta("5m 30s")
 
210
    >>> string_to_delta('5m 30s')
93
211
    datetime.timedelta(0, 330)
94
212
    """
95
 
    timevalue = datetime.timedelta(0)
96
 
    regexp = re.compile("\d+[dsmhw]")
97
 
    
98
 
    for s in regexp.findall(interval):
99
 
        try:
100
 
            suffix = unicode(s[-1])
101
 
            value = int(s[:-1])
102
 
            if suffix == "d":
103
 
                delta = datetime.timedelta(value)
104
 
            elif suffix == "s":
105
 
                delta = datetime.timedelta(0, value)
106
 
            elif suffix == "m":
107
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
108
 
            elif suffix == "h":
109
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
110
 
            elif suffix == "w":
111
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
112
 
            else:
113
 
                raise ValueError
114
 
        except (ValueError, IndexError):
115
 
            raise ValueError
116
 
        timevalue += delta
117
 
    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
 
118
237
 
119
238
def print_clients(clients, keywords):
120
239
    def valuetostring(value, keyword):
121
240
        if type(value) is dbus.Boolean:
122
241
            return "Yes" if value else "No"
123
242
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
124
 
                       "ApprovalDuration"):
 
243
                       "ApprovalDuration", "ExtendedTimeout"):
125
244
            return milliseconds_to_string(value)
126
 
        return unicode(value)
127
 
    
 
245
        return str(value)
 
246
 
128
247
    # Create format string to print table rows
129
 
    format_string = " ".join("%%-%ds" %
130
 
                             max(len(tablewords[key]),
131
 
                                 max(len(valuetostring(client[key],
132
 
                                                       key))
133
 
                                     for client in
134
 
                                     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)
135
253
                             for key in keywords)
136
254
    # Print header line
137
 
    print(format_string % tuple(tablewords[key] for key in keywords))
 
255
    print(format_string.format(**tablewords))
138
256
    for client in clients:
139
 
        print(format_string % tuple(valuetostring(client[key], key)
140
 
                                    for key in keywords))
 
257
        print(format_string
 
258
              .format(**{key: valuetostring(client[key], key)
 
259
                         for key in keywords}))
 
260
 
141
261
 
142
262
def has_actions(options):
143
263
    return any((options.enable,
149
269
                options.remove,
150
270
                options.checker is not None,
151
271
                options.timeout is not None,
 
272
                options.extended_timeout is not None,
152
273
                options.interval is not None,
153
274
                options.approved_by_default is not None,
154
275
                options.approval_delay is not None,
158
279
                options.approve,
159
280
                options.deny))
160
281
 
 
282
 
161
283
def main():
162
284
    parser = argparse.ArgumentParser()
163
285
    parser.add_argument("--version", action="version",
164
 
                        version = "%%prog %s" % version,
 
286
                        version="%(prog)s {}".format(version),
165
287
                        help="show version number and exit")
166
288
    parser.add_argument("-a", "--all", action="store_true",
167
289
                        help="Select all clients")
168
290
    parser.add_argument("-v", "--verbose", action="store_true",
169
291
                        help="Print all fields")
 
292
    parser.add_argument("-j", "--dump-json", action="store_true",
 
293
                        help="Dump client data in JSON format")
170
294
    parser.add_argument("-e", "--enable", action="store_true",
171
295
                        help="Enable client")
172
296
    parser.add_argument("-d", "--disable", action="store_true",
185
309
                        help="Set checker command for client")
186
310
    parser.add_argument("-t", "--timeout",
187
311
                        help="Set timeout for client")
 
312
    parser.add_argument("--extended-timeout",
 
313
                        help="Set extended timeout for client")
188
314
    parser.add_argument("-i", "--interval",
189
315
                        help="Set checker interval for client")
190
316
    parser.add_argument("--approve-by-default", action="store_true",
198
324
    parser.add_argument("--approval-duration",
199
325
                        help="Set duration of one client approval")
200
326
    parser.add_argument("-H", "--host", help="Set host for client")
201
 
    parser.add_argument("-s", "--secret", type=file,
 
327
    parser.add_argument("-s", "--secret",
 
328
                        type=argparse.FileType(mode="rb"),
202
329
                        help="Set password blob (file) for client")
203
330
    parser.add_argument("-A", "--approve", action="store_true",
204
331
                        help="Approve any current client request")
205
332
    parser.add_argument("-D", "--deny", action="store_true",
206
333
                        help="Deny any current client request")
 
334
    parser.add_argument("--check", action="store_true",
 
335
                        help="Run self-test")
207
336
    parser.add_argument("client", nargs="*", help="Client name")
208
337
    options = parser.parse_args()
209
 
    
210
 
    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):
211
340
        parser.error("Options require clients names or --all.")
212
341
    if options.verbose and has_actions(options):
213
 
        parser.error("--verbose can only be used alone or with"
214
 
                     " --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.")
215
346
    if options.all and not has_actions(options):
216
347
        parser.error("--all requires an action.")
217
 
    
 
348
 
218
349
    try:
219
350
        bus = dbus.SystemBus()
220
351
        mandos_dbus_objc = bus.get_object(busname, server_path)
221
352
    except dbus.exceptions.DBusException:
222
 
        print("Could not connect to Mandos server",
223
 
              file=sys.stderr)
 
353
        print("Could not connect to Mandos server", file=sys.stderr)
224
354
        sys.exit(1)
225
 
    
 
355
 
226
356
    mandos_serv = dbus.Interface(mandos_dbus_objc,
227
 
                                 dbus_interface = server_interface)
228
 
    
229
 
    #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
230
362
    null = os.open(os.path.devnull, os.O_RDWR)
231
363
    stderrcopy = os.dup(sys.stderr.fileno())
232
364
    os.dup2(null, sys.stderr.fileno())
233
365
    os.close(null)
234
366
    try:
235
367
        try:
236
 
            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}
237
373
        finally:
238
 
            #restore stderr
 
374
            # restore stderr
239
375
            os.dup2(stderrcopy, sys.stderr.fileno())
240
376
            os.close(stderrcopy)
241
 
    except dbus.exceptions.DBusException, e:
242
 
        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),
243
380
              file=sys.stderr)
244
381
        sys.exit(1)
245
 
    
 
382
 
246
383
    # Compile dict of (clients: properties) to process
247
 
    clients={}
248
 
    
 
384
    clients = {}
 
385
 
249
386
    if options.all or not options.client:
250
 
        clients = dict((bus.get_object(busname, path), properties)
251
 
                       for path, properties in
252
 
                       mandos_clients.iteritems())
 
387
        clients = {bus.get_object(busname, path): properties
 
388
                   for path, properties in mandos_clients.items()}
253
389
    else:
254
390
        for name in options.client:
255
 
            for path, client in mandos_clients.iteritems():
 
391
            for path, client in mandos_clients.items():
256
392
                if client["Name"] == name:
257
393
                    client_objc = bus.get_object(busname, path)
258
394
                    clients[client_objc] = client
259
395
                    break
260
396
            else:
261
 
                print("Client not found on server: %r" % name,
262
 
                      file=sys.stderr)
 
397
                print("Client not found on server: {!r}"
 
398
                      .format(name), file=sys.stderr)
263
399
                sys.exit(1)
264
 
    
 
400
 
265
401
    if not has_actions(options) and clients:
266
 
        if options.verbose:
267
 
            keywords = ("Name", "Enabled", "Timeout",
268
 
                        "LastCheckedOK", "Created", "Interval",
269
 
                        "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",
270
406
                        "LastEnabled", "ApprovalPending",
271
 
                        "ApprovedByDefault",
272
 
                        "LastApprovalRequest", "ApprovalDelay",
273
 
                        "ApprovalDuration", "Checker")
 
407
                        "ApprovedByDefault", "LastApprovalRequest",
 
408
                        "ApprovalDelay", "ApprovalDuration",
 
409
                        "Checker", "ExtendedTimeout", "Expires",
 
410
                        "LastCheckerStatus")
274
411
        else:
275
412
            keywords = defaultkeywords
276
 
        
277
 
        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)
278
427
    else:
279
428
        # Process each client in the list by all selected options
280
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
 
281
443
            if options.remove:
282
444
                mandos_serv.RemoveClient(client.__dbus_object_path__)
283
445
            if options.enable:
284
 
                client.Enable(dbus_interface=client_interface)
 
446
                set_client_prop("Enabled", dbus.Boolean(True))
285
447
            if options.disable:
286
 
                client.Disable(dbus_interface=client_interface)
 
448
                set_client_prop("Enabled", dbus.Boolean(False))
287
449
            if options.bump_timeout:
288
 
                client.CheckedOK(dbus_interface=client_interface)
 
450
                set_client_prop("LastCheckedOK", "")
289
451
            if options.start_checker:
290
 
                client.StartChecker(dbus_interface=client_interface)
 
452
                set_client_prop("CheckerRunning", dbus.Boolean(True))
291
453
            if options.stop_checker:
292
 
                client.StopChecker(dbus_interface=client_interface)
 
454
                set_client_prop("CheckerRunning", dbus.Boolean(False))
293
455
            if options.is_enabled:
294
 
                sys.exit(0 if client.Get(client_interface,
295
 
                                         "Enabled",
296
 
                                         dbus_interface=
297
 
                                         dbus.PROPERTIES_IFACE)
298
 
                         else 1)
299
 
            if options.checker:
300
 
                client.Set(client_interface, "Checker",
301
 
                           options.checker,
302
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
303
 
            if options.host:
304
 
                client.Set(client_interface, "Host", options.host,
305
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
306
 
            if options.interval:
307
 
                client.Set(client_interface, "Interval",
308
 
                           timedelta_to_milliseconds
309
 
                           (string_to_delta(options.interval)),
310
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
311
 
            if options.approval_delay:
312
 
                client.Set(client_interface, "ApprovalDelay",
313
 
                           timedelta_to_milliseconds
314
 
                           (string_to_delta(options.
315
 
                                            approval_delay)),
316
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
317
 
            if options.approval_duration:
318
 
                client.Set(client_interface, "ApprovalDuration",
319
 
                           timedelta_to_milliseconds
320
 
                           (string_to_delta(options.
321
 
                                            approval_duration)),
322
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
323
 
            if options.timeout:
324
 
                client.Set(client_interface, "Timeout",
325
 
                           timedelta_to_milliseconds
326
 
                           (string_to_delta(options.timeout)),
327
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
328
 
            if options.secret:
329
 
                client.Set(client_interface, "Secret",
330
 
                           dbus.ByteArray(open(options.secret,
331
 
                                               "rb").read()),
332
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
456
                if client.Get(client_interface, "Enabled",
 
457
                              dbus_interface=dbus.PROPERTIES_IFACE):
 
458
                    sys.exit(0)
 
459
                else:
 
460
                    sys.exit(1)
 
461
            if options.checker is not None:
 
462
                set_client_prop("Checker", options.checker)
 
463
            if options.host is not None:
 
464
                set_client_prop("Host", options.host)
 
465
            if options.interval is not None:
 
466
                set_client_prop_ms("Interval", options.interval)
 
467
            if options.approval_delay is not None:
 
468
                set_client_prop_ms("ApprovalDelay",
 
469
                                   options.approval_delay)
 
470
            if options.approval_duration is not None:
 
471
                set_client_prop_ms("ApprovalDuration",
 
472
                                   options.approval_duration)
 
473
            if options.timeout is not None:
 
474
                set_client_prop_ms("Timeout", options.timeout)
 
475
            if options.extended_timeout is not None:
 
476
                set_client_prop_ms("ExtendedTimeout",
 
477
                                   options.extended_timeout)
 
478
            if options.secret is not None:
 
479
                set_client_prop("Secret",
 
480
                                dbus.ByteArray(options.secret.read()))
333
481
            if options.approved_by_default is not None:
334
 
                client.Set(client_interface, "ApprovedByDefault",
335
 
                           dbus.Boolean(options
336
 
                                        .approved_by_default),
337
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
482
                set_client_prop("ApprovedByDefault",
 
483
                                dbus.Boolean(options
 
484
                                             .approved_by_default))
338
485
            if options.approve:
339
486
                client.Approve(dbus.Boolean(True),
340
487
                               dbus_interface=client_interface)
342
489
                client.Approve(dbus.Boolean(False),
343
490
                               dbus_interface=client_interface)
344
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
 
345
523
if __name__ == "__main__":
346
 
    main()
 
524
    if should_only_run_tests():
 
525
        # Call using ./tdd-python-script --check [--verbose]
 
526
        unittest.main()
 
527
    else:
 
528
        main()