/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: 2017-08-20 14:41:20 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 360.
  • Revision ID: teddy@recompile.se-20170820144120-ee0hsyhvo1geg8ms
Handle multiple lines better in cryptroot file.

* initramfs-tools-script: Avoid running plugin-runner more than once
  if the root file system device is specially marked in the cryptroot
  file.  Also never run plugin-runner for a resume (usually swap)
  device.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
 
# 
 
3
#
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
 
# 
6
 
# Copyright © 2008-2014 Teddy Hogeborn
7
 
# Copyright © 2008-2014 Björn Påhlsson
8
 
# 
 
5
#
 
6
# Copyright © 2008-2017 Teddy Hogeborn
 
7
# Copyright © 2008-2017 Björn Påhlsson
 
8
#
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
11
11
# the Free Software Foundation, either version 3 of the License, or
15
15
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
16
16
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
17
#     GNU General Public License for more details.
18
 
# 
 
18
#
19
19
# You should have received a copy of the GNU General Public License
20
20
# along with this program.  If not, see
21
21
# <http://www.gnu.org/licenses/>.
22
 
# 
 
22
#
23
23
# Contact the authors at <mandos@recompile.se>.
24
 
# 
 
24
#
25
25
 
26
26
from __future__ import (division, absolute_import, print_function,
27
27
                        unicode_literals)
38
38
import re
39
39
import os
40
40
import collections
41
 
import doctest
 
41
import json
42
42
 
43
43
import dbus
44
44
 
45
 
if sys.version_info[0] == 2:
 
45
if sys.version_info.major == 2:
46
46
    str = unicode
47
47
 
48
48
locale.setlocale(locale.LC_ALL, "")
64
64
    "ApprovalDelay": "Approval Delay",
65
65
    "ApprovalDuration": "Approval Duration",
66
66
    "Checker": "Checker",
67
 
    "ExtendedTimeout" : "Extended Timeout"
68
 
    }
 
67
    "ExtendedTimeout": "Extended Timeout",
 
68
    "Expires": "Expires",
 
69
    "LastCheckerStatus": "Last Checker Status",
 
70
}
69
71
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
70
72
domain = "se.recompile"
71
73
busname = domain + ".Mandos"
72
74
server_path = "/"
73
75
server_interface = domain + ".Mandos"
74
76
client_interface = domain + ".Mandos.Client"
75
 
version = "1.6.7"
76
 
 
77
 
def timedelta_to_milliseconds(td):
78
 
    """Convert a datetime.timedelta object to milliseconds"""
79
 
    return ((td.days * 24 * 60 * 60 * 1000)
80
 
            + (td.seconds * 1000)
81
 
            + (td.microseconds // 1000))
 
77
version = "1.7.15"
 
78
 
 
79
 
 
80
try:
 
81
    dbus.OBJECT_MANAGER_IFACE
 
82
except AttributeError:
 
83
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
84
 
82
85
 
83
86
def milliseconds_to_string(ms):
84
87
    td = datetime.timedelta(0, 0, 0, ms)
85
88
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
86
 
            .format(days = "{0}T".format(td.days) if td.days else "",
87
 
                    hours = td.seconds // 3600,
88
 
                    minutes = (td.seconds % 3600) // 60,
89
 
                    seconds = td.seconds % 60,
90
 
                    ))
 
89
            .format(days="{}T".format(td.days) if td.days else "",
 
90
                    hours=td.seconds // 3600,
 
91
                    minutes=(td.seconds % 3600) // 60,
 
92
                    seconds=td.seconds % 60))
91
93
 
92
94
 
93
95
def rfc3339_duration_to_delta(duration):
94
96
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
95
 
    
 
97
 
96
98
    >>> rfc3339_duration_to_delta("P7D")
97
99
    datetime.timedelta(7)
98
100
    >>> rfc3339_duration_to_delta("PT60S")
108
110
    >>> rfc3339_duration_to_delta("P1DT3M20S")
109
111
    datetime.timedelta(1, 200)
110
112
    """
111
 
    
 
113
 
112
114
    # Parsing an RFC 3339 duration with regular expressions is not
113
115
    # possible - there would have to be multiple places for the same
114
116
    # values, like seconds.  The current code, while more esoteric, is
115
117
    # cleaner without depending on a parsing library.  If Python had a
116
118
    # built-in library for parsing we would use it, but we'd like to
117
119
    # avoid excessive use of external libraries.
118
 
    
 
120
 
119
121
    # New type for defining tokens, syntax, and semantics all-in-one
120
 
    Token = collections.namedtuple("Token",
121
 
                                   ("regexp", # To match token; if
122
 
                                              # "value" is not None,
123
 
                                              # must have a "group"
124
 
                                              # containing digits
125
 
                                    "value",  # datetime.timedelta or
126
 
                                              # None
127
 
                                    "followers")) # Tokens valid after
128
 
                                                  # this token
 
122
    Token = collections.namedtuple("Token", (
 
123
        "regexp",  # To match token; if "value" is not None, must have
 
124
                   # a "group" containing digits
 
125
        "value",   # datetime.timedelta or None
 
126
        "followers"))           # Tokens valid after this token
129
127
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
130
128
    # the "duration" ABNF definition in RFC 3339, Appendix A.
131
129
    token_end = Token(re.compile(r"$"), None, frozenset())
132
130
    token_second = Token(re.compile(r"(\d+)S"),
133
131
                         datetime.timedelta(seconds=1),
134
 
                         frozenset((token_end,)))
 
132
                         frozenset((token_end, )))
135
133
    token_minute = Token(re.compile(r"(\d+)M"),
136
134
                         datetime.timedelta(minutes=1),
137
135
                         frozenset((token_second, token_end)))
153
151
                       frozenset((token_month, token_end)))
154
152
    token_week = Token(re.compile(r"(\d+)W"),
155
153
                       datetime.timedelta(weeks=1),
156
 
                       frozenset((token_end,)))
 
154
                       frozenset((token_end, )))
157
155
    token_duration = Token(re.compile(r"P"), None,
158
156
                           frozenset((token_year, token_month,
159
157
                                      token_day, token_time,
160
158
                                      token_week)))
161
 
    # Define starting values
162
 
    value = datetime.timedelta() # Value so far
 
159
    # Define starting values:
 
160
    # Value so far
 
161
    value = datetime.timedelta()
163
162
    found_token = None
164
 
    followers = frozenset((token_duration,)) # Following valid tokens
165
 
    s = duration                # String left to parse
 
163
    # Following valid tokens
 
164
    followers = frozenset((token_duration, ))
 
165
    # String left to parse
 
166
    s = duration
166
167
    # Loop until end token is found
167
168
    while found_token is not token_end:
168
169
        # Search for any currently valid tokens
184
185
                break
185
186
        else:
186
187
            # No currently valid tokens were found
187
 
            raise ValueError("Invalid RFC 3339 duration")
 
188
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
189
                             .format(duration))
188
190
    # End token found
189
191
    return value
190
192
 
191
193
 
192
194
def string_to_delta(interval):
193
195
    """Parse a string and return a datetime.timedelta
194
 
    
195
 
    >>> string_to_delta("7d")
 
196
 
 
197
    >>> string_to_delta('7d')
196
198
    datetime.timedelta(7)
197
 
    >>> string_to_delta("60s")
 
199
    >>> string_to_delta('60s')
198
200
    datetime.timedelta(0, 60)
199
 
    >>> string_to_delta("60m")
 
201
    >>> string_to_delta('60m')
200
202
    datetime.timedelta(0, 3600)
201
 
    >>> string_to_delta("24h")
 
203
    >>> string_to_delta('24h')
202
204
    datetime.timedelta(1)
203
 
    >>> string_to_delta("1w")
 
205
    >>> string_to_delta('1w')
204
206
    datetime.timedelta(7)
205
 
    >>> string_to_delta("5m 30s")
 
207
    >>> string_to_delta('5m 30s')
206
208
    datetime.timedelta(0, 330)
207
209
    """
208
 
    
 
210
 
209
211
    try:
210
212
        return rfc3339_duration_to_delta(interval)
211
213
    except ValueError:
212
214
        pass
213
 
    
 
215
 
214
216
    value = datetime.timedelta(0)
215
217
    regexp = re.compile(r"(\d+)([dsmhw]?)")
216
 
    
 
218
 
217
219
    for num, suffix in regexp.findall(interval):
218
220
        if suffix == "d":
219
221
            value += datetime.timedelta(int(num))
229
231
            value += datetime.timedelta(0, 0, 0, int(num))
230
232
    return value
231
233
 
 
234
 
232
235
def print_clients(clients, keywords):
233
236
    def valuetostring(value, keyword):
234
237
        if type(value) is dbus.Boolean:
237
240
                       "ApprovalDuration", "ExtendedTimeout"):
238
241
            return milliseconds_to_string(value)
239
242
        return str(value)
240
 
    
 
243
 
241
244
    # Create format string to print table rows
242
245
    format_string = " ".join("{{{key}:{width}}}".format(
243
 
            width = max(len(tablewords[key]),
244
 
                        max(len(valuetostring(client[key],
245
 
                                              key))
246
 
                            for client in
247
 
                            clients)),
248
 
            key = key) for key in keywords)
 
246
        width=max(len(tablewords[key]),
 
247
                  max(len(valuetostring(client[key], key))
 
248
                      for client in clients)),
 
249
        key=key)
 
250
                             for key in keywords)
249
251
    # Print header line
250
252
    print(format_string.format(**tablewords))
251
253
    for client in clients:
252
 
        print(format_string.format(**dict((key,
253
 
                                           valuetostring(client[key],
254
 
                                                         key))
255
 
                                          for key in keywords)))
 
254
        print(format_string
 
255
              .format(**{key: valuetostring(client[key], key)
 
256
                         for key in keywords}))
 
257
 
256
258
 
257
259
def has_actions(options):
258
260
    return any((options.enable,
274
276
                options.approve,
275
277
                options.deny))
276
278
 
 
279
 
277
280
def main():
278
281
    parser = argparse.ArgumentParser()
279
282
    parser.add_argument("--version", action="version",
280
 
                        version = "%(prog)s {0}".format(version),
 
283
                        version="%(prog)s {}".format(version),
281
284
                        help="show version number and exit")
282
285
    parser.add_argument("-a", "--all", action="store_true",
283
286
                        help="Select all clients")
284
287
    parser.add_argument("-v", "--verbose", action="store_true",
285
288
                        help="Print all fields")
 
289
    parser.add_argument("-j", "--dump-json", action="store_true",
 
290
                        help="Dump client data in JSON format")
286
291
    parser.add_argument("-e", "--enable", action="store_true",
287
292
                        help="Enable client")
288
293
    parser.add_argument("-d", "--disable", action="store_true",
327
332
                        help="Run self-test")
328
333
    parser.add_argument("client", nargs="*", help="Client name")
329
334
    options = parser.parse_args()
330
 
    
 
335
 
331
336
    if has_actions(options) and not (options.client or options.all):
332
337
        parser.error("Options require clients names or --all.")
333
338
    if options.verbose and has_actions(options):
334
 
        parser.error("--verbose can only be used alone or with"
335
 
                     " --all.")
 
339
        parser.error("--verbose can only be used alone.")
 
340
    if options.dump_json and (options.verbose
 
341
                              or has_actions(options)):
 
342
        parser.error("--dump-json can only be used alone.")
336
343
    if options.all and not has_actions(options):
337
344
        parser.error("--all requires an action.")
338
345
 
339
346
    if options.check:
 
347
        import doctest
340
348
        fail_count, test_count = doctest.testmod()
341
349
        sys.exit(os.EX_OK if fail_count == 0 else 1)
342
 
    
 
350
 
343
351
    try:
344
352
        bus = dbus.SystemBus()
345
353
        mandos_dbus_objc = bus.get_object(busname, server_path)
346
354
    except dbus.exceptions.DBusException:
347
 
        print("Could not connect to Mandos server",
348
 
              file=sys.stderr)
 
355
        print("Could not connect to Mandos server", file=sys.stderr)
349
356
        sys.exit(1)
350
 
    
 
357
 
351
358
    mandos_serv = dbus.Interface(mandos_dbus_objc,
352
 
                                 dbus_interface = server_interface)
353
 
    
354
 
    #block stderr since dbus library prints to stderr
 
359
                                 dbus_interface=server_interface)
 
360
    mandos_serv_object_manager = dbus.Interface(
 
361
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
 
362
 
 
363
    # block stderr since dbus library prints to stderr
355
364
    null = os.open(os.path.devnull, os.O_RDWR)
356
365
    stderrcopy = os.dup(sys.stderr.fileno())
357
366
    os.dup2(null, sys.stderr.fileno())
358
367
    os.close(null)
359
368
    try:
360
369
        try:
361
 
            mandos_clients = mandos_serv.GetAllClientsWithProperties()
 
370
            mandos_clients = {path: ifs_and_props[client_interface]
 
371
                              for path, ifs_and_props in
 
372
                              mandos_serv_object_manager
 
373
                              .GetManagedObjects().items()
 
374
                              if client_interface in ifs_and_props}
362
375
        finally:
363
 
            #restore stderr
 
376
            # restore stderr
364
377
            os.dup2(stderrcopy, sys.stderr.fileno())
365
378
            os.close(stderrcopy)
366
 
    except dbus.exceptions.DBusException:
367
 
        print("Access denied: Accessing mandos server through dbus.",
 
379
    except dbus.exceptions.DBusException as e:
 
380
        print("Access denied: "
 
381
              "Accessing mandos server through D-Bus: {}".format(e),
368
382
              file=sys.stderr)
369
383
        sys.exit(1)
370
 
    
 
384
 
371
385
    # Compile dict of (clients: properties) to process
372
 
    clients={}
373
 
    
 
386
    clients = {}
 
387
 
374
388
    if options.all or not options.client:
375
 
        clients = dict((bus.get_object(busname, path), properties)
376
 
                       for path, properties in
377
 
                       mandos_clients.items())
 
389
        clients = {bus.get_object(busname, path): properties
 
390
                   for path, properties in mandos_clients.items()}
378
391
    else:
379
392
        for name in options.client:
380
 
            for path, client in mandos_clients.iteritems():
 
393
            for path, client in mandos_clients.items():
381
394
                if client["Name"] == name:
382
395
                    client_objc = bus.get_object(busname, path)
383
396
                    clients[client_objc] = client
384
397
                    break
385
398
            else:
386
 
                print("Client not found on server: {0!r}"
 
399
                print("Client not found on server: {!r}"
387
400
                      .format(name), file=sys.stderr)
388
401
                sys.exit(1)
389
 
    
 
402
 
390
403
    if not has_actions(options) and clients:
391
 
        if options.verbose:
392
 
            keywords = ("Name", "Enabled", "Timeout",
393
 
                        "LastCheckedOK", "Created", "Interval",
394
 
                        "Host", "Fingerprint", "CheckerRunning",
395
 
                        "LastEnabled", "ApprovalPending",
396
 
                        "ApprovedByDefault",
 
404
        if options.verbose or options.dump_json:
 
405
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
 
406
                        "Created", "Interval", "Host", "Fingerprint",
 
407
                        "CheckerRunning", "LastEnabled",
 
408
                        "ApprovalPending", "ApprovedByDefault",
397
409
                        "LastApprovalRequest", "ApprovalDelay",
398
410
                        "ApprovalDuration", "Checker",
399
 
                        "ExtendedTimeout")
 
411
                        "ExtendedTimeout", "Expires",
 
412
                        "LastCheckerStatus")
400
413
        else:
401
414
            keywords = defaultkeywords
402
 
        
403
 
        print_clients(clients.values(), keywords)
 
415
 
 
416
        if options.dump_json:
 
417
            json.dump({client["Name"]: {key:
 
418
                                        bool(client[key])
 
419
                                        if isinstance(client[key],
 
420
                                                      dbus.Boolean)
 
421
                                        else client[key]
 
422
                                        for key in keywords}
 
423
                       for client in clients.values()},
 
424
                      fp=sys.stdout, indent=4,
 
425
                      separators=(',', ': '))
 
426
            print()
 
427
        else:
 
428
            print_clients(clients.values(), keywords)
404
429
    else:
405
430
        # Process each client in the list by all selected options
406
431
        for client in clients:
 
432
 
407
433
            def set_client_prop(prop, value):
408
434
                """Set a Client D-Bus property"""
409
435
                client.Set(client_interface, prop, value,
410
436
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
437
 
411
438
            def set_client_prop_ms(prop, value):
412
439
                """Set a Client D-Bus property, converted
413
440
                from a string to milliseconds."""
414
441
                set_client_prop(prop,
415
 
                                timedelta_to_milliseconds
416
 
                                (string_to_delta(value)))
 
442
                                string_to_delta(value).total_seconds()
 
443
                                * 1000)
 
444
 
417
445
            if options.remove:
418
446
                mandos_serv.RemoveClient(client.__dbus_object_path__)
419
447
            if options.enable:
427
455
            if options.stop_checker:
428
456
                set_client_prop("CheckerRunning", dbus.Boolean(False))
429
457
            if options.is_enabled:
430
 
                sys.exit(0 if client.Get(client_interface,
431
 
                                         "Enabled",
432
 
                                         dbus_interface=
433
 
                                         dbus.PROPERTIES_IFACE)
434
 
                         else 1)
 
458
                if client.Get(client_interface, "Enabled",
 
459
                              dbus_interface=dbus.PROPERTIES_IFACE):
 
460
                    sys.exit(0)
 
461
                else:
 
462
                    sys.exit(1)
435
463
            if options.checker is not None:
436
464
                set_client_prop("Checker", options.checker)
437
465
            if options.host is not None:
463
491
                client.Approve(dbus.Boolean(False),
464
492
                               dbus_interface=client_interface)
465
493
 
 
494
 
466
495
if __name__ == "__main__":
467
496
    main()