/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

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