/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: Björn Påhlsson
  • Date: 2010-09-12 18:12:11 UTC
  • mto: (237.4.3 mandos-release)
  • mto: This revision was merged to the branch mainline in revision 428.
  • Revision ID: belorn@fukt.bsnet.se-20100912181211-wvkt0sk37zhx7tws
mandos-client: Added never ending loop for --connect
mandos-ctl: Better option parsing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
 
# 
4
 
# Mandos Monitor - Control and monitor the Mandos server
5
 
# 
6
 
# Copyright © 2008-2010 Teddy Hogeborn
7
 
# Copyright © 2008-2010 Björn Påhlsson
8
 
# 
9
 
# This program is free software: you can redistribute it and/or modify
10
 
# it under the terms of the GNU General Public License as published by
11
 
# the Free Software Foundation, either version 3 of the License, or
12
 
# (at your option) any later version.
13
 
#
14
 
#     This program is distributed in the hope that it will be useful,
15
 
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
16
 
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
 
#     GNU General Public License for more details.
18
 
# 
19
 
# You should have received a copy of the GNU General Public License
20
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
 
# 
22
 
# Contact the authors at <mandos@fukt.bsnet.se>.
23
 
# 
24
3
 
25
4
from __future__ import division
26
5
import sys
31
10
import re
32
11
import os
33
12
 
34
 
locale.setlocale(locale.LC_ALL, u"")
 
13
locale.setlocale(locale.LC_ALL, u'')
35
14
 
36
15
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",
 
16
    'name': u'Name',
 
17
    'enabled': u'Enabled',
 
18
    'timeout': u'Timeout',
 
19
    'last_checked_ok': u'Last Successful Check',
 
20
    'created': u'Created',
 
21
    'interval': u'Interval',
 
22
    'host': u'Host',
 
23
    'fingerprint': u'Fingerprint',
 
24
    'checker_running': u'Check Is Running',
 
25
    'last_enabled': u'Last Enabled',
 
26
    'checker': u'Checker',
53
27
    }
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"
 
28
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok')
 
29
domain = 'se.bsnet.fukt'
 
30
busname = domain + '.Mandos'
 
31
server_path = '/'
 
32
server_interface = domain + '.Mandos'
 
33
client_interface = domain + '.Mandos.Client'
 
34
version = "1.0.14"
61
35
 
62
36
def timedelta_to_milliseconds(td):
63
 
    """Convert a datetime.timedelta object to milliseconds"""
 
37
    "Convert a datetime.timedelta object to milliseconds"
64
38
    return ((td.days * 24 * 60 * 60 * 1000)
65
39
            + (td.seconds * 1000)
66
40
            + (td.microseconds // 1000))
68
42
def milliseconds_to_string(ms):
69
43
    td = datetime.timedelta(0, 0, 0, ms)
70
44
    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,
 
45
            % { "days": "%dT" % td.days if td.days else "",
 
46
                "hours": td.seconds // 3600,
 
47
                "minutes": (td.seconds % 3600) // 60,
 
48
                "seconds": td.seconds % 60,
75
49
                })
76
50
 
77
51
 
78
52
def string_to_delta(interval):
79
53
    """Parse a string and return a datetime.timedelta
80
54
 
81
 
    >>> string_to_delta("7d")
 
55
    >>> string_to_delta('7d')
82
56
    datetime.timedelta(7)
83
 
    >>> string_to_delta("60s")
 
57
    >>> string_to_delta('60s')
84
58
    datetime.timedelta(0, 60)
85
 
    >>> string_to_delta("60m")
 
59
    >>> string_to_delta('60m')
86
60
    datetime.timedelta(0, 3600)
87
 
    >>> string_to_delta("24h")
 
61
    >>> string_to_delta('24h')
88
62
    datetime.timedelta(1)
89
 
    >>> string_to_delta(u"1w")
 
63
    >>> string_to_delta(u'1w')
90
64
    datetime.timedelta(7)
91
 
    >>> string_to_delta("5m 30s")
 
65
    >>> string_to_delta('5m 30s')
92
66
    datetime.timedelta(0, 330)
93
67
    """
94
68
    timevalue = datetime.timedelta(0)
95
 
    regexp = re.compile(u"\d+[dsmhw]")
 
69
    regexp = re.compile("\d+[dsmhw]")
96
70
    
97
71
    for s in regexp.findall(interval):
98
72
        try:
119
93
    def valuetostring(value, keyword):
120
94
        if type(value) is dbus.Boolean:
121
95
            return u"Yes" if value else u"No"
122
 
        if keyword in (u"Timeout", u"Interval", u"ApprovalDelay",
123
 
                       u"ApprovalDuration"):
 
96
        if keyword in (u"timeout", u"interval"):
124
97
            return milliseconds_to_string(value)
125
98
        return unicode(value)
126
99
    
127
100
    # Create format string to print table rows
128
 
    format_string = u" ".join(u"%%-%ds" %
 
101
    format_string = u' '.join(u'%%-%ds' %
129
102
                              max(len(tablewords[key]),
130
 
                                  max(len(valuetostring(client[key],
131
 
                                                        key))
 
103
                                  max(len(valuetostring(client[key], key))
132
104
                                      for client in
133
105
                                      clients))
134
106
                              for key in keywords)
137
109
    for client in clients:
138
110
        print format_string % tuple(valuetostring(client[key], key)
139
111
                                    for key in keywords)
140
 
 
141
112
def has_actions(options):
142
113
    return any((options.enable,
143
114
                options.disable,
149
120
                options.checker is not None,
150
121
                options.timeout is not None,
151
122
                options.interval is not None,
152
 
                options.approved_by_default is not None,
153
 
                options.approval_delay is not None,
154
 
                options.approval_duration is not None,
155
123
                options.host is not None,
156
124
                options.secret is not None,
157
125
                options.approve,
158
126
                options.deny))
159
127
        
160
128
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")
 
129
        parser = OptionParser(version = "%%prog %s" % version)
 
130
        parser.add_option("-a", "--all", action="store_true",
 
131
                          help="Select all clients")
 
132
        parser.add_option("-v", "--verbose", action="store_true",
 
133
                          help="Print all fields")
 
134
        parser.add_option("-e", "--enable", action="store_true",
 
135
                          help="Enable client")
 
136
        parser.add_option("-d", "--disable", action="store_true",
 
137
                          help="disable client")
 
138
        parser.add_option("-b", "--bump-timeout", action="store_true",
 
139
                          help="Bump timeout for client")
 
140
        parser.add_option("--start-checker", action="store_true",
 
141
                          help="Start checker for client")
 
142
        parser.add_option("--stop-checker", action="store_true",
 
143
                          help="Stop checker for client")
 
144
        parser.add_option("-V", "--is-enabled", action="store_true",
 
145
                          help="Check if client is enabled")
 
146
        parser.add_option("-r", "--remove", action="store_true",
 
147
                          help="Remove client")
 
148
        parser.add_option("-c", "--checker", type="string",
 
149
                          help="Set checker command for client")
 
150
        parser.add_option("-t", "--timeout", type="string",
 
151
                          help="Set timeout for client")
 
152
        parser.add_option("-i", "--interval", type="string",
 
153
                          help="Set checker interval for client")
 
154
        parser.add_option("-H", "--host", type="string",
 
155
                          help="Set host for client")
 
156
        parser.add_option("-s", "--secret", type="string",
 
157
                          help="Set password blob (file) for client")
 
158
        parser.add_option("-A", "--approve", action="store_true",
 
159
                          help="Approve any current client request")
 
160
        parser.add_option("-D", "--deny", action="store_true",
 
161
                          help="Deny any current client request")
204
162
        options, client_names = parser.parse_args()
205
 
        
 
163
 
206
164
        if has_actions(options) and not client_names and not options.all:
207
 
            parser.error(u"Options require clients names or --all.")
 
165
            parser.error('Options requires clients names or --all.')
208
166
        if options.verbose and has_actions(options):
209
 
            parser.error(u"--verbose can only be used alone or with"
210
 
                         u" --all.")
 
167
            parser.error('Verbose option can only be used alone or with --all.')
211
168
        if options.all and not has_actions(options):
212
 
            parser.error(u"--all requires an action.")
213
 
        
 
169
            parser.error('--all requires an action')
 
170
            
214
171
        try:
215
172
            bus = dbus.SystemBus()
216
173
            mandos_dbus_objc = bus.get_object(busname, server_path)
217
174
        except dbus.exceptions.DBusException:
218
 
            print >> sys.stderr, u"Could not connect to Mandos server"
 
175
            print >> sys.stderr, "Could not connect to Mandos server"
219
176
            sys.exit(1)
220
177
    
221
178
        mandos_serv = dbus.Interface(mandos_dbus_objc,
234
191
                os.dup2(stderrcopy, sys.stderr.fileno())
235
192
                os.close(stderrcopy)
236
193
        except dbus.exceptions.DBusException, e:
237
 
            print >> sys.stderr, u"Access denied: Accessing mandos server through dbus."
 
194
            print >> sys.stderr, "Access denied: Accessing mandos server through dbus."
238
195
            sys.exit(1)
239
196
            
240
 
        # Compile dict of (clients: properties) to process
241
 
        clients={}
242
 
        
 
197
        # Compile list of clients to process
 
198
        clients=[]
 
199
 
243
200
        if options.all or not client_names:
244
 
            clients = dict((bus.get_object(busname, path), properties)
245
 
                           for path, properties in
246
 
                           mandos_clients.iteritems())
 
201
            clients = (bus.get_object(busname, path) for path in mandos_clients.iterkeys())
247
202
        else:
248
203
            for name in client_names:
249
204
                for path, client in mandos_clients.iteritems():
250
 
                    if client[u"Name"] == name:
 
205
                    if client['name'] == name:
251
206
                        client_objc = bus.get_object(busname, path)
252
 
                        clients[client_objc] = client
 
207
                        clients.append(client_objc)
253
208
                        break
254
209
                else:
255
 
                    print >> sys.stderr, u"Client not found on server: %r" % name
 
210
                    print >> sys.stderr, "Client not found on server: %r" % name
256
211
                    sys.exit(1)
257
212
            
258
213
        if not has_actions(options) and clients:
259
214
            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")
 
215
                keywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
 
216
                            'created', 'interval', 'host', 'fingerprint',
 
217
                            'checker_running', 'last_enabled', 'checker')
267
218
            else:
268
219
                keywords = defaultkeywords
269
 
            
270
 
            print_clients(clients.values(), keywords)
 
220
                
 
221
            print_clients(mandos_clients.values(), keywords)
271
222
        else:
272
223
            # Process each client in the list by all selected options
273
224
            for client in clients:
285
236
                    client.StopChecker(dbus_interface=client_interface)
286
237
                if options.is_enabled:
287
238
                    sys.exit(0 if client.Get(client_interface,
288
 
                                             u"Enabled",
 
239
                                             u"enabled",
289
240
                                             dbus_interface=dbus.PROPERTIES_IFACE)
290
241
                             else 1)
291
242
                if options.checker:
292
 
                    client.Set(client_interface, u"Checker", options.checker,
 
243
                    client.Set(client_interface, u"checker", options.checker,
293
244
                               dbus_interface=dbus.PROPERTIES_IFACE)
294
245
                if options.host:
295
 
                    client.Set(client_interface, u"Host", options.host,
 
246
                    client.Set(client_interface, u"host", options.host,
296
247
                               dbus_interface=dbus.PROPERTIES_IFACE)
297
248
                if options.interval:
298
 
                    client.Set(client_interface, u"Interval",
 
249
                    client.Set(client_interface, u"interval",
299
250
                               timedelta_to_milliseconds
300
251
                               (string_to_delta(options.interval)),
301
252
                               dbus_interface=dbus.PROPERTIES_IFACE)
302
 
                if options.approval_delay:
303
 
                    client.Set(client_interface, u"ApprovalDelay",
304
 
                               timedelta_to_milliseconds
305
 
                               (string_to_delta(options.
306
 
                                                approval_delay)),
307
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
308
 
                if options.approval_duration:
309
 
                    client.Set(client_interface, u"ApprovalDuration",
310
 
                               timedelta_to_milliseconds
311
 
                               (string_to_delta(options.
312
 
                                                approval_duration)),
313
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
314
253
                if options.timeout:
315
 
                    client.Set(client_interface, u"Timeout",
316
 
                               timedelta_to_milliseconds
317
 
                               (string_to_delta(options.timeout)),
 
254
                    client.Set(client_interface, u"timeout",
 
255
                               timedelta_to_milliseconds(string_to_delta
 
256
                                                         (options.timeout)),
318
257
                               dbus_interface=dbus.PROPERTIES_IFACE)
319
258
                if options.secret:
320
 
                    client.Set(client_interface, u"Secret",
321
 
                               dbus.ByteArray(open(options.secret,
322
 
                                                   u"rb").read()),
323
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
324
 
                if options.approved_by_default is not None:
325
 
                    client.Set(client_interface, u"ApprovedByDefault",
326
 
                               dbus.Boolean(options
327
 
                                            .approved_by_default),
 
259
                    client.Set(client_interface, u"secret",
 
260
                               dbus.ByteArray(open(options.secret, u'rb').read()),
328
261
                               dbus_interface=dbus.PROPERTIES_IFACE)
329
262
                if options.approve:
330
 
                    client.Approve(dbus.Boolean(True),
331
 
                                   dbus_interface=client_interface)
332
 
                elif options.deny:
333
 
                    client.Approve(dbus.Boolean(False),
334
 
                                   dbus_interface=client_interface)
 
263
                    client.Approve(dbus.Boolean(True), dbus_interface=client_interface)
 
264
                if options.deny:
 
265
                    client.Approve(dbus.Boolean(False), dbus_interface=client_interface)
335
266
 
336
 
if __name__ == u"__main__":
 
267
if __name__ == '__main__':
337
268
    main()