/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: 2010-09-27 17:39:03 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100927173903-9s5e6a3hl5iswmp7
* mandos: Fixed "--help" output.
* mandos.xml (SYNOPSIS, OPTIONS): Document new option "--debuglevel".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
31
31
import re
32
32
import os
33
33
 
34
 
locale.setlocale(locale.LC_ALL, u"")
 
34
locale.setlocale(locale.LC_ALL, u'')
35
35
 
36
36
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",
 
37
    'Name': u'Name',
 
38
    'Enabled': u'Enabled',
 
39
    'Timeout': u'Timeout',
 
40
    'LastCheckedOK': u'Last Successful Check',
 
41
    'LastApprovalRequest': u'Last Approval Request',
 
42
    'Created': u'Created',
 
43
    'Interval': u'Interval',
 
44
    'Host': u'Host',
 
45
    'Fingerprint': u'Fingerprint',
 
46
    'CheckerRunning': u'Check Is Running',
 
47
    'LastEnabled': u'Last Enabled',
 
48
    'ApprovalPending': u'Approval Is Pending',
 
49
    'ApprovedByDefault': u'Approved By Default',
 
50
    'ApprovalDelay': u"Approval Delay",
 
51
    'ApprovalDuration': u"Approval Duration",
 
52
    'Checker': u'Checker',
53
53
    }
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"
 
54
defaultkeywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK')
 
55
domain = 'se.bsnet.fukt'
 
56
busname = domain + '.Mandos'
 
57
server_path = '/'
 
58
server_interface = domain + '.Mandos'
 
59
client_interface = domain + '.Mandos.Client'
 
60
version = "1.0.14"
61
61
 
62
62
def timedelta_to_milliseconds(td):
63
 
    """Convert a datetime.timedelta object to milliseconds"""
 
63
    "Convert a datetime.timedelta object to milliseconds"
64
64
    return ((td.days * 24 * 60 * 60 * 1000)
65
65
            + (td.seconds * 1000)
66
66
            + (td.microseconds // 1000))
68
68
def milliseconds_to_string(ms):
69
69
    td = datetime.timedelta(0, 0, 0, ms)
70
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
            % { "days": "%dT" % td.days if td.days else "",
 
72
                "hours": td.seconds // 3600,
 
73
                "minutes": (td.seconds % 3600) // 60,
 
74
                "seconds": td.seconds % 60,
75
75
                })
76
76
 
77
77
 
78
78
def string_to_delta(interval):
79
79
    """Parse a string and return a datetime.timedelta
80
80
 
81
 
    >>> string_to_delta("7d")
 
81
    >>> string_to_delta('7d')
82
82
    datetime.timedelta(7)
83
 
    >>> string_to_delta("60s")
 
83
    >>> string_to_delta('60s')
84
84
    datetime.timedelta(0, 60)
85
 
    >>> string_to_delta("60m")
 
85
    >>> string_to_delta('60m')
86
86
    datetime.timedelta(0, 3600)
87
 
    >>> string_to_delta("24h")
 
87
    >>> string_to_delta('24h')
88
88
    datetime.timedelta(1)
89
 
    >>> string_to_delta(u"1w")
 
89
    >>> string_to_delta(u'1w')
90
90
    datetime.timedelta(7)
91
 
    >>> string_to_delta("5m 30s")
 
91
    >>> string_to_delta('5m 30s')
92
92
    datetime.timedelta(0, 330)
93
93
    """
94
94
    timevalue = datetime.timedelta(0)
95
 
    regexp = re.compile(u"\d+[dsmhw]")
 
95
    regexp = re.compile("\d+[dsmhw]")
96
96
    
97
97
    for s in regexp.findall(interval):
98
98
        try:
125
125
        return unicode(value)
126
126
    
127
127
    # Create format string to print table rows
128
 
    format_string = u" ".join(u"%%-%ds" %
 
128
    format_string = u' '.join(u'%%-%ds' %
129
129
                              max(len(tablewords[key]),
130
130
                                  max(len(valuetostring(client[key],
131
131
                                                        key))
158
158
                options.deny))
159
159
        
160
160
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")
 
161
        parser = OptionParser(version = "%%prog %s" % version)
 
162
        parser.add_option("-a", "--all", action="store_true",
 
163
                          help="Select all clients")
 
164
        parser.add_option("-v", "--verbose", action="store_true",
 
165
                          help="Print all fields")
 
166
        parser.add_option("-e", "--enable", action="store_true",
 
167
                          help="Enable client")
 
168
        parser.add_option("-d", "--disable", action="store_true",
 
169
                          help="disable client")
 
170
        parser.add_option("-b", "--bump-timeout", action="store_true",
 
171
                          help="Bump timeout for client")
 
172
        parser.add_option("--start-checker", action="store_true",
 
173
                          help="Start checker for client")
 
174
        parser.add_option("--stop-checker", action="store_true",
 
175
                          help="Stop checker for client")
 
176
        parser.add_option("-V", "--is-enabled", action="store_true",
 
177
                          help="Check if client is enabled")
 
178
        parser.add_option("-r", "--remove", action="store_true",
 
179
                          help="Remove client")
 
180
        parser.add_option("-c", "--checker", type="string",
 
181
                          help="Set checker command for client")
 
182
        parser.add_option("-t", "--timeout", type="string",
 
183
                          help="Set timeout for client")
 
184
        parser.add_option("-i", "--interval", type="string",
 
185
                          help="Set checker interval for client")
 
186
        parser.add_option("--approve-by-default", action="store_true",
 
187
                          dest=u"approved_by_default",
 
188
                          help="Set client to be approved by default")
 
189
        parser.add_option("--deny-by-default", action="store_false",
 
190
                          dest=u"approved_by_default",
 
191
                          help="Set client to be denied by default")
 
192
        parser.add_option("--approval-delay", type="string",
 
193
                          help="Set delay before client approve/deny")
 
194
        parser.add_option("--approval-duration", type="string",
 
195
                          help="Set duration of one client approval")
 
196
        parser.add_option("-H", "--host", type="string",
 
197
                          help="Set host for client")
 
198
        parser.add_option("-s", "--secret", type="string",
 
199
                          help="Set password blob (file) for client")
 
200
        parser.add_option("-A", "--approve", action="store_true",
 
201
                          help="Approve any current client request")
 
202
        parser.add_option("-D", "--deny", action="store_true",
 
203
                          help="Deny any current client request")
204
204
        options, client_names = parser.parse_args()
205
205
        
206
206
        if has_actions(options) and not client_names and not options.all:
207
 
            parser.error(u"Options require clients names or --all.")
 
207
            parser.error('Options require clients names or --all.')
208
208
        if options.verbose and has_actions(options):
209
 
            parser.error(u"--verbose can only be used alone or with"
210
 
                         u" --all.")
 
209
            parser.error('--verbose can only be used alone or with'
 
210
                         ' --all.')
211
211
        if options.all and not has_actions(options):
212
 
            parser.error(u"--all requires an action.")
 
212
            parser.error('--all requires an action.')
213
213
        
214
214
        try:
215
215
            bus = dbus.SystemBus()
216
216
            mandos_dbus_objc = bus.get_object(busname, server_path)
217
217
        except dbus.exceptions.DBusException:
218
 
            print >> sys.stderr, u"Could not connect to Mandos server"
 
218
            print >> sys.stderr, "Could not connect to Mandos server"
219
219
            sys.exit(1)
220
220
    
221
221
        mandos_serv = dbus.Interface(mandos_dbus_objc,
234
234
                os.dup2(stderrcopy, sys.stderr.fileno())
235
235
                os.close(stderrcopy)
236
236
        except dbus.exceptions.DBusException, e:
237
 
            print >> sys.stderr, u"Access denied: Accessing mandos server through dbus."
 
237
            print >> sys.stderr, "Access denied: Accessing mandos server through dbus."
238
238
            sys.exit(1)
239
239
            
240
240
        # Compile dict of (clients: properties) to process
247
247
        else:
248
248
            for name in client_names:
249
249
                for path, client in mandos_clients.iteritems():
250
 
                    if client[u"Name"] == name:
 
250
                    if client['Name'] == name:
251
251
                        client_objc = bus.get_object(busname, path)
252
252
                        clients[client_objc] = client
253
253
                        break
254
254
                else:
255
 
                    print >> sys.stderr, u"Client not found on server: %r" % name
 
255
                    print >> sys.stderr, "Client not found on server: %r" % name
256
256
                    sys.exit(1)
257
257
            
258
258
        if not has_actions(options) and clients:
259
259
            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")
 
260
                keywords = ('Name', 'Enabled', 'Timeout',
 
261
                            'LastCheckedOK', 'Created', 'Interval',
 
262
                            'Host', 'Fingerprint', 'CheckerRunning',
 
263
                            'LastEnabled', 'ApprovalPending',
 
264
                            'ApprovedByDefault',
 
265
                            'LastApprovalRequest', 'ApprovalDelay',
 
266
                            'ApprovalDuration', 'Checker')
267
267
            else:
268
268
                keywords = defaultkeywords
269
269
            
319
319
                if options.secret:
320
320
                    client.Set(client_interface, u"Secret",
321
321
                               dbus.ByteArray(open(options.secret,
322
 
                                                   u"rb").read()),
 
322
                                                   u'rb').read()),
323
323
                               dbus_interface=dbus.PROPERTIES_IFACE)
324
324
                if options.approved_by_default is not None:
325
325
                    client.Set(client_interface, u"ApprovedByDefault",
333
333
                    client.Approve(dbus.Boolean(False),
334
334
                                   dbus_interface=client_interface)
335
335
 
336
 
if __name__ == u"__main__":
 
336
if __name__ == '__main__':
337
337
    main()