/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-2012 Teddy Hogeborn
7
 
# Copyright © 2008-2012 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
21
 
# <http://www.gnu.org/licenses/>.
22
 
# 
23
 
# Contact the authors at <mandos@recompile.se>.
24
 
# 
25
 
 
26
 
from __future__ import (division, absolute_import, print_function,
27
 
                        unicode_literals)
28
 
 
29
 
from future_builtins import *
30
 
 
 
3
 
 
4
from __future__ import division
31
5
import sys
32
6
import dbus
33
 
import argparse
 
7
from optparse import OptionParser
34
8
import locale
35
9
import datetime
36
10
import re
37
11
import os
38
12
 
39
 
locale.setlocale(locale.LC_ALL, "")
 
13
locale.setlocale(locale.LC_ALL, u'')
40
14
 
41
15
tablewords = {
42
 
    "Name": "Name",
43
 
    "Enabled": "Enabled",
44
 
    "Timeout": "Timeout",
45
 
    "LastCheckedOK": "Last Successful Check",
46
 
    "LastApprovalRequest": "Last Approval Request",
47
 
    "Created": "Created",
48
 
    "Interval": "Interval",
49
 
    "Host": "Host",
50
 
    "Fingerprint": "Fingerprint",
51
 
    "CheckerRunning": "Check Is Running",
52
 
    "LastEnabled": "Last Enabled",
53
 
    "ApprovalPending": "Approval Is Pending",
54
 
    "ApprovedByDefault": "Approved By Default",
55
 
    "ApprovalDelay": "Approval Delay",
56
 
    "ApprovalDuration": "Approval Duration",
57
 
    "Checker": "Checker",
58
 
    "ExtendedTimeout" : "Extended Timeout"
 
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
    'Checker': u'Checker',
59
27
    }
60
 
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
61
 
domain = "se.recompile"
62
 
busname = domain + ".Mandos"
63
 
server_path = "/"
64
 
server_interface = domain + ".Mandos"
65
 
client_interface = domain + ".Mandos.Client"
66
 
version = "1.5.3"
 
28
defaultkeywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK')
 
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"
67
35
 
68
36
def timedelta_to_milliseconds(td):
69
 
    """Convert a datetime.timedelta object to milliseconds"""
 
37
    "Convert a datetime.timedelta object to milliseconds"
70
38
    return ((td.days * 24 * 60 * 60 * 1000)
71
39
            + (td.seconds * 1000)
72
40
            + (td.microseconds // 1000))
73
41
 
74
42
def milliseconds_to_string(ms):
75
43
    td = datetime.timedelta(0, 0, 0, ms)
76
 
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
77
 
            .format(days = "{0}T".format(td.days) if td.days else "",
78
 
                    hours = td.seconds // 3600,
79
 
                    minutes = (td.seconds % 3600) // 60,
80
 
                    seconds = td.seconds % 60,
81
 
                    ))
 
44
    return (u"%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
 
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,
 
49
                })
 
50
 
82
51
 
83
52
def string_to_delta(interval):
84
53
    """Parse a string and return a datetime.timedelta
85
 
    
86
 
    >>> string_to_delta("7d")
 
54
 
 
55
    >>> string_to_delta('7d')
87
56
    datetime.timedelta(7)
88
 
    >>> string_to_delta("60s")
 
57
    >>> string_to_delta('60s')
89
58
    datetime.timedelta(0, 60)
90
 
    >>> string_to_delta("60m")
 
59
    >>> string_to_delta('60m')
91
60
    datetime.timedelta(0, 3600)
92
 
    >>> string_to_delta("24h")
 
61
    >>> string_to_delta('24h')
93
62
    datetime.timedelta(1)
94
 
    >>> string_to_delta("1w")
 
63
    >>> string_to_delta(u'1w')
95
64
    datetime.timedelta(7)
96
 
    >>> string_to_delta("5m 30s")
 
65
    >>> string_to_delta('5m 30s')
97
66
    datetime.timedelta(0, 330)
98
67
    """
99
 
    value = datetime.timedelta(0)
100
 
    regexp = re.compile("(\d+)([dsmhw]?)")
 
68
    timevalue = datetime.timedelta(0)
 
69
    regexp = re.compile("\d+[dsmhw]")
101
70
    
102
 
    for num, suffix in regexp.findall(interval):
103
 
        if suffix == "d":
104
 
            value += datetime.timedelta(int(num))
105
 
        elif suffix == "s":
106
 
            value += datetime.timedelta(0, int(num))
107
 
        elif suffix == "m":
108
 
            value += datetime.timedelta(0, 0, 0, 0, int(num))
109
 
        elif suffix == "h":
110
 
            value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
111
 
        elif suffix == "w":
112
 
            value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
113
 
        elif suffix == "":
114
 
            value += datetime.timedelta(0, 0, 0, int(num))
115
 
    return value
 
71
    for s in regexp.findall(interval):
 
72
        try:
 
73
            suffix = unicode(s[-1])
 
74
            value = int(s[:-1])
 
75
            if suffix == u"d":
 
76
                delta = datetime.timedelta(value)
 
77
            elif suffix == u"s":
 
78
                delta = datetime.timedelta(0, value)
 
79
            elif suffix == u"m":
 
80
                delta = datetime.timedelta(0, 0, 0, 0, value)
 
81
            elif suffix == u"h":
 
82
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
83
            elif suffix == u"w":
 
84
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
85
            else:
 
86
                raise ValueError
 
87
        except (ValueError, IndexError):
 
88
            raise ValueError
 
89
        timevalue += delta
 
90
    return timevalue
116
91
 
117
92
def print_clients(clients, keywords):
118
93
    def valuetostring(value, keyword):
119
94
        if type(value) is dbus.Boolean:
120
 
            return "Yes" if value else "No"
121
 
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
122
 
                       "ApprovalDuration", "ExtendedTimeout"):
 
95
            return u"Yes" if value else u"No"
 
96
        if keyword in (u"Timeout", u"Interval"):
123
97
            return milliseconds_to_string(value)
124
98
        return unicode(value)
125
99
    
126
100
    # Create format string to print table rows
127
 
    format_string = " ".join("{{{key}:{width}}}".format(
128
 
            width = max(len(tablewords[key]),
129
 
                        max(len(valuetostring(client[key],
130
 
                                              key))
131
 
                            for client in
132
 
                            clients)),
133
 
            key = key) for key in keywords)
 
101
    format_string = u' '.join(u'%%-%ds' %
 
102
                              max(len(tablewords[key]),
 
103
                                  max(len(valuetostring(client[key],
 
104
                                                        key))
 
105
                                      for client in
 
106
                                      clients))
 
107
                              for key in keywords)
134
108
    # Print header line
135
 
    print(format_string.format(**tablewords))
 
109
    print format_string % tuple(tablewords[key] for key in keywords)
136
110
    for client in clients:
137
 
        print(format_string.format(**dict((key,
138
 
                                           valuetostring(client[key],
139
 
                                                         key))
140
 
                                          for key in keywords)))
 
111
        print format_string % tuple(valuetostring(client[key], key)
 
112
                                    for key in keywords)
141
113
 
142
114
def has_actions(options):
143
115
    return any((options.enable,
149
121
                options.remove,
150
122
                options.checker is not None,
151
123
                options.timeout is not None,
152
 
                options.extended_timeout is not None,
153
124
                options.interval is not None,
154
 
                options.approved_by_default is not None,
155
 
                options.approval_delay is not None,
156
 
                options.approval_duration is not None,
157
125
                options.host is not None,
158
126
                options.secret is not None,
159
127
                options.approve,
160
128
                options.deny))
161
 
 
 
129
        
162
130
def main():
163
 
    parser = argparse.ArgumentParser()
164
 
    parser.add_argument("--version", action="version",
165
 
                        version = "%(prog)s {0}".format(version),
166
 
                        help="show version number and exit")
167
 
    parser.add_argument("-a", "--all", action="store_true",
168
 
                        help="Select all clients")
169
 
    parser.add_argument("-v", "--verbose", action="store_true",
170
 
                        help="Print all fields")
171
 
    parser.add_argument("-e", "--enable", action="store_true",
172
 
                        help="Enable client")
173
 
    parser.add_argument("-d", "--disable", action="store_true",
174
 
                        help="disable client")
175
 
    parser.add_argument("-b", "--bump-timeout", action="store_true",
176
 
                        help="Bump timeout for client")
177
 
    parser.add_argument("--start-checker", action="store_true",
178
 
                        help="Start checker for client")
179
 
    parser.add_argument("--stop-checker", action="store_true",
180
 
                        help="Stop checker for client")
181
 
    parser.add_argument("-V", "--is-enabled", action="store_true",
182
 
                        help="Check if client is enabled")
183
 
    parser.add_argument("-r", "--remove", action="store_true",
184
 
                        help="Remove client")
185
 
    parser.add_argument("-c", "--checker",
186
 
                        help="Set checker command for client")
187
 
    parser.add_argument("-t", "--timeout",
188
 
                        help="Set timeout for client")
189
 
    parser.add_argument("--extended-timeout",
190
 
                        help="Set extended timeout for client")
191
 
    parser.add_argument("-i", "--interval",
192
 
                        help="Set checker interval for client")
193
 
    parser.add_argument("--approve-by-default", action="store_true",
194
 
                        default=None, dest="approved_by_default",
195
 
                        help="Set client to be approved by default")
196
 
    parser.add_argument("--deny-by-default", action="store_false",
197
 
                        dest="approved_by_default",
198
 
                        help="Set client to be denied by default")
199
 
    parser.add_argument("--approval-delay",
200
 
                        help="Set delay before client approve/deny")
201
 
    parser.add_argument("--approval-duration",
202
 
                        help="Set duration of one client approval")
203
 
    parser.add_argument("-H", "--host", help="Set host for client")
204
 
    parser.add_argument("-s", "--secret", type=file,
205
 
                        help="Set password blob (file) for client")
206
 
    parser.add_argument("-A", "--approve", action="store_true",
207
 
                        help="Approve any current client request")
208
 
    parser.add_argument("-D", "--deny", action="store_true",
209
 
                        help="Deny any current client request")
210
 
    parser.add_argument("client", nargs="*", help="Client name")
211
 
    options = parser.parse_args()
212
 
    
213
 
    if has_actions(options) and not (options.client or options.all):
214
 
        parser.error("Options require clients names or --all.")
215
 
    if options.verbose and has_actions(options):
216
 
        parser.error("--verbose can only be used alone or with"
217
 
                     " --all.")
218
 
    if options.all and not has_actions(options):
219
 
        parser.error("--all requires an action.")
220
 
    
221
 
    try:
222
 
        bus = dbus.SystemBus()
223
 
        mandos_dbus_objc = bus.get_object(busname, server_path)
224
 
    except dbus.exceptions.DBusException:
225
 
        print("Could not connect to Mandos server",
226
 
              file=sys.stderr)
227
 
        sys.exit(1)
228
 
    
229
 
    mandos_serv = dbus.Interface(mandos_dbus_objc,
230
 
                                 dbus_interface = server_interface)
231
 
    
232
 
    #block stderr since dbus library prints to stderr
233
 
    null = os.open(os.path.devnull, os.O_RDWR)
234
 
    stderrcopy = os.dup(sys.stderr.fileno())
235
 
    os.dup2(null, sys.stderr.fileno())
236
 
    os.close(null)
237
 
    try:
238
 
        try:
239
 
            mandos_clients = mandos_serv.GetAllClientsWithProperties()
240
 
        finally:
241
 
            #restore stderr
242
 
            os.dup2(stderrcopy, sys.stderr.fileno())
243
 
            os.close(stderrcopy)
244
 
    except dbus.exceptions.DBusException:
245
 
        print("Access denied: Accessing mandos server through dbus.",
246
 
              file=sys.stderr)
247
 
        sys.exit(1)
248
 
    
249
 
    # Compile dict of (clients: properties) to process
250
 
    clients={}
251
 
    
252
 
    if options.all or not options.client:
253
 
        clients = dict((bus.get_object(busname, path), properties)
254
 
                       for path, properties in
255
 
                       mandos_clients.iteritems())
256
 
    else:
257
 
        for name in options.client:
258
 
            for path, client in mandos_clients.iteritems():
259
 
                if client["Name"] == name:
260
 
                    client_objc = bus.get_object(busname, path)
261
 
                    clients[client_objc] = client
262
 
                    break
 
131
        parser = OptionParser(version = "%%prog %s" % version)
 
132
        parser.add_option("-a", "--all", action="store_true",
 
133
                          help="Select all clients")
 
134
        parser.add_option("-v", "--verbose", action="store_true",
 
135
                          help="Print all fields")
 
136
        parser.add_option("-e", "--enable", action="store_true",
 
137
                          help="Enable client")
 
138
        parser.add_option("-d", "--disable", action="store_true",
 
139
                          help="disable client")
 
140
        parser.add_option("-b", "--bump-timeout", action="store_true",
 
141
                          help="Bump timeout for client")
 
142
        parser.add_option("--start-checker", action="store_true",
 
143
                          help="Start checker for client")
 
144
        parser.add_option("--stop-checker", action="store_true",
 
145
                          help="Stop checker for client")
 
146
        parser.add_option("-V", "--is-enabled", action="store_true",
 
147
                          help="Check if client is enabled")
 
148
        parser.add_option("-r", "--remove", action="store_true",
 
149
                          help="Remove client")
 
150
        parser.add_option("-c", "--checker", type="string",
 
151
                          help="Set checker command for client")
 
152
        parser.add_option("-t", "--timeout", type="string",
 
153
                          help="Set timeout for client")
 
154
        parser.add_option("-i", "--interval", type="string",
 
155
                          help="Set checker interval for client")
 
156
        parser.add_option("-H", "--host", type="string",
 
157
                          help="Set host for client")
 
158
        parser.add_option("-s", "--secret", type="string",
 
159
                          help="Set password blob (file) for client")
 
160
        parser.add_option("-A", "--approve", action="store_true",
 
161
                          help="Approve any current client request")
 
162
        parser.add_option("-D", "--deny", action="store_true",
 
163
                          help="Deny any current client request")
 
164
        options, client_names = parser.parse_args()
 
165
        
 
166
        if has_actions(options) and not client_names and not options.all:
 
167
            parser.error('Options requires clients names or --all.')
 
168
        if options.verbose and has_actions(options):
 
169
            parser.error('Verbose option can only be used alone or with --all.')
 
170
        if options.all and not has_actions(options):
 
171
            parser.error('--all requires an action')
 
172
            
 
173
        try:
 
174
            bus = dbus.SystemBus()
 
175
            mandos_dbus_objc = bus.get_object(busname, server_path)
 
176
        except dbus.exceptions.DBusException:
 
177
            print >> sys.stderr, "Could not connect to Mandos server"
 
178
            sys.exit(1)
 
179
    
 
180
        mandos_serv = dbus.Interface(mandos_dbus_objc,
 
181
                                     dbus_interface = server_interface)
 
182
 
 
183
        #block stderr since dbus library prints to stderr
 
184
        null = os.open(os.path.devnull, os.O_RDWR)
 
185
        stderrcopy = os.dup(sys.stderr.fileno())
 
186
        os.dup2(null, sys.stderr.fileno())
 
187
        os.close(null)
 
188
        try:
 
189
            try:
 
190
                mandos_clients = mandos_serv.GetAllClientsWithProperties()
 
191
            finally:
 
192
                #restore stderr
 
193
                os.dup2(stderrcopy, sys.stderr.fileno())
 
194
                os.close(stderrcopy)
 
195
        except dbus.exceptions.DBusException, e:
 
196
            print >> sys.stderr, "Access denied: Accessing mandos server through dbus."
 
197
            sys.exit(1)
 
198
            
 
199
        # Compile dict of (clients: properties) to process
 
200
        clients={}
 
201
        
 
202
        if options.all or not client_names:
 
203
            clients = dict((bus.get_object(busname, path), properties)
 
204
                           for path, properties in
 
205
                           mandos_clients.iteritems())
 
206
        else:
 
207
            for name in client_names:
 
208
                for path, client in mandos_clients.iteritems():
 
209
                    if client['Name'] == name:
 
210
                        client_objc = bus.get_object(busname, path)
 
211
                        clients[client_objc] = client
 
212
                        break
 
213
                else:
 
214
                    print >> sys.stderr, "Client not found on server: %r" % name
 
215
                    sys.exit(1)
 
216
            
 
217
        if not has_actions(options) and clients:
 
218
            if options.verbose:
 
219
                keywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK',
 
220
                            'Created', 'Interval', 'Host', 'Fingerprint',
 
221
                            'CheckerRunning', 'LastEnabled', 'Checker')
263
222
            else:
264
 
                print("Client not found on server: {0!r}"
265
 
                      .format(name), file=sys.stderr)
266
 
                sys.exit(1)
267
 
    
268
 
    if not has_actions(options) and clients:
269
 
        if options.verbose:
270
 
            keywords = ("Name", "Enabled", "Timeout",
271
 
                        "LastCheckedOK", "Created", "Interval",
272
 
                        "Host", "Fingerprint", "CheckerRunning",
273
 
                        "LastEnabled", "ApprovalPending",
274
 
                        "ApprovedByDefault",
275
 
                        "LastApprovalRequest", "ApprovalDelay",
276
 
                        "ApprovalDuration", "Checker",
277
 
                        "ExtendedTimeout")
 
223
                keywords = defaultkeywords
 
224
                
 
225
            print_clients(clients.values(), keywords)
278
226
        else:
279
 
            keywords = defaultkeywords
280
 
        
281
 
        print_clients(clients.values(), keywords)
282
 
    else:
283
 
        # Process each client in the list by all selected options
284
 
        for client in clients:
285
 
            def set_client_prop(prop, value):
286
 
                """Set a Client D-Bus property"""
287
 
                client.Set(client_interface, prop, value,
288
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
289
 
            def set_client_prop_ms(prop, value):
290
 
                """Set a Client D-Bus property, converted
291
 
                from a string to milliseconds."""
292
 
                set_client_prop(prop,
293
 
                                timedelta_to_milliseconds
294
 
                                (string_to_delta(value)))
295
 
            if options.remove:
296
 
                mandos_serv.RemoveClient(client.__dbus_object_path__)
297
 
            if options.enable:
298
 
                set_client_prop("Enabled", dbus.Boolean(True))
299
 
            if options.disable:
300
 
                set_client_prop("Enabled", dbus.Boolean(False))
301
 
            if options.bump_timeout:
302
 
                set_client_prop("LastCheckedOK", "")
303
 
            if options.start_checker:
304
 
                set_client_prop("CheckerRunning", dbus.Boolean(True))
305
 
            if options.stop_checker:
306
 
                set_client_prop("CheckerRunning", dbus.Boolean(False))
307
 
            if options.is_enabled:
308
 
                sys.exit(0 if client.Get(client_interface,
309
 
                                         "Enabled",
310
 
                                         dbus_interface=
311
 
                                         dbus.PROPERTIES_IFACE)
312
 
                         else 1)
313
 
            if options.checker is not None:
314
 
                set_client_prop("Checker", options.checker)
315
 
            if options.host is not None:
316
 
                set_client_prop("Host", options.host)
317
 
            if options.interval is not None:
318
 
                set_client_prop_ms("Interval", options.interval)
319
 
            if options.approval_delay is not None:
320
 
                set_client_prop_ms("ApprovalDelay",
321
 
                                   options.approval_delay)
322
 
            if options.approval_duration is not None:
323
 
                set_client_prop_ms("ApprovalDuration",
324
 
                                   options.approval_duration)
325
 
            if options.timeout is not None:
326
 
                set_client_prop_ms("Timeout", options.timeout)
327
 
            if options.extended_timeout is not None:
328
 
                set_client_prop_ms("ExtendedTimeout",
329
 
                                   options.extended_timeout)
330
 
            if options.secret is not None:
331
 
                set_client_prop("Secret",
332
 
                                dbus.ByteArray(options.secret.read()))
333
 
            if options.approved_by_default is not None:
334
 
                set_client_prop("ApprovedByDefault",
335
 
                                dbus.Boolean(options
336
 
                                             .approved_by_default))
337
 
            if options.approve:
338
 
                client.Approve(dbus.Boolean(True),
339
 
                               dbus_interface=client_interface)
340
 
            elif options.deny:
341
 
                client.Approve(dbus.Boolean(False),
342
 
                               dbus_interface=client_interface)
 
227
            # Process each client in the list by all selected options
 
228
            for client in clients:
 
229
                if options.remove:
 
230
                    mandos_serv.RemoveClient(client.__dbus_object_path__)
 
231
                if options.enable:
 
232
                    client.Enable(dbus_interface=client_interface)
 
233
                if options.disable:
 
234
                    client.Disable(dbus_interface=client_interface)
 
235
                if options.bump_timeout:
 
236
                    client.CheckedOK(dbus_interface=client_interface)
 
237
                if options.start_checker:
 
238
                    client.StartChecker(dbus_interface=client_interface)
 
239
                if options.stop_checker:
 
240
                    client.StopChecker(dbus_interface=client_interface)
 
241
                if options.is_enabled:
 
242
                    sys.exit(0 if client.Get(client_interface,
 
243
                                             u"Enabled",
 
244
                                             dbus_interface=dbus.PROPERTIES_IFACE)
 
245
                             else 1)
 
246
                if options.checker:
 
247
                    client.Set(client_interface, u"Checker", options.checker,
 
248
                               dbus_interface=dbus.PROPERTIES_IFACE)
 
249
                if options.host:
 
250
                    client.Set(client_interface, u"Host", options.host,
 
251
                               dbus_interface=dbus.PROPERTIES_IFACE)
 
252
                if options.interval:
 
253
                    client.Set(client_interface, u"Interval",
 
254
                               timedelta_to_milliseconds
 
255
                               (string_to_delta(options.interval)),
 
256
                               dbus_interface=dbus.PROPERTIES_IFACE)
 
257
                if options.timeout:
 
258
                    client.Set(client_interface, u"Timeout",
 
259
                               timedelta_to_milliseconds(string_to_delta
 
260
                                                         (options.timeout)),
 
261
                               dbus_interface=dbus.PROPERTIES_IFACE)
 
262
                if options.secret:
 
263
                    client.Set(client_interface, u"Secret",
 
264
                               dbus.ByteArray(open(options.secret, u'rb').read()),
 
265
                               dbus_interface=dbus.PROPERTIES_IFACE)
 
266
                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)
343
270
 
344
 
if __name__ == "__main__":
 
271
if __name__ == '__main__':
345
272
    main()