/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

* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
                                to "_" in D-Bus object paths.
  (MandosServer.handle_ipc): Bug fix: Send only address string to
                             D-Bus signal, not whole tuple.

* mandos-ctl: New options "--approve-by-default", "--deny-by-default",
              "--approval-delay", and "--approval-duration".
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new options.

* mandos-monitor (MandosClientWidget.update): Fix spelling.

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
 
 
25
 
from __future__ import (division, absolute_import, print_function,
26
 
                        unicode_literals)
27
 
 
 
3
 
 
4
from __future__ import division
28
5
import sys
29
6
import dbus
30
7
from optparse import OptionParser
33
10
import re
34
11
import os
35
12
 
36
 
locale.setlocale(locale.LC_ALL, "")
 
13
locale.setlocale(locale.LC_ALL, u'')
37
14
 
38
15
tablewords = {
39
 
    "Name": "Name",
40
 
    "Enabled": "Enabled",
41
 
    "Timeout": "Timeout",
42
 
    "LastCheckedOK": "Last Successful Check",
43
 
    "LastApprovalRequest": "Last Approval Request",
44
 
    "Created": "Created",
45
 
    "Interval": "Interval",
46
 
    "Host": "Host",
47
 
    "Fingerprint": "Fingerprint",
48
 
    "CheckerRunning": "Check Is Running",
49
 
    "LastEnabled": "Last Enabled",
50
 
    "ApprovalPending": "Approval Is Pending",
51
 
    "ApprovedByDefault": "Approved By Default",
52
 
    "ApprovalDelay": "Approval Delay",
53
 
    "ApprovalDuration": "Approval Duration",
54
 
    "Checker": "Checker",
 
16
    'Name': u'Name',
 
17
    'Enabled': u'Enabled',
 
18
    'Timeout': u'Timeout',
 
19
    'LastCheckedOK': u'Last Successful Check',
 
20
    'Created': u'Created',
 
21
    'Interval': u'Interval',
 
22
    'Host': u'Host',
 
23
    'Fingerprint': u'Fingerprint',
 
24
    'CheckerRunning': u'Check Is Running',
 
25
    'LastEnabled': u'Last Enabled',
 
26
    'ApprovalPending': u'Approval Is Pending',
 
27
    'ApprovedByDefault': u'Approved By Default',
 
28
    'ApprovalDelay': u"Approval Delay",
 
29
    'ApprovalDuration': u"Approval Duration",
 
30
    'Checker': u'Checker',
55
31
    }
56
 
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
57
 
domain = "se.bsnet.fukt"
58
 
busname = domain + ".Mandos"
59
 
server_path = "/"
60
 
server_interface = domain + ".Mandos"
61
 
client_interface = domain + ".Mandos.Client"
62
 
version = "1.2.3"
 
32
defaultkeywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK')
 
33
domain = 'se.bsnet.fukt'
 
34
busname = domain + '.Mandos'
 
35
server_path = '/'
 
36
server_interface = domain + '.Mandos'
 
37
client_interface = domain + '.Mandos.Client'
 
38
version = "1.0.14"
63
39
 
64
40
def timedelta_to_milliseconds(td):
65
 
    """Convert a datetime.timedelta object to milliseconds"""
 
41
    "Convert a datetime.timedelta object to milliseconds"
66
42
    return ((td.days * 24 * 60 * 60 * 1000)
67
43
            + (td.seconds * 1000)
68
44
            + (td.microseconds // 1000))
69
45
 
70
46
def milliseconds_to_string(ms):
71
47
    td = datetime.timedelta(0, 0, 0, ms)
72
 
    return ("%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
 
48
    return (u"%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
73
49
            % { "days": "%dT" % td.days if td.days else "",
74
50
                "hours": td.seconds // 3600,
75
51
                "minutes": (td.seconds % 3600) // 60,
80
56
def string_to_delta(interval):
81
57
    """Parse a string and return a datetime.timedelta
82
58
 
83
 
    >>> string_to_delta("7d")
 
59
    >>> string_to_delta('7d')
84
60
    datetime.timedelta(7)
85
 
    >>> string_to_delta("60s")
 
61
    >>> string_to_delta('60s')
86
62
    datetime.timedelta(0, 60)
87
 
    >>> string_to_delta("60m")
 
63
    >>> string_to_delta('60m')
88
64
    datetime.timedelta(0, 3600)
89
 
    >>> string_to_delta("24h")
 
65
    >>> string_to_delta('24h')
90
66
    datetime.timedelta(1)
91
 
    >>> string_to_delta("1w")
 
67
    >>> string_to_delta(u'1w')
92
68
    datetime.timedelta(7)
93
 
    >>> string_to_delta("5m 30s")
 
69
    >>> string_to_delta('5m 30s')
94
70
    datetime.timedelta(0, 330)
95
71
    """
96
72
    timevalue = datetime.timedelta(0)
100
76
        try:
101
77
            suffix = unicode(s[-1])
102
78
            value = int(s[:-1])
103
 
            if suffix == "d":
 
79
            if suffix == u"d":
104
80
                delta = datetime.timedelta(value)
105
 
            elif suffix == "s":
 
81
            elif suffix == u"s":
106
82
                delta = datetime.timedelta(0, value)
107
 
            elif suffix == "m":
 
83
            elif suffix == u"m":
108
84
                delta = datetime.timedelta(0, 0, 0, 0, value)
109
 
            elif suffix == "h":
 
85
            elif suffix == u"h":
110
86
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
111
 
            elif suffix == "w":
 
87
            elif suffix == u"w":
112
88
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
113
89
            else:
114
90
                raise ValueError
120
96
def print_clients(clients, keywords):
121
97
    def valuetostring(value, keyword):
122
98
        if type(value) is dbus.Boolean:
123
 
            return "Yes" if value else "No"
124
 
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
125
 
                       "ApprovalDuration"):
 
99
            return u"Yes" if value else u"No"
 
100
        if keyword in (u"Timeout", u"Interval", u"ApprovalDelay",
 
101
                       u"ApprovalDuration"):
126
102
            return milliseconds_to_string(value)
127
103
        return unicode(value)
128
104
    
129
105
    # Create format string to print table rows
130
 
    format_string = " ".join("%%-%ds" %
131
 
                             max(len(tablewords[key]),
132
 
                                 max(len(valuetostring(client[key],
133
 
                                                       key))
134
 
                                     for client in
135
 
                                     clients))
136
 
                             for key in keywords)
 
106
    format_string = u' '.join(u'%%-%ds' %
 
107
                              max(len(tablewords[key]),
 
108
                                  max(len(valuetostring(client[key],
 
109
                                                        key))
 
110
                                      for client in
 
111
                                      clients))
 
112
                              for key in keywords)
137
113
    # Print header line
138
 
    print(format_string % tuple(tablewords[key] for key in keywords))
 
114
    print format_string % tuple(tablewords[key] for key in keywords)
139
115
    for client in clients:
140
 
        print(format_string % tuple(valuetostring(client[key], key)
141
 
                                    for key in keywords))
 
116
        print format_string % tuple(valuetostring(client[key], key)
 
117
                                    for key in keywords)
142
118
 
143
119
def has_actions(options):
144
120
    return any((options.enable,
186
162
        parser.add_option("-i", "--interval", type="string",
187
163
                          help="Set checker interval for client")
188
164
        parser.add_option("--approve-by-default", action="store_true",
189
 
                          dest="approved_by_default",
 
165
                          dest=u"approved_by_default",
190
166
                          help="Set client to be approved by default")
191
167
        parser.add_option("--deny-by-default", action="store_false",
192
 
                          dest="approved_by_default",
 
168
                          dest=u"approved_by_default",
193
169
                          help="Set client to be denied by default")
194
170
        parser.add_option("--approval-delay", type="string",
195
171
                          help="Set delay before client approve/deny")
206
182
        options, client_names = parser.parse_args()
207
183
        
208
184
        if has_actions(options) and not client_names and not options.all:
209
 
            parser.error("Options require clients names or --all.")
 
185
            parser.error('Options require clients names or --all.')
210
186
        if options.verbose and has_actions(options):
211
 
            parser.error("--verbose can only be used alone or with"
212
 
                         " --all.")
 
187
            parser.error('--verbose can only be used alone or with'
 
188
                         ' --all.')
213
189
        if options.all and not has_actions(options):
214
 
            parser.error("--all requires an action.")
 
190
            parser.error('--all requires an action.')
215
191
        
216
192
        try:
217
193
            bus = dbus.SystemBus()
218
194
            mandos_dbus_objc = bus.get_object(busname, server_path)
219
195
        except dbus.exceptions.DBusException:
220
 
            print("Could not connect to Mandos server",
221
 
                  file=sys.stderr)
 
196
            print >> sys.stderr, "Could not connect to Mandos server"
222
197
            sys.exit(1)
223
198
    
224
199
        mandos_serv = dbus.Interface(mandos_dbus_objc,
237
212
                os.dup2(stderrcopy, sys.stderr.fileno())
238
213
                os.close(stderrcopy)
239
214
        except dbus.exceptions.DBusException, e:
240
 
            print("Access denied: Accessing mandos server through dbus.",
241
 
                  file=sys.stderr)
 
215
            print >> sys.stderr, "Access denied: Accessing mandos server through dbus."
242
216
            sys.exit(1)
243
217
            
244
218
        # Compile dict of (clients: properties) to process
251
225
        else:
252
226
            for name in client_names:
253
227
                for path, client in mandos_clients.iteritems():
254
 
                    if client["Name"] == name:
 
228
                    if client['Name'] == name:
255
229
                        client_objc = bus.get_object(busname, path)
256
230
                        clients[client_objc] = client
257
231
                        break
258
232
                else:
259
 
                    print("Client not found on server: %r" % name,
260
 
                          file=sys.stderr)
 
233
                    print >> sys.stderr, "Client not found on server: %r" % name
261
234
                    sys.exit(1)
262
235
            
263
236
        if not has_actions(options) and clients:
264
237
            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")
 
238
                keywords = ('Name', 'Enabled', 'Timeout',
 
239
                            'LastCheckedOK', 'Created', 'Interval',
 
240
                            'Host', 'Fingerprint', 'CheckerRunning',
 
241
                            'LastEnabled', 'ApprovalPending',
 
242
                            'ApprovedByDefault', 'ApprovalDelay',
 
243
                            'ApprovalDuration', 'Checker')
272
244
            else:
273
245
                keywords = defaultkeywords
274
 
            
 
246
                
275
247
            print_clients(clients.values(), keywords)
276
248
        else:
277
249
            # Process each client in the list by all selected options
290
262
                    client.StopChecker(dbus_interface=client_interface)
291
263
                if options.is_enabled:
292
264
                    sys.exit(0 if client.Get(client_interface,
293
 
                                             "Enabled",
 
265
                                             u"Enabled",
294
266
                                             dbus_interface=dbus.PROPERTIES_IFACE)
295
267
                             else 1)
296
268
                if options.checker:
297
 
                    client.Set(client_interface, "Checker", options.checker,
 
269
                    client.Set(client_interface, u"Checker", options.checker,
298
270
                               dbus_interface=dbus.PROPERTIES_IFACE)
299
271
                if options.host:
300
 
                    client.Set(client_interface, "Host", options.host,
 
272
                    client.Set(client_interface, u"Host", options.host,
301
273
                               dbus_interface=dbus.PROPERTIES_IFACE)
302
274
                if options.interval:
303
 
                    client.Set(client_interface, "Interval",
 
275
                    client.Set(client_interface, u"Interval",
304
276
                               timedelta_to_milliseconds
305
277
                               (string_to_delta(options.interval)),
306
278
                               dbus_interface=dbus.PROPERTIES_IFACE)
307
279
                if options.approval_delay:
308
 
                    client.Set(client_interface, "ApprovalDelay",
 
280
                    client.Set(client_interface, u"ApprovalDelay",
309
281
                               timedelta_to_milliseconds
310
282
                               (string_to_delta(options.
311
283
                                                approval_delay)),
312
284
                               dbus_interface=dbus.PROPERTIES_IFACE)
313
285
                if options.approval_duration:
314
 
                    client.Set(client_interface, "ApprovalDuration",
 
286
                    client.Set(client_interface, u"ApprovalDuration",
315
287
                               timedelta_to_milliseconds
316
288
                               (string_to_delta(options.
317
289
                                                approval_duration)),
318
290
                               dbus_interface=dbus.PROPERTIES_IFACE)
319
291
                if options.timeout:
320
 
                    client.Set(client_interface, "Timeout",
 
292
                    client.Set(client_interface, u"Timeout",
321
293
                               timedelta_to_milliseconds
322
294
                               (string_to_delta(options.timeout)),
323
295
                               dbus_interface=dbus.PROPERTIES_IFACE)
324
296
                if options.secret:
325
 
                    client.Set(client_interface, "Secret",
 
297
                    client.Set(client_interface, u"Secret",
326
298
                               dbus.ByteArray(open(options.secret,
327
 
                                                   "rb").read()),
 
299
                                                   u'rb').read()),
328
300
                               dbus_interface=dbus.PROPERTIES_IFACE)
329
301
                if options.approved_by_default is not None:
330
 
                    client.Set(client_interface, "ApprovedByDefault",
 
302
                    client.Set(client_interface, u"ApprovedByDefault",
331
303
                               dbus.Boolean(options
332
304
                                            .approved_by_default),
333
305
                               dbus_interface=dbus.PROPERTIES_IFACE)
338
310
                    client.Approve(dbus.Boolean(False),
339
311
                                   dbus_interface=client_interface)
340
312
 
341
 
if __name__ == "__main__":
 
313
if __name__ == '__main__':
342
314
    main()