/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: 2017-02-23 20:20:34 UTC
  • mfrom: (899 trunk)
  • mto: This revision was merged to the branch mainline in revision 900.
  • Revision ID: teddy@recompile.se-20170223202034-0820bcq0k7d1j9kf
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
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*")))); -*-
 
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
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
 
6
# Copyright © 2008-2017 Teddy Hogeborn
 
7
# Copyright © 2008-2017 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/>.
 
20
# along with this program.  If not, see
 
21
# <http://www.gnu.org/licenses/>.
23
22
#
24
23
# Contact the authors at <mandos@recompile.se>.
25
24
#
39
38
import re
40
39
import os
41
40
import collections
 
41
import doctest
42
42
import json
43
 
import unittest
44
 
import logging
45
43
 
46
44
import dbus
47
45
 
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
46
if sys.version_info.major == 2:
60
47
    str = unicode
61
48
 
62
49
locale.setlocale(locale.LC_ALL, "")
63
50
 
 
51
tablewords = {
 
52
    "Name": "Name",
 
53
    "Enabled": "Enabled",
 
54
    "Timeout": "Timeout",
 
55
    "LastCheckedOK": "Last Successful Check",
 
56
    "LastApprovalRequest": "Last Approval Request",
 
57
    "Created": "Created",
 
58
    "Interval": "Interval",
 
59
    "Host": "Host",
 
60
    "Fingerprint": "Fingerprint",
 
61
    "CheckerRunning": "Check Is Running",
 
62
    "LastEnabled": "Last Enabled",
 
63
    "ApprovalPending": "Approval Is Pending",
 
64
    "ApprovedByDefault": "Approved By Default",
 
65
    "ApprovalDelay": "Approval Delay",
 
66
    "ApprovalDuration": "Approval Duration",
 
67
    "Checker": "Checker",
 
68
    "ExtendedTimeout": "Extended Timeout",
 
69
    "Expires": "Expires",
 
70
    "LastCheckerStatus": "Last Checker Status",
 
71
}
 
72
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
64
73
domain = "se.recompile"
65
74
busname = domain + ".Mandos"
66
75
server_path = "/"
67
76
server_interface = domain + ".Mandos"
68
77
client_interface = domain + ".Mandos.Client"
69
 
version = "1.8.3"
 
78
version = "1.7.14"
70
79
 
71
80
 
72
81
try:
93
102
    datetime.timedelta(0, 60)
94
103
    >>> rfc3339_duration_to_delta("PT60M")
95
104
    datetime.timedelta(0, 3600)
96
 
    >>> rfc3339_duration_to_delta("P60M")
97
 
    datetime.timedelta(1680)
98
105
    >>> rfc3339_duration_to_delta("PT24H")
99
106
    datetime.timedelta(1)
100
107
    >>> rfc3339_duration_to_delta("P1W")
103
110
    datetime.timedelta(0, 330)
104
111
    >>> rfc3339_duration_to_delta("P1DT3M20S")
105
112
    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'
135
113
    """
136
114
 
137
115
    # Parsing an RFC 3339 duration with regular expressions is not
215
193
 
216
194
 
217
195
def string_to_delta(interval):
218
 
    """Parse a string and return a datetime.timedelta"""
 
196
    """Parse a string and return a datetime.timedelta
 
197
 
 
198
    >>> string_to_delta('7d')
 
199
    datetime.timedelta(7)
 
200
    >>> string_to_delta('60s')
 
201
    datetime.timedelta(0, 60)
 
202
    >>> string_to_delta('60m')
 
203
    datetime.timedelta(0, 3600)
 
204
    >>> string_to_delta('24h')
 
205
    datetime.timedelta(1)
 
206
    >>> string_to_delta('1w')
 
207
    datetime.timedelta(7)
 
208
    >>> string_to_delta('5m 30s')
 
209
    datetime.timedelta(0, 330)
 
210
    """
219
211
 
220
212
    try:
221
213
        return rfc3339_duration_to_delta(interval)
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
 
    """
 
214
    except ValueError:
 
215
        pass
251
216
 
252
217
    value = datetime.timedelta(0)
253
218
    regexp = re.compile(r"(\d+)([dsmhw]?)")
268
233
    return value
269
234
 
270
235
 
271
 
## Classes for commands.
272
 
 
273
 
# Abstract classes first
274
 
class Command(object):
275
 
    """Abstract class for commands"""
276
 
    def run(self, mandos, clients):
277
 
        """Normal commands should implement run_on_one_client(), but
278
 
        commands which want to operate on all clients at the same time
279
 
        can override this run() method instead."""
280
 
        self.mandos = mandos
281
 
        for client in clients:
282
 
            self.run_on_one_client(client)
283
 
 
284
 
class PrintCmd(Command):
285
 
    """Abstract class for commands printing client details"""
286
 
    all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
287
 
                    "Created", "Interval", "Host", "KeyID",
288
 
                    "Fingerprint", "CheckerRunning", "LastEnabled",
289
 
                    "ApprovalPending", "ApprovedByDefault",
290
 
                    "LastApprovalRequest", "ApprovalDelay",
291
 
                    "ApprovalDuration", "Checker", "ExtendedTimeout",
292
 
                    "Expires", "LastCheckerStatus")
293
 
    def run(self, mandos, clients):
294
 
        print(self.output(clients))
295
 
 
296
 
class PropertyCmd(Command):
297
 
    """Abstract class for Actions for setting one client property"""
298
 
    def run_on_one_client(self, client):
299
 
        """Set the Client's D-Bus property"""
300
 
        client.Set(client_interface, self.property, self.value_to_set,
301
 
                   dbus_interface=dbus.PROPERTIES_IFACE)
302
 
 
303
 
class ValueArgumentMixIn(object):
304
 
    """Mixin class for commands taking a value as argument"""
305
 
    def __init__(self, value):
306
 
        self.value_to_set = value
307
 
 
308
 
class MillisecondsValueArgumentMixIn(ValueArgumentMixIn):
309
 
    """Mixin class for commands taking a value argument as
310
 
    milliseconds."""
311
 
    @property
312
 
    def value_to_set(self):
313
 
        return self._vts
314
 
    @value_to_set.setter
315
 
    def value_to_set(self, value):
316
 
        """When setting, convert value to a datetime.timedelta"""
317
 
        self._vts = string_to_delta(value).total_seconds() * 1000
318
 
 
319
 
# Actual (non-abstract) command classes
320
 
 
321
 
class PrintTableCmd(PrintCmd):
322
 
    def __init__(self, verbose=False):
323
 
        self.verbose = verbose
324
 
 
325
 
    def output(self, clients):
326
 
        if self.verbose:
327
 
            keywords = self.all_keywords
328
 
        else:
329
 
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
330
 
        return str(self.TableOfClients(clients.values(), keywords))
331
 
 
332
 
    class TableOfClients(object):
333
 
        tableheaders = {
334
 
            "Name": "Name",
335
 
            "Enabled": "Enabled",
336
 
            "Timeout": "Timeout",
337
 
            "LastCheckedOK": "Last Successful Check",
338
 
            "LastApprovalRequest": "Last Approval Request",
339
 
            "Created": "Created",
340
 
            "Interval": "Interval",
341
 
            "Host": "Host",
342
 
            "Fingerprint": "Fingerprint",
343
 
            "KeyID": "Key ID",
344
 
            "CheckerRunning": "Check Is Running",
345
 
            "LastEnabled": "Last Enabled",
346
 
            "ApprovalPending": "Approval Is Pending",
347
 
            "ApprovedByDefault": "Approved By Default",
348
 
            "ApprovalDelay": "Approval Delay",
349
 
            "ApprovalDuration": "Approval Duration",
350
 
            "Checker": "Checker",
351
 
            "ExtendedTimeout": "Extended Timeout",
352
 
            "Expires": "Expires",
353
 
            "LastCheckerStatus": "Last Checker Status",
354
 
        }
355
 
 
356
 
        def __init__(self, clients, keywords, tableheaders=None):
357
 
            self.clients = clients
358
 
            self.keywords = keywords
359
 
            if tableheaders is not None:
360
 
                self.tableheaders = tableheaders
361
 
 
362
 
        def __str__(self):
363
 
            return "\n".join(self.rows())
364
 
 
365
 
        if sys.version_info.major == 2:
366
 
            __unicode__ = __str__
367
 
            def __str__(self):
368
 
                return str(self).encode(locale.getpreferredencoding())
369
 
 
370
 
        def rows(self):
371
 
            format_string = self.row_formatting_string()
372
 
            rows = [self.header_line(format_string)]
373
 
            rows.extend(self.client_line(client, format_string)
374
 
                        for client in self.clients)
375
 
            return rows
376
 
 
377
 
        def row_formatting_string(self):
378
 
            "Format string used to format table rows"
379
 
            return " ".join("{{{key}:{width}}}".format(
380
 
                width=max(len(self.tableheaders[key]),
381
 
                          *(len(self.string_from_client(client, key))
382
 
                            for client in self.clients)),
383
 
                key=key)
384
 
                            for key in self.keywords)
385
 
 
386
 
        def string_from_client(self, client, key):
387
 
            return self.valuetostring(client[key], key)
388
 
 
389
 
        @staticmethod
390
 
        def valuetostring(value, keyword):
391
 
            if isinstance(value, dbus.Boolean):
392
 
                return "Yes" if value else "No"
393
 
            if keyword in ("Timeout", "Interval", "ApprovalDelay",
394
 
                           "ApprovalDuration", "ExtendedTimeout"):
395
 
                return milliseconds_to_string(value)
396
 
            return str(value)
397
 
 
398
 
        def header_line(self, format_string):
399
 
            return format_string.format(**self.tableheaders)
400
 
 
401
 
        def client_line(self, client, format_string):
402
 
            return format_string.format(
403
 
                **{key: self.string_from_client(client, key)
404
 
                   for key in self.keywords})
405
 
 
406
 
 
407
 
 
408
 
class DumpJSONCmd(PrintCmd):
409
 
    def output(self, clients):
410
 
        data = {client["Name"]:
411
 
                {key: self.dbus_boolean_to_bool(client[key])
412
 
                 for key in self.all_keywords}
413
 
                for client in clients.values()}
414
 
        return json.dumps(data, indent=4, separators=(',', ': '))
415
 
    @staticmethod
416
 
    def dbus_boolean_to_bool(value):
417
 
        if isinstance(value, dbus.Boolean):
418
 
            value = bool(value)
419
 
        return value
420
 
 
421
 
class IsEnabledCmd(Command):
422
 
    def run_on_one_client(self, client):
423
 
        if self.is_enabled(client):
424
 
            sys.exit(0)
425
 
        sys.exit(1)
426
 
    def is_enabled(self, client):
427
 
        return client.Get(client_interface, "Enabled",
428
 
                          dbus_interface=dbus.PROPERTIES_IFACE)
429
 
 
430
 
class RemoveCmd(Command):
431
 
    def run_on_one_client(self, client):
432
 
        self.mandos.RemoveClient(client.__dbus_object_path__)
433
 
 
434
 
class ApproveCmd(Command):
435
 
    def run_on_one_client(self, client):
436
 
        client.Approve(dbus.Boolean(True),
437
 
                       dbus_interface=client_interface)
438
 
 
439
 
class DenyCmd(Command):
440
 
    def run_on_one_client(self, client):
441
 
        client.Approve(dbus.Boolean(False),
442
 
                       dbus_interface=client_interface)
443
 
 
444
 
class EnableCmd(PropertyCmd):
445
 
    property = "Enabled"
446
 
    value_to_set = dbus.Boolean(True)
447
 
 
448
 
class DisableCmd(PropertyCmd):
449
 
    property = "Enabled"
450
 
    value_to_set = dbus.Boolean(False)
451
 
 
452
 
class BumpTimeoutCmd(PropertyCmd):
453
 
    property = "LastCheckedOK"
454
 
    value_to_set = ""
455
 
 
456
 
class StartCheckerCmd(PropertyCmd):
457
 
    property = "CheckerRunning"
458
 
    value_to_set = dbus.Boolean(True)
459
 
 
460
 
class StopCheckerCmd(PropertyCmd):
461
 
    property = "CheckerRunning"
462
 
    value_to_set = dbus.Boolean(False)
463
 
 
464
 
class ApproveByDefaultCmd(PropertyCmd):
465
 
    property = "ApprovedByDefault"
466
 
    value_to_set = dbus.Boolean(True)
467
 
 
468
 
class DenyByDefaultCmd(PropertyCmd):
469
 
    property = "ApprovedByDefault"
470
 
    value_to_set = dbus.Boolean(False)
471
 
 
472
 
class SetCheckerCmd(PropertyCmd, ValueArgumentMixIn):
473
 
    property = "Checker"
474
 
 
475
 
class SetHostCmd(PropertyCmd, ValueArgumentMixIn):
476
 
    property = "Host"
477
 
 
478
 
class SetSecretCmd(PropertyCmd, ValueArgumentMixIn):
479
 
    property = "Secret"
480
 
 
481
 
class SetTimeoutCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
482
 
    property = "Timeout"
483
 
 
484
 
class SetExtendedTimeoutCmd(PropertyCmd,
485
 
                            MillisecondsValueArgumentMixIn):
486
 
    property = "ExtendedTimeout"
487
 
 
488
 
class SetIntervalCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
489
 
    property = "Interval"
490
 
 
491
 
class SetApprovalDelayCmd(PropertyCmd,
492
 
                          MillisecondsValueArgumentMixIn):
493
 
    property = "ApprovalDelay"
494
 
 
495
 
class SetApprovalDurationCmd(PropertyCmd,
496
 
                             MillisecondsValueArgumentMixIn):
497
 
    property = "ApprovalDuration"
 
236
def print_clients(clients, keywords):
 
237
    def valuetostring(value, keyword):
 
238
        if type(value) is dbus.Boolean:
 
239
            return "Yes" if value else "No"
 
240
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
 
241
                       "ApprovalDuration", "ExtendedTimeout"):
 
242
            return milliseconds_to_string(value)
 
243
        return str(value)
 
244
 
 
245
    # Create format string to print table rows
 
246
    format_string = " ".join("{{{key}:{width}}}".format(
 
247
        width=max(len(tablewords[key]),
 
248
                  max(len(valuetostring(client[key], key))
 
249
                      for client in clients)),
 
250
        key=key)
 
251
                             for key in keywords)
 
252
    # Print header line
 
253
    print(format_string.format(**tablewords))
 
254
    for client in clients:
 
255
        print(format_string
 
256
              .format(**{key: valuetostring(client[key], key)
 
257
                         for key in keywords}))
 
258
 
498
259
 
499
260
def has_actions(options):
500
261
    return any((options.enable,
517
278
                options.deny))
518
279
 
519
280
 
520
 
def commands_and_clients_from_options(args=None):
521
 
    if args is None:
522
 
        args=sys.argv[1:]
 
281
def main():
523
282
    parser = argparse.ArgumentParser()
524
283
    parser.add_argument("--version", action="version",
525
284
                        version="%(prog)s {}".format(version),
530
289
                        help="Print all fields")
531
290
    parser.add_argument("-j", "--dump-json", action="store_true",
532
291
                        help="Dump client data in JSON format")
533
 
    enable_disable = parser.add_mutually_exclusive_group()
534
 
    enable_disable.add_argument("-e", "--enable", action="store_true",
535
 
                                help="Enable client")
536
 
    enable_disable.add_argument("-d", "--disable",
537
 
                                action="store_true",
538
 
                                help="disable client")
 
292
    parser.add_argument("-e", "--enable", action="store_true",
 
293
                        help="Enable client")
 
294
    parser.add_argument("-d", "--disable", action="store_true",
 
295
                        help="disable client")
539
296
    parser.add_argument("-b", "--bump-timeout", action="store_true",
540
297
                        help="Bump timeout for client")
541
 
    start_stop_checker = parser.add_mutually_exclusive_group()
542
 
    start_stop_checker.add_argument("--start-checker",
543
 
                                    action="store_true",
544
 
                                    help="Start checker for client")
545
 
    start_stop_checker.add_argument("--stop-checker",
546
 
                                    action="store_true",
547
 
                                    help="Stop checker for client")
 
298
    parser.add_argument("--start-checker", action="store_true",
 
299
                        help="Start checker for client")
 
300
    parser.add_argument("--stop-checker", action="store_true",
 
301
                        help="Stop checker for client")
548
302
    parser.add_argument("-V", "--is-enabled", action="store_true",
549
303
                        help="Check if client is enabled")
550
304
    parser.add_argument("-r", "--remove", action="store_true",
557
311
                        help="Set extended timeout for client")
558
312
    parser.add_argument("-i", "--interval",
559
313
                        help="Set checker interval for client")
560
 
    approve_deny_default = parser.add_mutually_exclusive_group()
561
 
    approve_deny_default.add_argument(
562
 
        "--approve-by-default", action="store_true",
563
 
        default=None, dest="approved_by_default",
564
 
        help="Set client to be approved by default")
565
 
    approve_deny_default.add_argument(
566
 
        "--deny-by-default", action="store_false",
567
 
        dest="approved_by_default",
568
 
        help="Set client to be denied by default")
 
314
    parser.add_argument("--approve-by-default", action="store_true",
 
315
                        default=None, dest="approved_by_default",
 
316
                        help="Set client to be approved by default")
 
317
    parser.add_argument("--deny-by-default", action="store_false",
 
318
                        dest="approved_by_default",
 
319
                        help="Set client to be denied by default")
569
320
    parser.add_argument("--approval-delay",
570
321
                        help="Set delay before client approve/deny")
571
322
    parser.add_argument("--approval-duration",
574
325
    parser.add_argument("-s", "--secret",
575
326
                        type=argparse.FileType(mode="rb"),
576
327
                        help="Set password blob (file) for client")
577
 
    approve_deny = parser.add_mutually_exclusive_group()
578
 
    approve_deny.add_argument(
579
 
        "-A", "--approve", action="store_true",
580
 
        help="Approve any current client request")
581
 
    approve_deny.add_argument("-D", "--deny", action="store_true",
582
 
                              help="Deny any current client request")
 
328
    parser.add_argument("-A", "--approve", action="store_true",
 
329
                        help="Approve any current client request")
 
330
    parser.add_argument("-D", "--deny", action="store_true",
 
331
                        help="Deny any current client request")
583
332
    parser.add_argument("--check", action="store_true",
584
333
                        help="Run self-test")
585
334
    parser.add_argument("client", nargs="*", help="Client name")
586
 
    options = parser.parse_args(args=args)
 
335
    options = parser.parse_args()
587
336
 
588
337
    if has_actions(options) and not (options.client or options.all):
589
338
        parser.error("Options require clients names or --all.")
594
343
        parser.error("--dump-json can only be used alone.")
595
344
    if options.all and not has_actions(options):
596
345
        parser.error("--all requires an action.")
597
 
    if options.is_enabled and len(options.client) > 1:
598
 
            parser.error("--is-enabled requires exactly one client")
599
 
 
600
 
    commands = []
601
 
 
602
 
    if options.dump_json:
603
 
        commands.append(DumpJSONCmd())
604
 
 
605
 
    if options.enable:
606
 
        commands.append(EnableCmd())
607
 
 
608
 
    if options.disable:
609
 
        commands.append(DisableCmd())
610
 
 
611
 
    if options.bump_timeout:
612
 
        commands.append(BumpTimeoutCmd(options.bump_timeout))
613
 
 
614
 
    if options.start_checker:
615
 
        commands.append(StartCheckerCmd())
616
 
 
617
 
    if options.stop_checker:
618
 
        commands.append(StopCheckerCmd())
619
 
 
620
 
    if options.is_enabled:
621
 
        commands.append(IsEnabledCmd())
622
 
 
623
 
    if options.remove:
624
 
        commands.append(RemoveCmd())
625
 
 
626
 
    if options.checker is not None:
627
 
        commands.append(SetCheckerCmd())
628
 
 
629
 
    if options.timeout is not None:
630
 
        commands.append(SetTimeoutCmd(options.timeout))
631
 
 
632
 
    if options.extended_timeout:
633
 
        commands.append(
634
 
            SetExtendedTimeoutCmd(options.extended_timeout))
635
 
 
636
 
    if options.interval is not None:
637
 
        command.append(SetIntervalCmd(options.interval))
638
 
 
639
 
    if options.approved_by_default is not None:
640
 
        if options.approved_by_default:
641
 
            command.append(ApproveByDefaultCmd())
642
 
        else:
643
 
            command.append(DenyByDefaultCmd())
644
 
 
645
 
    if options.approval_delay is not None:
646
 
        command.append(SetApprovalDelayCmd(options.approval_delay))
647
 
 
648
 
    if options.approval_duration is not None:
649
 
        command.append(
650
 
            SetApprovalDurationCmd(options.approval_duration))
651
 
 
652
 
    if options.host is not None:
653
 
        command.append(SetHostCmd(options.host))
654
 
 
655
 
    if options.secret is not None:
656
 
        command.append(SetSecretCmd(options.secret))
657
 
 
658
 
    if options.approve:
659
 
        commands.append(ApproveCmd())
660
 
 
661
 
    if options.deny:
662
 
        commands.append(DenyCmd())
663
 
 
664
 
    # If no command option has been given, show table of clients,
665
 
    # optionally verbosely
666
 
    if not commands:
667
 
        commands.append(PrintTableCmd(verbose=options.verbose))
668
 
 
669
 
    return commands, options.client
670
 
 
671
 
 
672
 
def main():
673
 
    commands, clientnames = commands_and_clients_from_options()
 
346
 
 
347
    if options.check:
 
348
        fail_count, test_count = doctest.testmod()
 
349
        sys.exit(os.EX_OK if fail_count == 0 else 1)
674
350
 
675
351
    try:
676
352
        bus = dbus.SystemBus()
677
353
        mandos_dbus_objc = bus.get_object(busname, server_path)
678
354
    except dbus.exceptions.DBusException:
679
 
        log.critical("Could not connect to Mandos server")
 
355
        print("Could not connect to Mandos server", file=sys.stderr)
680
356
        sys.exit(1)
681
357
 
682
358
    mandos_serv = dbus.Interface(mandos_dbus_objc,
684
360
    mandos_serv_object_manager = dbus.Interface(
685
361
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
686
362
 
687
 
    # Filter out log message from dbus module
688
 
    dbus_logger = logging.getLogger("dbus.proxies")
689
 
    class NullFilter(logging.Filter):
690
 
        def filter(self, record):
691
 
            return False
692
 
    dbus_filter = NullFilter()
693
 
    dbus_logger.addFilter(dbus_filter)
 
363
    # block stderr since dbus library prints to stderr
 
364
    null = os.open(os.path.devnull, os.O_RDWR)
 
365
    stderrcopy = os.dup(sys.stderr.fileno())
 
366
    os.dup2(null, sys.stderr.fileno())
 
367
    os.close(null)
694
368
    try:
695
369
        try:
696
370
            mandos_clients = {path: ifs_and_props[client_interface]
699
373
                              .GetManagedObjects().items()
700
374
                              if client_interface in ifs_and_props}
701
375
        finally:
702
 
            # restore dbus logger
703
 
            dbus_logger.removeFilter(dbus_filter)
 
376
            # restore stderr
 
377
            os.dup2(stderrcopy, sys.stderr.fileno())
 
378
            os.close(stderrcopy)
704
379
    except dbus.exceptions.DBusException as e:
705
 
        log.critical("Failed to access Mandos server through D-Bus:"
706
 
                     "\n%s", e)
 
380
        print("Access denied: "
 
381
              "Accessing mandos server through D-Bus: {}".format(e),
 
382
              file=sys.stderr)
707
383
        sys.exit(1)
708
384
 
709
385
    # Compile dict of (clients: properties) to process
710
386
    clients = {}
711
387
 
712
 
    if not clientnames:
 
388
    if options.all or not options.client:
713
389
        clients = {bus.get_object(busname, path): properties
714
390
                   for path, properties in mandos_clients.items()}
715
391
    else:
716
 
        for name in clientnames:
 
392
        for name in options.client:
717
393
            for path, client in mandos_clients.items():
718
394
                if client["Name"] == name:
719
395
                    client_objc = bus.get_object(busname, path)
720
396
                    clients[client_objc] = client
721
397
                    break
722
398
            else:
723
 
                log.critical("Client not found on server: %r", name)
 
399
                print("Client not found on server: {!r}"
 
400
                      .format(name), file=sys.stderr)
724
401
                sys.exit(1)
725
402
 
726
 
    # Run all commands on clients
727
 
    for command in commands:
728
 
        command.run(mandos_serv, clients)
729
 
 
730
 
 
731
 
class Test_milliseconds_to_string(unittest.TestCase):
732
 
    def test_all(self):
733
 
        self.assertEqual(milliseconds_to_string(93785000),
734
 
                         "1T02:03:05")
735
 
    def test_no_days(self):
736
 
        self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
737
 
    def test_all_zero(self):
738
 
        self.assertEqual(milliseconds_to_string(0), "00:00:00")
739
 
    def test_no_fractional_seconds(self):
740
 
        self.assertEqual(milliseconds_to_string(400), "00:00:00")
741
 
        self.assertEqual(milliseconds_to_string(900), "00:00:00")
742
 
        self.assertEqual(milliseconds_to_string(1900), "00:00:01")
743
 
 
744
 
class Test_string_to_delta(unittest.TestCase):
745
 
    def test_handles_basic_rfc3339(self):
746
 
        self.assertEqual(string_to_delta("PT2H"),
747
 
                         datetime.timedelta(0, 7200))
748
 
    def test_falls_back_to_pre_1_6_1_with_warning(self):
749
 
        # assertLogs only exists in Python 3.4
750
 
        if hasattr(self, "assertLogs"):
751
 
            with self.assertLogs(log, logging.WARNING):
752
 
                value = string_to_delta("2h")
753
 
        else:
754
 
            class WarningFilter(logging.Filter):
755
 
                """Don't show, but record the presence of, warnings"""
756
 
                def filter(self, record):
757
 
                    is_warning = record.levelno >= logging.WARNING
758
 
                    self.found = is_warning or getattr(self, "found",
759
 
                                                       False)
760
 
                    return not is_warning
761
 
            warning_filter = WarningFilter()
762
 
            log.addFilter(warning_filter)
763
 
            try:
764
 
                value = string_to_delta("2h")
765
 
            finally:
766
 
                log.removeFilter(warning_filter)
767
 
            self.assertTrue(getattr(warning_filter, "found", False))
768
 
        self.assertEqual(value, datetime.timedelta(0, 7200))
769
 
 
770
 
 
771
 
class TestCmd(unittest.TestCase):
772
 
    """Abstract class for tests of command classes"""
773
 
    def setUp(self):
774
 
        testcase = self
775
 
        class MockClient(object):
776
 
            def __init__(self, name, **attributes):
777
 
                self.__dbus_object_path__ = "objpath_{}".format(name)
778
 
                self.attributes = attributes
779
 
                self.attributes["Name"] = name
780
 
            def Set(interface, property, value,
781
 
                    properties_interface):
782
 
                testcase.assertEqual(interface, client_interface)
783
 
                testcase.assertEqual(properties_interface,
784
 
                                     dbus.PROPERTIES_IFACE)
785
 
                self.attributes[property] = value
786
 
            def Get(interface, property, properties_interface):
787
 
                testcase.assertEqual(interface, client_interface)
788
 
                testcase.assertEqual(properties_interface,
789
 
                                     dbus.PROPERTIES_IFACE)
790
 
                return self.attributes[property]
791
 
            def __getitem__(self, key):
792
 
                return self.attributes[key]
793
 
        self.clients = collections.OrderedDict([
794
 
            ("foo",
795
 
             MockClient(
796
 
                 "foo",
797
 
                 KeyID=("92ed150794387c03ce684574b1139a65"
798
 
                        "94a34f895daaaf09fd8ea90a27cddb12"),
799
 
                 Secret=b"secret",
800
 
                 Host="foo.example.org",
801
 
                 Enabled=dbus.Boolean(True),
802
 
                 Timeout=300000,
803
 
                 LastCheckedOK="2019-02-03T00:00:00",
804
 
                 Created="2019-01-02T00:00:00",
805
 
                 Interval=120000,
806
 
                 Fingerprint=("778827225BA7DE539C5A"
807
 
                              "7CFA59CFF7CDBD9A5920"),
808
 
                 CheckerRunning=dbus.Boolean(False),
809
 
                 LastEnabled="2019-01-03T00:00:00",
810
 
                 ApprovalPending=dbus.Boolean(False),
811
 
                 ApprovedByDefault=dbus.Boolean(True),
812
 
                 LastApprovalRequest="",
813
 
                 ApprovalDelay=0,
814
 
                 ApprovalDuration=1000,
815
 
                 Checker="fping -q -- %(host)s",
816
 
                 ExtendedTimeout=900000,
817
 
                 Expires="2019-02-04T00:00:00",
818
 
                 LastCheckerStatus=0)),
819
 
            ("barbar",
820
 
             MockClient(
821
 
                 "barbar",
822
 
                 KeyID=("0558568eedd67d622f5c83b35a115f79"
823
 
                        "6ab612cff5ad227247e46c2b020f441c"),
824
 
                 Secret=b"secretbar",
825
 
                 Host="192.0.2.3",
826
 
                 Enabled=dbus.Boolean(True),
827
 
                 Timeout=300000,
828
 
                 LastCheckedOK="2019-02-04T00:00:00",
829
 
                 Created="2019-01-03T00:00:00",
830
 
                 Interval=120000,
831
 
                 Fingerprint=("3E393AEAEFB84C7E89E2"
832
 
                              "F547B3A107558FCA3A27"),
833
 
                 CheckerRunning=dbus.Boolean(True),
834
 
                 LastEnabled="2019-01-04T00:00:00",
835
 
                 ApprovalPending=dbus.Boolean(False),
836
 
                 ApprovedByDefault=dbus.Boolean(False),
837
 
                 LastApprovalRequest="2019-01-03T00:00:00",
838
 
                 ApprovalDelay=30000,
839
 
                 ApprovalDuration=1000,
840
 
                 Checker=":",
841
 
                 ExtendedTimeout=900000,
842
 
                 Expires="2019-02-05T00:00:00",
843
 
                 LastCheckerStatus=-2)),
844
 
            ])
845
 
 
846
 
class TestPrintTableCmd(TestCmd):
847
 
    def test_normal(self):
848
 
        output = PrintTableCmd().output(self.clients)
849
 
        expected_output = """
850
 
Name   Enabled Timeout  Last Successful Check
851
 
foo    Yes     00:05:00 2019-02-03T00:00:00  
852
 
barbar Yes     00:05:00 2019-02-04T00:00:00  
853
 
"""[1:-1]
854
 
        self.assertEqual(output, expected_output)
855
 
    def test_verbose(self):
856
 
        output = PrintTableCmd(verbose=True).output(self.clients)
857
 
        expected_output = """
858
 
Name   Enabled Timeout  Last Successful Check Created             Interval Host            Key ID                                                           Fingerprint                              Check Is Running Last Enabled        Approval Is Pending Approved By Default Last Approval Request Approval Delay Approval Duration Checker              Extended Timeout Expires             Last Checker Status
859
 
foo    Yes     00:05:00 2019-02-03T00:00:00   2019-01-02T00:00:00 00:02:00 foo.example.org 92ed150794387c03ce684574b1139a6594a34f895daaaf09fd8ea90a27cddb12 778827225BA7DE539C5A7CFA59CFF7CDBD9A5920 No               2019-01-03T00:00:00 No                  Yes                                       00:00:00       00:00:01          fping -q -- %(host)s 00:15:00         2019-02-04T00:00:00 0                  
860
 
barbar Yes     00:05:00 2019-02-04T00:00:00   2019-01-03T00:00:00 00:02:00 192.0.2.3       0558568eedd67d622f5c83b35a115f796ab612cff5ad227247e46c2b020f441c 3E393AEAEFB84C7E89E2F547B3A107558FCA3A27 Yes              2019-01-04T00:00:00 No                  No                  2019-01-03T00:00:00   00:00:30       00:00:01          :                    00:15:00         2019-02-05T00:00:00 -2                 
861
 
"""[1:-1]
862
 
        self.assertEqual(output, expected_output)
863
 
    def test_one_client(self):
864
 
        output = PrintTableCmd().output({"foo": self.clients["foo"]})
865
 
        expected_output = """
866
 
Name Enabled Timeout  Last Successful Check
867
 
foo  Yes     00:05:00 2019-02-03T00:00:00  
868
 
"""[1:-1]
869
 
        self.assertEqual(output, expected_output)
870
 
 
871
 
 
872
 
 
873
 
def should_only_run_tests():
874
 
    parser = argparse.ArgumentParser(add_help=False)
875
 
    parser.add_argument("--check", action='store_true')
876
 
    args, unknown_args = parser.parse_known_args()
877
 
    run_tests = args.check
878
 
    if run_tests:
879
 
        # Remove --check argument from sys.argv
880
 
        sys.argv[1:] = unknown_args
881
 
    return run_tests
882
 
 
883
 
# Add all tests from doctest strings
884
 
def load_tests(loader, tests, none):
885
 
    import doctest
886
 
    tests.addTests(doctest.DocTestSuite())
887
 
    return tests
 
403
    if not has_actions(options) and clients:
 
404
        if options.verbose or options.dump_json:
 
405
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
 
406
                        "Created", "Interval", "Host", "Fingerprint",
 
407
                        "CheckerRunning", "LastEnabled",
 
408
                        "ApprovalPending", "ApprovedByDefault",
 
409
                        "LastApprovalRequest", "ApprovalDelay",
 
410
                        "ApprovalDuration", "Checker",
 
411
                        "ExtendedTimeout", "Expires",
 
412
                        "LastCheckerStatus")
 
413
        else:
 
414
            keywords = defaultkeywords
 
415
 
 
416
        if options.dump_json:
 
417
            json.dump({client["Name"]: {key:
 
418
                                        bool(client[key])
 
419
                                        if isinstance(client[key],
 
420
                                                      dbus.Boolean)
 
421
                                        else client[key]
 
422
                                        for key in keywords}
 
423
                       for client in clients.values()},
 
424
                      fp=sys.stdout, indent=4,
 
425
                      separators=(',', ': '))
 
426
            print()
 
427
        else:
 
428
            print_clients(clients.values(), keywords)
 
429
    else:
 
430
        # Process each client in the list by all selected options
 
431
        for client in clients:
 
432
 
 
433
            def set_client_prop(prop, value):
 
434
                """Set a Client D-Bus property"""
 
435
                client.Set(client_interface, prop, value,
 
436
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
437
 
 
438
            def set_client_prop_ms(prop, value):
 
439
                """Set a Client D-Bus property, converted
 
440
                from a string to milliseconds."""
 
441
                set_client_prop(prop,
 
442
                                string_to_delta(value).total_seconds()
 
443
                                * 1000)
 
444
 
 
445
            if options.remove:
 
446
                mandos_serv.RemoveClient(client.__dbus_object_path__)
 
447
            if options.enable:
 
448
                set_client_prop("Enabled", dbus.Boolean(True))
 
449
            if options.disable:
 
450
                set_client_prop("Enabled", dbus.Boolean(False))
 
451
            if options.bump_timeout:
 
452
                set_client_prop("LastCheckedOK", "")
 
453
            if options.start_checker:
 
454
                set_client_prop("CheckerRunning", dbus.Boolean(True))
 
455
            if options.stop_checker:
 
456
                set_client_prop("CheckerRunning", dbus.Boolean(False))
 
457
            if options.is_enabled:
 
458
                if client.Get(client_interface, "Enabled",
 
459
                              dbus_interface=dbus.PROPERTIES_IFACE):
 
460
                    sys.exit(0)
 
461
                else:
 
462
                    sys.exit(1)
 
463
            if options.checker is not None:
 
464
                set_client_prop("Checker", options.checker)
 
465
            if options.host is not None:
 
466
                set_client_prop("Host", options.host)
 
467
            if options.interval is not None:
 
468
                set_client_prop_ms("Interval", options.interval)
 
469
            if options.approval_delay is not None:
 
470
                set_client_prop_ms("ApprovalDelay",
 
471
                                   options.approval_delay)
 
472
            if options.approval_duration is not None:
 
473
                set_client_prop_ms("ApprovalDuration",
 
474
                                   options.approval_duration)
 
475
            if options.timeout is not None:
 
476
                set_client_prop_ms("Timeout", options.timeout)
 
477
            if options.extended_timeout is not None:
 
478
                set_client_prop_ms("ExtendedTimeout",
 
479
                                   options.extended_timeout)
 
480
            if options.secret is not None:
 
481
                set_client_prop("Secret",
 
482
                                dbus.ByteArray(options.secret.read()))
 
483
            if options.approved_by_default is not None:
 
484
                set_client_prop("ApprovedByDefault",
 
485
                                dbus.Boolean(options
 
486
                                             .approved_by_default))
 
487
            if options.approve:
 
488
                client.Approve(dbus.Boolean(True),
 
489
                               dbus_interface=client_interface)
 
490
            elif options.deny:
 
491
                client.Approve(dbus.Boolean(False),
 
492
                               dbus_interface=client_interface)
 
493
 
888
494
 
889
495
if __name__ == "__main__":
890
 
    if should_only_run_tests():
891
 
        # Call using ./tdd-python-script --check [--verbose]
892
 
        unittest.main()
893
 
    else:
894
 
        main()
 
496
    main()