/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: 2016-03-17 21:14:12 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 341.
  • Revision ID: teddy@recompile.se-20160317211412-yp8msw4v4ifx4i4x
Client: Remove dead code in plugin-runner

WCOREDUMP is always a subset of WTERMSIG; ignore WCOREDUMP.

* plugin-runner.c (main): Remove WCOREDUMP clause.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
3
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
# 
6
 
# Copyright © 2008-2012 Teddy Hogeborn
7
 
# Copyright © 2008-2012 Björn Påhlsson
 
6
# Copyright © 2008-2016 Teddy Hogeborn
 
7
# Copyright © 2008-2016 Björn Påhlsson
8
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
26
26
from __future__ import (division, absolute_import, print_function,
27
27
                        unicode_literals)
28
28
 
29
 
from future_builtins import *
 
29
try:
 
30
    from future_builtins import *
 
31
except ImportError:
 
32
    pass
30
33
 
31
34
import sys
32
35
import argparse
39
42
 
40
43
import dbus
41
44
 
 
45
if sys.version_info.major == 2:
 
46
    str = unicode
 
47
 
42
48
locale.setlocale(locale.LC_ALL, "")
43
49
 
44
50
tablewords = {
58
64
    "ApprovalDelay": "Approval Delay",
59
65
    "ApprovalDuration": "Approval Duration",
60
66
    "Checker": "Checker",
61
 
    "ExtendedTimeout" : "Extended Timeout"
62
 
    }
 
67
    "ExtendedTimeout": "Extended Timeout"
 
68
}
63
69
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
64
70
domain = "se.recompile"
65
71
busname = domain + ".Mandos"
66
72
server_path = "/"
67
73
server_interface = domain + ".Mandos"
68
74
client_interface = domain + ".Mandos.Client"
69
 
version = "1.6.3"
70
 
 
71
 
def timedelta_to_milliseconds(td):
72
 
    """Convert a datetime.timedelta object to milliseconds"""
73
 
    return ((td.days * 24 * 60 * 60 * 1000)
74
 
            + (td.seconds * 1000)
75
 
            + (td.microseconds // 1000))
 
75
version = "1.7.6"
 
76
 
 
77
 
 
78
try:
 
79
    dbus.OBJECT_MANAGER_IFACE
 
80
except AttributeError:
 
81
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
76
82
 
77
83
def milliseconds_to_string(ms):
78
84
    td = datetime.timedelta(0, 0, 0, ms)
79
 
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
80
 
            .format(days = "{0}T".format(td.days) if td.days else "",
81
 
                    hours = td.seconds // 3600,
82
 
                    minutes = (td.seconds % 3600) // 60,
83
 
                    seconds = td.seconds % 60,
84
 
                    ))
 
85
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}".format(
 
86
        days = "{}T".format(td.days) if td.days else "",
 
87
        hours = td.seconds // 3600,
 
88
        minutes = (td.seconds % 3600) // 60,
 
89
        seconds = td.seconds % 60))
85
90
 
86
91
 
87
92
def rfc3339_duration_to_delta(duration):
111
116
    # avoid excessive use of external libraries.
112
117
    
113
118
    # New type for defining tokens, syntax, and semantics all-in-one
114
 
    Token = collections.namedtuple("Token",
115
 
                                   ("regexp", # To match token; if
116
 
                                              # "value" is not None,
117
 
                                              # must have a "group"
118
 
                                              # containing digits
119
 
                                    "value",  # datetime.timedelta or
120
 
                                              # None
121
 
                                    "followers")) # Tokens valid after
122
 
                                                  # this token
 
119
    Token = collections.namedtuple("Token", (
 
120
        "regexp",  # To match token; if "value" is not None, must have
 
121
                   # a "group" containing digits
 
122
        "value",   # datetime.timedelta or None
 
123
        "followers"))           # Tokens valid after this token
123
124
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
124
125
    # the "duration" ABNF definition in RFC 3339, Appendix A.
125
126
    token_end = Token(re.compile(r"$"), None, frozenset())
126
127
    token_second = Token(re.compile(r"(\d+)S"),
127
128
                         datetime.timedelta(seconds=1),
128
 
                         frozenset((token_end,)))
 
129
                         frozenset((token_end, )))
129
130
    token_minute = Token(re.compile(r"(\d+)M"),
130
131
                         datetime.timedelta(minutes=1),
131
132
                         frozenset((token_second, token_end)))
147
148
                       frozenset((token_month, token_end)))
148
149
    token_week = Token(re.compile(r"(\d+)W"),
149
150
                       datetime.timedelta(weeks=1),
150
 
                       frozenset((token_end,)))
 
151
                       frozenset((token_end, )))
151
152
    token_duration = Token(re.compile(r"P"), None,
152
153
                           frozenset((token_year, token_month,
153
154
                                      token_day, token_time,
154
 
                                      token_week))),
 
155
                                      token_week)))
155
156
    # Define starting values
156
157
    value = datetime.timedelta() # Value so far
157
158
    found_token = None
158
 
    followers = frozenset(token_duration,) # Following valid tokens
 
159
    followers = frozenset((token_duration, )) # Following valid tokens
159
160
    s = duration                # String left to parse
160
161
    # Loop until end token is found
161
162
    while found_token is not token_end:
178
179
                break
179
180
        else:
180
181
            # No currently valid tokens were found
181
 
            raise ValueError("Invalid RFC 3339 duration")
 
182
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
183
                             .format(duration))
182
184
    # End token found
183
185
    return value
184
186
 
186
188
def string_to_delta(interval):
187
189
    """Parse a string and return a datetime.timedelta
188
190
    
189
 
    >>> string_to_delta("7d")
 
191
    >>> string_to_delta('7d')
190
192
    datetime.timedelta(7)
191
 
    >>> string_to_delta("60s")
 
193
    >>> string_to_delta('60s')
192
194
    datetime.timedelta(0, 60)
193
 
    >>> string_to_delta("60m")
 
195
    >>> string_to_delta('60m')
194
196
    datetime.timedelta(0, 3600)
195
 
    >>> string_to_delta("24h")
 
197
    >>> string_to_delta('24h')
196
198
    datetime.timedelta(1)
197
 
    >>> string_to_delta("1w")
 
199
    >>> string_to_delta('1w')
198
200
    datetime.timedelta(7)
199
 
    >>> string_to_delta("5m 30s")
 
201
    >>> string_to_delta('5m 30s')
200
202
    datetime.timedelta(0, 330)
201
203
    """
202
204
    
223
225
            value += datetime.timedelta(0, 0, 0, int(num))
224
226
    return value
225
227
 
 
228
 
226
229
def print_clients(clients, keywords):
227
230
    def valuetostring(value, keyword):
228
231
        if type(value) is dbus.Boolean:
230
233
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
231
234
                       "ApprovalDuration", "ExtendedTimeout"):
232
235
            return milliseconds_to_string(value)
233
 
        return unicode(value)
 
236
        return str(value)
234
237
    
235
238
    # Create format string to print table rows
236
239
    format_string = " ".join("{{{key}:{width}}}".format(
237
 
            width = max(len(tablewords[key]),
238
 
                        max(len(valuetostring(client[key],
239
 
                                              key))
240
 
                            for client in
241
 
                            clients)),
242
 
            key = key) for key in keywords)
 
240
        width = max(len(tablewords[key]),
 
241
                    max(len(valuetostring(client[key], key))
 
242
                        for client in clients)),
 
243
        key = key)
 
244
                             for key in keywords)
243
245
    # Print header line
244
246
    print(format_string.format(**tablewords))
245
247
    for client in clients:
246
 
        print(format_string.format(**dict((key,
247
 
                                           valuetostring(client[key],
248
 
                                                         key))
249
 
                                          for key in keywords)))
 
248
        print(format_string.format(**{
 
249
            key: valuetostring(client[key], key)
 
250
            for key in keywords }))
 
251
 
250
252
 
251
253
def has_actions(options):
252
254
    return any((options.enable,
268
270
                options.approve,
269
271
                options.deny))
270
272
 
 
273
 
271
274
def main():
272
275
    parser = argparse.ArgumentParser()
273
276
    parser.add_argument("--version", action="version",
274
 
                        version = "%(prog)s {0}".format(version),
 
277
                        version = "%(prog)s {}".format(version),
275
278
                        help="show version number and exit")
276
279
    parser.add_argument("-a", "--all", action="store_true",
277
280
                        help="Select all clients")
310
313
    parser.add_argument("--approval-duration",
311
314
                        help="Set duration of one client approval")
312
315
    parser.add_argument("-H", "--host", help="Set host for client")
313
 
    parser.add_argument("-s", "--secret", type=file,
 
316
    parser.add_argument("-s", "--secret",
 
317
                        type=argparse.FileType(mode="rb"),
314
318
                        help="Set password blob (file) for client")
315
319
    parser.add_argument("-A", "--approve", action="store_true",
316
320
                        help="Approve any current client request")
337
341
        bus = dbus.SystemBus()
338
342
        mandos_dbus_objc = bus.get_object(busname, server_path)
339
343
    except dbus.exceptions.DBusException:
340
 
        print("Could not connect to Mandos server",
341
 
              file=sys.stderr)
 
344
        print("Could not connect to Mandos server", file=sys.stderr)
342
345
        sys.exit(1)
343
346
    
344
347
    mandos_serv = dbus.Interface(mandos_dbus_objc,
345
348
                                 dbus_interface = server_interface)
 
349
    mandos_serv_object_manager = dbus.Interface(
 
350
        mandos_dbus_objc, dbus_interface = dbus.OBJECT_MANAGER_IFACE)
346
351
    
347
352
    #block stderr since dbus library prints to stderr
348
353
    null = os.open(os.path.devnull, os.O_RDWR)
351
356
    os.close(null)
352
357
    try:
353
358
        try:
354
 
            mandos_clients = mandos_serv.GetAllClientsWithProperties()
 
359
            mandos_clients = { path: ifs_and_props[client_interface]
 
360
                               for path, ifs_and_props in
 
361
                               mandos_serv_object_manager
 
362
                               .GetManagedObjects().items()
 
363
                               if client_interface in ifs_and_props }
355
364
        finally:
356
365
            #restore stderr
357
366
            os.dup2(stderrcopy, sys.stderr.fileno())
358
367
            os.close(stderrcopy)
359
 
    except dbus.exceptions.DBusException:
360
 
        print("Access denied: Accessing mandos server through dbus.",
361
 
              file=sys.stderr)
 
368
    except dbus.exceptions.DBusException as e:
 
369
        print("Access denied: Accessing mandos server through D-Bus: {}"
 
370
              .format(e), file=sys.stderr)
362
371
        sys.exit(1)
363
372
    
364
373
    # Compile dict of (clients: properties) to process
365
374
    clients={}
366
375
    
367
376
    if options.all or not options.client:
368
 
        clients = dict((bus.get_object(busname, path), properties)
369
 
                       for path, properties in
370
 
                       mandos_clients.iteritems())
 
377
        clients = { bus.get_object(busname, path): properties
 
378
                    for path, properties in mandos_clients.items() }
371
379
    else:
372
380
        for name in options.client:
373
 
            for path, client in mandos_clients.iteritems():
 
381
            for path, client in mandos_clients.items():
374
382
                if client["Name"] == name:
375
383
                    client_objc = bus.get_object(busname, path)
376
384
                    clients[client_objc] = client
377
385
                    break
378
386
            else:
379
 
                print("Client not found on server: {0!r}"
 
387
                print("Client not found on server: {!r}"
380
388
                      .format(name), file=sys.stderr)
381
389
                sys.exit(1)
382
390
    
383
391
    if not has_actions(options) and clients:
384
392
        if options.verbose:
385
 
            keywords = ("Name", "Enabled", "Timeout",
386
 
                        "LastCheckedOK", "Created", "Interval",
387
 
                        "Host", "Fingerprint", "CheckerRunning",
388
 
                        "LastEnabled", "ApprovalPending",
389
 
                        "ApprovedByDefault",
 
393
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
 
394
                        "Created", "Interval", "Host", "Fingerprint",
 
395
                        "CheckerRunning", "LastEnabled",
 
396
                        "ApprovalPending", "ApprovedByDefault",
390
397
                        "LastApprovalRequest", "ApprovalDelay",
391
398
                        "ApprovalDuration", "Checker",
392
399
                        "ExtendedTimeout")
397
404
    else:
398
405
        # Process each client in the list by all selected options
399
406
        for client in clients:
 
407
            
400
408
            def set_client_prop(prop, value):
401
409
                """Set a Client D-Bus property"""
402
410
                client.Set(client_interface, prop, value,
403
411
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
412
            
404
413
            def set_client_prop_ms(prop, value):
405
414
                """Set a Client D-Bus property, converted
406
415
                from a string to milliseconds."""
407
416
                set_client_prop(prop,
408
 
                                timedelta_to_milliseconds
409
 
                                (string_to_delta(value)))
 
417
                                string_to_delta(value).total_seconds()
 
418
                                * 1000)
 
419
            
410
420
            if options.remove:
411
421
                mandos_serv.RemoveClient(client.__dbus_object_path__)
412
422
            if options.enable:
456
466
                client.Approve(dbus.Boolean(False),
457
467
                               dbus_interface=client_interface)
458
468
 
 
469
 
459
470
if __name__ == "__main__":
460
471
    main()