/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: 2010-09-25 19:55:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100925195517-u0qfi01huxl72f75
* mandos (Client.runtime_expansions): New attribute containing the
                                      allowed runtime expansions.

* mandos-clients.conf.xml (OPTIONS): Reordered alphabetically.

* mandos-ctl: Bug fix: print timeout and interval values pretty again.

* mandos-ctl.xml (EXAMPLE): Added more examples.

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
38
17
    'Enabled': u'Enabled',
39
18
    'Timeout': u'Timeout',
40
19
    'LastCheckedOK': u'Last Successful Check',
41
 
    'LastApprovalRequest': u'Last Approval Request',
42
20
    'Created': u'Created',
43
21
    'Interval': u'Interval',
44
22
    'Host': u'Host',
45
23
    'Fingerprint': u'Fingerprint',
46
24
    'CheckerRunning': u'Check Is Running',
47
25
    '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
26
    'Checker': u'Checker',
53
27
    }
54
28
defaultkeywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK')
57
31
server_path = '/'
58
32
server_interface = domain + '.Mandos'
59
33
client_interface = domain + '.Mandos.Client'
60
 
version = "1.2.1"
 
34
version = "1.0.14"
61
35
 
62
36
def timedelta_to_milliseconds(td):
63
37
    "Convert a datetime.timedelta object to milliseconds"
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
    
149
122
                options.checker is not None,
150
123
                options.timeout is not None,
151
124
                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
125
                options.host is not None,
156
126
                options.secret is not None,
157
127
                options.approve,
183
153
                          help="Set timeout for client")
184
154
        parser.add_option("-i", "--interval", type="string",
185
155
                          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
156
        parser.add_option("-H", "--host", type="string",
197
157
                          help="Set host for client")
198
158
        parser.add_option("-s", "--secret", type="string",
204
164
        options, client_names = parser.parse_args()
205
165
        
206
166
        if has_actions(options) and not client_names and not options.all:
207
 
            parser.error('Options require clients names or --all.')
 
167
            parser.error('Options requires clients names or --all.')
208
168
        if options.verbose and has_actions(options):
209
 
            parser.error('--verbose can only be used alone or with'
210
 
                         ' --all.')
 
169
            parser.error('Verbose option can only be used alone or with --all.')
211
170
        if options.all and not has_actions(options):
212
 
            parser.error('--all requires an action.')
213
 
        
 
171
            parser.error('--all requires an action')
 
172
            
214
173
        try:
215
174
            bus = dbus.SystemBus()
216
175
            mandos_dbus_objc = bus.get_object(busname, server_path)
257
216
            
258
217
        if not has_actions(options) and clients:
259
218
            if options.verbose:
260
 
                keywords = ('Name', 'Enabled', 'Timeout',
261
 
                            'LastCheckedOK', 'Created', 'Interval',
262
 
                            'Host', 'Fingerprint', 'CheckerRunning',
263
 
                            'LastEnabled', 'ApprovalPending',
264
 
                            'ApprovedByDefault',
265
 
                            'LastApprovalRequest', 'ApprovalDelay',
266
 
                            'ApprovalDuration', 'Checker')
 
219
                keywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK',
 
220
                            'Created', 'Interval', 'Host', 'Fingerprint',
 
221
                            'CheckerRunning', 'LastEnabled', 'Checker')
267
222
            else:
268
223
                keywords = defaultkeywords
269
 
            
 
224
                
270
225
            print_clients(clients.values(), keywords)
271
226
        else:
272
227
            # Process each client in the list by all selected options
299
254
                               timedelta_to_milliseconds
300
255
                               (string_to_delta(options.interval)),
301
256
                               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
257
                if options.timeout:
315
258
                    client.Set(client_interface, u"Timeout",
316
 
                               timedelta_to_milliseconds
317
 
                               (string_to_delta(options.timeout)),
 
259
                               timedelta_to_milliseconds(string_to_delta
 
260
                                                         (options.timeout)),
318
261
                               dbus_interface=dbus.PROPERTIES_IFACE)
319
262
                if options.secret:
320
263
                    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),
 
264
                               dbus.ByteArray(open(options.secret, u'rb').read()),
328
265
                               dbus_interface=dbus.PROPERTIES_IFACE)
329
266
                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)
 
267
                    client.Approve(dbus.Boolean(True), dbus_interface=client_interface)
 
268
                if options.deny:
 
269
                    client.Approve(dbus.Boolean(False), dbus_interface=client_interface)
335
270
 
336
271
if __name__ == '__main__':
337
272
    main()