/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: Björn Påhlsson
  • Date: 2011-10-02 19:18:24 UTC
  • mto: (237.7.53 trunk)
  • mto: This revision was merged to the branch mainline in revision 286.
  • Revision ID: belorn@fukt.bsnet.se-20111002191824-eweh4pvneeg3qzia
transitional stuff actually working
documented change to D-Bus API

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
27
27
 
28
28
import sys
29
29
import dbus
30
 
from optparse import OptionParser
 
30
import argparse
31
31
import locale
32
32
import datetime
33
33
import re
52
52
    "ApprovalDelay": "Approval Delay",
53
53
    "ApprovalDuration": "Approval Duration",
54
54
    "Checker": "Checker",
 
55
    "ExtendedTimeout" : "Extended Timeout"
55
56
    }
56
57
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
57
 
domain = "se.bsnet.fukt"
 
58
domain = "se.recompile"
58
59
busname = domain + ".Mandos"
59
60
server_path = "/"
60
61
server_interface = domain + ".Mandos"
61
62
client_interface = domain + ".Mandos.Client"
62
 
version = "1.2.3"
 
63
version = "1.3.1"
63
64
 
64
65
def timedelta_to_milliseconds(td):
65
66
    """Convert a datetime.timedelta object to milliseconds"""
76
77
                "seconds": td.seconds % 60,
77
78
                })
78
79
 
79
 
 
80
80
def string_to_delta(interval):
81
81
    """Parse a string and return a datetime.timedelta
82
 
 
 
82
    
83
83
    >>> string_to_delta("7d")
84
84
    datetime.timedelta(7)
85
85
    >>> string_to_delta("60s")
150
150
                options.remove,
151
151
                options.checker is not None,
152
152
                options.timeout is not None,
 
153
                options.extended_timeout is not None,
153
154
                options.interval is not None,
154
155
                options.approved_by_default is not None,
155
156
                options.approval_delay is not None,
158
159
                options.secret is not None,
159
160
                options.approve,
160
161
                options.deny))
161
 
        
 
162
 
162
163
def main():
163
 
        parser = OptionParser(version = "%%prog %s" % version)
164
 
        parser.add_option("-a", "--all", action="store_true",
165
 
                          help="Select all clients")
166
 
        parser.add_option("-v", "--verbose", action="store_true",
167
 
                          help="Print all fields")
168
 
        parser.add_option("-e", "--enable", action="store_true",
169
 
                          help="Enable client")
170
 
        parser.add_option("-d", "--disable", action="store_true",
171
 
                          help="disable client")
172
 
        parser.add_option("-b", "--bump-timeout", action="store_true",
173
 
                          help="Bump timeout for client")
174
 
        parser.add_option("--start-checker", action="store_true",
175
 
                          help="Start checker for client")
176
 
        parser.add_option("--stop-checker", action="store_true",
177
 
                          help="Stop checker for client")
178
 
        parser.add_option("-V", "--is-enabled", action="store_true",
179
 
                          help="Check if client is enabled")
180
 
        parser.add_option("-r", "--remove", action="store_true",
181
 
                          help="Remove client")
182
 
        parser.add_option("-c", "--checker", type="string",
183
 
                          help="Set checker command for client")
184
 
        parser.add_option("-t", "--timeout", type="string",
185
 
                          help="Set timeout for client")
186
 
        parser.add_option("-i", "--interval", type="string",
187
 
                          help="Set checker interval for client")
188
 
        parser.add_option("--approve-by-default", action="store_true",
189
 
                          dest="approved_by_default",
190
 
                          help="Set client to be approved by default")
191
 
        parser.add_option("--deny-by-default", action="store_false",
192
 
                          dest="approved_by_default",
193
 
                          help="Set client to be denied by default")
194
 
        parser.add_option("--approval-delay", type="string",
195
 
                          help="Set delay before client approve/deny")
196
 
        parser.add_option("--approval-duration", type="string",
197
 
                          help="Set duration of one client approval")
198
 
        parser.add_option("-H", "--host", type="string",
199
 
                          help="Set host for client")
200
 
        parser.add_option("-s", "--secret", type="string",
201
 
                          help="Set password blob (file) for client")
202
 
        parser.add_option("-A", "--approve", action="store_true",
203
 
                          help="Approve any current client request")
204
 
        parser.add_option("-D", "--deny", action="store_true",
205
 
                          help="Deny any current client request")
206
 
        options, client_names = parser.parse_args()
207
 
        
208
 
        if has_actions(options) and not client_names and not options.all:
209
 
            parser.error("Options require clients names or --all.")
210
 
        if options.verbose and has_actions(options):
211
 
            parser.error("--verbose can only be used alone or with"
212
 
                         " --all.")
213
 
        if options.all and not has_actions(options):
214
 
            parser.error("--all requires an action.")
215
 
        
216
 
        try:
217
 
            bus = dbus.SystemBus()
218
 
            mandos_dbus_objc = bus.get_object(busname, server_path)
219
 
        except dbus.exceptions.DBusException:
220
 
            print("Could not connect to Mandos server",
221
 
                  file=sys.stderr)
222
 
            sys.exit(1)
223
 
    
224
 
        mandos_serv = dbus.Interface(mandos_dbus_objc,
225
 
                                     dbus_interface = server_interface)
226
 
 
227
 
        #block stderr since dbus library prints to stderr
228
 
        null = os.open(os.path.devnull, os.O_RDWR)
229
 
        stderrcopy = os.dup(sys.stderr.fileno())
230
 
        os.dup2(null, sys.stderr.fileno())
231
 
        os.close(null)
232
 
        try:
233
 
            try:
234
 
                mandos_clients = mandos_serv.GetAllClientsWithProperties()
235
 
            finally:
236
 
                #restore stderr
237
 
                os.dup2(stderrcopy, sys.stderr.fileno())
238
 
                os.close(stderrcopy)
239
 
        except dbus.exceptions.DBusException, e:
240
 
            print("Access denied: Accessing mandos server through dbus.",
241
 
                  file=sys.stderr)
242
 
            sys.exit(1)
243
 
            
244
 
        # Compile dict of (clients: properties) to process
245
 
        clients={}
246
 
        
247
 
        if options.all or not client_names:
248
 
            clients = dict((bus.get_object(busname, path), properties)
249
 
                           for path, properties in
250
 
                           mandos_clients.iteritems())
251
 
        else:
252
 
            for name in client_names:
253
 
                for path, client in mandos_clients.iteritems():
254
 
                    if client["Name"] == name:
255
 
                        client_objc = bus.get_object(busname, path)
256
 
                        clients[client_objc] = client
257
 
                        break
258
 
                else:
259
 
                    print("Client not found on server: %r" % name,
260
 
                          file=sys.stderr)
261
 
                    sys.exit(1)
262
 
            
263
 
        if not has_actions(options) and clients:
264
 
            if options.verbose:
265
 
                keywords = ("Name", "Enabled", "Timeout",
266
 
                            "LastCheckedOK", "Created", "Interval",
267
 
                            "Host", "Fingerprint", "CheckerRunning",
268
 
                            "LastEnabled", "ApprovalPending",
269
 
                            "ApprovedByDefault",
270
 
                            "LastApprovalRequest", "ApprovalDelay",
271
 
                            "ApprovalDuration", "Checker")
 
164
    parser = argparse.ArgumentParser()
 
165
    parser.add_argument("--version", action="version",
 
166
                        version = "%%prog %s" % version,
 
167
                        help="show version number and exit")
 
168
    parser.add_argument("-a", "--all", action="store_true",
 
169
                        help="Select all clients")
 
170
    parser.add_argument("-v", "--verbose", action="store_true",
 
171
                        help="Print all fields")
 
172
    parser.add_argument("-e", "--enable", action="store_true",
 
173
                        help="Enable client")
 
174
    parser.add_argument("-d", "--disable", action="store_true",
 
175
                        help="disable client")
 
176
    parser.add_argument("-b", "--bump-timeout", action="store_true",
 
177
                        help="Bump timeout for client")
 
178
    parser.add_argument("--start-checker", action="store_true",
 
179
                        help="Start checker for client")
 
180
    parser.add_argument("--stop-checker", action="store_true",
 
181
                        help="Stop checker for client")
 
182
    parser.add_argument("-V", "--is-enabled", action="store_true",
 
183
                        help="Check if client is enabled")
 
184
    parser.add_argument("-r", "--remove", action="store_true",
 
185
                        help="Remove client")
 
186
    parser.add_argument("-c", "--checker",
 
187
                        help="Set checker command for client")
 
188
    parser.add_argument("-t", "--timeout",
 
189
                        help="Set timeout for client")
 
190
    parser.add_argument("--extended-timeout",
 
191
                        help="Set extended timeout for client")
 
192
    parser.add_argument("-i", "--interval",
 
193
                        help="Set checker interval for client")
 
194
    parser.add_argument("--approve-by-default", action="store_true",
 
195
                        default=None, dest="approved_by_default",
 
196
                        help="Set client to be approved by default")
 
197
    parser.add_argument("--deny-by-default", action="store_false",
 
198
                        dest="approved_by_default",
 
199
                        help="Set client to be denied by default")
 
200
    parser.add_argument("--approval-delay",
 
201
                        help="Set delay before client approve/deny")
 
202
    parser.add_argument("--approval-duration",
 
203
                        help="Set duration of one client approval")
 
204
    parser.add_argument("-H", "--host", help="Set host for client")
 
205
    parser.add_argument("-s", "--secret", type=file,
 
206
                        help="Set password blob (file) for client")
 
207
    parser.add_argument("-A", "--approve", action="store_true",
 
208
                        help="Approve any current client request")
 
209
    parser.add_argument("-D", "--deny", action="store_true",
 
210
                        help="Deny any current client request")
 
211
    parser.add_argument("client", nargs="*", help="Client name")
 
212
    options = parser.parse_args()
 
213
    
 
214
    if has_actions(options) and not options.client and not options.all:
 
215
        parser.error("Options require clients names or --all.")
 
216
    if options.verbose and has_actions(options):
 
217
        parser.error("--verbose can only be used alone or with"
 
218
                     " --all.")
 
219
    if options.all and not has_actions(options):
 
220
        parser.error("--all requires an action.")
 
221
    
 
222
    try:
 
223
        bus = dbus.SystemBus()
 
224
        mandos_dbus_objc = bus.get_object(busname, server_path)
 
225
    except dbus.exceptions.DBusException:
 
226
        print("Could not connect to Mandos server",
 
227
              file=sys.stderr)
 
228
        sys.exit(1)
 
229
    
 
230
    mandos_serv = dbus.Interface(mandos_dbus_objc,
 
231
                                 dbus_interface = server_interface)
 
232
    
 
233
    #block stderr since dbus library prints to stderr
 
234
    null = os.open(os.path.devnull, os.O_RDWR)
 
235
    stderrcopy = os.dup(sys.stderr.fileno())
 
236
    os.dup2(null, sys.stderr.fileno())
 
237
    os.close(null)
 
238
    try:
 
239
        try:
 
240
            mandos_clients = mandos_serv.GetAllClientsWithProperties()
 
241
        finally:
 
242
            #restore stderr
 
243
            os.dup2(stderrcopy, sys.stderr.fileno())
 
244
            os.close(stderrcopy)
 
245
    except dbus.exceptions.DBusException, e:
 
246
        print("Access denied: Accessing mandos server through dbus.",
 
247
              file=sys.stderr)
 
248
        sys.exit(1)
 
249
    
 
250
    # Compile dict of (clients: properties) to process
 
251
    clients={}
 
252
    
 
253
    if options.all or not options.client:
 
254
        clients = dict((bus.get_object(busname, path), properties)
 
255
                       for path, properties in
 
256
                       mandos_clients.iteritems())
 
257
    else:
 
258
        for name in options.client:
 
259
            for path, client in mandos_clients.iteritems():
 
260
                if client["Name"] == name:
 
261
                    client_objc = bus.get_object(busname, path)
 
262
                    clients[client_objc] = client
 
263
                    break
272
264
            else:
273
 
                keywords = defaultkeywords
274
 
            
275
 
            print_clients(clients.values(), keywords)
 
265
                print("Client not found on server: %r" % name,
 
266
                      file=sys.stderr)
 
267
                sys.exit(1)
 
268
    
 
269
    if not has_actions(options) and clients:
 
270
        if options.verbose:
 
271
            keywords = ("Name", "Enabled", "Timeout",
 
272
                        "LastCheckedOK", "Created", "Interval",
 
273
                        "Host", "Fingerprint", "CheckerRunning",
 
274
                        "LastEnabled", "ApprovalPending",
 
275
                        "ApprovedByDefault",
 
276
                        "LastApprovalRequest", "ApprovalDelay",
 
277
                        "ApprovalDuration", "Checker",
 
278
                        "ExtendedTimeout")
276
279
        else:
277
 
            # Process each client in the list by all selected options
278
 
            for client in clients:
279
 
                if options.remove:
280
 
                    mandos_serv.RemoveClient(client.__dbus_object_path__)
281
 
                if options.enable:
282
 
                    client.Enable(dbus_interface=client_interface)
283
 
                if options.disable:
284
 
                    client.Disable(dbus_interface=client_interface)
285
 
                if options.bump_timeout:
286
 
                    client.CheckedOK(dbus_interface=client_interface)
287
 
                if options.start_checker:
288
 
                    client.StartChecker(dbus_interface=client_interface)
289
 
                if options.stop_checker:
290
 
                    client.StopChecker(dbus_interface=client_interface)
291
 
                if options.is_enabled:
292
 
                    sys.exit(0 if client.Get(client_interface,
293
 
                                             "Enabled",
294
 
                                             dbus_interface=dbus.PROPERTIES_IFACE)
295
 
                             else 1)
296
 
                if options.checker:
297
 
                    client.Set(client_interface, "Checker", options.checker,
298
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
299
 
                if options.host:
300
 
                    client.Set(client_interface, "Host", options.host,
301
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
302
 
                if options.interval:
303
 
                    client.Set(client_interface, "Interval",
304
 
                               timedelta_to_milliseconds
305
 
                               (string_to_delta(options.interval)),
306
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
307
 
                if options.approval_delay:
308
 
                    client.Set(client_interface, "ApprovalDelay",
309
 
                               timedelta_to_milliseconds
310
 
                               (string_to_delta(options.
311
 
                                                approval_delay)),
312
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
313
 
                if options.approval_duration:
314
 
                    client.Set(client_interface, "ApprovalDuration",
315
 
                               timedelta_to_milliseconds
316
 
                               (string_to_delta(options.
317
 
                                                approval_duration)),
318
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
319
 
                if options.timeout:
320
 
                    client.Set(client_interface, "Timeout",
321
 
                               timedelta_to_milliseconds
322
 
                               (string_to_delta(options.timeout)),
323
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
324
 
                if options.secret:
325
 
                    client.Set(client_interface, "Secret",
326
 
                               dbus.ByteArray(open(options.secret,
327
 
                                                   "rb").read()),
328
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
329
 
                if options.approved_by_default is not None:
330
 
                    client.Set(client_interface, "ApprovedByDefault",
331
 
                               dbus.Boolean(options
332
 
                                            .approved_by_default),
333
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
334
 
                if options.approve:
335
 
                    client.Approve(dbus.Boolean(True),
336
 
                                   dbus_interface=client_interface)
337
 
                elif options.deny:
338
 
                    client.Approve(dbus.Boolean(False),
339
 
                                   dbus_interface=client_interface)
 
280
            keywords = defaultkeywords
 
281
        
 
282
        print_clients(clients.values(), keywords)
 
283
    else:
 
284
        # Process each client in the list by all selected options
 
285
        for client in clients:
 
286
            if options.remove:
 
287
                mandos_serv.RemoveClient(client.__dbus_object_path__)
 
288
            if options.enable:
 
289
                client.Enable(dbus_interface=client_interface)
 
290
            if options.disable:
 
291
                client.Disable(dbus_interface=client_interface)
 
292
            if options.bump_timeout:
 
293
                client.CheckedOK(dbus_interface=client_interface)
 
294
            if options.start_checker:
 
295
                client.StartChecker(dbus_interface=client_interface)
 
296
            if options.stop_checker:
 
297
                client.StopChecker(dbus_interface=client_interface)
 
298
            if options.is_enabled:
 
299
                sys.exit(0 if client.Get(client_interface,
 
300
                                         "Enabled",
 
301
                                         dbus_interface=
 
302
                                         dbus.PROPERTIES_IFACE)
 
303
                         else 1)
 
304
            if options.checker:
 
305
                client.Set(client_interface, "Checker",
 
306
                           options.checker,
 
307
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
308
            if options.host:
 
309
                client.Set(client_interface, "Host", options.host,
 
310
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
311
            if options.interval:
 
312
                client.Set(client_interface, "Interval",
 
313
                           timedelta_to_milliseconds
 
314
                           (string_to_delta(options.interval)),
 
315
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
316
            if options.approval_delay:
 
317
                client.Set(client_interface, "ApprovalDelay",
 
318
                           timedelta_to_milliseconds
 
319
                           (string_to_delta(options.
 
320
                                            approval_delay)),
 
321
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
322
            if options.approval_duration:
 
323
                client.Set(client_interface, "ApprovalDuration",
 
324
                           timedelta_to_milliseconds
 
325
                           (string_to_delta(options.
 
326
                                            approval_duration)),
 
327
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
328
            if options.timeout:
 
329
                client.Set(client_interface, "Timeout",
 
330
                           timedelta_to_milliseconds
 
331
                           (string_to_delta(options.timeout)),
 
332
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
333
            if options.extended_timeout:
 
334
                client.Set(client_interface, "ExtendedTimeout",
 
335
                           timedelta_to_milliseconds
 
336
                           (string_to_delta(options.extended_timeout)),
 
337
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
338
            if options.secret:
 
339
                client.Set(client_interface, "Secret",
 
340
                           dbus.ByteArray(open(options.secret,
 
341
                                               "rb").read()),
 
342
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
343
            if options.approved_by_default is not None:
 
344
                client.Set(client_interface, "ApprovedByDefault",
 
345
                           dbus.Boolean(options
 
346
                                        .approved_by_default),
 
347
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
348
            if options.approve:
 
349
                client.Approve(dbus.Boolean(True),
 
350
                               dbus_interface=client_interface)
 
351
            elif options.deny:
 
352
                client.Approve(dbus.Boolean(False),
 
353
                               dbus_interface=client_interface)
340
354
 
341
355
if __name__ == "__main__":
342
356
    main()