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