/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2012-01-15 21:07:44 UTC
  • mto: (237.4.29 release)
  • mto: This revision was merged to the branch mainline in revision 559.
  • Revision ID: teddy@recompile.se-20120115210744-xc33sww1zxrk92s9
Tags: version-1.5.3-1
* Makefile (version): Changed to "1.5.3".
* NEWS (Version 1.5.3): New entry.
* debian/changelog (1.5.3-1): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
 
#
 
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-2012 Teddy Hogeborn
 
7
# Copyright © 2008-2012 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
 
 
45
 
import dbus
46
 
 
47
 
if sys.version_info.major == 2:
48
 
    str = unicode
49
35
 
50
36
locale.setlocale(locale.LC_ALL, "")
51
37
 
59
45
    "Interval": "Interval",
60
46
    "Host": "Host",
61
47
    "Fingerprint": "Fingerprint",
62
 
    "KeyID": "Key ID",
63
48
    "CheckerRunning": "Check Is Running",
64
49
    "LastEnabled": "Last Enabled",
65
50
    "ApprovalPending": "Approval Is Pending",
67
52
    "ApprovalDelay": "Approval Delay",
68
53
    "ApprovalDuration": "Approval Duration",
69
54
    "Checker": "Checker",
70
 
    "ExtendedTimeout": "Extended Timeout",
71
 
    "Expires": "Expires",
72
 
    "LastCheckerStatus": "Last Checker Status",
73
 
}
 
55
    "ExtendedTimeout" : "Extended Timeout"
 
56
    }
74
57
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
75
58
domain = "se.recompile"
76
59
busname = domain + ".Mandos"
77
60
server_path = "/"
78
61
server_interface = domain + ".Mandos"
79
62
client_interface = domain + ".Mandos.Client"
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
 
 
 
63
version = "1.5.3"
 
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))
88
70
 
89
71
def milliseconds_to_string(ms):
90
72
    td = datetime.timedelta(0, 0, 0, ms)
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
 
 
 
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
                })
196
79
 
197
80
def string_to_delta(interval):
198
81
    """Parse a string and return a datetime.timedelta
199
 
 
200
 
    >>> string_to_delta('7d')
 
82
    
 
83
    >>> string_to_delta("7d")
201
84
    datetime.timedelta(7)
202
 
    >>> string_to_delta('60s')
 
85
    >>> string_to_delta("60s")
203
86
    datetime.timedelta(0, 60)
204
 
    >>> string_to_delta('60m')
 
87
    >>> string_to_delta("60m")
205
88
    datetime.timedelta(0, 3600)
206
 
    >>> string_to_delta('24h')
 
89
    >>> string_to_delta("24h")
207
90
    datetime.timedelta(1)
208
 
    >>> string_to_delta('1w')
 
91
    >>> string_to_delta("1w")
209
92
    datetime.timedelta(7)
210
 
    >>> string_to_delta('5m 30s')
 
93
    >>> string_to_delta("5m 30s")
211
94
    datetime.timedelta(0, 330)
212
95
    """
213
 
 
214
 
    try:
215
 
        return rfc3339_duration_to_delta(interval)
216
 
    except ValueError:
217
 
        pass
218
 
 
219
96
    value = datetime.timedelta(0)
220
 
    regexp = re.compile(r"(\d+)([dsmhw]?)")
221
 
 
 
97
    regexp = re.compile("(\d+)([dsmhw]?)")
 
98
    
222
99
    for num, suffix in regexp.findall(interval):
223
100
        if suffix == "d":
224
101
            value += datetime.timedelta(int(num))
234
111
            value += datetime.timedelta(0, 0, 0, int(num))
235
112
    return value
236
113
 
237
 
 
238
114
def print_clients(clients, keywords):
239
115
    def valuetostring(value, keyword):
240
116
        if type(value) is dbus.Boolean:
241
117
            return "Yes" if value else "No"
242
118
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
243
 
                       "ApprovalDuration", "ExtendedTimeout"):
 
119
                       "ApprovalDuration"):
244
120
            return milliseconds_to_string(value)
245
 
        return str(value)
246
 
 
 
121
        return unicode(value)
 
122
    
247
123
    # Create format string to print table rows
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)
 
124
    format_string = " ".join("%%-%ds" %
 
125
                             max(len(tablewords[key]),
 
126
                                 max(len(valuetostring(client[key],
 
127
                                                       key))
 
128
                                     for client in
 
129
                                     clients))
253
130
                             for key in keywords)
254
131
    # Print header line
255
 
    print(format_string.format(**tablewords))
 
132
    print(format_string % tuple(tablewords[key] for key in keywords))
256
133
    for client in clients:
257
 
        print(format_string
258
 
              .format(**{key: valuetostring(client[key], key)
259
 
                         for key in keywords}))
260
 
 
 
134
        print(format_string % tuple(valuetostring(client[key], key)
 
135
                                    for key in keywords))
261
136
 
262
137
def has_actions(options):
263
138
    return any((options.enable,
279
154
                options.approve,
280
155
                options.deny))
281
156
 
282
 
 
283
157
def main():
284
158
    parser = argparse.ArgumentParser()
285
159
    parser.add_argument("--version", action="version",
286
 
                        version="%(prog)s {}".format(version),
 
160
                        version = "%%prog %s" % version,
287
161
                        help="show version number and exit")
288
162
    parser.add_argument("-a", "--all", action="store_true",
289
163
                        help="Select all clients")
290
164
    parser.add_argument("-v", "--verbose", action="store_true",
291
165
                        help="Print all fields")
292
 
    parser.add_argument("-j", "--dump-json", action="store_true",
293
 
                        help="Dump client data in JSON format")
294
166
    parser.add_argument("-e", "--enable", action="store_true",
295
167
                        help="Enable client")
296
168
    parser.add_argument("-d", "--disable", action="store_true",
324
196
    parser.add_argument("--approval-duration",
325
197
                        help="Set duration of one client approval")
326
198
    parser.add_argument("-H", "--host", help="Set host for client")
327
 
    parser.add_argument("-s", "--secret",
328
 
                        type=argparse.FileType(mode="rb"),
 
199
    parser.add_argument("-s", "--secret", type=file,
329
200
                        help="Set password blob (file) for client")
330
201
    parser.add_argument("-A", "--approve", action="store_true",
331
202
                        help="Approve any current client request")
332
203
    parser.add_argument("-D", "--deny", action="store_true",
333
204
                        help="Deny any current client request")
334
 
    parser.add_argument("--check", action="store_true",
335
 
                        help="Run self-test")
336
205
    parser.add_argument("client", nargs="*", help="Client name")
337
206
    options = parser.parse_args()
338
 
 
339
 
    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:
340
209
        parser.error("Options require clients names or --all.")
341
210
    if options.verbose and has_actions(options):
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.")
 
211
        parser.error("--verbose can only be used alone or with"
 
212
                     " --all.")
346
213
    if options.all and not has_actions(options):
347
214
        parser.error("--all requires an action.")
348
 
 
 
215
    
349
216
    try:
350
217
        bus = dbus.SystemBus()
351
218
        mandos_dbus_objc = bus.get_object(busname, server_path)
352
219
    except dbus.exceptions.DBusException:
353
 
        print("Could not connect to Mandos server", file=sys.stderr)
 
220
        print("Could not connect to Mandos server",
 
221
              file=sys.stderr)
354
222
        sys.exit(1)
355
 
 
 
223
    
356
224
    mandos_serv = dbus.Interface(mandos_dbus_objc,
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
 
225
                                 dbus_interface = server_interface)
 
226
    
 
227
    #block stderr since dbus library prints to stderr
362
228
    null = os.open(os.path.devnull, os.O_RDWR)
363
229
    stderrcopy = os.dup(sys.stderr.fileno())
364
230
    os.dup2(null, sys.stderr.fileno())
365
231
    os.close(null)
366
232
    try:
367
233
        try:
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}
 
234
            mandos_clients = mandos_serv.GetAllClientsWithProperties()
373
235
        finally:
374
 
            # restore stderr
 
236
            #restore stderr
375
237
            os.dup2(stderrcopy, sys.stderr.fileno())
376
238
            os.close(stderrcopy)
377
 
    except dbus.exceptions.DBusException as e:
378
 
        print("Access denied: "
379
 
              "Accessing mandos server through D-Bus: {}".format(e),
 
239
    except dbus.exceptions.DBusException:
 
240
        print("Access denied: Accessing mandos server through dbus.",
380
241
              file=sys.stderr)
381
242
        sys.exit(1)
382
 
 
 
243
    
383
244
    # Compile dict of (clients: properties) to process
384
 
    clients = {}
385
 
 
 
245
    clients={}
 
246
    
386
247
    if options.all or not options.client:
387
 
        clients = {bus.get_object(busname, path): properties
388
 
                   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())
389
251
    else:
390
252
        for name in options.client:
391
 
            for path, client in mandos_clients.items():
 
253
            for path, client in mandos_clients.iteritems():
392
254
                if client["Name"] == name:
393
255
                    client_objc = bus.get_object(busname, path)
394
256
                    clients[client_objc] = client
395
257
                    break
396
258
            else:
397
 
                print("Client not found on server: {!r}"
398
 
                      .format(name), file=sys.stderr)
 
259
                print("Client not found on server: %r" % name,
 
260
                      file=sys.stderr)
399
261
                sys.exit(1)
400
 
 
 
262
    
401
263
    if not has_actions(options) and clients:
402
 
        if options.verbose or options.dump_json:
403
 
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
404
 
                        "Created", "Interval", "Host", "KeyID",
405
 
                        "Fingerprint", "CheckerRunning",
 
264
        if options.verbose:
 
265
            keywords = ("Name", "Enabled", "Timeout",
 
266
                        "LastCheckedOK", "Created", "Interval",
 
267
                        "Host", "Fingerprint", "CheckerRunning",
406
268
                        "LastEnabled", "ApprovalPending",
407
 
                        "ApprovedByDefault", "LastApprovalRequest",
408
 
                        "ApprovalDelay", "ApprovalDuration",
409
 
                        "Checker", "ExtendedTimeout", "Expires",
410
 
                        "LastCheckerStatus")
 
269
                        "ApprovedByDefault",
 
270
                        "LastApprovalRequest", "ApprovalDelay",
 
271
                        "ApprovalDuration", "Checker",
 
272
                        "ExtendedTimeout")
411
273
        else:
412
274
            keywords = defaultkeywords
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)
 
275
        
 
276
        print_clients(clients.values(), keywords)
427
277
    else:
428
278
        # Process each client in the list by all selected options
429
279
        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
 
 
443
280
            if options.remove:
444
281
                mandos_serv.RemoveClient(client.__dbus_object_path__)
445
282
            if options.enable:
446
 
                set_client_prop("Enabled", dbus.Boolean(True))
 
283
                client.Enable(dbus_interface=client_interface)
447
284
            if options.disable:
448
 
                set_client_prop("Enabled", dbus.Boolean(False))
 
285
                client.Disable(dbus_interface=client_interface)
449
286
            if options.bump_timeout:
450
 
                set_client_prop("LastCheckedOK", "")
 
287
                client.CheckedOK(dbus_interface=client_interface)
451
288
            if options.start_checker:
452
 
                set_client_prop("CheckerRunning", dbus.Boolean(True))
 
289
                client.StartChecker(dbus_interface=client_interface)
453
290
            if options.stop_checker:
454
 
                set_client_prop("CheckerRunning", dbus.Boolean(False))
 
291
                client.StopChecker(dbus_interface=client_interface)
455
292
            if options.is_enabled:
456
 
                if client.Get(client_interface, "Enabled",
457
 
                              dbus_interface=dbus.PROPERTIES_IFACE):
458
 
                    sys.exit(0)
459
 
                else:
460
 
                    sys.exit(1)
 
293
                sys.exit(0 if client.Get(client_interface,
 
294
                                         "Enabled",
 
295
                                         dbus_interface=
 
296
                                         dbus.PROPERTIES_IFACE)
 
297
                         else 1)
461
298
            if options.checker is not None:
462
 
                set_client_prop("Checker", options.checker)
 
299
                client.Set(client_interface, "Checker",
 
300
                           options.checker,
 
301
                           dbus_interface=dbus.PROPERTIES_IFACE)
463
302
            if options.host is not None:
464
 
                set_client_prop("Host", options.host)
 
303
                client.Set(client_interface, "Host", options.host,
 
304
                           dbus_interface=dbus.PROPERTIES_IFACE)
465
305
            if options.interval is not None:
466
 
                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)
467
310
            if options.approval_delay is not None:
468
 
                set_client_prop_ms("ApprovalDelay",
469
 
                                   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)
470
316
            if options.approval_duration is not None:
471
 
                set_client_prop_ms("ApprovalDuration",
472
 
                                   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)
473
322
            if options.timeout is not None:
474
 
                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)
475
327
            if options.extended_timeout is not None:
476
 
                set_client_prop_ms("ExtendedTimeout",
477
 
                                   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)
478
332
            if options.secret is not None:
479
 
                set_client_prop("Secret",
480
 
                                dbus.ByteArray(options.secret.read()))
 
333
                client.Set(client_interface, "Secret",
 
334
                           dbus.ByteArray(options.secret.read()),
 
335
                           dbus_interface=dbus.PROPERTIES_IFACE)
481
336
            if options.approved_by_default is not None:
482
 
                set_client_prop("ApprovedByDefault",
483
 
                                dbus.Boolean(options
484
 
                                             .approved_by_default))
 
337
                client.Set(client_interface, "ApprovedByDefault",
 
338
                           dbus.Boolean(options
 
339
                                        .approved_by_default),
 
340
                           dbus_interface=dbus.PROPERTIES_IFACE)
485
341
            if options.approve:
486
342
                client.Approve(dbus.Boolean(True),
487
343
                               dbus_interface=client_interface)
489
345
                client.Approve(dbus.Boolean(False),
490
346
                               dbus_interface=client_interface)
491
347
 
492
 
 
493
 
def should_only_run_tests():
494
 
    parser = argparse.ArgumentParser(add_help=False)
495
 
    parser.add_argument("--check", action='store_true')
496
 
    args, unknown_args = parser.parse_known_args()
497
 
    run_tests = args.check
498
 
    if run_tests:
499
 
        # Remove --check argument from sys.argv
500
 
        sys.argv[1:] = unknown_args
501
 
    return run_tests
502
 
 
503
 
# Add all tests from doctest strings
504
 
def load_tests(loader, tests, none):
505
 
    import doctest
506
 
    tests.addTests(doctest.DocTestSuite())
507
 
    return tests
508
 
 
509
348
if __name__ == "__main__":
510
 
    if should_only_run_tests():
511
 
        # Call using ./tdd-python-script --check [--verbose]
512
 
        unittest.main()
513
 
    else:
514
 
        main()
 
349
    main()