/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: 2019-03-03 14:21:15 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 382.
  • Revision ID: teddy@recompile.se-20190303142115-qdbpaz17ms5cq7y5
mandos-ctl: Refactor

* mandos-ctl (main): Move argument parsing into separate function.
  (commands_and_clients_from_options): New.

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 -*-
3
 
# 
 
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
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
 
# 
6
 
# Copyright © 2008-2016 Teddy Hogeborn
7
 
# Copyright © 2008-2016 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
 
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
11
13
# the Free Software Foundation, either version 3 of the License, or
12
14
# (at your option) any later version.
13
15
#
14
 
#     This program is distributed in the hope that it will be useful,
15
 
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
16
#     Mandos is distributed in the hope that it will be useful, but
 
17
#     WITHOUT ANY WARRANTY; without even the implied warranty of
16
18
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
19
#     GNU General Public License for more details.
18
 
# 
 
20
#
19
21
# You should have received a copy of the GNU General Public License
20
 
# along with this program.  If not, see
21
 
# <http://www.gnu.org/licenses/>.
22
 
# 
 
22
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
23
#
23
24
# Contact the authors at <mandos@recompile.se>.
24
 
# 
 
25
#
25
26
 
26
27
from __future__ import (division, absolute_import, print_function,
27
28
                        unicode_literals)
38
39
import re
39
40
import os
40
41
import collections
41
 
import doctest
 
42
import json
 
43
import unittest
 
44
import logging
42
45
 
43
46
import dbus
44
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
 
45
59
if sys.version_info.major == 2:
46
60
    str = unicode
47
61
 
48
62
locale.setlocale(locale.LC_ALL, "")
49
63
 
50
 
tablewords = {
51
 
    "Name": "Name",
52
 
    "Enabled": "Enabled",
53
 
    "Timeout": "Timeout",
54
 
    "LastCheckedOK": "Last Successful Check",
55
 
    "LastApprovalRequest": "Last Approval Request",
56
 
    "Created": "Created",
57
 
    "Interval": "Interval",
58
 
    "Host": "Host",
59
 
    "Fingerprint": "Fingerprint",
60
 
    "CheckerRunning": "Check Is Running",
61
 
    "LastEnabled": "Last Enabled",
62
 
    "ApprovalPending": "Approval Is Pending",
63
 
    "ApprovedByDefault": "Approved By Default",
64
 
    "ApprovalDelay": "Approval Delay",
65
 
    "ApprovalDuration": "Approval Duration",
66
 
    "Checker": "Checker",
67
 
    "ExtendedTimeout": "Extended Timeout"
68
 
}
69
 
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
70
64
domain = "se.recompile"
71
65
busname = domain + ".Mandos"
72
66
server_path = "/"
73
67
server_interface = domain + ".Mandos"
74
68
client_interface = domain + ".Mandos.Client"
75
 
version = "1.7.6"
 
69
version = "1.8.3"
76
70
 
77
71
 
78
72
try:
80
74
except AttributeError:
81
75
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
82
76
 
 
77
 
83
78
def milliseconds_to_string(ms):
84
79
    td = datetime.timedelta(0, 0, 0, ms)
85
 
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}".format(
86
 
        days = "{}T".format(td.days) if td.days else "",
87
 
        hours = td.seconds // 3600,
88
 
        minutes = (td.seconds % 3600) // 60,
89
 
        seconds = td.seconds % 60))
 
80
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
 
81
            .format(days="{}T".format(td.days) if td.days else "",
 
82
                    hours=td.seconds // 3600,
 
83
                    minutes=(td.seconds % 3600) // 60,
 
84
                    seconds=td.seconds % 60))
90
85
 
91
86
 
92
87
def rfc3339_duration_to_delta(duration):
93
88
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
94
 
    
 
89
 
95
90
    >>> rfc3339_duration_to_delta("P7D")
96
91
    datetime.timedelta(7)
97
92
    >>> rfc3339_duration_to_delta("PT60S")
98
93
    datetime.timedelta(0, 60)
99
94
    >>> rfc3339_duration_to_delta("PT60M")
100
95
    datetime.timedelta(0, 3600)
 
96
    >>> rfc3339_duration_to_delta("P60M")
 
97
    datetime.timedelta(1680)
101
98
    >>> rfc3339_duration_to_delta("PT24H")
102
99
    datetime.timedelta(1)
103
100
    >>> rfc3339_duration_to_delta("P1W")
106
103
    datetime.timedelta(0, 330)
107
104
    >>> rfc3339_duration_to_delta("P1DT3M20S")
108
105
    datetime.timedelta(1, 200)
 
106
    >>> # Can not be empty:
 
107
    >>> rfc3339_duration_to_delta("")
 
108
    Traceback (most recent call last):
 
109
    ...
 
110
    ValueError: Invalid RFC 3339 duration: u''
 
111
    >>> # Must start with "P":
 
112
    >>> rfc3339_duration_to_delta("1D")
 
113
    Traceback (most recent call last):
 
114
    ...
 
115
    ValueError: Invalid RFC 3339 duration: u'1D'
 
116
    >>> # Must use correct order
 
117
    >>> rfc3339_duration_to_delta("PT1S2M")
 
118
    Traceback (most recent call last):
 
119
    ...
 
120
    ValueError: Invalid RFC 3339 duration: u'PT1S2M'
 
121
    >>> # Time needs time marker
 
122
    >>> rfc3339_duration_to_delta("P1H2S")
 
123
    Traceback (most recent call last):
 
124
    ...
 
125
    ValueError: Invalid RFC 3339 duration: u'P1H2S'
 
126
    >>> # Weeks can not be combined with anything else
 
127
    >>> rfc3339_duration_to_delta("P1D2W")
 
128
    Traceback (most recent call last):
 
129
    ...
 
130
    ValueError: Invalid RFC 3339 duration: u'P1D2W'
 
131
    >>> rfc3339_duration_to_delta("P2W2H")
 
132
    Traceback (most recent call last):
 
133
    ...
 
134
    ValueError: Invalid RFC 3339 duration: u'P2W2H'
109
135
    """
110
 
    
 
136
 
111
137
    # Parsing an RFC 3339 duration with regular expressions is not
112
138
    # possible - there would have to be multiple places for the same
113
139
    # values, like seconds.  The current code, while more esoteric, is
114
140
    # cleaner without depending on a parsing library.  If Python had a
115
141
    # built-in library for parsing we would use it, but we'd like to
116
142
    # avoid excessive use of external libraries.
117
 
    
 
143
 
118
144
    # New type for defining tokens, syntax, and semantics all-in-one
119
145
    Token = collections.namedtuple("Token", (
120
146
        "regexp",  # To match token; if "value" is not None, must have
153
179
                           frozenset((token_year, token_month,
154
180
                                      token_day, token_time,
155
181
                                      token_week)))
156
 
    # Define starting values
157
 
    value = datetime.timedelta() # Value so far
 
182
    # Define starting values:
 
183
    # Value so far
 
184
    value = datetime.timedelta()
158
185
    found_token = None
159
 
    followers = frozenset((token_duration, )) # Following valid tokens
160
 
    s = duration                # String left to parse
 
186
    # Following valid tokens
 
187
    followers = frozenset((token_duration, ))
 
188
    # String left to parse
 
189
    s = duration
161
190
    # Loop until end token is found
162
191
    while found_token is not token_end:
163
192
        # Search for any currently valid tokens
186
215
 
187
216
 
188
217
def string_to_delta(interval):
189
 
    """Parse a string and return a datetime.timedelta
190
 
    
191
 
    >>> string_to_delta('7d')
192
 
    datetime.timedelta(7)
193
 
    >>> string_to_delta('60s')
194
 
    datetime.timedelta(0, 60)
195
 
    >>> string_to_delta('60m')
196
 
    datetime.timedelta(0, 3600)
197
 
    >>> string_to_delta('24h')
198
 
    datetime.timedelta(1)
199
 
    >>> string_to_delta('1w')
200
 
    datetime.timedelta(7)
201
 
    >>> string_to_delta('5m 30s')
202
 
    datetime.timedelta(0, 330)
203
 
    """
204
 
    
 
218
    """Parse a string and return a datetime.timedelta"""
 
219
 
205
220
    try:
206
221
        return rfc3339_duration_to_delta(interval)
207
 
    except ValueError:
208
 
        pass
209
 
    
 
222
    except ValueError as e:
 
223
        log.warning("%s - Parsing as pre-1.6.1 interval instead",
 
224
                    ' '.join(e.args))
 
225
    return parse_pre_1_6_1_interval(interval)
 
226
 
 
227
 
 
228
def parse_pre_1_6_1_interval(interval):
 
229
    """Parse an interval string as documented by Mandos before 1.6.1,
 
230
    and return a datetime.timedelta
 
231
 
 
232
    >>> parse_pre_1_6_1_interval('7d')
 
233
    datetime.timedelta(7)
 
234
    >>> parse_pre_1_6_1_interval('60s')
 
235
    datetime.timedelta(0, 60)
 
236
    >>> parse_pre_1_6_1_interval('60m')
 
237
    datetime.timedelta(0, 3600)
 
238
    >>> parse_pre_1_6_1_interval('24h')
 
239
    datetime.timedelta(1)
 
240
    >>> parse_pre_1_6_1_interval('1w')
 
241
    datetime.timedelta(7)
 
242
    >>> parse_pre_1_6_1_interval('5m 30s')
 
243
    datetime.timedelta(0, 330)
 
244
    >>> parse_pre_1_6_1_interval('')
 
245
    datetime.timedelta(0)
 
246
    >>> # Ignore unknown characters, allow any order and repetitions
 
247
    >>> parse_pre_1_6_1_interval('2dxy7zz11y3m5m')
 
248
    datetime.timedelta(2, 480, 18000)
 
249
 
 
250
    """
 
251
 
210
252
    value = datetime.timedelta(0)
211
253
    regexp = re.compile(r"(\d+)([dsmhw]?)")
212
 
    
 
254
 
213
255
    for num, suffix in regexp.findall(interval):
214
256
        if suffix == "d":
215
257
            value += datetime.timedelta(int(num))
226
268
    return value
227
269
 
228
270
 
229
 
def print_clients(clients, keywords):
 
271
class TableOfClients(object):
 
272
    tableheaders = {
 
273
        "Name": "Name",
 
274
        "Enabled": "Enabled",
 
275
        "Timeout": "Timeout",
 
276
        "LastCheckedOK": "Last Successful Check",
 
277
        "LastApprovalRequest": "Last Approval Request",
 
278
        "Created": "Created",
 
279
        "Interval": "Interval",
 
280
        "Host": "Host",
 
281
        "Fingerprint": "Fingerprint",
 
282
        "KeyID": "Key ID",
 
283
        "CheckerRunning": "Check Is Running",
 
284
        "LastEnabled": "Last Enabled",
 
285
        "ApprovalPending": "Approval Is Pending",
 
286
        "ApprovedByDefault": "Approved By Default",
 
287
        "ApprovalDelay": "Approval Delay",
 
288
        "ApprovalDuration": "Approval Duration",
 
289
        "Checker": "Checker",
 
290
        "ExtendedTimeout": "Extended Timeout",
 
291
        "Expires": "Expires",
 
292
        "LastCheckerStatus": "Last Checker Status",
 
293
    }
 
294
 
 
295
    def __init__(self, clients, keywords, tableheaders=None):
 
296
        self.clients = clients
 
297
        self.keywords = keywords
 
298
        if tableheaders is not None:
 
299
            self.tableheaders = tableheaders
 
300
 
 
301
    def __str__(self):
 
302
        return "\n".join(self.rows())
 
303
 
 
304
    if sys.version_info.major == 2:
 
305
        __unicode__ = __str__
 
306
        def __str__(self):
 
307
            return str(self).encode(locale.getpreferredencoding())
 
308
 
 
309
    def rows(self):
 
310
        format_string = self.row_formatting_string()
 
311
        rows = [self.header_line(format_string)]
 
312
        rows.extend(self.client_line(client, format_string)
 
313
                    for client in self.clients)
 
314
        return rows
 
315
 
 
316
    def row_formatting_string(self):
 
317
        "Format string used to format table rows"
 
318
        return " ".join("{{{key}:{width}}}".format(
 
319
            width=max(len(self.tableheaders[key]),
 
320
                      *(len(self.string_from_client(client, key))
 
321
                        for client in self.clients)),
 
322
            key=key)
 
323
                        for key in self.keywords)
 
324
 
 
325
    def string_from_client(self, client, key):
 
326
        return self.valuetostring(client[key], key)
 
327
 
 
328
    @staticmethod
230
329
    def valuetostring(value, keyword):
231
 
        if type(value) is dbus.Boolean:
 
330
        if isinstance(value, dbus.Boolean):
232
331
            return "Yes" if value else "No"
233
332
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
234
333
                       "ApprovalDuration", "ExtendedTimeout"):
235
334
            return milliseconds_to_string(value)
236
335
        return str(value)
237
 
    
238
 
    # Create format string to print table rows
239
 
    format_string = " ".join("{{{key}:{width}}}".format(
240
 
        width = max(len(tablewords[key]),
241
 
                    max(len(valuetostring(client[key], key))
242
 
                        for client in clients)),
243
 
        key = key)
244
 
                             for key in keywords)
245
 
    # Print header line
246
 
    print(format_string.format(**tablewords))
247
 
    for client in clients:
248
 
        print(format_string.format(**{
249
 
            key: valuetostring(client[key], key)
250
 
            for key in keywords }))
251
 
 
 
336
 
 
337
    def header_line(self, format_string):
 
338
        return format_string.format(**self.tableheaders)
 
339
 
 
340
    def client_line(self, client, format_string):
 
341
        return format_string.format(
 
342
            **{key: self.string_from_client(client, key)
 
343
               for key in self.keywords})
 
344
 
 
345
 
 
346
## Classes for commands.
 
347
 
 
348
# Abstract classes first
 
349
class Command(object):
 
350
    """Abstract class for commands"""
 
351
    def run(self, mandos, clients):
 
352
        """Normal commands should implement run_on_one_client(), but
 
353
        commands which want to operate on all clients at the same time
 
354
        can override this run() method instead."""
 
355
        self.mandos = mandos
 
356
        for client in clients:
 
357
            self.run_on_one_client(client)
 
358
 
 
359
class PrintCmd(Command):
 
360
    """Abstract class for commands printing client details"""
 
361
    all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
 
362
                    "Created", "Interval", "Host", "KeyID",
 
363
                    "Fingerprint", "CheckerRunning", "LastEnabled",
 
364
                    "ApprovalPending", "ApprovedByDefault",
 
365
                    "LastApprovalRequest", "ApprovalDelay",
 
366
                    "ApprovalDuration", "Checker", "ExtendedTimeout",
 
367
                    "Expires", "LastCheckerStatus")
 
368
    def run(self, mandos, clients):
 
369
        print(self.output(clients))
 
370
 
 
371
class PropertyCmd(Command):
 
372
    """Abstract class for Actions for setting one client property"""
 
373
    def run_on_one_client(self, client):
 
374
        """Set the Client's D-Bus property"""
 
375
        client.Set(client_interface, self.property, self.value_to_set,
 
376
                   dbus_interface=dbus.PROPERTIES_IFACE)
 
377
 
 
378
class ValueArgumentMixIn(object):
 
379
    """Mixin class for commands taking a value as argument"""
 
380
    def __init__(self, value):
 
381
        self.value_to_set = value
 
382
 
 
383
class MillisecondsValueArgumentMixIn(ValueArgumentMixIn):
 
384
    """Mixin class for commands taking a value argument as
 
385
    milliseconds."""
 
386
    @property
 
387
    def value_to_set(self):
 
388
        return self._vts
 
389
    @value_to_set.setter
 
390
    def value_to_set(self, value):
 
391
        """When setting, convert value to a datetime.timedelta"""
 
392
        self._vts = string_to_delta(value).total_seconds() * 1000
 
393
 
 
394
# Actual (non-abstract) command classes
 
395
 
 
396
class PrintTableCmd(PrintCmd):
 
397
    def __init__(self, verbose=False):
 
398
        self.verbose = verbose
 
399
    def output(self, clients):
 
400
        if self.verbose:
 
401
            keywords = self.all_keywords
 
402
        else:
 
403
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
 
404
        return str(TableOfClients(clients.values(), keywords))
 
405
 
 
406
class DumpJSONCmd(PrintCmd):
 
407
    def output(self, clients):
 
408
        data = {client["Name"]:
 
409
                {key: self.dbus_boolean_to_bool(client[key])
 
410
                 for key in self.all_keywords}
 
411
                for client in clients.values()}
 
412
        return json.dumps(data, indent=4, separators=(',', ': '))
 
413
    @staticmethod
 
414
    def dbus_boolean_to_bool(value):
 
415
        if isinstance(value, dbus.Boolean):
 
416
            value = bool(value)
 
417
        return value
 
418
 
 
419
class IsEnabledCmd(Command):
 
420
    def run_on_one_client(self, client):
 
421
        if self.is_enabled(client):
 
422
            sys.exit(0)
 
423
        sys.exit(1)
 
424
    def is_enabled(self, client):
 
425
        return client.Get(client_interface, "Enabled",
 
426
                          dbus_interface=dbus.PROPERTIES_IFACE)
 
427
 
 
428
class RemoveCmd(Command):
 
429
    def run_on_one_client(self, client):
 
430
        self.mandos.RemoveClient(client.__dbus_object_path__)
 
431
 
 
432
class ApproveCmd(Command):
 
433
    def run_on_one_client(self, client):
 
434
        client.Approve(dbus.Boolean(True),
 
435
                       dbus_interface=client_interface)
 
436
 
 
437
class DenyCmd(Command):
 
438
    def run_on_one_client(self, client):
 
439
        client.Approve(dbus.Boolean(False),
 
440
                       dbus_interface=client_interface)
 
441
 
 
442
class EnableCmd(PropertyCmd):
 
443
    property = "Enabled"
 
444
    value_to_set = dbus.Boolean(True)
 
445
 
 
446
class DisableCmd(PropertyCmd):
 
447
    property = "Enabled"
 
448
    value_to_set = dbus.Boolean(False)
 
449
 
 
450
class BumpTimeoutCmd(PropertyCmd):
 
451
    property = "LastCheckedOK"
 
452
    value_to_set = ""
 
453
 
 
454
class StartCheckerCmd(PropertyCmd):
 
455
    property = "CheckerRunning"
 
456
    value_to_set = dbus.Boolean(True)
 
457
 
 
458
class StopCheckerCmd(PropertyCmd):
 
459
    property = "CheckerRunning"
 
460
    value_to_set = dbus.Boolean(False)
 
461
 
 
462
class ApproveByDefaultCmd(PropertyCmd):
 
463
    property = "ApprovedByDefault"
 
464
    value_to_set = dbus.Boolean(True)
 
465
 
 
466
class DenyByDefaultCmd(PropertyCmd):
 
467
    property = "ApprovedByDefault"
 
468
    value_to_set = dbus.Boolean(False)
 
469
 
 
470
class SetCheckerCmd(PropertyCmd, ValueArgumentMixIn):
 
471
    property = "Checker"
 
472
 
 
473
class SetHostCmd(PropertyCmd, ValueArgumentMixIn):
 
474
    property = "Host"
 
475
 
 
476
class SetSecretCmd(PropertyCmd, ValueArgumentMixIn):
 
477
    property = "Secret"
 
478
 
 
479
class SetTimeoutCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
 
480
    property = "Timeout"
 
481
 
 
482
class SetExtendedTimeoutCmd(PropertyCmd,
 
483
                            MillisecondsValueArgumentMixIn):
 
484
    property = "ExtendedTimeout"
 
485
 
 
486
class SetIntervalCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
 
487
    property = "Interval"
 
488
 
 
489
class SetApprovalDelayCmd(PropertyCmd,
 
490
                          MillisecondsValueArgumentMixIn):
 
491
    property = "ApprovalDelay"
 
492
 
 
493
class SetApprovalDurationCmd(PropertyCmd,
 
494
                             MillisecondsValueArgumentMixIn):
 
495
    property = "ApprovalDuration"
252
496
 
253
497
def has_actions(options):
254
498
    return any((options.enable,
271
515
                options.deny))
272
516
 
273
517
 
274
 
def main():
 
518
def commands_and_clients_from_options():
275
519
    parser = argparse.ArgumentParser()
276
520
    parser.add_argument("--version", action="version",
277
 
                        version = "%(prog)s {}".format(version),
 
521
                        version="%(prog)s {}".format(version),
278
522
                        help="show version number and exit")
279
523
    parser.add_argument("-a", "--all", action="store_true",
280
524
                        help="Select all clients")
281
525
    parser.add_argument("-v", "--verbose", action="store_true",
282
526
                        help="Print all fields")
283
 
    parser.add_argument("-e", "--enable", action="store_true",
284
 
                        help="Enable client")
285
 
    parser.add_argument("-d", "--disable", action="store_true",
286
 
                        help="disable client")
 
527
    parser.add_argument("-j", "--dump-json", action="store_true",
 
528
                        help="Dump client data in JSON format")
 
529
    enable_disable = parser.add_mutually_exclusive_group()
 
530
    enable_disable.add_argument("-e", "--enable", action="store_true",
 
531
                                help="Enable client")
 
532
    enable_disable.add_argument("-d", "--disable",
 
533
                                action="store_true",
 
534
                                help="disable client")
287
535
    parser.add_argument("-b", "--bump-timeout", action="store_true",
288
536
                        help="Bump timeout for client")
289
 
    parser.add_argument("--start-checker", action="store_true",
290
 
                        help="Start checker for client")
291
 
    parser.add_argument("--stop-checker", action="store_true",
292
 
                        help="Stop checker for client")
 
537
    start_stop_checker = parser.add_mutually_exclusive_group()
 
538
    start_stop_checker.add_argument("--start-checker",
 
539
                                    action="store_true",
 
540
                                    help="Start checker for client")
 
541
    start_stop_checker.add_argument("--stop-checker",
 
542
                                    action="store_true",
 
543
                                    help="Stop checker for client")
293
544
    parser.add_argument("-V", "--is-enabled", action="store_true",
294
545
                        help="Check if client is enabled")
295
546
    parser.add_argument("-r", "--remove", action="store_true",
302
553
                        help="Set extended timeout for client")
303
554
    parser.add_argument("-i", "--interval",
304
555
                        help="Set checker interval for client")
305
 
    parser.add_argument("--approve-by-default", action="store_true",
306
 
                        default=None, dest="approved_by_default",
307
 
                        help="Set client to be approved by default")
308
 
    parser.add_argument("--deny-by-default", action="store_false",
309
 
                        dest="approved_by_default",
310
 
                        help="Set client to be denied by default")
 
556
    approve_deny_default = parser.add_mutually_exclusive_group()
 
557
    approve_deny_default.add_argument(
 
558
        "--approve-by-default", action="store_true",
 
559
        default=None, dest="approved_by_default",
 
560
        help="Set client to be approved by default")
 
561
    approve_deny_default.add_argument(
 
562
        "--deny-by-default", action="store_false",
 
563
        dest="approved_by_default",
 
564
        help="Set client to be denied by default")
311
565
    parser.add_argument("--approval-delay",
312
566
                        help="Set delay before client approve/deny")
313
567
    parser.add_argument("--approval-duration",
316
570
    parser.add_argument("-s", "--secret",
317
571
                        type=argparse.FileType(mode="rb"),
318
572
                        help="Set password blob (file) for client")
319
 
    parser.add_argument("-A", "--approve", action="store_true",
320
 
                        help="Approve any current client request")
321
 
    parser.add_argument("-D", "--deny", action="store_true",
322
 
                        help="Deny any current client request")
 
573
    approve_deny = parser.add_mutually_exclusive_group()
 
574
    approve_deny.add_argument(
 
575
        "-A", "--approve", action="store_true",
 
576
        help="Approve any current client request")
 
577
    approve_deny.add_argument("-D", "--deny", action="store_true",
 
578
                              help="Deny any current client request")
323
579
    parser.add_argument("--check", action="store_true",
324
580
                        help="Run self-test")
325
581
    parser.add_argument("client", nargs="*", help="Client name")
326
582
    options = parser.parse_args()
327
 
    
 
583
 
328
584
    if has_actions(options) and not (options.client or options.all):
329
585
        parser.error("Options require clients names or --all.")
330
586
    if options.verbose and has_actions(options):
331
 
        parser.error("--verbose can only be used alone or with"
332
 
                     " --all.")
 
587
        parser.error("--verbose can only be used alone.")
 
588
    if options.dump_json and (options.verbose
 
589
                              or has_actions(options)):
 
590
        parser.error("--dump-json can only be used alone.")
333
591
    if options.all and not has_actions(options):
334
592
        parser.error("--all requires an action.")
335
 
 
336
 
    if options.check:
337
 
        fail_count, test_count = doctest.testmod()
338
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
339
 
    
 
593
    if options.is_enabled and len(options.client) > 1:
 
594
            parser.error("--is-enabled requires exactly one client")
 
595
 
 
596
    commands = []
 
597
 
 
598
    if options.dump_json:
 
599
        commands.append(DumpJSONCmd())
 
600
 
 
601
    if options.enable:
 
602
        commands.append(EnableCmd())
 
603
 
 
604
    if options.disable:
 
605
        commands.append(DisableCmd())
 
606
 
 
607
    if options.bump_timeout:
 
608
        commands.append(BumpTimeoutCmd(options.bump_timeout))
 
609
 
 
610
    if options.start_checker:
 
611
        commands.append(StartCheckerCmd())
 
612
 
 
613
    if options.stop_checker:
 
614
        commands.append(StopCheckerCmd())
 
615
 
 
616
    if options.is_enabled:
 
617
        commands.append(IsEnabledCmd())
 
618
 
 
619
    if options.remove:
 
620
        commands.append(RemoveCmd())
 
621
 
 
622
    if options.checker is not None:
 
623
        commands.append(SetCheckerCmd())
 
624
 
 
625
    if options.timeout is not None:
 
626
        commands.append(SetTimeoutCmd(options.timeout))
 
627
 
 
628
    if options.extended_timeout:
 
629
        commands.append(
 
630
            SetExtendedTimeoutCmd(options.extended_timeout))
 
631
 
 
632
    if options.interval is not None:
 
633
        command.append(SetIntervalCmd(options.interval))
 
634
 
 
635
    if options.approved_by_default is not None:
 
636
        if options.approved_by_default:
 
637
            command.append(ApproveByDefaultCmd())
 
638
        else:
 
639
            command.append(DenyByDefaultCmd())
 
640
 
 
641
    if options.approval_delay is not None:
 
642
        command.append(SetApprovalDelayCmd(options.approval_delay))
 
643
 
 
644
    if options.approval_duration is not None:
 
645
        command.append(
 
646
            SetApprovalDurationCmd(options.approval_duration))
 
647
 
 
648
    if options.host is not None:
 
649
        command.append(SetHostCmd(options.host))
 
650
 
 
651
    if options.secret is not None:
 
652
        command.append(SetSecretCmd(options.secret))
 
653
 
 
654
    if options.approve:
 
655
        commands.append(ApproveCmd())
 
656
 
 
657
    if options.deny:
 
658
        commands.append(DenyCmd())
 
659
 
 
660
    # If no command option has been given, show table of clients,
 
661
    # optionally verbosely
 
662
    if not commands:
 
663
        commands.append(PrintTableCmd(verbose=options.verbose))
 
664
 
 
665
    return commands, options.client
 
666
 
 
667
 
 
668
def main():
 
669
    commands, clientnames = commands_and_clients_from_options()
 
670
 
340
671
    try:
341
672
        bus = dbus.SystemBus()
342
673
        mandos_dbus_objc = bus.get_object(busname, server_path)
343
674
    except dbus.exceptions.DBusException:
344
 
        print("Could not connect to Mandos server", file=sys.stderr)
 
675
        log.critical("Could not connect to Mandos server")
345
676
        sys.exit(1)
346
 
    
 
677
 
347
678
    mandos_serv = dbus.Interface(mandos_dbus_objc,
348
 
                                 dbus_interface = server_interface)
 
679
                                 dbus_interface=server_interface)
349
680
    mandos_serv_object_manager = dbus.Interface(
350
 
        mandos_dbus_objc, dbus_interface = dbus.OBJECT_MANAGER_IFACE)
351
 
    
352
 
    #block stderr since dbus library prints to stderr
353
 
    null = os.open(os.path.devnull, os.O_RDWR)
354
 
    stderrcopy = os.dup(sys.stderr.fileno())
355
 
    os.dup2(null, sys.stderr.fileno())
356
 
    os.close(null)
 
681
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
 
682
 
 
683
    # Filter out log message from dbus module
 
684
    dbus_logger = logging.getLogger("dbus.proxies")
 
685
    class NullFilter(logging.Filter):
 
686
        def filter(self, record):
 
687
            return False
 
688
    dbus_filter = NullFilter()
 
689
    dbus_logger.addFilter(dbus_filter)
357
690
    try:
358
691
        try:
359
 
            mandos_clients = { path: ifs_and_props[client_interface]
360
 
                               for path, ifs_and_props in
361
 
                               mandos_serv_object_manager
362
 
                               .GetManagedObjects().items()
363
 
                               if client_interface in ifs_and_props }
 
692
            mandos_clients = {path: ifs_and_props[client_interface]
 
693
                              for path, ifs_and_props in
 
694
                              mandos_serv_object_manager
 
695
                              .GetManagedObjects().items()
 
696
                              if client_interface in ifs_and_props}
364
697
        finally:
365
 
            #restore stderr
366
 
            os.dup2(stderrcopy, sys.stderr.fileno())
367
 
            os.close(stderrcopy)
 
698
            # restore dbus logger
 
699
            dbus_logger.removeFilter(dbus_filter)
368
700
    except dbus.exceptions.DBusException as e:
369
 
        print("Access denied: Accessing mandos server through D-Bus: {}"
370
 
              .format(e), file=sys.stderr)
 
701
        log.critical("Failed to access Mandos server through D-Bus:"
 
702
                     "\n%s", e)
371
703
        sys.exit(1)
372
 
    
 
704
 
373
705
    # Compile dict of (clients: properties) to process
374
 
    clients={}
375
 
    
376
 
    if options.all or not options.client:
377
 
        clients = { bus.get_object(busname, path): properties
378
 
                    for path, properties in mandos_clients.items() }
 
706
    clients = {}
 
707
 
 
708
    if not clientnames:
 
709
        clients = {bus.get_object(busname, path): properties
 
710
                   for path, properties in mandos_clients.items()}
379
711
    else:
380
 
        for name in options.client:
 
712
        for name in clientnames:
381
713
            for path, client in mandos_clients.items():
382
714
                if client["Name"] == name:
383
715
                    client_objc = bus.get_object(busname, path)
384
716
                    clients[client_objc] = client
385
717
                    break
386
718
            else:
387
 
                print("Client not found on server: {!r}"
388
 
                      .format(name), file=sys.stderr)
 
719
                log.critical("Client not found on server: %r", name)
389
720
                sys.exit(1)
390
 
    
391
 
    if not has_actions(options) and clients:
392
 
        if options.verbose:
393
 
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
394
 
                        "Created", "Interval", "Host", "Fingerprint",
395
 
                        "CheckerRunning", "LastEnabled",
396
 
                        "ApprovalPending", "ApprovedByDefault",
397
 
                        "LastApprovalRequest", "ApprovalDelay",
398
 
                        "ApprovalDuration", "Checker",
399
 
                        "ExtendedTimeout")
 
721
 
 
722
    # Run all commands on clients
 
723
    for command in commands:
 
724
        command.run(mandos_serv, clients)
 
725
 
 
726
 
 
727
class Test_milliseconds_to_string(unittest.TestCase):
 
728
    def test_all(self):
 
729
        self.assertEqual(milliseconds_to_string(93785000),
 
730
                         "1T02:03:05")
 
731
    def test_no_days(self):
 
732
        self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
 
733
    def test_all_zero(self):
 
734
        self.assertEqual(milliseconds_to_string(0), "00:00:00")
 
735
    def test_no_fractional_seconds(self):
 
736
        self.assertEqual(milliseconds_to_string(400), "00:00:00")
 
737
        self.assertEqual(milliseconds_to_string(900), "00:00:00")
 
738
        self.assertEqual(milliseconds_to_string(1900), "00:00:01")
 
739
 
 
740
class Test_string_to_delta(unittest.TestCase):
 
741
    def test_handles_basic_rfc3339(self):
 
742
        self.assertEqual(string_to_delta("PT2H"),
 
743
                         datetime.timedelta(0, 7200))
 
744
    def test_falls_back_to_pre_1_6_1_with_warning(self):
 
745
        # assertLogs only exists in Python 3.4
 
746
        if hasattr(self, "assertLogs"):
 
747
            with self.assertLogs(log, logging.WARNING):
 
748
                value = string_to_delta("2h")
400
749
        else:
401
 
            keywords = defaultkeywords
402
 
        
403
 
        print_clients(clients.values(), keywords)
404
 
    else:
405
 
        # Process each client in the list by all selected options
406
 
        for client in clients:
407
 
            
408
 
            def set_client_prop(prop, value):
409
 
                """Set a Client D-Bus property"""
410
 
                client.Set(client_interface, prop, value,
411
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
412
 
            
413
 
            def set_client_prop_ms(prop, value):
414
 
                """Set a Client D-Bus property, converted
415
 
                from a string to milliseconds."""
416
 
                set_client_prop(prop,
417
 
                                string_to_delta(value).total_seconds()
418
 
                                * 1000)
419
 
            
420
 
            if options.remove:
421
 
                mandos_serv.RemoveClient(client.__dbus_object_path__)
422
 
            if options.enable:
423
 
                set_client_prop("Enabled", dbus.Boolean(True))
424
 
            if options.disable:
425
 
                set_client_prop("Enabled", dbus.Boolean(False))
426
 
            if options.bump_timeout:
427
 
                set_client_prop("LastCheckedOK", "")
428
 
            if options.start_checker:
429
 
                set_client_prop("CheckerRunning", dbus.Boolean(True))
430
 
            if options.stop_checker:
431
 
                set_client_prop("CheckerRunning", dbus.Boolean(False))
432
 
            if options.is_enabled:
433
 
                sys.exit(0 if client.Get(client_interface,
434
 
                                         "Enabled",
435
 
                                         dbus_interface=
436
 
                                         dbus.PROPERTIES_IFACE)
437
 
                         else 1)
438
 
            if options.checker is not None:
439
 
                set_client_prop("Checker", options.checker)
440
 
            if options.host is not None:
441
 
                set_client_prop("Host", options.host)
442
 
            if options.interval is not None:
443
 
                set_client_prop_ms("Interval", options.interval)
444
 
            if options.approval_delay is not None:
445
 
                set_client_prop_ms("ApprovalDelay",
446
 
                                   options.approval_delay)
447
 
            if options.approval_duration is not None:
448
 
                set_client_prop_ms("ApprovalDuration",
449
 
                                   options.approval_duration)
450
 
            if options.timeout is not None:
451
 
                set_client_prop_ms("Timeout", options.timeout)
452
 
            if options.extended_timeout is not None:
453
 
                set_client_prop_ms("ExtendedTimeout",
454
 
                                   options.extended_timeout)
455
 
            if options.secret is not None:
456
 
                set_client_prop("Secret",
457
 
                                dbus.ByteArray(options.secret.read()))
458
 
            if options.approved_by_default is not None:
459
 
                set_client_prop("ApprovedByDefault",
460
 
                                dbus.Boolean(options
461
 
                                             .approved_by_default))
462
 
            if options.approve:
463
 
                client.Approve(dbus.Boolean(True),
464
 
                               dbus_interface=client_interface)
465
 
            elif options.deny:
466
 
                client.Approve(dbus.Boolean(False),
467
 
                               dbus_interface=client_interface)
468
 
 
 
750
            class WarningFilter(logging.Filter):
 
751
                """Don't show, but record the presence of, warnings"""
 
752
                def filter(self, record):
 
753
                    is_warning = record.levelno >= logging.WARNING
 
754
                    self.found = is_warning or getattr(self, "found",
 
755
                                                       False)
 
756
                    return not is_warning
 
757
            warning_filter = WarningFilter()
 
758
            log.addFilter(warning_filter)
 
759
            try:
 
760
                value = string_to_delta("2h")
 
761
            finally:
 
762
                log.removeFilter(warning_filter)
 
763
            self.assertTrue(getattr(warning_filter, "found", False))
 
764
        self.assertEqual(value, datetime.timedelta(0, 7200))
 
765
 
 
766
class Test_TableOfClients(unittest.TestCase):
 
767
    def setUp(self):
 
768
        self.tableheaders = {
 
769
            "Attr1": "X",
 
770
            "AttrTwo": "Yy",
 
771
            "AttrThree": "Zzz",
 
772
            "Bool": "A D-BUS Boolean",
 
773
            "NonDbusBoolean": "A Non-D-BUS Boolean",
 
774
            "Integer": "An Integer",
 
775
            "Timeout": "Timedelta 1",
 
776
            "Interval": "Timedelta 2",
 
777
            "ApprovalDelay": "Timedelta 3",
 
778
            "ApprovalDuration": "Timedelta 4",
 
779
            "ExtendedTimeout": "Timedelta 5",
 
780
            "String": "A String",
 
781
        }
 
782
        self.keywords = ["Attr1", "AttrTwo"]
 
783
        self.clients = [
 
784
            {
 
785
                "Attr1": "x1",
 
786
                "AttrTwo": "y1",
 
787
                "AttrThree": "z1",
 
788
                "Bool": dbus.Boolean(False),
 
789
                "NonDbusBoolean": False,
 
790
                "Integer": 0,
 
791
                "Timeout": 0,
 
792
                "Interval": 1000,
 
793
                "ApprovalDelay": 2000,
 
794
                "ApprovalDuration": 3000,
 
795
                "ExtendedTimeout": 4000,
 
796
                "String": "",
 
797
            },
 
798
            {
 
799
                "Attr1": "x2",
 
800
                "AttrTwo": "y2",
 
801
                "AttrThree": "z2",
 
802
                "Bool": dbus.Boolean(True),
 
803
                "NonDbusBoolean": True,
 
804
                "Integer": 1,
 
805
                "Timeout": 93785000,
 
806
                "Interval": 93786000,
 
807
                "ApprovalDelay": 93787000,
 
808
                "ApprovalDuration": 93788000,
 
809
                "ExtendedTimeout": 93789000,
 
810
                "String": "A huge string which will not fit," * 10,
 
811
            },
 
812
        ]
 
813
    def test_short_header(self):
 
814
        text = str(TableOfClients(self.clients, self.keywords,
 
815
                                  self.tableheaders))
 
816
        expected_text = """
 
817
X  Yy
 
818
x1 y1
 
819
x2 y2
 
820
"""[1:-1]
 
821
        self.assertEqual(text, expected_text)
 
822
    def test_booleans(self):
 
823
        keywords = ["Bool", "NonDbusBoolean"]
 
824
        text = str(TableOfClients(self.clients, keywords,
 
825
                                  self.tableheaders))
 
826
        expected_text = """
 
827
A D-BUS Boolean A Non-D-BUS Boolean
 
828
No              False              
 
829
Yes             True               
 
830
"""[1:-1]
 
831
        self.assertEqual(text, expected_text)
 
832
    def test_milliseconds_detection(self):
 
833
        keywords = ["Integer", "Timeout", "Interval", "ApprovalDelay",
 
834
                    "ApprovalDuration", "ExtendedTimeout"]
 
835
        text = str(TableOfClients(self.clients, keywords,
 
836
                                  self.tableheaders))
 
837
        expected_text = """
 
838
An Integer Timedelta 1 Timedelta 2 Timedelta 3 Timedelta 4 Timedelta 5
 
839
0          00:00:00    00:00:01    00:00:02    00:00:03    00:00:04   
 
840
1          1T02:03:05  1T02:03:06  1T02:03:07  1T02:03:08  1T02:03:09 
 
841
"""[1:-1]
 
842
        self.assertEqual(text, expected_text)
 
843
    def test_empty_and_long_string_values(self):
 
844
        keywords = ["String"]
 
845
        text = str(TableOfClients(self.clients, keywords,
 
846
                                  self.tableheaders))
 
847
        expected_text = """
 
848
A String                                                                                                                                                                                                                                                                                                                                  
 
849
                                                                                                                                                                                                                                                                                                                                          
 
850
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,
 
851
"""[1:-1]
 
852
        self.assertEqual(text, expected_text)
 
853
 
 
854
 
 
855
 
 
856
def should_only_run_tests():
 
857
    parser = argparse.ArgumentParser(add_help=False)
 
858
    parser.add_argument("--check", action='store_true')
 
859
    args, unknown_args = parser.parse_known_args()
 
860
    run_tests = args.check
 
861
    if run_tests:
 
862
        # Remove --check argument from sys.argv
 
863
        sys.argv[1:] = unknown_args
 
864
    return run_tests
 
865
 
 
866
# Add all tests from doctest strings
 
867
def load_tests(loader, tests, none):
 
868
    import doctest
 
869
    tests.addTests(doctest.DocTestSuite())
 
870
    return tests
469
871
 
470
872
if __name__ == "__main__":
471
 
    main()
 
873
    if should_only_run_tests():
 
874
        # Call using ./tdd-python-script --check [--verbose]
 
875
        unittest.main()
 
876
    else:
 
877
        main()