/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
23
23
    'Fingerprint': u'Fingerprint',
24
24
    'CheckerRunning': u'Check Is Running',
25
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
26
    'Checker': u'Checker',
31
27
    }
32
28
defaultkeywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK')
97
93
    def valuetostring(value, keyword):
98
94
        if type(value) is dbus.Boolean:
99
95
            return u"Yes" if value else u"No"
100
 
        if keyword in (u"Timeout", u"Interval", u"ApprovalDelay",
101
 
                       u"ApprovalDuration"):
 
96
        if keyword in (u"Timeout", u"Interval"):
102
97
            return milliseconds_to_string(value)
103
98
        return unicode(value)
104
99
    
127
122
                options.checker is not None,
128
123
                options.timeout is not None,
129
124
                options.interval is not None,
130
 
                options.approved_by_default is not None,
131
 
                options.approval_delay is not None,
132
 
                options.approval_duration is not None,
133
125
                options.host is not None,
134
126
                options.secret is not None,
135
127
                options.approve,
161
153
                          help="Set timeout for client")
162
154
        parser.add_option("-i", "--interval", type="string",
163
155
                          help="Set checker interval for client")
164
 
        parser.add_option("--approve-by-default", action="store_true",
165
 
                          dest=u"approved_by_default",
166
 
                          help="Set client to be approved by default")
167
 
        parser.add_option("--deny-by-default", action="store_false",
168
 
                          dest=u"approved_by_default",
169
 
                          help="Set client to be denied by default")
170
 
        parser.add_option("--approval-delay", type="string",
171
 
                          help="Set delay before client approve/deny")
172
 
        parser.add_option("--approval-duration", type="string",
173
 
                          help="Set duration of one client approval")
174
156
        parser.add_option("-H", "--host", type="string",
175
157
                          help="Set host for client")
176
158
        parser.add_option("-s", "--secret", type="string",
182
164
        options, client_names = parser.parse_args()
183
165
        
184
166
        if has_actions(options) and not client_names and not options.all:
185
 
            parser.error('Options require clients names or --all.')
 
167
            parser.error('Options requires clients names or --all.')
186
168
        if options.verbose and has_actions(options):
187
 
            parser.error('--verbose can only be used alone or with'
188
 
                         ' --all.')
 
169
            parser.error('Verbose option can only be used alone or with --all.')
189
170
        if options.all and not has_actions(options):
190
 
            parser.error('--all requires an action.')
191
 
        
 
171
            parser.error('--all requires an action')
 
172
            
192
173
        try:
193
174
            bus = dbus.SystemBus()
194
175
            mandos_dbus_objc = bus.get_object(busname, server_path)
235
216
            
236
217
        if not has_actions(options) and clients:
237
218
            if options.verbose:
238
 
                keywords = ('Name', 'Enabled', 'Timeout',
239
 
                            'LastCheckedOK', 'Created', 'Interval',
240
 
                            'Host', 'Fingerprint', 'CheckerRunning',
241
 
                            'LastEnabled', 'ApprovalPending',
242
 
                            'ApprovedByDefault', 'ApprovalDelay',
243
 
                            'ApprovalDuration', 'Checker')
 
219
                keywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK',
 
220
                            'Created', 'Interval', 'Host', 'Fingerprint',
 
221
                            'CheckerRunning', 'LastEnabled', 'Checker')
244
222
            else:
245
223
                keywords = defaultkeywords
246
224
                
276
254
                               timedelta_to_milliseconds
277
255
                               (string_to_delta(options.interval)),
278
256
                               dbus_interface=dbus.PROPERTIES_IFACE)
279
 
                if options.approval_delay:
280
 
                    client.Set(client_interface, u"ApprovalDelay",
281
 
                               timedelta_to_milliseconds
282
 
                               (string_to_delta(options.
283
 
                                                approval_delay)),
284
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
285
 
                if options.approval_duration:
286
 
                    client.Set(client_interface, u"ApprovalDuration",
287
 
                               timedelta_to_milliseconds
288
 
                               (string_to_delta(options.
289
 
                                                approval_duration)),
290
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
291
257
                if options.timeout:
292
258
                    client.Set(client_interface, u"Timeout",
293
 
                               timedelta_to_milliseconds
294
 
                               (string_to_delta(options.timeout)),
 
259
                               timedelta_to_milliseconds(string_to_delta
 
260
                                                         (options.timeout)),
295
261
                               dbus_interface=dbus.PROPERTIES_IFACE)
296
262
                if options.secret:
297
263
                    client.Set(client_interface, u"Secret",
298
 
                               dbus.ByteArray(open(options.secret,
299
 
                                                   u'rb').read()),
300
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
301
 
                if options.approved_by_default is not None:
302
 
                    client.Set(client_interface, u"ApprovedByDefault",
303
 
                               dbus.Boolean(options
304
 
                                            .approved_by_default),
 
264
                               dbus.ByteArray(open(options.secret, u'rb').read()),
305
265
                               dbus_interface=dbus.PROPERTIES_IFACE)
306
266
                if options.approve:
307
 
                    client.Approve(dbus.Boolean(True),
308
 
                                   dbus_interface=client_interface)
309
 
                elif options.deny:
310
 
                    client.Approve(dbus.Boolean(False),
311
 
                                   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)
312
270
 
313
271
if __name__ == '__main__':
314
272
    main()