/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 at bsnet
  • Date: 2011-02-15 19:27:23 UTC
  • mto: This revision was merged to the branch mainline in revision 465.
  • Revision ID: teddy@fukt.bsnet.se-20110215192723-qpftjhlvzadm5cjc
* mandos-ctl: Use unicode string literals.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
22
22
# Contact the authors at <mandos@fukt.bsnet.se>.
23
23
# 
24
24
 
25
 
from __future__ import division
 
25
from __future__ import division, absolute_import, unicode_literals
 
26
 
26
27
import sys
27
28
import dbus
28
29
from optparse import OptionParser
31
32
import re
32
33
import os
33
34
 
34
 
locale.setlocale(locale.LC_ALL, u"")
 
35
locale.setlocale(locale.LC_ALL, "")
35
36
 
36
37
tablewords = {
37
 
    u"Name": u"Name",
38
 
    u"Enabled": u"Enabled",
39
 
    u"Timeout": u"Timeout",
40
 
    u"LastCheckedOK": u"Last Successful Check",
41
 
    u"LastApprovalRequest": u"Last Approval Request",
42
 
    u"Created": u"Created",
43
 
    u"Interval": u"Interval",
44
 
    u"Host": u"Host",
45
 
    u"Fingerprint": u"Fingerprint",
46
 
    u"CheckerRunning": u"Check Is Running",
47
 
    u"LastEnabled": u"Last Enabled",
48
 
    u"ApprovalPending": u"Approval Is Pending",
49
 
    u"ApprovedByDefault": u"Approved By Default",
50
 
    u"ApprovalDelay": u"Approval Delay",
51
 
    u"ApprovalDuration": u"Approval Duration",
52
 
    u"Checker": u"Checker",
 
38
    "Name": "Name",
 
39
    "Enabled": "Enabled",
 
40
    "Timeout": "Timeout",
 
41
    "LastCheckedOK": "Last Successful Check",
 
42
    "LastApprovalRequest": "Last Approval Request",
 
43
    "Created": "Created",
 
44
    "Interval": "Interval",
 
45
    "Host": "Host",
 
46
    "Fingerprint": "Fingerprint",
 
47
    "CheckerRunning": "Check Is Running",
 
48
    "LastEnabled": "Last Enabled",
 
49
    "ApprovalPending": "Approval Is Pending",
 
50
    "ApprovedByDefault": "Approved By Default",
 
51
    "ApprovalDelay": "Approval Delay",
 
52
    "ApprovalDuration": "Approval Duration",
 
53
    "Checker": "Checker",
53
54
    }
54
 
defaultkeywords = (u"Name", u"Enabled", u"Timeout", u"LastCheckedOK")
55
 
domain = u"se.bsnet.fukt"
56
 
busname = domain + u".Mandos"
57
 
server_path = u"/"
58
 
server_interface = domain + u".Mandos"
59
 
client_interface = domain + u".Mandos.Client"
60
 
version = u"1.2.3"
 
55
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
 
56
domain = "se.bsnet.fukt"
 
57
busname = domain + ".Mandos"
 
58
server_path = "/"
 
59
server_interface = domain + ".Mandos"
 
60
client_interface = domain + ".Mandos.Client"
 
61
version = "1.2.3"
61
62
 
62
63
def timedelta_to_milliseconds(td):
63
64
    """Convert a datetime.timedelta object to milliseconds"""
67
68
 
68
69
def milliseconds_to_string(ms):
69
70
    td = datetime.timedelta(0, 0, 0, ms)
70
 
    return (u"%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
71
 
            % { u"days": u"%dT" % td.days if td.days else u"",
72
 
                u"hours": td.seconds // 3600,
73
 
                u"minutes": (td.seconds % 3600) // 60,
74
 
                u"seconds": td.seconds % 60,
 
71
    return ("%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
 
72
            % { "days": "%dT" % td.days if td.days else "",
 
73
                "hours": td.seconds // 3600,
 
74
                "minutes": (td.seconds % 3600) // 60,
 
75
                "seconds": td.seconds % 60,
75
76
                })
76
77
 
77
78
 
86
87
    datetime.timedelta(0, 3600)
87
88
    >>> string_to_delta("24h")
88
89
    datetime.timedelta(1)
89
 
    >>> string_to_delta(u"1w")
 
90
    >>> string_to_delta("1w")
90
91
    datetime.timedelta(7)
91
92
    >>> string_to_delta("5m 30s")
92
93
    datetime.timedelta(0, 330)
93
94
    """
94
95
    timevalue = datetime.timedelta(0)
95
 
    regexp = re.compile(u"\d+[dsmhw]")
 
96
    regexp = re.compile("\d+[dsmhw]")
96
97
    
97
98
    for s in regexp.findall(interval):
98
99
        try:
99
100
            suffix = unicode(s[-1])
100
101
            value = int(s[:-1])
101
 
            if suffix == u"d":
 
102
            if suffix == "d":
102
103
                delta = datetime.timedelta(value)
103
 
            elif suffix == u"s":
 
104
            elif suffix == "s":
104
105
                delta = datetime.timedelta(0, value)
105
 
            elif suffix == u"m":
 
106
            elif suffix == "m":
106
107
                delta = datetime.timedelta(0, 0, 0, 0, value)
107
 
            elif suffix == u"h":
 
108
            elif suffix == "h":
108
109
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
109
 
            elif suffix == u"w":
 
110
            elif suffix == "w":
110
111
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
111
112
            else:
112
113
                raise ValueError
118
119
def print_clients(clients, keywords):
119
120
    def valuetostring(value, keyword):
120
121
        if type(value) is dbus.Boolean:
121
 
            return u"Yes" if value else u"No"
122
 
        if keyword in (u"Timeout", u"Interval", u"ApprovalDelay",
123
 
                       u"ApprovalDuration"):
 
122
            return "Yes" if value else "No"
 
123
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
 
124
                       "ApprovalDuration"):
124
125
            return milliseconds_to_string(value)
125
126
        return unicode(value)
126
127
    
127
128
    # Create format string to print table rows
128
 
    format_string = u" ".join(u"%%-%ds" %
129
 
                              max(len(tablewords[key]),
130
 
                                  max(len(valuetostring(client[key],
131
 
                                                        key))
132
 
                                      for client in
133
 
                                      clients))
134
 
                              for key in keywords)
 
129
    format_string = " ".join("%%-%ds" %
 
130
                             max(len(tablewords[key]),
 
131
                                 max(len(valuetostring(client[key],
 
132
                                                       key))
 
133
                                     for client in
 
134
                                     clients))
 
135
                             for key in keywords)
135
136
    # Print header line
136
137
    print format_string % tuple(tablewords[key] for key in keywords)
137
138
    for client in clients:
158
159
                options.deny))
159
160
        
160
161
def main():
161
 
        parser = OptionParser(version = u"%%prog %s" % version)
162
 
        parser.add_option(u"-a", u"--all", action=u"store_true",
163
 
                          help=u"Select all clients")
164
 
        parser.add_option(u"-v", u"--verbose", action=u"store_true",
165
 
                          help=u"Print all fields")
166
 
        parser.add_option(u"-e", u"--enable", action=u"store_true",
167
 
                          help=u"Enable client")
168
 
        parser.add_option(u"-d", u"--disable", action=u"store_true",
169
 
                          help=u"disable client")
170
 
        parser.add_option(u"-b", u"--bump-timeout", action=u"store_true",
171
 
                          help=u"Bump timeout for client")
172
 
        parser.add_option(u"--start-checker", action=u"store_true",
173
 
                          help=u"Start checker for client")
174
 
        parser.add_option(u"--stop-checker", action=u"store_true",
175
 
                          help=u"Stop checker for client")
176
 
        parser.add_option(u"-V", u"--is-enabled", action=u"store_true",
177
 
                          help=u"Check if client is enabled")
178
 
        parser.add_option(u"-r", u"--remove", action=u"store_true",
179
 
                          help=u"Remove client")
180
 
        parser.add_option(u"-c", u"--checker", type=u"string",
181
 
                          help=u"Set checker command for client")
182
 
        parser.add_option(u"-t", u"--timeout", type=u"string",
183
 
                          help=u"Set timeout for client")
184
 
        parser.add_option(u"-i", u"--interval", type=u"string",
185
 
                          help=u"Set checker interval for client")
186
 
        parser.add_option(u"--approve-by-default", action=u"store_true",
187
 
                          dest=u"approved_by_default",
188
 
                          help=u"Set client to be approved by default")
189
 
        parser.add_option(u"--deny-by-default", action=u"store_false",
190
 
                          dest=u"approved_by_default",
191
 
                          help=u"Set client to be denied by default")
192
 
        parser.add_option(u"--approval-delay", type=u"string",
193
 
                          help=u"Set delay before client approve/deny")
194
 
        parser.add_option(u"--approval-duration", type=u"string",
195
 
                          help=u"Set duration of one client approval")
196
 
        parser.add_option(u"-H", u"--host", type=u"string",
197
 
                          help=u"Set host for client")
198
 
        parser.add_option(u"-s", u"--secret", type=u"string",
199
 
                          help=u"Set password blob (file) for client")
200
 
        parser.add_option(u"-A", u"--approve", action=u"store_true",
201
 
                          help=u"Approve any current client request")
202
 
        parser.add_option(u"-D", u"--deny", action=u"store_true",
203
 
                          help=u"Deny any current client request")
 
162
        parser = OptionParser(version = "%%prog %s" % version)
 
163
        parser.add_option("-a", "--all", action="store_true",
 
164
                          help="Select all clients")
 
165
        parser.add_option("-v", "--verbose", action="store_true",
 
166
                          help="Print all fields")
 
167
        parser.add_option("-e", "--enable", action="store_true",
 
168
                          help="Enable client")
 
169
        parser.add_option("-d", "--disable", action="store_true",
 
170
                          help="disable client")
 
171
        parser.add_option("-b", "--bump-timeout", action="store_true",
 
172
                          help="Bump timeout for client")
 
173
        parser.add_option("--start-checker", action="store_true",
 
174
                          help="Start checker for client")
 
175
        parser.add_option("--stop-checker", action="store_true",
 
176
                          help="Stop checker for client")
 
177
        parser.add_option("-V", "--is-enabled", action="store_true",
 
178
                          help="Check if client is enabled")
 
179
        parser.add_option("-r", "--remove", action="store_true",
 
180
                          help="Remove client")
 
181
        parser.add_option("-c", "--checker", type="string",
 
182
                          help="Set checker command for client")
 
183
        parser.add_option("-t", "--timeout", type="string",
 
184
                          help="Set timeout for client")
 
185
        parser.add_option("-i", "--interval", type="string",
 
186
                          help="Set checker interval for client")
 
187
        parser.add_option("--approve-by-default", action="store_true",
 
188
                          dest="approved_by_default",
 
189
                          help="Set client to be approved by default")
 
190
        parser.add_option("--deny-by-default", action="store_false",
 
191
                          dest="approved_by_default",
 
192
                          help="Set client to be denied by default")
 
193
        parser.add_option("--approval-delay", type="string",
 
194
                          help="Set delay before client approve/deny")
 
195
        parser.add_option("--approval-duration", type="string",
 
196
                          help="Set duration of one client approval")
 
197
        parser.add_option("-H", "--host", type="string",
 
198
                          help="Set host for client")
 
199
        parser.add_option("-s", "--secret", type="string",
 
200
                          help="Set password blob (file) for client")
 
201
        parser.add_option("-A", "--approve", action="store_true",
 
202
                          help="Approve any current client request")
 
203
        parser.add_option("-D", "--deny", action="store_true",
 
204
                          help="Deny any current client request")
204
205
        options, client_names = parser.parse_args()
205
206
        
206
207
        if has_actions(options) and not client_names and not options.all:
207
 
            parser.error(u"Options require clients names or --all.")
 
208
            parser.error("Options require clients names or --all.")
208
209
        if options.verbose and has_actions(options):
209
 
            parser.error(u"--verbose can only be used alone or with"
210
 
                         u" --all.")
 
210
            parser.error("--verbose can only be used alone or with"
 
211
                         " --all.")
211
212
        if options.all and not has_actions(options):
212
 
            parser.error(u"--all requires an action.")
 
213
            parser.error("--all requires an action.")
213
214
        
214
215
        try:
215
216
            bus = dbus.SystemBus()
216
217
            mandos_dbus_objc = bus.get_object(busname, server_path)
217
218
        except dbus.exceptions.DBusException:
218
 
            print >> sys.stderr, u"Could not connect to Mandos server"
 
219
            print >> sys.stderr, "Could not connect to Mandos server"
219
220
            sys.exit(1)
220
221
    
221
222
        mandos_serv = dbus.Interface(mandos_dbus_objc,
234
235
                os.dup2(stderrcopy, sys.stderr.fileno())
235
236
                os.close(stderrcopy)
236
237
        except dbus.exceptions.DBusException, e:
237
 
            print >> sys.stderr, u"Access denied: Accessing mandos server through dbus."
 
238
            print >> sys.stderr, "Access denied: Accessing mandos server through dbus."
238
239
            sys.exit(1)
239
240
            
240
241
        # Compile dict of (clients: properties) to process
247
248
        else:
248
249
            for name in client_names:
249
250
                for path, client in mandos_clients.iteritems():
250
 
                    if client[u"Name"] == name:
 
251
                    if client["Name"] == name:
251
252
                        client_objc = bus.get_object(busname, path)
252
253
                        clients[client_objc] = client
253
254
                        break
254
255
                else:
255
 
                    print >> sys.stderr, u"Client not found on server: %r" % name
 
256
                    print >> sys.stderr, "Client not found on server: %r" % name
256
257
                    sys.exit(1)
257
258
            
258
259
        if not has_actions(options) and clients:
259
260
            if options.verbose:
260
 
                keywords = (u"Name", u"Enabled", u"Timeout",
261
 
                            u"LastCheckedOK", u"Created", u"Interval",
262
 
                            u"Host", u"Fingerprint", u"CheckerRunning",
263
 
                            u"LastEnabled", u"ApprovalPending",
264
 
                            u"ApprovedByDefault",
265
 
                            u"LastApprovalRequest", u"ApprovalDelay",
266
 
                            u"ApprovalDuration", u"Checker")
 
261
                keywords = ("Name", "Enabled", "Timeout",
 
262
                            "LastCheckedOK", "Created", "Interval",
 
263
                            "Host", "Fingerprint", "CheckerRunning",
 
264
                            "LastEnabled", "ApprovalPending",
 
265
                            "ApprovedByDefault",
 
266
                            "LastApprovalRequest", "ApprovalDelay",
 
267
                            "ApprovalDuration", "Checker")
267
268
            else:
268
269
                keywords = defaultkeywords
269
270
            
285
286
                    client.StopChecker(dbus_interface=client_interface)
286
287
                if options.is_enabled:
287
288
                    sys.exit(0 if client.Get(client_interface,
288
 
                                             u"Enabled",
 
289
                                             "Enabled",
289
290
                                             dbus_interface=dbus.PROPERTIES_IFACE)
290
291
                             else 1)
291
292
                if options.checker:
292
 
                    client.Set(client_interface, u"Checker", options.checker,
 
293
                    client.Set(client_interface, "Checker", options.checker,
293
294
                               dbus_interface=dbus.PROPERTIES_IFACE)
294
295
                if options.host:
295
 
                    client.Set(client_interface, u"Host", options.host,
 
296
                    client.Set(client_interface, "Host", options.host,
296
297
                               dbus_interface=dbus.PROPERTIES_IFACE)
297
298
                if options.interval:
298
 
                    client.Set(client_interface, u"Interval",
 
299
                    client.Set(client_interface, "Interval",
299
300
                               timedelta_to_milliseconds
300
301
                               (string_to_delta(options.interval)),
301
302
                               dbus_interface=dbus.PROPERTIES_IFACE)
302
303
                if options.approval_delay:
303
 
                    client.Set(client_interface, u"ApprovalDelay",
 
304
                    client.Set(client_interface, "ApprovalDelay",
304
305
                               timedelta_to_milliseconds
305
306
                               (string_to_delta(options.
306
307
                                                approval_delay)),
307
308
                               dbus_interface=dbus.PROPERTIES_IFACE)
308
309
                if options.approval_duration:
309
 
                    client.Set(client_interface, u"ApprovalDuration",
 
310
                    client.Set(client_interface, "ApprovalDuration",
310
311
                               timedelta_to_milliseconds
311
312
                               (string_to_delta(options.
312
313
                                                approval_duration)),
313
314
                               dbus_interface=dbus.PROPERTIES_IFACE)
314
315
                if options.timeout:
315
 
                    client.Set(client_interface, u"Timeout",
 
316
                    client.Set(client_interface, "Timeout",
316
317
                               timedelta_to_milliseconds
317
318
                               (string_to_delta(options.timeout)),
318
319
                               dbus_interface=dbus.PROPERTIES_IFACE)
319
320
                if options.secret:
320
 
                    client.Set(client_interface, u"Secret",
 
321
                    client.Set(client_interface, "Secret",
321
322
                               dbus.ByteArray(open(options.secret,
322
 
                                                   u"rb").read()),
 
323
                                                   "rb").read()),
323
324
                               dbus_interface=dbus.PROPERTIES_IFACE)
324
325
                if options.approved_by_default is not None:
325
 
                    client.Set(client_interface, u"ApprovedByDefault",
 
326
                    client.Set(client_interface, "ApprovedByDefault",
326
327
                               dbus.Boolean(options
327
328
                                            .approved_by_default),
328
329
                               dbus_interface=dbus.PROPERTIES_IFACE)
333
334
                    client.Approve(dbus.Boolean(False),
334
335
                                   dbus_interface=client_interface)
335
336
 
336
 
if __name__ == u"__main__":
 
337
if __name__ == "__main__":
337
338
    main()