/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2016-06-03 18:28:39 UTC
  • Revision ID: teddy@recompile.se-20160603182839-064dp506ht0ylzrt
mandos: Bug fix for Python 2.7 and the "--interface" option

* mandos: Try harder at program start to find correct value of
          SO_BINDTODEVICE, even if it is missing from the Python
          standard libraries.
  (IPv6_TCPServer.server_bind): If SO_BINDTODEVICE was not found, fall
                                back to a hard-coded value (and emit
                                warning).

Reported-by: Valerio Bellizzomi <valerio@selnet.org>

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-2014 Teddy Hogeborn
7
 
# Copyright © 2008-2014 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
64
64
    "ApprovalDelay": "Approval Delay",
65
65
    "ApprovalDuration": "Approval Duration",
66
66
    "Checker": "Checker",
67
 
    "ExtendedTimeout" : "Extended Timeout"
68
 
    }
 
67
    "ExtendedTimeout": "Extended Timeout"
 
68
}
69
69
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
70
70
domain = "se.recompile"
71
71
busname = domain + ".Mandos"
72
72
server_path = "/"
73
73
server_interface = domain + ".Mandos"
74
74
client_interface = domain + ".Mandos.Client"
75
 
version = "1.6.8"
 
75
version = "1.7.7"
 
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 = "{}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,
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:
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(**{ 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",
338
341
        bus = dbus.SystemBus()
339
342
        mandos_dbus_objc = bus.get_object(busname, server_path)
340
343
    except dbus.exceptions.DBusException:
341
 
        print("Could not connect to Mandos server",
342
 
              file=sys.stderr)
 
344
        print("Could not connect to Mandos server", file=sys.stderr)
343
345
        sys.exit(1)
344
346
    
345
347
    mandos_serv = dbus.Interface(mandos_dbus_objc,
346
348
                                 dbus_interface = server_interface)
 
349
    mandos_serv_object_manager = dbus.Interface(
 
350
        mandos_dbus_objc, dbus_interface = dbus.OBJECT_MANAGER_IFACE)
347
351
    
348
352
    #block stderr since dbus library prints to stderr
349
353
    null = os.open(os.path.devnull, os.O_RDWR)
352
356
    os.close(null)
353
357
    try:
354
358
        try:
355
 
            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 }
356
364
        finally:
357
365
            #restore stderr
358
366
            os.dup2(stderrcopy, sys.stderr.fileno())
359
367
            os.close(stderrcopy)
360
 
    except dbus.exceptions.DBusException:
361
 
        print("Access denied: Accessing mandos server through dbus.",
362
 
              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)
363
371
        sys.exit(1)
364
372
    
365
373
    # Compile dict of (clients: properties) to process
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
417
                                string_to_delta(value).total_seconds()
409
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()