/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 20:27:28 UTC
  • Revision ID: teddy@recompile.se-20120115202728-185929ww2r84s8xg
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New
                                                           property.
* mandos (Client.last_checker_status): Use -2 instead of None to match
                                       D-Bus property.  All users
                                       changed.
  (Client.checked_ok): Remove "timeout" argument and call
                       "self.bump_timeout()" instead.
  (Client.bump_timeout): New; separated out from "checked_ok".
  (ClientDBus.last_checker_status): Hook to a D-Bus property.
  (ClientDBus.LastCheckerStatus_dbus_property): New D-Bus property.
  (ClientHandler.handle): Call client.bump_timeout() instead of
                          client.checked_ok().

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-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
 
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
 
 
38
tablewords = {
 
39
    "Name": "Name",
 
40
    "Enabled": "Enabled",
 
41
    "Timeout": "Timeout",
 
42
    "LastCheckedOK": "Last Successful Check",
 
43
    "LastApprovalRequest": "Last Approval Request",
 
44
    "Created": "Created",
 
45
    "Interval": "Interval",
 
46
    "Host": "Host",
 
47
    "Fingerprint": "Fingerprint",
 
48
    "CheckerRunning": "Check Is Running",
 
49
    "LastEnabled": "Last Enabled",
 
50
    "ApprovalPending": "Approval Is Pending",
 
51
    "ApprovedByDefault": "Approved By Default",
 
52
    "ApprovalDelay": "Approval Delay",
 
53
    "ApprovalDuration": "Approval Duration",
 
54
    "Checker": "Checker",
 
55
    "ExtendedTimeout" : "Extended Timeout"
 
56
    }
64
57
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
65
58
domain = "se.recompile"
66
59
busname = domain + ".Mandos"
67
60
server_path = "/"
68
61
server_interface = domain + ".Mandos"
69
62
client_interface = domain + ".Mandos.Client"
70
 
version = "1.8.3"
71
 
 
72
 
 
73
 
try:
74
 
    dbus.OBJECT_MANAGER_IFACE
75
 
except AttributeError:
76
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
77
 
 
 
63
version = "1.5.2"
 
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))
78
70
 
79
71
def milliseconds_to_string(ms):
80
72
    td = datetime.timedelta(0, 0, 0, ms)
81
 
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
82
 
            .format(days="{}T".format(td.days) if td.days else "",
83
 
                    hours=td.seconds // 3600,
84
 
                    minutes=(td.seconds % 3600) // 60,
85
 
                    seconds=td.seconds % 60))
86
 
 
87
 
 
88
 
def rfc3339_duration_to_delta(duration):
89
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
90
 
 
91
 
    >>> rfc3339_duration_to_delta("P7D")
92
 
    datetime.timedelta(7)
93
 
    >>> rfc3339_duration_to_delta("PT60S")
94
 
    datetime.timedelta(0, 60)
95
 
    >>> rfc3339_duration_to_delta("PT60M")
96
 
    datetime.timedelta(0, 3600)
97
 
    >>> rfc3339_duration_to_delta("P60M")
98
 
    datetime.timedelta(1680)
99
 
    >>> rfc3339_duration_to_delta("PT24H")
100
 
    datetime.timedelta(1)
101
 
    >>> rfc3339_duration_to_delta("P1W")
102
 
    datetime.timedelta(7)
103
 
    >>> rfc3339_duration_to_delta("PT5M30S")
104
 
    datetime.timedelta(0, 330)
105
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
106
 
    datetime.timedelta(1, 200)
107
 
    >>> # Can not be empty:
108
 
    >>> rfc3339_duration_to_delta("")
109
 
    Traceback (most recent call last):
110
 
    ...
111
 
    ValueError: Invalid RFC 3339 duration: u''
112
 
    >>> # Must start with "P":
113
 
    >>> rfc3339_duration_to_delta("1D")
114
 
    Traceback (most recent call last):
115
 
    ...
116
 
    ValueError: Invalid RFC 3339 duration: u'1D'
117
 
    >>> # Must use correct order
118
 
    >>> rfc3339_duration_to_delta("PT1S2M")
119
 
    Traceback (most recent call last):
120
 
    ...
121
 
    ValueError: Invalid RFC 3339 duration: u'PT1S2M'
122
 
    >>> # Time needs time marker
123
 
    >>> rfc3339_duration_to_delta("P1H2S")
124
 
    Traceback (most recent call last):
125
 
    ...
126
 
    ValueError: Invalid RFC 3339 duration: u'P1H2S'
127
 
    >>> # Weeks can not be combined with anything else
128
 
    >>> rfc3339_duration_to_delta("P1D2W")
129
 
    Traceback (most recent call last):
130
 
    ...
131
 
    ValueError: Invalid RFC 3339 duration: u'P1D2W'
132
 
    >>> rfc3339_duration_to_delta("P2W2H")
133
 
    Traceback (most recent call last):
134
 
    ...
135
 
    ValueError: Invalid RFC 3339 duration: u'P2W2H'
136
 
    """
137
 
 
138
 
    # Parsing an RFC 3339 duration with regular expressions is not
139
 
    # possible - there would have to be multiple places for the same
140
 
    # values, like seconds.  The current code, while more esoteric, is
141
 
    # cleaner without depending on a parsing library.  If Python had a
142
 
    # built-in library for parsing we would use it, but we'd like to
143
 
    # avoid excessive use of external libraries.
144
 
 
145
 
    # New type for defining tokens, syntax, and semantics all-in-one
146
 
    Token = collections.namedtuple("Token", (
147
 
        "regexp",  # To match token; if "value" is not None, must have
148
 
                   # a "group" containing digits
149
 
        "value",   # datetime.timedelta or None
150
 
        "followers"))           # Tokens valid after this token
151
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
152
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
153
 
    token_end = Token(re.compile(r"$"), None, frozenset())
154
 
    token_second = Token(re.compile(r"(\d+)S"),
155
 
                         datetime.timedelta(seconds=1),
156
 
                         frozenset((token_end, )))
157
 
    token_minute = Token(re.compile(r"(\d+)M"),
158
 
                         datetime.timedelta(minutes=1),
159
 
                         frozenset((token_second, token_end)))
160
 
    token_hour = Token(re.compile(r"(\d+)H"),
161
 
                       datetime.timedelta(hours=1),
162
 
                       frozenset((token_minute, token_end)))
163
 
    token_time = Token(re.compile(r"T"),
164
 
                       None,
165
 
                       frozenset((token_hour, token_minute,
166
 
                                  token_second)))
167
 
    token_day = Token(re.compile(r"(\d+)D"),
168
 
                      datetime.timedelta(days=1),
169
 
                      frozenset((token_time, token_end)))
170
 
    token_month = Token(re.compile(r"(\d+)M"),
171
 
                        datetime.timedelta(weeks=4),
172
 
                        frozenset((token_day, token_end)))
173
 
    token_year = Token(re.compile(r"(\d+)Y"),
174
 
                       datetime.timedelta(weeks=52),
175
 
                       frozenset((token_month, token_end)))
176
 
    token_week = Token(re.compile(r"(\d+)W"),
177
 
                       datetime.timedelta(weeks=1),
178
 
                       frozenset((token_end, )))
179
 
    token_duration = Token(re.compile(r"P"), None,
180
 
                           frozenset((token_year, token_month,
181
 
                                      token_day, token_time,
182
 
                                      token_week)))
183
 
    # Define starting values:
184
 
    # Value so far
185
 
    value = datetime.timedelta()
186
 
    found_token = None
187
 
    # Following valid tokens
188
 
    followers = frozenset((token_duration, ))
189
 
    # String left to parse
190
 
    s = duration
191
 
    # Loop until end token is found
192
 
    while found_token is not token_end:
193
 
        # Search for any currently valid tokens
194
 
        for token in followers:
195
 
            match = token.regexp.match(s)
196
 
            if match is not None:
197
 
                # Token found
198
 
                if token.value is not None:
199
 
                    # Value found, parse digits
200
 
                    factor = int(match.group(1), 10)
201
 
                    # Add to value so far
202
 
                    value += factor * token.value
203
 
                # Strip token from string
204
 
                s = token.regexp.sub("", s, 1)
205
 
                # Go to found token
206
 
                found_token = token
207
 
                # Set valid next tokens
208
 
                followers = found_token.followers
209
 
                break
210
 
        else:
211
 
            # No currently valid tokens were found
212
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
213
 
                             .format(duration))
214
 
    # End token found
215
 
    return value
216
 
 
 
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
                })
217
79
 
218
80
def string_to_delta(interval):
219
81
    """Parse a string and return a datetime.timedelta
220
 
    """
221
 
 
222
 
    try:
223
 
        return rfc3339_duration_to_delta(interval)
224
 
    except ValueError as e:
225
 
        log.warning("%s - Parsing as pre-1.6.1 interval instead",
226
 
                    ' '.join(e.args))
227
 
    return parse_pre_1_6_1_interval(interval)
228
 
 
229
 
 
230
 
def parse_pre_1_6_1_interval(interval):
231
 
    """Parse an interval string as documented by Mandos before 1.6.1, and
232
 
    return a datetime.timedelta
233
 
    >>> parse_pre_1_6_1_interval('7d')
 
82
    
 
83
    >>> string_to_delta("7d")
234
84
    datetime.timedelta(7)
235
 
    >>> parse_pre_1_6_1_interval('60s')
 
85
    >>> string_to_delta("60s")
236
86
    datetime.timedelta(0, 60)
237
 
    >>> parse_pre_1_6_1_interval('60m')
 
87
    >>> string_to_delta("60m")
238
88
    datetime.timedelta(0, 3600)
239
 
    >>> parse_pre_1_6_1_interval('24h')
 
89
    >>> string_to_delta("24h")
240
90
    datetime.timedelta(1)
241
 
    >>> parse_pre_1_6_1_interval('1w')
 
91
    >>> string_to_delta("1w")
242
92
    datetime.timedelta(7)
243
 
    >>> parse_pre_1_6_1_interval('5m 30s')
 
93
    >>> string_to_delta("5m 30s")
244
94
    datetime.timedelta(0, 330)
245
 
    >>> parse_pre_1_6_1_interval('')
246
 
    datetime.timedelta(0)
247
 
    >>> # Ignore unknown characters, allow any order and repetitions
248
 
    >>> parse_pre_1_6_1_interval('2dxy7zz11y3m5m')
249
 
    datetime.timedelta(2, 480, 18000)
250
 
 
251
95
    """
252
 
 
253
96
    value = datetime.timedelta(0)
254
 
    regexp = re.compile(r"(\d+)([dsmhw]?)")
255
 
 
 
97
    regexp = re.compile("(\d+)([dsmhw]?)")
 
98
    
256
99
    for num, suffix in regexp.findall(interval):
257
100
        if suffix == "d":
258
101
            value += datetime.timedelta(int(num))
268
111
            value += datetime.timedelta(0, 0, 0, int(num))
269
112
    return value
270
113
 
271
 
 
272
114
def print_clients(clients, keywords):
273
 
    print('\n'.join(TableOfClients(clients, keywords).rows()))
274
 
 
275
 
class TableOfClients(object):
276
 
    tablewords = {
277
 
        "Name": "Name",
278
 
        "Enabled": "Enabled",
279
 
        "Timeout": "Timeout",
280
 
        "LastCheckedOK": "Last Successful Check",
281
 
        "LastApprovalRequest": "Last Approval Request",
282
 
        "Created": "Created",
283
 
        "Interval": "Interval",
284
 
        "Host": "Host",
285
 
        "Fingerprint": "Fingerprint",
286
 
        "KeyID": "Key ID",
287
 
        "CheckerRunning": "Check Is Running",
288
 
        "LastEnabled": "Last Enabled",
289
 
        "ApprovalPending": "Approval Is Pending",
290
 
        "ApprovedByDefault": "Approved By Default",
291
 
        "ApprovalDelay": "Approval Delay",
292
 
        "ApprovalDuration": "Approval Duration",
293
 
        "Checker": "Checker",
294
 
        "ExtendedTimeout": "Extended Timeout",
295
 
        "Expires": "Expires",
296
 
        "LastCheckerStatus": "Last Checker Status",
297
 
    }
298
 
 
299
 
    def __init__(self, clients, keywords, tablewords=None):
300
 
        self.clients = clients
301
 
        self.keywords = keywords
302
 
        if tablewords is not None:
303
 
            self.tablewords = tablewords
304
 
 
305
 
    @staticmethod
306
115
    def valuetostring(value, keyword):
307
 
        if isinstance(value, dbus.Boolean):
 
116
        if type(value) is dbus.Boolean:
308
117
            return "Yes" if value else "No"
309
118
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
310
 
                       "ApprovalDuration", "ExtendedTimeout"):
 
119
                       "ApprovalDuration"):
311
120
            return milliseconds_to_string(value)
312
 
        return str(value)
313
 
 
314
 
    def rows(self):
315
 
        # Create format string to format table rows
316
 
        format_string = " ".join("{{{key}:{width}}}".format(
317
 
            width=max(len(self.tablewords[key]),
318
 
                      max(len(self.valuetostring(client[key], key))
319
 
                          for client in self.clients)),
320
 
            key=key)
321
 
                                 for key in self.keywords)
322
 
        # Start with header line
323
 
        rows = [format_string.format(**self.tablewords)]
324
 
        for client in self.clients:
325
 
            rows.append(format_string
326
 
                        .format(**{key: self.valuetostring(client[key], key)
327
 
                                   for key in self.keywords}))
328
 
        return rows
329
 
 
 
121
        return unicode(value)
 
122
    
 
123
    # Create format string to print table rows
 
124
    format_string = " ".join("%%-%ds" %
 
125
                             max(len(tablewords[key]),
 
126
                                 max(len(valuetostring(client[key],
 
127
                                                       key))
 
128
                                     for client in
 
129
                                     clients))
 
130
                             for key in keywords)
 
131
    # Print header line
 
132
    print(format_string % tuple(tablewords[key] for key in keywords))
 
133
    for client in clients:
 
134
        print(format_string % tuple(valuetostring(client[key], key)
 
135
                                    for key in keywords))
330
136
 
331
137
def has_actions(options):
332
138
    return any((options.enable,
348
154
                options.approve,
349
155
                options.deny))
350
156
 
351
 
 
352
157
def main():
353
158
    parser = argparse.ArgumentParser()
354
159
    parser.add_argument("--version", action="version",
355
 
                        version="%(prog)s {}".format(version),
 
160
                        version = "%%prog %s" % version,
356
161
                        help="show version number and exit")
357
162
    parser.add_argument("-a", "--all", action="store_true",
358
163
                        help="Select all clients")
359
164
    parser.add_argument("-v", "--verbose", action="store_true",
360
165
                        help="Print all fields")
361
 
    parser.add_argument("-j", "--dump-json", action="store_true",
362
 
                        help="Dump client data in JSON format")
363
166
    parser.add_argument("-e", "--enable", action="store_true",
364
167
                        help="Enable client")
365
168
    parser.add_argument("-d", "--disable", action="store_true",
393
196
    parser.add_argument("--approval-duration",
394
197
                        help="Set duration of one client approval")
395
198
    parser.add_argument("-H", "--host", help="Set host for client")
396
 
    parser.add_argument("-s", "--secret",
397
 
                        type=argparse.FileType(mode="rb"),
 
199
    parser.add_argument("-s", "--secret", type=file,
398
200
                        help="Set password blob (file) for client")
399
201
    parser.add_argument("-A", "--approve", action="store_true",
400
202
                        help="Approve any current client request")
401
203
    parser.add_argument("-D", "--deny", action="store_true",
402
204
                        help="Deny any current client request")
403
 
    parser.add_argument("--check", action="store_true",
404
 
                        help="Run self-test")
405
205
    parser.add_argument("client", nargs="*", help="Client name")
406
206
    options = parser.parse_args()
407
 
 
408
 
    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:
409
209
        parser.error("Options require clients names or --all.")
410
210
    if options.verbose and has_actions(options):
411
 
        parser.error("--verbose can only be used alone.")
412
 
    if options.dump_json and (options.verbose
413
 
                              or has_actions(options)):
414
 
        parser.error("--dump-json can only be used alone.")
 
211
        parser.error("--verbose can only be used alone or with"
 
212
                     " --all.")
415
213
    if options.all and not has_actions(options):
416
214
        parser.error("--all requires an action.")
417
 
 
 
215
    
418
216
    try:
419
217
        bus = dbus.SystemBus()
420
218
        mandos_dbus_objc = bus.get_object(busname, server_path)
421
219
    except dbus.exceptions.DBusException:
422
 
        log.critical("Could not connect to Mandos server")
 
220
        print("Could not connect to Mandos server",
 
221
              file=sys.stderr)
423
222
        sys.exit(1)
424
 
 
 
223
    
425
224
    mandos_serv = dbus.Interface(mandos_dbus_objc,
426
 
                                 dbus_interface=server_interface)
427
 
    mandos_serv_object_manager = dbus.Interface(
428
 
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
429
 
 
430
 
    # block stderr since dbus library prints to stderr
 
225
                                 dbus_interface = server_interface)
 
226
    
 
227
    #block stderr since dbus library prints to stderr
431
228
    null = os.open(os.path.devnull, os.O_RDWR)
432
229
    stderrcopy = os.dup(sys.stderr.fileno())
433
230
    os.dup2(null, sys.stderr.fileno())
434
231
    os.close(null)
435
232
    try:
436
233
        try:
437
 
            mandos_clients = {path: ifs_and_props[client_interface]
438
 
                              for path, ifs_and_props in
439
 
                              mandos_serv_object_manager
440
 
                              .GetManagedObjects().items()
441
 
                              if client_interface in ifs_and_props}
 
234
            mandos_clients = mandos_serv.GetAllClientsWithProperties()
442
235
        finally:
443
 
            # restore stderr
 
236
            #restore stderr
444
237
            os.dup2(stderrcopy, sys.stderr.fileno())
445
238
            os.close(stderrcopy)
446
 
    except dbus.exceptions.DBusException as e:
447
 
        log.critical("Failed to access Mandos server through D-Bus:"
448
 
                     "\n%s", e)
 
239
    except dbus.exceptions.DBusException:
 
240
        print("Access denied: Accessing mandos server through dbus.",
 
241
              file=sys.stderr)
449
242
        sys.exit(1)
450
 
 
 
243
    
451
244
    # Compile dict of (clients: properties) to process
452
 
    clients = {}
453
 
 
 
245
    clients={}
 
246
    
454
247
    if options.all or not options.client:
455
 
        clients = {bus.get_object(busname, path): properties
456
 
                   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())
457
251
    else:
458
252
        for name in options.client:
459
 
            for path, client in mandos_clients.items():
 
253
            for path, client in mandos_clients.iteritems():
460
254
                if client["Name"] == name:
461
255
                    client_objc = bus.get_object(busname, path)
462
256
                    clients[client_objc] = client
463
257
                    break
464
258
            else:
465
 
                log.critical("Client not found on server: %r", name)
 
259
                print("Client not found on server: %r" % name,
 
260
                      file=sys.stderr)
466
261
                sys.exit(1)
467
 
 
 
262
    
468
263
    if not has_actions(options) and clients:
469
 
        if options.verbose or options.dump_json:
470
 
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
471
 
                        "Created", "Interval", "Host", "KeyID",
472
 
                        "Fingerprint", "CheckerRunning",
 
264
        if options.verbose:
 
265
            keywords = ("Name", "Enabled", "Timeout",
 
266
                        "LastCheckedOK", "Created", "Interval",
 
267
                        "Host", "Fingerprint", "CheckerRunning",
473
268
                        "LastEnabled", "ApprovalPending",
474
 
                        "ApprovedByDefault", "LastApprovalRequest",
475
 
                        "ApprovalDelay", "ApprovalDuration",
476
 
                        "Checker", "ExtendedTimeout", "Expires",
477
 
                        "LastCheckerStatus")
 
269
                        "ApprovedByDefault",
 
270
                        "LastApprovalRequest", "ApprovalDelay",
 
271
                        "ApprovalDuration", "Checker",
 
272
                        "ExtendedTimeout")
478
273
        else:
479
274
            keywords = defaultkeywords
480
 
 
481
 
        if options.dump_json:
482
 
            json.dump({client["Name"]: {key:
483
 
                                        bool(client[key])
484
 
                                        if isinstance(client[key],
485
 
                                                      dbus.Boolean)
486
 
                                        else client[key]
487
 
                                        for key in keywords}
488
 
                       for client in clients.values()},
489
 
                      fp=sys.stdout, indent=4,
490
 
                      separators=(',', ': '))
491
 
            print()
492
 
        else:
493
 
            print_clients(clients.values(), keywords)
 
275
        
 
276
        print_clients(clients.values(), keywords)
494
277
    else:
495
278
        # Process each client in the list by all selected options
496
279
        for client in clients:
497
 
 
498
 
            def set_client_prop(prop, value):
499
 
                """Set a Client D-Bus property"""
500
 
                client.Set(client_interface, prop, value,
501
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
502
 
 
503
 
            def set_client_prop_ms(prop, value):
504
 
                """Set a Client D-Bus property, converted
505
 
                from a string to milliseconds."""
506
 
                set_client_prop(prop,
507
 
                                string_to_delta(value).total_seconds()
508
 
                                * 1000)
509
 
 
510
280
            if options.remove:
511
281
                mandos_serv.RemoveClient(client.__dbus_object_path__)
512
282
            if options.enable:
513
 
                set_client_prop("Enabled", dbus.Boolean(True))
 
283
                client.Enable(dbus_interface=client_interface)
514
284
            if options.disable:
515
 
                set_client_prop("Enabled", dbus.Boolean(False))
 
285
                client.Disable(dbus_interface=client_interface)
516
286
            if options.bump_timeout:
517
 
                set_client_prop("LastCheckedOK", "")
 
287
                client.CheckedOK(dbus_interface=client_interface)
518
288
            if options.start_checker:
519
 
                set_client_prop("CheckerRunning", dbus.Boolean(True))
 
289
                client.StartChecker(dbus_interface=client_interface)
520
290
            if options.stop_checker:
521
 
                set_client_prop("CheckerRunning", dbus.Boolean(False))
 
291
                client.StopChecker(dbus_interface=client_interface)
522
292
            if options.is_enabled:
523
 
                if client.Get(client_interface, "Enabled",
524
 
                              dbus_interface=dbus.PROPERTIES_IFACE):
525
 
                    sys.exit(0)
526
 
                else:
527
 
                    sys.exit(1)
 
293
                sys.exit(0 if client.Get(client_interface,
 
294
                                         "Enabled",
 
295
                                         dbus_interface=
 
296
                                         dbus.PROPERTIES_IFACE)
 
297
                         else 1)
528
298
            if options.checker is not None:
529
 
                set_client_prop("Checker", options.checker)
 
299
                client.Set(client_interface, "Checker",
 
300
                           options.checker,
 
301
                           dbus_interface=dbus.PROPERTIES_IFACE)
530
302
            if options.host is not None:
531
 
                set_client_prop("Host", options.host)
 
303
                client.Set(client_interface, "Host", options.host,
 
304
                           dbus_interface=dbus.PROPERTIES_IFACE)
532
305
            if options.interval is not None:
533
 
                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)
534
310
            if options.approval_delay is not None:
535
 
                set_client_prop_ms("ApprovalDelay",
536
 
                                   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)
537
316
            if options.approval_duration is not None:
538
 
                set_client_prop_ms("ApprovalDuration",
539
 
                                   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)
540
322
            if options.timeout is not None:
541
 
                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)
542
327
            if options.extended_timeout is not None:
543
 
                set_client_prop_ms("ExtendedTimeout",
544
 
                                   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)
545
332
            if options.secret is not None:
546
 
                set_client_prop("Secret",
547
 
                                dbus.ByteArray(options.secret.read()))
 
333
                client.Set(client_interface, "Secret",
 
334
                           dbus.ByteArray(options.secret.read()),
 
335
                           dbus_interface=dbus.PROPERTIES_IFACE)
548
336
            if options.approved_by_default is not None:
549
 
                set_client_prop("ApprovedByDefault",
550
 
                                dbus.Boolean(options
551
 
                                             .approved_by_default))
 
337
                client.Set(client_interface, "ApprovedByDefault",
 
338
                           dbus.Boolean(options
 
339
                                        .approved_by_default),
 
340
                           dbus_interface=dbus.PROPERTIES_IFACE)
552
341
            if options.approve:
553
342
                client.Approve(dbus.Boolean(True),
554
343
                               dbus_interface=client_interface)
556
345
                client.Approve(dbus.Boolean(False),
557
346
                               dbus_interface=client_interface)
558
347
 
559
 
 
560
 
class Test_milliseconds_to_string(unittest.TestCase):
561
 
    def test_all(self):
562
 
        self.assertEqual(milliseconds_to_string(93785000),
563
 
                         "1T02:03:05")
564
 
    def test_no_days(self):
565
 
        self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
566
 
    def test_all_zero(self):
567
 
        self.assertEqual(milliseconds_to_string(0), "00:00:00")
568
 
    def test_no_fractional_seconds(self):
569
 
        self.assertEqual(milliseconds_to_string(400), "00:00:00")
570
 
        self.assertEqual(milliseconds_to_string(900), "00:00:00")
571
 
        self.assertEqual(milliseconds_to_string(1900), "00:00:01")
572
 
 
573
 
class Test_string_to_delta(unittest.TestCase):
574
 
    def test_handles_basic_rfc3339(self):
575
 
        self.assertEqual(string_to_delta("PT2H"),
576
 
                         datetime.timedelta(0, 7200))
577
 
    def test_falls_back_to_pre_1_6_1_with_warning(self):
578
 
        # assertLogs only exists in Python 3.4
579
 
        if hasattr(self, "assertLogs"):
580
 
            with self.assertLogs(log, logging.WARNING):
581
 
                value = string_to_delta("2h")
582
 
        else:
583
 
            value = string_to_delta("2h")
584
 
        self.assertEqual(value, datetime.timedelta(0, 7200))
585
 
 
586
 
class Test_TableOfClients(unittest.TestCase):
587
 
    def setUp(self):
588
 
        self.tablewords = {
589
 
            "Attr1": "X",
590
 
            "AttrTwo": "Yy",
591
 
            "AttrThree": "Zzz",
592
 
            "Bool": "A D-BUS Boolean",
593
 
            "NonDbusBoolean": "A Non-D-BUS Boolean",
594
 
            "Integer": "An Integer",
595
 
            "Timeout": "Timedelta 1",
596
 
            "Interval": "Timedelta 2",
597
 
            "ApprovalDelay": "Timedelta 3",
598
 
            "ApprovalDuration": "Timedelta 4",
599
 
            "ExtendedTimeout": "Timedelta 5",
600
 
            "String": "A String",
601
 
        }
602
 
        self.keywords = ["Attr1", "AttrTwo"]
603
 
        self.clients = [
604
 
            {
605
 
                "Attr1": "x1",
606
 
                "AttrTwo": "y1",
607
 
                "AttrThree": "z1",
608
 
                "Bool": dbus.Boolean(False),
609
 
                "NonDbusBoolean": False,
610
 
                "Integer": 0,
611
 
                "Timeout": 0,
612
 
                "Interval": 1000,
613
 
                "ApprovalDelay": 2000,
614
 
                "ApprovalDuration": 3000,
615
 
                "ExtendedTimeout": 4000,
616
 
                "String": "",
617
 
            },
618
 
            {
619
 
                "Attr1": "x2",
620
 
                "AttrTwo": "y2",
621
 
                "AttrThree": "z2",
622
 
                "Bool": dbus.Boolean(True),
623
 
                "NonDbusBoolean": True,
624
 
                "Integer": 1,
625
 
                "Timeout": 93785000,
626
 
                "Interval": 93786000,
627
 
                "ApprovalDelay": 93787000,
628
 
                "ApprovalDuration": 93788000,
629
 
                "ExtendedTimeout": 93789000,
630
 
                "String": "A huge string which will not fit," * 10,
631
 
            },
632
 
        ]
633
 
    def test_short_header(self):
634
 
        rows = TableOfClients(self.clients, self.keywords,
635
 
                              self.tablewords).rows()
636
 
        expected_rows = [
637
 
            "X  Yy",
638
 
            "x1 y1",
639
 
            "x2 y2"]
640
 
        self.assertEqual(rows, expected_rows)
641
 
    def test_booleans(self):
642
 
        keywords = ["Bool", "NonDbusBoolean"]
643
 
        rows = TableOfClients(self.clients, keywords,
644
 
                              self.tablewords).rows()
645
 
        expected_rows = [
646
 
            "A D-BUS Boolean A Non-D-BUS Boolean",
647
 
            "No              False              ",
648
 
            "Yes             True               ",
649
 
        ]
650
 
        self.assertEqual(rows, expected_rows)
651
 
    def test_milliseconds_detection(self):
652
 
        keywords = ["Integer", "Timeout", "Interval", "ApprovalDelay",
653
 
                    "ApprovalDuration", "ExtendedTimeout"]
654
 
        rows = TableOfClients(self.clients, keywords,
655
 
                              self.tablewords).rows()
656
 
        expected_rows = ("""
657
 
An Integer Timedelta 1 Timedelta 2 Timedelta 3 Timedelta 4 Timedelta 5
658
 
0          00:00:00    00:00:01    00:00:02    00:00:03    00:00:04   
659
 
1          1T02:03:05  1T02:03:06  1T02:03:07  1T02:03:08  1T02:03:09 
660
 
"""
661
 
        ).splitlines()[1:]
662
 
        self.assertEqual(rows, expected_rows)
663
 
    def test_empty_and_long_string_values(self):
664
 
        keywords = ["String"]
665
 
        rows = TableOfClients(self.clients, keywords,
666
 
                              self.tablewords).rows()
667
 
        expected_rows = ("""
668
 
A String                                                                                                                                                                                                                                                                                                                                  
669
 
                                                                                                                                                                                                                                                                                                                                          
670
 
A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,
671
 
"""
672
 
        ).splitlines()[1:]
673
 
        self.assertEqual(rows, expected_rows)
674
 
 
675
 
 
676
 
 
677
 
def should_only_run_tests():
678
 
    parser = argparse.ArgumentParser(add_help=False)
679
 
    parser.add_argument("--check", action='store_true')
680
 
    args, unknown_args = parser.parse_known_args()
681
 
    run_tests = args.check
682
 
    if run_tests:
683
 
        # Remove --check argument from sys.argv
684
 
        sys.argv[1:] = unknown_args
685
 
    return run_tests
686
 
 
687
 
# Add all tests from doctest strings
688
 
def load_tests(loader, tests, none):
689
 
    import doctest
690
 
    tests.addTests(doctest.DocTestSuite())
691
 
    return tests
692
 
 
693
348
if __name__ == "__main__":
694
 
    if should_only_run_tests():
695
 
        # Call using ./tdd-python-script --check [--verbose]
696
 
        unittest.main()
697
 
    else:
698
 
        main()
 
349
    main()