/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: 2011-02-27 18:57:58 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110227185758-vie4xhfaevhpqtr6
* plugins.d/password-prompt.c (conflict_detection): Check for both
                                                    "plymouth" and
                                                    "plymouthd".

Show diffs side-by-side

added added

removed removed

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