/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 13:19:47 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 382.
  • Revision ID: teddy@recompile.se-20190303131947-s7pwice2hi8l2hyv
mandos-ctl: Improve a test when running Python older than 3.4.

* mandos-ctl
  (Test_string_to_delta.test_falls_back_to_pre_1_6_1_with_warning):
  When assertLogs() is not present, implement alternative.

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