/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: 2014-06-08 17:36:33 UTC
  • Revision ID: teddy@recompile.se-20140608173633-miqqavhoxym10uiz
Fix mandos server "--servicename" option, broken since 1.6.4.

* mandos (initlogger): Make "syslogger" a global variable again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
26
26
from __future__ import (division, absolute_import, print_function,
27
27
                        unicode_literals)
28
28
 
29
 
try:
30
 
    from future_builtins import *
31
 
except ImportError:
32
 
    pass
 
29
from future_builtins import *
33
30
 
34
31
import sys
35
32
import argparse
42
39
 
43
40
import dbus
44
41
 
45
 
if sys.version_info[0] == 2:
46
 
    str = unicode
47
 
 
48
42
locale.setlocale(locale.LC_ALL, "")
49
43
 
50
44
tablewords = {
72
66
server_path = "/"
73
67
server_interface = domain + ".Mandos"
74
68
client_interface = domain + ".Mandos.Client"
75
 
version = "1.6.7"
 
69
version = "1.6.5"
76
70
 
77
71
def timedelta_to_milliseconds(td):
78
72
    """Convert a datetime.timedelta object to milliseconds"""
83
77
def milliseconds_to_string(ms):
84
78
    td = datetime.timedelta(0, 0, 0, ms)
85
79
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
86
 
            .format(days = "{}T".format(td.days) if td.days else "",
 
80
            .format(days = "{0}T".format(td.days) if td.days else "",
87
81
                    hours = td.seconds // 3600,
88
82
                    minutes = (td.seconds % 3600) // 60,
89
83
                    seconds = td.seconds % 60,
157
151
    token_duration = Token(re.compile(r"P"), None,
158
152
                           frozenset((token_year, token_month,
159
153
                                      token_day, token_time,
160
 
                                      token_week)))
 
154
                                      token_week))),
161
155
    # Define starting values
162
156
    value = datetime.timedelta() # Value so far
163
157
    found_token = None
164
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
158
    followers = frozenset(token_duration,) # Following valid tokens
165
159
    s = duration                # String left to parse
166
160
    # Loop until end token is found
167
161
    while found_token is not token_end:
236
230
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
237
231
                       "ApprovalDuration", "ExtendedTimeout"):
238
232
            return milliseconds_to_string(value)
239
 
        return str(value)
 
233
        return unicode(value)
240
234
    
241
235
    # Create format string to print table rows
242
236
    format_string = " ".join("{{{key}:{width}}}".format(
249
243
    # Print header line
250
244
    print(format_string.format(**tablewords))
251
245
    for client in clients:
252
 
        print(format_string.format(**{ key:
 
246
        print(format_string.format(**dict((key,
253
247
                                           valuetostring(client[key],
254
 
                                                         key)
255
 
                                       for key in keywords }))
 
248
                                                         key))
 
249
                                          for key in keywords)))
256
250
 
257
251
def has_actions(options):
258
252
    return any((options.enable,
277
271
def main():
278
272
    parser = argparse.ArgumentParser()
279
273
    parser.add_argument("--version", action="version",
280
 
                        version = "%(prog)s {}".format(version),
 
274
                        version = "%(prog)s {0}".format(version),
281
275
                        help="show version number and exit")
282
276
    parser.add_argument("-a", "--all", action="store_true",
283
277
                        help="Select all clients")
316
310
    parser.add_argument("--approval-duration",
317
311
                        help="Set duration of one client approval")
318
312
    parser.add_argument("-H", "--host", help="Set host for client")
319
 
    parser.add_argument("-s", "--secret",
320
 
                        type=argparse.FileType(mode="rb"),
 
313
    parser.add_argument("-s", "--secret", type=file,
321
314
                        help="Set password blob (file) for client")
322
315
    parser.add_argument("-A", "--approve", action="store_true",
323
316
                        help="Approve any current client request")
372
365
    clients={}
373
366
    
374
367
    if options.all or not options.client:
375
 
        clients = { bus.get_object(busname, path): properties
376
 
                    for path, properties in mandos_clients.items() }
 
368
        clients = dict((bus.get_object(busname, path), properties)
 
369
                       for path, properties in
 
370
                       mandos_clients.iteritems())
377
371
    else:
378
372
        for name in options.client:
379
 
            for path, client in mandos_clients.items():
 
373
            for path, client in mandos_clients.iteritems():
380
374
                if client["Name"] == name:
381
375
                    client_objc = bus.get_object(busname, path)
382
376
                    clients[client_objc] = client
383
377
                    break
384
378
            else:
385
 
                print("Client not found on server: {!r}"
 
379
                print("Client not found on server: {0!r}"
386
380
                      .format(name), file=sys.stderr)
387
381
                sys.exit(1)
388
382