/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: White space and other misc. format fixes only.

Show diffs side-by-side

added added

removed removed

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