/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 Hogeborn
  • Date: 2017-08-20 14:41:20 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 360.
  • Revision ID: teddy@recompile.se-20170820144120-ee0hsyhvo1geg8ms
Handle multiple lines better in cryptroot file.

* initramfs-tools-script: Avoid running plugin-runner more than once
  if the root file system device is specially marked in the cryptroot
  file.  Also never run plugin-runner for a resume (usually swap)
  device.

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
 
# 
 
3
#
4
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
 
# 
 
5
#
 
6
# Copyright © 2008-2017 Teddy Hogeborn
 
7
# Copyright © 2008-2017 Björn Påhlsson
 
8
#
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
11
11
# the Free Software Foundation, either version 3 of the License, or
15
15
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
16
16
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
17
#     GNU General Public License for more details.
18
 
# 
 
18
#
19
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
 
# 
 
20
# along with this program.  If not, see
 
21
# <http://www.gnu.org/licenses/>.
 
22
#
22
23
# Contact the authors at <mandos@recompile.se>.
23
 
# 
 
24
#
24
25
 
25
26
from __future__ import (division, absolute_import, print_function,
26
27
                        unicode_literals)
27
28
 
 
29
try:
 
30
    from future_builtins import *
 
31
except ImportError:
 
32
    pass
 
33
 
28
34
import sys
29
 
import dbus
30
35
import argparse
31
36
import locale
32
37
import datetime
33
38
import re
34
39
import os
 
40
import collections
 
41
import json
 
42
 
 
43
import dbus
 
44
 
 
45
if sys.version_info.major == 2:
 
46
    str = unicode
35
47
 
36
48
locale.setlocale(locale.LC_ALL, "")
37
49
 
52
64
    "ApprovalDelay": "Approval Delay",
53
65
    "ApprovalDuration": "Approval Duration",
54
66
    "Checker": "Checker",
55
 
    "ExtendedTimeout" : "Extended Timeout"
56
 
    }
 
67
    "ExtendedTimeout": "Extended Timeout",
 
68
    "Expires": "Expires",
 
69
    "LastCheckerStatus": "Last Checker Status",
 
70
}
57
71
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
58
72
domain = "se.recompile"
59
73
busname = domain + ".Mandos"
60
74
server_path = "/"
61
75
server_interface = domain + ".Mandos"
62
76
client_interface = domain + ".Mandos.Client"
63
 
version = "1.5.2"
64
 
 
65
 
def timedelta_to_milliseconds(td):
66
 
    """Convert a datetime.timedelta object to milliseconds"""
67
 
    return ((td.days * 24 * 60 * 60 * 1000)
68
 
            + (td.seconds * 1000)
69
 
            + (td.microseconds // 1000))
 
77
version = "1.7.15"
 
78
 
 
79
 
 
80
try:
 
81
    dbus.OBJECT_MANAGER_IFACE
 
82
except AttributeError:
 
83
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
84
 
70
85
 
71
86
def milliseconds_to_string(ms):
72
87
    td = datetime.timedelta(0, 0, 0, ms)
73
 
    return ("%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
74
 
            % { "days": "%dT" % td.days if td.days else "",
75
 
                "hours": td.seconds // 3600,
76
 
                "minutes": (td.seconds % 3600) // 60,
77
 
                "seconds": td.seconds % 60,
78
 
                })
 
88
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
 
89
            .format(days="{}T".format(td.days) if td.days else "",
 
90
                    hours=td.seconds // 3600,
 
91
                    minutes=(td.seconds % 3600) // 60,
 
92
                    seconds=td.seconds % 60))
 
93
 
 
94
 
 
95
def rfc3339_duration_to_delta(duration):
 
96
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
97
 
 
98
    >>> rfc3339_duration_to_delta("P7D")
 
99
    datetime.timedelta(7)
 
100
    >>> rfc3339_duration_to_delta("PT60S")
 
101
    datetime.timedelta(0, 60)
 
102
    >>> rfc3339_duration_to_delta("PT60M")
 
103
    datetime.timedelta(0, 3600)
 
104
    >>> rfc3339_duration_to_delta("PT24H")
 
105
    datetime.timedelta(1)
 
106
    >>> rfc3339_duration_to_delta("P1W")
 
107
    datetime.timedelta(7)
 
108
    >>> rfc3339_duration_to_delta("PT5M30S")
 
109
    datetime.timedelta(0, 330)
 
110
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
111
    datetime.timedelta(1, 200)
 
112
    """
 
113
 
 
114
    # Parsing an RFC 3339 duration with regular expressions is not
 
115
    # possible - there would have to be multiple places for the same
 
116
    # values, like seconds.  The current code, while more esoteric, is
 
117
    # cleaner without depending on a parsing library.  If Python had a
 
118
    # built-in library for parsing we would use it, but we'd like to
 
119
    # avoid excessive use of external libraries.
 
120
 
 
121
    # New type for defining tokens, syntax, and semantics all-in-one
 
122
    Token = collections.namedtuple("Token", (
 
123
        "regexp",  # To match token; if "value" is not None, must have
 
124
                   # a "group" containing digits
 
125
        "value",   # datetime.timedelta or None
 
126
        "followers"))           # Tokens valid after this token
 
127
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
128
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
129
    token_end = Token(re.compile(r"$"), None, frozenset())
 
130
    token_second = Token(re.compile(r"(\d+)S"),
 
131
                         datetime.timedelta(seconds=1),
 
132
                         frozenset((token_end, )))
 
133
    token_minute = Token(re.compile(r"(\d+)M"),
 
134
                         datetime.timedelta(minutes=1),
 
135
                         frozenset((token_second, token_end)))
 
136
    token_hour = Token(re.compile(r"(\d+)H"),
 
137
                       datetime.timedelta(hours=1),
 
138
                       frozenset((token_minute, token_end)))
 
139
    token_time = Token(re.compile(r"T"),
 
140
                       None,
 
141
                       frozenset((token_hour, token_minute,
 
142
                                  token_second)))
 
143
    token_day = Token(re.compile(r"(\d+)D"),
 
144
                      datetime.timedelta(days=1),
 
145
                      frozenset((token_time, token_end)))
 
146
    token_month = Token(re.compile(r"(\d+)M"),
 
147
                        datetime.timedelta(weeks=4),
 
148
                        frozenset((token_day, token_end)))
 
149
    token_year = Token(re.compile(r"(\d+)Y"),
 
150
                       datetime.timedelta(weeks=52),
 
151
                       frozenset((token_month, token_end)))
 
152
    token_week = Token(re.compile(r"(\d+)W"),
 
153
                       datetime.timedelta(weeks=1),
 
154
                       frozenset((token_end, )))
 
155
    token_duration = Token(re.compile(r"P"), None,
 
156
                           frozenset((token_year, token_month,
 
157
                                      token_day, token_time,
 
158
                                      token_week)))
 
159
    # Define starting values:
 
160
    # Value so far
 
161
    value = datetime.timedelta()
 
162
    found_token = None
 
163
    # Following valid tokens
 
164
    followers = frozenset((token_duration, ))
 
165
    # String left to parse
 
166
    s = duration
 
167
    # Loop until end token is found
 
168
    while found_token is not token_end:
 
169
        # Search for any currently valid tokens
 
170
        for token in followers:
 
171
            match = token.regexp.match(s)
 
172
            if match is not None:
 
173
                # Token found
 
174
                if token.value is not None:
 
175
                    # Value found, parse digits
 
176
                    factor = int(match.group(1), 10)
 
177
                    # Add to value so far
 
178
                    value += factor * token.value
 
179
                # Strip token from string
 
180
                s = token.regexp.sub("", s, 1)
 
181
                # Go to found token
 
182
                found_token = token
 
183
                # Set valid next tokens
 
184
                followers = found_token.followers
 
185
                break
 
186
        else:
 
187
            # No currently valid tokens were found
 
188
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
189
                             .format(duration))
 
190
    # End token found
 
191
    return value
 
192
 
79
193
 
80
194
def string_to_delta(interval):
81
195
    """Parse a string and return a datetime.timedelta
82
 
    
83
 
    >>> string_to_delta("7d")
 
196
 
 
197
    >>> string_to_delta('7d')
84
198
    datetime.timedelta(7)
85
 
    >>> string_to_delta("60s")
 
199
    >>> string_to_delta('60s')
86
200
    datetime.timedelta(0, 60)
87
 
    >>> string_to_delta("60m")
 
201
    >>> string_to_delta('60m')
88
202
    datetime.timedelta(0, 3600)
89
 
    >>> string_to_delta("24h")
 
203
    >>> string_to_delta('24h')
90
204
    datetime.timedelta(1)
91
 
    >>> string_to_delta("1w")
 
205
    >>> string_to_delta('1w')
92
206
    datetime.timedelta(7)
93
 
    >>> string_to_delta("5m 30s")
 
207
    >>> string_to_delta('5m 30s')
94
208
    datetime.timedelta(0, 330)
95
209
    """
 
210
 
 
211
    try:
 
212
        return rfc3339_duration_to_delta(interval)
 
213
    except ValueError:
 
214
        pass
 
215
 
96
216
    value = datetime.timedelta(0)
97
 
    regexp = re.compile("(\d+)([dsmhw]?)")
98
 
    
 
217
    regexp = re.compile(r"(\d+)([dsmhw]?)")
 
218
 
99
219
    for num, suffix in regexp.findall(interval):
100
220
        if suffix == "d":
101
221
            value += datetime.timedelta(int(num))
111
231
            value += datetime.timedelta(0, 0, 0, int(num))
112
232
    return value
113
233
 
 
234
 
114
235
def print_clients(clients, keywords):
115
236
    def valuetostring(value, keyword):
116
237
        if type(value) is dbus.Boolean:
117
238
            return "Yes" if value else "No"
118
239
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
119
 
                       "ApprovalDuration"):
 
240
                       "ApprovalDuration", "ExtendedTimeout"):
120
241
            return milliseconds_to_string(value)
121
 
        return unicode(value)
122
 
    
 
242
        return str(value)
 
243
 
123
244
    # Create format string to print table rows
124
 
    format_string = " ".join("%%-%ds" %
125
 
                             max(len(tablewords[key]),
126
 
                                 max(len(valuetostring(client[key],
127
 
                                                       key))
128
 
                                     for client in
129
 
                                     clients))
 
245
    format_string = " ".join("{{{key}:{width}}}".format(
 
246
        width=max(len(tablewords[key]),
 
247
                  max(len(valuetostring(client[key], key))
 
248
                      for client in clients)),
 
249
        key=key)
130
250
                             for key in keywords)
131
251
    # Print header line
132
 
    print(format_string % tuple(tablewords[key] for key in keywords))
 
252
    print(format_string.format(**tablewords))
133
253
    for client in clients:
134
 
        print(format_string % tuple(valuetostring(client[key], key)
135
 
                                    for key in keywords))
 
254
        print(format_string
 
255
              .format(**{key: valuetostring(client[key], key)
 
256
                         for key in keywords}))
 
257
 
136
258
 
137
259
def has_actions(options):
138
260
    return any((options.enable,
154
276
                options.approve,
155
277
                options.deny))
156
278
 
 
279
 
157
280
def main():
158
281
    parser = argparse.ArgumentParser()
159
282
    parser.add_argument("--version", action="version",
160
 
                        version = "%%prog %s" % version,
 
283
                        version="%(prog)s {}".format(version),
161
284
                        help="show version number and exit")
162
285
    parser.add_argument("-a", "--all", action="store_true",
163
286
                        help="Select all clients")
164
287
    parser.add_argument("-v", "--verbose", action="store_true",
165
288
                        help="Print all fields")
 
289
    parser.add_argument("-j", "--dump-json", action="store_true",
 
290
                        help="Dump client data in JSON format")
166
291
    parser.add_argument("-e", "--enable", action="store_true",
167
292
                        help="Enable client")
168
293
    parser.add_argument("-d", "--disable", action="store_true",
196
321
    parser.add_argument("--approval-duration",
197
322
                        help="Set duration of one client approval")
198
323
    parser.add_argument("-H", "--host", help="Set host for client")
199
 
    parser.add_argument("-s", "--secret", type=file,
 
324
    parser.add_argument("-s", "--secret",
 
325
                        type=argparse.FileType(mode="rb"),
200
326
                        help="Set password blob (file) for client")
201
327
    parser.add_argument("-A", "--approve", action="store_true",
202
328
                        help="Approve any current client request")
203
329
    parser.add_argument("-D", "--deny", action="store_true",
204
330
                        help="Deny any current client request")
 
331
    parser.add_argument("--check", action="store_true",
 
332
                        help="Run self-test")
205
333
    parser.add_argument("client", nargs="*", help="Client name")
206
334
    options = parser.parse_args()
207
 
    
208
 
    if has_actions(options) and not options.client and not options.all:
 
335
 
 
336
    if has_actions(options) and not (options.client or options.all):
209
337
        parser.error("Options require clients names or --all.")
210
338
    if options.verbose and has_actions(options):
211
 
        parser.error("--verbose can only be used alone or with"
212
 
                     " --all.")
 
339
        parser.error("--verbose can only be used alone.")
 
340
    if options.dump_json and (options.verbose
 
341
                              or has_actions(options)):
 
342
        parser.error("--dump-json can only be used alone.")
213
343
    if options.all and not has_actions(options):
214
344
        parser.error("--all requires an action.")
215
 
    
 
345
 
 
346
    if options.check:
 
347
        import doctest
 
348
        fail_count, test_count = doctest.testmod()
 
349
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
350
 
216
351
    try:
217
352
        bus = dbus.SystemBus()
218
353
        mandos_dbus_objc = bus.get_object(busname, server_path)
219
354
    except dbus.exceptions.DBusException:
220
 
        print("Could not connect to Mandos server",
221
 
              file=sys.stderr)
 
355
        print("Could not connect to Mandos server", file=sys.stderr)
222
356
        sys.exit(1)
223
 
    
 
357
 
224
358
    mandos_serv = dbus.Interface(mandos_dbus_objc,
225
 
                                 dbus_interface = server_interface)
226
 
    
227
 
    #block stderr since dbus library prints to stderr
 
359
                                 dbus_interface=server_interface)
 
360
    mandos_serv_object_manager = dbus.Interface(
 
361
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
 
362
 
 
363
    # block stderr since dbus library prints to stderr
228
364
    null = os.open(os.path.devnull, os.O_RDWR)
229
365
    stderrcopy = os.dup(sys.stderr.fileno())
230
366
    os.dup2(null, sys.stderr.fileno())
231
367
    os.close(null)
232
368
    try:
233
369
        try:
234
 
            mandos_clients = mandos_serv.GetAllClientsWithProperties()
 
370
            mandos_clients = {path: ifs_and_props[client_interface]
 
371
                              for path, ifs_and_props in
 
372
                              mandos_serv_object_manager
 
373
                              .GetManagedObjects().items()
 
374
                              if client_interface in ifs_and_props}
235
375
        finally:
236
 
            #restore stderr
 
376
            # restore stderr
237
377
            os.dup2(stderrcopy, sys.stderr.fileno())
238
378
            os.close(stderrcopy)
239
 
    except dbus.exceptions.DBusException:
240
 
        print("Access denied: Accessing mandos server through dbus.",
 
379
    except dbus.exceptions.DBusException as e:
 
380
        print("Access denied: "
 
381
              "Accessing mandos server through D-Bus: {}".format(e),
241
382
              file=sys.stderr)
242
383
        sys.exit(1)
243
 
    
 
384
 
244
385
    # Compile dict of (clients: properties) to process
245
 
    clients={}
246
 
    
 
386
    clients = {}
 
387
 
247
388
    if options.all or not options.client:
248
 
        clients = dict((bus.get_object(busname, path), properties)
249
 
                       for path, properties in
250
 
                       mandos_clients.iteritems())
 
389
        clients = {bus.get_object(busname, path): properties
 
390
                   for path, properties in mandos_clients.items()}
251
391
    else:
252
392
        for name in options.client:
253
 
            for path, client in mandos_clients.iteritems():
 
393
            for path, client in mandos_clients.items():
254
394
                if client["Name"] == name:
255
395
                    client_objc = bus.get_object(busname, path)
256
396
                    clients[client_objc] = client
257
397
                    break
258
398
            else:
259
 
                print("Client not found on server: %r" % name,
260
 
                      file=sys.stderr)
 
399
                print("Client not found on server: {!r}"
 
400
                      .format(name), file=sys.stderr)
261
401
                sys.exit(1)
262
 
    
 
402
 
263
403
    if not has_actions(options) and clients:
264
 
        if options.verbose:
265
 
            keywords = ("Name", "Enabled", "Timeout",
266
 
                        "LastCheckedOK", "Created", "Interval",
267
 
                        "Host", "Fingerprint", "CheckerRunning",
268
 
                        "LastEnabled", "ApprovalPending",
269
 
                        "ApprovedByDefault",
 
404
        if options.verbose or options.dump_json:
 
405
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
 
406
                        "Created", "Interval", "Host", "Fingerprint",
 
407
                        "CheckerRunning", "LastEnabled",
 
408
                        "ApprovalPending", "ApprovedByDefault",
270
409
                        "LastApprovalRequest", "ApprovalDelay",
271
410
                        "ApprovalDuration", "Checker",
272
 
                        "ExtendedTimeout")
 
411
                        "ExtendedTimeout", "Expires",
 
412
                        "LastCheckerStatus")
273
413
        else:
274
414
            keywords = defaultkeywords
275
 
        
276
 
        print_clients(clients.values(), keywords)
 
415
 
 
416
        if options.dump_json:
 
417
            json.dump({client["Name"]: {key:
 
418
                                        bool(client[key])
 
419
                                        if isinstance(client[key],
 
420
                                                      dbus.Boolean)
 
421
                                        else client[key]
 
422
                                        for key in keywords}
 
423
                       for client in clients.values()},
 
424
                      fp=sys.stdout, indent=4,
 
425
                      separators=(',', ': '))
 
426
            print()
 
427
        else:
 
428
            print_clients(clients.values(), keywords)
277
429
    else:
278
430
        # Process each client in the list by all selected options
279
431
        for client in clients:
 
432
 
 
433
            def set_client_prop(prop, value):
 
434
                """Set a Client D-Bus property"""
 
435
                client.Set(client_interface, prop, value,
 
436
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
437
 
 
438
            def set_client_prop_ms(prop, value):
 
439
                """Set a Client D-Bus property, converted
 
440
                from a string to milliseconds."""
 
441
                set_client_prop(prop,
 
442
                                string_to_delta(value).total_seconds()
 
443
                                * 1000)
 
444
 
280
445
            if options.remove:
281
446
                mandos_serv.RemoveClient(client.__dbus_object_path__)
282
447
            if options.enable:
283
 
                client.Enable(dbus_interface=client_interface)
 
448
                set_client_prop("Enabled", dbus.Boolean(True))
284
449
            if options.disable:
285
 
                client.Disable(dbus_interface=client_interface)
 
450
                set_client_prop("Enabled", dbus.Boolean(False))
286
451
            if options.bump_timeout:
287
 
                client.CheckedOK(dbus_interface=client_interface)
 
452
                set_client_prop("LastCheckedOK", "")
288
453
            if options.start_checker:
289
 
                client.StartChecker(dbus_interface=client_interface)
 
454
                set_client_prop("CheckerRunning", dbus.Boolean(True))
290
455
            if options.stop_checker:
291
 
                client.StopChecker(dbus_interface=client_interface)
 
456
                set_client_prop("CheckerRunning", dbus.Boolean(False))
292
457
            if options.is_enabled:
293
 
                sys.exit(0 if client.Get(client_interface,
294
 
                                         "Enabled",
295
 
                                         dbus_interface=
296
 
                                         dbus.PROPERTIES_IFACE)
297
 
                         else 1)
 
458
                if client.Get(client_interface, "Enabled",
 
459
                              dbus_interface=dbus.PROPERTIES_IFACE):
 
460
                    sys.exit(0)
 
461
                else:
 
462
                    sys.exit(1)
298
463
            if options.checker is not None:
299
 
                client.Set(client_interface, "Checker",
300
 
                           options.checker,
301
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
464
                set_client_prop("Checker", options.checker)
302
465
            if options.host is not None:
303
 
                client.Set(client_interface, "Host", options.host,
304
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
466
                set_client_prop("Host", options.host)
305
467
            if options.interval is not None:
306
 
                client.Set(client_interface, "Interval",
307
 
                           timedelta_to_milliseconds
308
 
                           (string_to_delta(options.interval)),
309
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
468
                set_client_prop_ms("Interval", options.interval)
310
469
            if options.approval_delay is not None:
311
 
                client.Set(client_interface, "ApprovalDelay",
312
 
                           timedelta_to_milliseconds
313
 
                           (string_to_delta(options.
314
 
                                            approval_delay)),
315
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
470
                set_client_prop_ms("ApprovalDelay",
 
471
                                   options.approval_delay)
316
472
            if options.approval_duration is not None:
317
 
                client.Set(client_interface, "ApprovalDuration",
318
 
                           timedelta_to_milliseconds
319
 
                           (string_to_delta(options.
320
 
                                            approval_duration)),
321
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
473
                set_client_prop_ms("ApprovalDuration",
 
474
                                   options.approval_duration)
322
475
            if options.timeout is not None:
323
 
                client.Set(client_interface, "Timeout",
324
 
                           timedelta_to_milliseconds
325
 
                           (string_to_delta(options.timeout)),
326
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
476
                set_client_prop_ms("Timeout", options.timeout)
327
477
            if options.extended_timeout is not None:
328
 
                client.Set(client_interface, "ExtendedTimeout",
329
 
                           timedelta_to_milliseconds
330
 
                           (string_to_delta(options.extended_timeout)),
331
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
478
                set_client_prop_ms("ExtendedTimeout",
 
479
                                   options.extended_timeout)
332
480
            if options.secret is not None:
333
 
                client.Set(client_interface, "Secret",
334
 
                           dbus.ByteArray(options.secret.read()),
335
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
481
                set_client_prop("Secret",
 
482
                                dbus.ByteArray(options.secret.read()))
336
483
            if options.approved_by_default is not None:
337
 
                client.Set(client_interface, "ApprovedByDefault",
338
 
                           dbus.Boolean(options
339
 
                                        .approved_by_default),
340
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
484
                set_client_prop("ApprovedByDefault",
 
485
                                dbus.Boolean(options
 
486
                                             .approved_by_default))
341
487
            if options.approve:
342
488
                client.Approve(dbus.Boolean(True),
343
489
                               dbus_interface=client_interface)
345
491
                client.Approve(dbus.Boolean(False),
346
492
                               dbus_interface=client_interface)
347
493
 
 
494
 
348
495
if __name__ == "__main__":
349
496
    main()