/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

working new feature: network-hooks - Enables user-scripts to take up
                     interfaces during bootup

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