/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk
24.1.116 by Björn Påhlsson
added a mandos list client program
1
#!/usr/bin/python
985 by Teddy Hogeborn
Make Emacs run tests when mandos-ctl file is saved
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*")))); -*-
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
3
#
444 by Teddy Hogeborn
Update copyright year to "2010" wherever appropriate.
4
# Mandos Monitor - Control and monitor the Mandos server
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
5
#
969 by Teddy Hogeborn
Update copyright year to 2019
6
# Copyright © 2008-2019 Teddy Hogeborn
7
# Copyright © 2008-2019 Björn Påhlsson
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
8
#
907 by Teddy Hogeborn
Alter copyright notices slightly. Actual license is unchanged!
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
444 by Teddy Hogeborn
Update copyright year to "2010" wherever appropriate.
13
# the Free Software Foundation, either version 3 of the License, or
14
# (at your option) any later version.
15
#
907 by Teddy Hogeborn
Alter copyright notices slightly. Actual license is unchanged!
16
#     Mandos is distributed in the hope that it will be useful, but
17
#     WITHOUT ANY WARRANTY; without even the implied warranty of
444 by Teddy Hogeborn
Update copyright year to "2010" wherever appropriate.
18
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
19
#     GNU General Public License for more details.
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
20
#
444 by Teddy Hogeborn
Update copyright year to "2010" wherever appropriate.
21
# You should have received a copy of the GNU General Public License
907 by Teddy Hogeborn
Alter copyright notices slightly. Actual license is unchanged!
22
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
23
#
505.1.2 by Teddy Hogeborn
Change "fukt.bsnet.se" to "recompile.se" throughout.
24
# Contact the authors at <mandos@recompile.se>.
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
25
#
24.1.116 by Björn Påhlsson
added a mandos list client program
26
463.1.9 by teddy at bsnet
* mandos-ctl: Use print function.
27
from __future__ import (division, absolute_import, print_function,
28
                        unicode_literals)
463.1.8 by teddy at bsnet
* mandos-ctl: Use unicode string literals.
29
718 by Teddy Hogeborn
mandos-ctl: Make it work in Python 3.
30
try:
31
    from future_builtins import *
32
except ImportError:
33
    pass
579 by Teddy Hogeborn
* mandos: Use all new builtins.
34
24.1.119 by Björn Påhlsson
Added more method support for mandos clients through mandos-ctl
35
import sys
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
36
import argparse
240 by Teddy Hogeborn
Merge "mandos-list" from belorn.
37
import locale
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
38
import datetime
39
import re
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
40
import os
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
41
import collections
863 by Teddy Hogeborn
mandos-ctl: Implement --dump-json option
42
import json
984 by Teddy Hogeborn
Make mandos-ctl use unittest instead of doctest module
43
import unittest
987 by Teddy Hogeborn
mandos-ctl: Use logging module instead of print() for errors
44
import logging
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
45
46
import dbus
240 by Teddy Hogeborn
Merge "mandos-list" from belorn.
47
988 by Teddy Hogeborn
mandos-ctl: Show warnings
48
# Show warnings by default
49
if not sys.warnoptions:
50
    import warnings
51
    warnings.simplefilter("default")
52
987 by Teddy Hogeborn
mandos-ctl: Use logging module instead of print() for errors
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
988 by Teddy Hogeborn
mandos-ctl: Show warnings
57
logging.captureWarnings(True)   # Show warnings via the logging system
58
723.1.7 by Teddy Hogeborn
Use the .major attribute on sys.version_info instead of using "[0]".
59
if sys.version_info.major == 2:
718 by Teddy Hogeborn
mandos-ctl: Make it work in Python 3.
60
    str = unicode
61
463.1.8 by teddy at bsnet
* mandos-ctl: Use unicode string literals.
62
locale.setlocale(locale.LC_ALL, "")
24.1.116 by Björn Påhlsson
added a mandos list client program
63
463.1.8 by teddy at bsnet
* mandos-ctl: Use unicode string literals.
64
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
24.1.186 by Björn Påhlsson
transitional stuff actually working
65
domain = "se.recompile"
463.1.8 by teddy at bsnet
* mandos-ctl: Use unicode string literals.
66
busname = domain + ".Mandos"
67
server_path = "/"
68
server_interface = domain + ".Mandos"
69
client_interface = domain + ".Mandos.Client"
237.4.108 by Teddy Hogeborn
* Makefile (version): Change to 1.8.3.
70
version = "1.8.3"
24.1.118 by Björn Påhlsson
Added enable/disable
71
745 by Teddy Hogeborn
mandos-ctl: Do minor formatting and whitespace adjustments.
72
785 by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface.
73
try:
74
    dbus.OBJECT_MANAGER_IFACE
75
except AttributeError:
76
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
77
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
78
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
79
def milliseconds_to_string(ms):
80
    td = datetime.timedelta(0, 0, 0, ms)
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
81
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
82
            .format(days="{}T".format(td.days) if td.days else "",
83
                    hours=td.seconds // 3600,
84
                    minutes=(td.seconds % 3600) // 60,
85
                    seconds=td.seconds % 60))
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
86
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
87
88
def rfc3339_duration_to_delta(duration):
609 by Teddy Hogeborn
* clients.conf: Convert all time intervals to new RFC 3339 syntax.
89
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
90
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
91
    >>> rfc3339_duration_to_delta("P7D")
92
    datetime.timedelta(7)
93
    >>> rfc3339_duration_to_delta("PT60S")
94
    datetime.timedelta(0, 60)
95
    >>> rfc3339_duration_to_delta("PT60M")
96
    datetime.timedelta(0, 3600)
990 by Teddy Hogeborn
mandos-ctl (rfc3339_duration_to_delta): Improve tests
97
    >>> rfc3339_duration_to_delta("P60M")
98
    datetime.timedelta(1680)
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
99
    >>> rfc3339_duration_to_delta("PT24H")
100
    datetime.timedelta(1)
101
    >>> rfc3339_duration_to_delta("P1W")
102
    datetime.timedelta(7)
103
    >>> rfc3339_duration_to_delta("PT5M30S")
104
    datetime.timedelta(0, 330)
105
    >>> rfc3339_duration_to_delta("P1DT3M20S")
106
    datetime.timedelta(1, 200)
990 by Teddy Hogeborn
mandos-ctl (rfc3339_duration_to_delta): Improve tests
107
    >>> # Can not be empty:
108
    >>> rfc3339_duration_to_delta("")
109
    Traceback (most recent call last):
110
    ...
111
    ValueError: Invalid RFC 3339 duration: u''
112
    >>> # Must start with "P":
113
    >>> rfc3339_duration_to_delta("1D")
114
    Traceback (most recent call last):
115
    ...
116
    ValueError: Invalid RFC 3339 duration: u'1D'
117
    >>> # Must use correct order
118
    >>> rfc3339_duration_to_delta("PT1S2M")
119
    Traceback (most recent call last):
120
    ...
121
    ValueError: Invalid RFC 3339 duration: u'PT1S2M'
122
    >>> # Time needs time marker
123
    >>> rfc3339_duration_to_delta("P1H2S")
124
    Traceback (most recent call last):
125
    ...
126
    ValueError: Invalid RFC 3339 duration: u'P1H2S'
127
    >>> # Weeks can not be combined with anything else
128
    >>> rfc3339_duration_to_delta("P1D2W")
129
    Traceback (most recent call last):
130
    ...
131
    ValueError: Invalid RFC 3339 duration: u'P1D2W'
132
    >>> rfc3339_duration_to_delta("P2W2H")
133
    Traceback (most recent call last):
134
    ...
135
    ValueError: Invalid RFC 3339 duration: u'P2W2H'
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
136
    """
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
137
609 by Teddy Hogeborn
* clients.conf: Convert all time intervals to new RFC 3339 syntax.
138
    # Parsing an RFC 3339 duration with regular expressions is not
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
139
    # possible - there would have to be multiple places for the same
609 by Teddy Hogeborn
* clients.conf: Convert all time intervals to new RFC 3339 syntax.
140
    # values, like seconds.  The current code, while more esoteric, is
141
    # cleaner without depending on a parsing library.  If Python had a
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
142
    # built-in library for parsing we would use it, but we'd like to
143
    # avoid excessive use of external libraries.
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
144
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
145
    # New type for defining tokens, syntax, and semantics all-in-one
753 by Teddy Hogeborn
mandos-ctl: Generate better messages in exceptions.
146
    Token = collections.namedtuple("Token", (
147
        "regexp",  # To match token; if "value" is not None, must have
148
                   # a "group" containing digits
149
        "value",   # datetime.timedelta or None
150
        "followers"))           # Tokens valid after this token
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
151
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
152
    # the "duration" ABNF definition in RFC 3339, Appendix A.
153
    token_end = Token(re.compile(r"$"), None, frozenset())
154
    token_second = Token(re.compile(r"(\d+)S"),
155
                         datetime.timedelta(seconds=1),
745 by Teddy Hogeborn
mandos-ctl: Do minor formatting and whitespace adjustments.
156
                         frozenset((token_end, )))
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
157
    token_minute = Token(re.compile(r"(\d+)M"),
158
                         datetime.timedelta(minutes=1),
159
                         frozenset((token_second, token_end)))
160
    token_hour = Token(re.compile(r"(\d+)H"),
161
                       datetime.timedelta(hours=1),
162
                       frozenset((token_minute, token_end)))
163
    token_time = Token(re.compile(r"T"),
164
                       None,
165
                       frozenset((token_hour, token_minute,
166
                                  token_second)))
167
    token_day = Token(re.compile(r"(\d+)D"),
168
                      datetime.timedelta(days=1),
169
                      frozenset((token_time, token_end)))
170
    token_month = Token(re.compile(r"(\d+)M"),
171
                        datetime.timedelta(weeks=4),
172
                        frozenset((token_day, token_end)))
173
    token_year = Token(re.compile(r"(\d+)Y"),
174
                       datetime.timedelta(weeks=52),
175
                       frozenset((token_month, token_end)))
176
    token_week = Token(re.compile(r"(\d+)W"),
177
                       datetime.timedelta(weeks=1),
745 by Teddy Hogeborn
mandos-ctl: Do minor formatting and whitespace adjustments.
178
                       frozenset((token_end, )))
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
179
    token_duration = Token(re.compile(r"P"), None,
180
                           frozenset((token_year, token_month,
181
                                      token_day, token_time,
721 by Teddy Hogeborn
Fix two mutually cancelling bugs.
182
                                      token_week)))
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
183
    # Define starting values:
184
    # Value so far
185
    value = datetime.timedelta()
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
186
    found_token = None
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
187
    # Following valid tokens
188
    followers = frozenset((token_duration, ))
189
    # String left to parse
190
    s = duration
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
191
    # Loop until end token is found
192
    while found_token is not token_end:
193
        # Search for any currently valid tokens
194
        for token in followers:
195
            match = token.regexp.match(s)
196
            if match is not None:
197
                # Token found
198
                if token.value is not None:
199
                    # Value found, parse digits
200
                    factor = int(match.group(1), 10)
201
                    # Add to value so far
202
                    value += factor * token.value
203
                # Strip token from string
204
                s = token.regexp.sub("", s, 1)
205
                # Go to found token
206
                found_token = token
207
                # Set valid next tokens
208
                followers = found_token.followers
209
                break
210
        else:
211
            # No currently valid tokens were found
753 by Teddy Hogeborn
mandos-ctl: Generate better messages in exceptions.
212
            raise ValueError("Invalid RFC 3339 duration: {!r}"
213
                             .format(duration))
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
214
    # End token found
215
    return value
216
217
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
218
def string_to_delta(interval):
219
    """Parse a string and return a datetime.timedelta
220
    """
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
221
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
222
    try:
223
        return rfc3339_duration_to_delta(interval)
991 by Teddy Hogeborn
mandos-ctl: Refactor and add more tests
224
    except ValueError as e:
225
        log.warning("%s - Parsing as pre-1.6.1 interval instead",
226
                    ' '.join(e.args))
227
    return parse_pre_1_6_1_interval(interval)
228
229
230
def parse_pre_1_6_1_interval(interval):
231
    """Parse an interval string as documented by Mandos before 1.6.1, and
232
    return a datetime.timedelta
233
    >>> parse_pre_1_6_1_interval('7d')
234
    datetime.timedelta(7)
235
    >>> parse_pre_1_6_1_interval('60s')
236
    datetime.timedelta(0, 60)
237
    >>> parse_pre_1_6_1_interval('60m')
238
    datetime.timedelta(0, 3600)
239
    >>> parse_pre_1_6_1_interval('24h')
240
    datetime.timedelta(1)
241
    >>> parse_pre_1_6_1_interval('1w')
242
    datetime.timedelta(7)
243
    >>> parse_pre_1_6_1_interval('5m 30s')
244
    datetime.timedelta(0, 330)
245
    >>> parse_pre_1_6_1_interval('')
246
    datetime.timedelta(0)
247
    >>> # Ignore unknown characters, allow any order and repetitions
248
    >>> parse_pre_1_6_1_interval('2dxy7zz11y3m5m')
249
    datetime.timedelta(2, 480, 18000)
250
251
    """
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
252
616 by Teddy Hogeborn
* mandos-ctl (string_to_delta): Try to parse RFC 3339 duration before
253
    value = datetime.timedelta(0)
254
    regexp = re.compile(r"(\d+)([dsmhw]?)")
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
255
518.2.9 by Teddy Hogeborn
* mandos (ClientDBus.approval_delay, ClientDBus.approval_duration,
256
    for num, suffix in regexp.findall(interval):
257
        if suffix == "d":
258
            value += datetime.timedelta(int(num))
259
        elif suffix == "s":
260
            value += datetime.timedelta(0, int(num))
261
        elif suffix == "m":
262
            value += datetime.timedelta(0, 0, 0, 0, int(num))
263
        elif suffix == "h":
264
            value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
265
        elif suffix == "w":
266
            value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
267
        elif suffix == "":
268
            value += datetime.timedelta(0, 0, 0, int(num))
269
    return value
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
270
745 by Teddy Hogeborn
mandos-ctl: Do minor formatting and whitespace adjustments.
271
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
272
def print_clients(clients, keywords):
995 by Teddy Hogeborn
mandos-ctl: Refactor
273
    print('\n'.join(TableOfClients(clients, keywords).rows()))
274
275
class TableOfClients(object):
996 by Teddy Hogeborn
mandos-ctl: Refactor
276
    tablewords = {
277
        "Name": "Name",
278
        "Enabled": "Enabled",
279
        "Timeout": "Timeout",
280
        "LastCheckedOK": "Last Successful Check",
281
        "LastApprovalRequest": "Last Approval Request",
282
        "Created": "Created",
283
        "Interval": "Interval",
284
        "Host": "Host",
285
        "Fingerprint": "Fingerprint",
286
        "KeyID": "Key ID",
287
        "CheckerRunning": "Check Is Running",
288
        "LastEnabled": "Last Enabled",
289
        "ApprovalPending": "Approval Is Pending",
290
        "ApprovedByDefault": "Approved By Default",
291
        "ApprovalDelay": "Approval Delay",
292
        "ApprovalDuration": "Approval Duration",
293
        "Checker": "Checker",
294
        "ExtendedTimeout": "Extended Timeout",
295
        "Expires": "Expires",
296
        "LastCheckerStatus": "Last Checker Status",
297
    }
298
299
    def __init__(self, clients, keywords, tablewords=None):
995 by Teddy Hogeborn
mandos-ctl: Refactor
300
        self.clients = clients
301
        self.keywords = keywords
996 by Teddy Hogeborn
mandos-ctl: Refactor
302
        if tablewords is not None:
303
            self.tablewords = tablewords
995 by Teddy Hogeborn
mandos-ctl: Refactor
304
997 by Teddy Hogeborn
mandos-ctl: Refactor
305
    def rows(self):
306
        format_string = self.row_formatting_string()
307
        rows = [self.header_line(format_string)]
308
        rows.extend(self.client_line(client, format_string)
309
                    for client in self.clients)
310
        return rows
311
312
    def row_formatting_string(self):
313
        "Format string used to format table rows"
314
        return " ".join("{{{key}:{width}}}".format(
315
            width=max(len(self.tablewords[key]),
316
                      max(len(self.string_from_client(client, key))
317
                          for client in self.clients)),
318
            key=key)
319
                                 for key in self.keywords)
320
321
    def string_from_client(self, client, key):
322
        return self.valuetostring(client[key], key)
323
995 by Teddy Hogeborn
mandos-ctl: Refactor
324
    @staticmethod
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
325
    def valuetostring(value, keyword):
989 by Teddy Hogeborn
mandos-ctl: Use isinstance(x, X) instead of type(x) is X
326
        if isinstance(value, dbus.Boolean):
463.1.8 by teddy at bsnet
* mandos-ctl: Use unicode string literals.
327
            return "Yes" if value else "No"
328
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
571 by Teddy Hogeborn
* mandos-ctl (print_clients): Bug fix: Don't show "Extended Timeout"
329
                       "ApprovalDuration", "ExtendedTimeout"):
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
330
            return milliseconds_to_string(value)
718 by Teddy Hogeborn
mandos-ctl: Make it work in Python 3.
331
        return str(value)
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
332
997 by Teddy Hogeborn
mandos-ctl: Refactor
333
    def header_line(self, format_string):
334
        return format_string.format(**self.tablewords)
335
336
    def client_line(self, client, format_string):
337
        return format_string.format(
338
            **{key: self.string_from_client(client, key)
339
               for key in self.keywords})
745 by Teddy Hogeborn
mandos-ctl: Do minor formatting and whitespace adjustments.
340
438 by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the
341
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
342
def has_actions(options):
343
    return any((options.enable,
344
                options.disable,
345
                options.bump_timeout,
346
                options.start_checker,
347
                options.stop_checker,
348
                options.is_enabled,
349
                options.remove,
350
                options.checker is not None,
351
                options.timeout is not None,
24.1.179 by Björn Påhlsson
New feature:
352
                options.extended_timeout is not None,
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
353
                options.interval is not None,
441 by Teddy Hogeborn
* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
354
                options.approved_by_default is not None,
355
                options.approval_delay is not None,
356
                options.approval_duration is not None,
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
357
                options.host is not None,
358
                options.secret is not None,
359
                options.approve,
360
                options.deny))
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
361
745 by Teddy Hogeborn
mandos-ctl: Do minor formatting and whitespace adjustments.
362
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
363
def main():
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
364
    parser = argparse.ArgumentParser()
365
    parser.add_argument("--version", action="version",
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
366
                        version="%(prog)s {}".format(version),
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
367
                        help="show version number and exit")
368
    parser.add_argument("-a", "--all", action="store_true",
369
                        help="Select all clients")
370
    parser.add_argument("-v", "--verbose", action="store_true",
371
                        help="Print all fields")
863 by Teddy Hogeborn
mandos-ctl: Implement --dump-json option
372
    parser.add_argument("-j", "--dump-json", action="store_true",
373
                        help="Dump client data in JSON format")
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
374
    parser.add_argument("-e", "--enable", action="store_true",
375
                        help="Enable client")
376
    parser.add_argument("-d", "--disable", action="store_true",
377
                        help="disable client")
378
    parser.add_argument("-b", "--bump-timeout", action="store_true",
379
                        help="Bump timeout for client")
380
    parser.add_argument("--start-checker", action="store_true",
381
                        help="Start checker for client")
382
    parser.add_argument("--stop-checker", action="store_true",
383
                        help="Stop checker for client")
384
    parser.add_argument("-V", "--is-enabled", action="store_true",
385
                        help="Check if client is enabled")
386
    parser.add_argument("-r", "--remove", action="store_true",
387
                        help="Remove client")
388
    parser.add_argument("-c", "--checker",
389
                        help="Set checker command for client")
390
    parser.add_argument("-t", "--timeout",
391
                        help="Set timeout for client")
24.1.179 by Björn Påhlsson
New feature:
392
    parser.add_argument("--extended-timeout",
393
                        help="Set extended timeout for client")
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
394
    parser.add_argument("-i", "--interval",
395
                        help="Set checker interval for client")
396
    parser.add_argument("--approve-by-default", action="store_true",
397
                        default=None, dest="approved_by_default",
398
                        help="Set client to be approved by default")
399
    parser.add_argument("--deny-by-default", action="store_false",
400
                        dest="approved_by_default",
401
                        help="Set client to be denied by default")
402
    parser.add_argument("--approval-delay",
403
                        help="Set delay before client approve/deny")
404
    parser.add_argument("--approval-duration",
405
                        help="Set duration of one client approval")
406
    parser.add_argument("-H", "--host", help="Set host for client")
718 by Teddy Hogeborn
mandos-ctl: Make it work in Python 3.
407
    parser.add_argument("-s", "--secret",
408
                        type=argparse.FileType(mode="rb"),
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
409
                        help="Set password blob (file) for client")
410
    parser.add_argument("-A", "--approve", action="store_true",
411
                        help="Approve any current client request")
412
    parser.add_argument("-D", "--deny", action="store_true",
413
                        help="Deny any current client request")
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
414
    parser.add_argument("--check", action="store_true",
415
                        help="Run self-test")
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
416
    parser.add_argument("client", nargs="*", help="Client name")
417
    options = parser.parse_args()
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
418
572 by Teddy Hogeborn
* mandos-ctl: Break long lines.
419
    if has_actions(options) and not (options.client or options.all):
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
420
        parser.error("Options require clients names or --all.")
421
    if options.verbose and has_actions(options):
863 by Teddy Hogeborn
mandos-ctl: Implement --dump-json option
422
        parser.error("--verbose can only be used alone.")
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
423
    if options.dump_json and (options.verbose
424
                              or has_actions(options)):
863 by Teddy Hogeborn
mandos-ctl: Implement --dump-json option
425
        parser.error("--dump-json can only be used alone.")
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
426
    if options.all and not has_actions(options):
427
        parser.error("--all requires an action.")
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
428
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
429
    try:
430
        bus = dbus.SystemBus()
431
        mandos_dbus_objc = bus.get_object(busname, server_path)
432
    except dbus.exceptions.DBusException:
987 by Teddy Hogeborn
mandos-ctl: Use logging module instead of print() for errors
433
        log.critical("Could not connect to Mandos server")
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
434
        sys.exit(1)
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
435
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
436
    mandos_serv = dbus.Interface(mandos_dbus_objc,
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
437
                                 dbus_interface=server_interface)
785 by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface.
438
    mandos_serv_object_manager = dbus.Interface(
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
439
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
440
441
    # block stderr since dbus library prints to stderr
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
442
    null = os.open(os.path.devnull, os.O_RDWR)
443
    stderrcopy = os.dup(sys.stderr.fileno())
444
    os.dup2(null, sys.stderr.fileno())
445
    os.close(null)
446
    try:
447
        try:
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
448
            mandos_clients = {path: ifs_and_props[client_interface]
449
                              for path, ifs_and_props in
450
                              mandos_serv_object_manager
451
                              .GetManagedObjects().items()
452
                              if client_interface in ifs_and_props}
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
453
        finally:
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
454
            # restore stderr
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
455
            os.dup2(stderrcopy, sys.stderr.fileno())
456
            os.close(stderrcopy)
785 by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface.
457
    except dbus.exceptions.DBusException as e:
987 by Teddy Hogeborn
mandos-ctl: Use logging module instead of print() for errors
458
        log.critical("Failed to access Mandos server through D-Bus:"
459
                     "\n%s", e)
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
460
        sys.exit(1)
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
461
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
462
    # Compile dict of (clients: properties) to process
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
463
    clients = {}
464
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
465
    if options.all or not options.client:
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
466
        clients = {bus.get_object(busname, path): properties
467
                   for path, properties in mandos_clients.items()}
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
468
    else:
469
        for name in options.client:
723.1.4 by Teddy Hogeborn
Use the .items() method instead of .iteritems().
470
            for path, client in mandos_clients.items():
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
471
                if client["Name"] == name:
472
                    client_objc = bus.get_object(busname, path)
473
                    clients[client_objc] = client
474
                    break
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
475
            else:
987 by Teddy Hogeborn
mandos-ctl: Use logging module instead of print() for errors
476
                log.critical("Client not found on server: %r", name)
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
477
                sys.exit(1)
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
478
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
479
    if not has_actions(options) and clients:
863 by Teddy Hogeborn
mandos-ctl: Implement --dump-json option
480
        if options.verbose or options.dump_json:
745 by Teddy Hogeborn
mandos-ctl: Do minor formatting and whitespace adjustments.
481
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
962 by Teddy Hogeborn
Add support for using raw public keys in TLS (RFC 7250)
482
                        "Created", "Interval", "Host", "KeyID",
483
                        "Fingerprint", "CheckerRunning",
484
                        "LastEnabled", "ApprovalPending",
485
                        "ApprovedByDefault", "LastApprovalRequest",
486
                        "ApprovalDelay", "ApprovalDuration",
487
                        "Checker", "ExtendedTimeout", "Expires",
865 by Teddy Hogeborn
mandos-ctl: Include "Expires" and "LastCheckerStatus" properties
488
                        "LastCheckerStatus")
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
489
        else:
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
490
            keywords = defaultkeywords
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
491
863 by Teddy Hogeborn
mandos-ctl: Implement --dump-json option
492
        if options.dump_json:
864 by Teddy Hogeborn
mandos-ctl: Dump booleans as booleans in --dump-json output.
493
            json.dump({client["Name"]: {key:
494
                                        bool(client[key])
495
                                        if isinstance(client[key],
496
                                                      dbus.Boolean)
497
                                        else client[key]
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
498
                                        for key in keywords}
499
                       for client in clients.values()},
500
                      fp=sys.stdout, indent=4,
501
                      separators=(',', ': '))
863 by Teddy Hogeborn
mandos-ctl: Implement --dump-json option
502
            print()
503
        else:
504
            print_clients(clients.values(), keywords)
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
505
    else:
506
        # Process each client in the list by all selected options
507
        for client in clients:
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
508
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
509
            def set_client_prop(prop, value):
510
                """Set a Client D-Bus property"""
511
                client.Set(client_interface, prop, value,
512
                           dbus_interface=dbus.PROPERTIES_IFACE)
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
513
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
514
            def set_client_prop_ms(prop, value):
515
                """Set a Client D-Bus property, converted
516
                from a string to milliseconds."""
517
                set_client_prop(prop,
723.1.6 by Teddy Hogeborn
Use the new .total_seconds() method on datetime.timedelta objects.
518
                                string_to_delta(value).total_seconds()
519
                                * 1000)
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
520
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
521
            if options.remove:
522
                mandos_serv.RemoveClient(client.__dbus_object_path__)
523
            if options.enable:
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
524
                set_client_prop("Enabled", dbus.Boolean(True))
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
525
            if options.disable:
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
526
                set_client_prop("Enabled", dbus.Boolean(False))
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
527
            if options.bump_timeout:
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
528
                set_client_prop("LastCheckedOK", "")
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
529
            if options.start_checker:
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
530
                set_client_prop("CheckerRunning", dbus.Boolean(True))
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
531
            if options.stop_checker:
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
532
                set_client_prop("CheckerRunning", dbus.Boolean(False))
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
533
            if options.is_enabled:
872 by Teddy Hogeborn
PEP8 compliance: mandos-ctl
534
                if client.Get(client_interface, "Enabled",
535
                              dbus_interface=dbus.PROPERTIES_IFACE):
536
                    sys.exit(0)
537
                else:
538
                    sys.exit(1)
505.1.16 by Teddy Hogeborn
* mandos-ctl (main): Bug fix: Handle empty strings correctly.
539
            if options.checker is not None:
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
540
                set_client_prop("Checker", options.checker)
505.1.16 by Teddy Hogeborn
* mandos-ctl (main): Bug fix: Handle empty strings correctly.
541
            if options.host is not None:
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
542
                set_client_prop("Host", options.host)
505.1.16 by Teddy Hogeborn
* mandos-ctl (main): Bug fix: Handle empty strings correctly.
543
            if options.interval is not None:
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
544
                set_client_prop_ms("Interval", options.interval)
505.1.16 by Teddy Hogeborn
* mandos-ctl (main): Bug fix: Handle empty strings correctly.
545
            if options.approval_delay is not None:
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
546
                set_client_prop_ms("ApprovalDelay",
547
                                   options.approval_delay)
505.1.16 by Teddy Hogeborn
* mandos-ctl (main): Bug fix: Handle empty strings correctly.
548
            if options.approval_duration is not None:
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
549
                set_client_prop_ms("ApprovalDuration",
550
                                   options.approval_duration)
505.1.16 by Teddy Hogeborn
* mandos-ctl (main): Bug fix: Handle empty strings correctly.
551
            if options.timeout is not None:
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
552
                set_client_prop_ms("Timeout", options.timeout)
505.1.16 by Teddy Hogeborn
* mandos-ctl (main): Bug fix: Handle empty strings correctly.
553
            if options.extended_timeout is not None:
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
554
                set_client_prop_ms("ExtendedTimeout",
555
                                   options.extended_timeout)
505.1.16 by Teddy Hogeborn
* mandos-ctl (main): Bug fix: Handle empty strings correctly.
556
            if options.secret is not None:
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
557
                set_client_prop("Secret",
558
                                dbus.ByteArray(options.secret.read()))
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
559
            if options.approved_by_default is not None:
569.1.2 by Teddy Hogeborn
* mandos-ctl (main): Use helper functions to shorten code.
560
                set_client_prop("ApprovedByDefault",
561
                                dbus.Boolean(options
562
                                             .approved_by_default))
475 by teddy at bsnet
* mandos-ctl: Use the new argparse library instead of optparse.
563
            if options.approve:
564
                client.Approve(dbus.Boolean(True),
565
                               dbus_interface=client_interface)
566
            elif options.deny:
567
                client.Approve(dbus.Boolean(False),
568
                               dbus_interface=client_interface)
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
569
984 by Teddy Hogeborn
Make mandos-ctl use unittest instead of doctest module
570

986 by Teddy Hogeborn
Add tests to mandos-ctl's milliseconds_to_string function
571
class Test_milliseconds_to_string(unittest.TestCase):
572
    def test_all(self):
573
        self.assertEqual(milliseconds_to_string(93785000),
574
                         "1T02:03:05")
575
    def test_no_days(self):
576
        self.assertEqual(milliseconds_to_string(7385000), "02:03:05")
577
    def test_all_zero(self):
578
        self.assertEqual(milliseconds_to_string(0), "00:00:00")
579
    def test_no_fractional_seconds(self):
580
        self.assertEqual(milliseconds_to_string(400), "00:00:00")
581
        self.assertEqual(milliseconds_to_string(900), "00:00:00")
582
        self.assertEqual(milliseconds_to_string(1900), "00:00:01")
583
992 by Teddy Hogeborn
mandos-ctl: Add more tests
584
class Test_string_to_delta(unittest.TestCase):
585
    def test_handles_basic_rfc3339(self):
586
        self.assertEqual(string_to_delta("PT2H"),
587
                         datetime.timedelta(0, 7200))
588
    def test_falls_back_to_pre_1_6_1_with_warning(self):
589
        # assertLogs only exists in Python 3.4
590
        if hasattr(self, "assertLogs"):
591
            with self.assertLogs(log, logging.WARNING):
592
                value = string_to_delta("2h")
593
        else:
594
            value = string_to_delta("2h")
595
        self.assertEqual(value, datetime.timedelta(0, 7200))
596
995 by Teddy Hogeborn
mandos-ctl: Refactor
597
class Test_TableOfClients(unittest.TestCase):
994 by Teddy Hogeborn
mandos-ctl: Add tests for table_rows_of_clients()
598
    def setUp(self):
996 by Teddy Hogeborn
mandos-ctl: Refactor
599
        self.tablewords = {
994 by Teddy Hogeborn
mandos-ctl: Add tests for table_rows_of_clients()
600
            "Attr1": "X",
601
            "AttrTwo": "Yy",
602
            "AttrThree": "Zzz",
603
            "Bool": "A D-BUS Boolean",
604
            "NonDbusBoolean": "A Non-D-BUS Boolean",
605
            "Integer": "An Integer",
606
            "Timeout": "Timedelta 1",
607
            "Interval": "Timedelta 2",
608
            "ApprovalDelay": "Timedelta 3",
609
            "ApprovalDuration": "Timedelta 4",
610
            "ExtendedTimeout": "Timedelta 5",
611
            "String": "A String",
612
        }
613
        self.keywords = ["Attr1", "AttrTwo"]
614
        self.clients = [
615
            {
616
                "Attr1": "x1",
617
                "AttrTwo": "y1",
618
                "AttrThree": "z1",
619
                "Bool": dbus.Boolean(False),
620
                "NonDbusBoolean": False,
621
                "Integer": 0,
622
                "Timeout": 0,
623
                "Interval": 1000,
624
                "ApprovalDelay": 2000,
625
                "ApprovalDuration": 3000,
626
                "ExtendedTimeout": 4000,
627
                "String": "",
628
            },
629
            {
630
                "Attr1": "x2",
631
                "AttrTwo": "y2",
632
                "AttrThree": "z2",
633
                "Bool": dbus.Boolean(True),
634
                "NonDbusBoolean": True,
635
                "Integer": 1,
636
                "Timeout": 93785000,
637
                "Interval": 93786000,
638
                "ApprovalDelay": 93787000,
639
                "ApprovalDuration": 93788000,
640
                "ExtendedTimeout": 93789000,
641
                "String": "A huge string which will not fit," * 10,
642
            },
643
        ]
644
    def test_short_header(self):
996 by Teddy Hogeborn
mandos-ctl: Refactor
645
        rows = TableOfClients(self.clients, self.keywords,
646
                              self.tablewords).rows()
994 by Teddy Hogeborn
mandos-ctl: Add tests for table_rows_of_clients()
647
        expected_rows = [
648
            "X  Yy",
649
            "x1 y1",
650
            "x2 y2"]
651
        self.assertEqual(rows, expected_rows)
652
    def test_booleans(self):
653
        keywords = ["Bool", "NonDbusBoolean"]
996 by Teddy Hogeborn
mandos-ctl: Refactor
654
        rows = TableOfClients(self.clients, keywords,
655
                              self.tablewords).rows()
994 by Teddy Hogeborn
mandos-ctl: Add tests for table_rows_of_clients()
656
        expected_rows = [
657
            "A D-BUS Boolean A Non-D-BUS Boolean",
658
            "No              False              ",
659
            "Yes             True               ",
660
        ]
661
        self.assertEqual(rows, expected_rows)
662
    def test_milliseconds_detection(self):
663
        keywords = ["Integer", "Timeout", "Interval", "ApprovalDelay",
664
                    "ApprovalDuration", "ExtendedTimeout"]
996 by Teddy Hogeborn
mandos-ctl: Refactor
665
        rows = TableOfClients(self.clients, keywords,
666
                              self.tablewords).rows()
994 by Teddy Hogeborn
mandos-ctl: Add tests for table_rows_of_clients()
667
        expected_rows = ("""
668
An Integer Timedelta 1 Timedelta 2 Timedelta 3 Timedelta 4 Timedelta 5
669
0          00:00:00    00:00:01    00:00:02    00:00:03    00:00:04   
670
1          1T02:03:05  1T02:03:06  1T02:03:07  1T02:03:08  1T02:03:09 
671
"""
672
        ).splitlines()[1:]
673
        self.assertEqual(rows, expected_rows)
674
    def test_empty_and_long_string_values(self):
675
        keywords = ["String"]
996 by Teddy Hogeborn
mandos-ctl: Refactor
676
        rows = TableOfClients(self.clients, keywords,
677
                              self.tablewords).rows()
994 by Teddy Hogeborn
mandos-ctl: Add tests for table_rows_of_clients()
678
        expected_rows = ("""
679
A String                                                                                                                                                                                                                                                                                                                                  
680
                                                                                                                                                                                                                                                                                                                                          
681
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,
682
"""
683
        ).splitlines()[1:]
684
        self.assertEqual(rows, expected_rows)
685
686
986 by Teddy Hogeborn
Add tests to mandos-ctl's milliseconds_to_string function
687

984 by Teddy Hogeborn
Make mandos-ctl use unittest instead of doctest module
688
def should_only_run_tests():
689
    parser = argparse.ArgumentParser(add_help=False)
690
    parser.add_argument("--check", action='store_true')
691
    args, unknown_args = parser.parse_known_args()
692
    run_tests = args.check
693
    if run_tests:
694
        # Remove --check argument from sys.argv
695
        sys.argv[1:] = unknown_args
696
    return run_tests
697
698
# Add all tests from doctest strings
699
def load_tests(loader, tests, none):
700
    import doctest
701
    tests.addTests(doctest.DocTestSuite())
702
    return tests
745 by Teddy Hogeborn
mandos-ctl: Do minor formatting and whitespace adjustments.
703
463.1.8 by teddy at bsnet
* mandos-ctl: Use unicode string literals.
704
if __name__ == "__main__":
984 by Teddy Hogeborn
Make mandos-ctl use unittest instead of doctest module
705
    if should_only_run_tests():
706
        # Call using ./tdd-python-script --check [--verbose]
707
        unittest.main()
708
    else:
709
        main()