/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

  • Committer: teddy at bsnet
  • Date: 2011-02-11 19:02:24 UTC
  • mto: (237.7.13 mandos)
  • mto: This revision was merged to the branch mainline in revision 282.
  • Revision ID: teddy@fukt.bsnet.se-20110211190224-62celso7mswtep65
* mandos-monitor: Use unicode string literals.  Update __future__
                  import line to use all available and applicable
                  imports.

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