/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

  • Committer: Teddy Hogeborn
  • Date: 2014-06-08 02:31:50 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 317.
  • Revision ID: teddy@recompile.se-20140608023150-eu8jxll7uddjxter
Bug fix for mandos-client: Run the network hook, not the directory.

* plugins.d/mandos-client.d (set_cloexec_flag): Removed.
  (run_network_hooks): Do not set O_CLOEXEC on "hookdir_fd".
                       Instead, open hook to new "hook_fd" and simply
                       close(hookdir_fd) before fexecve().

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