/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: 2014-07-25 23:32:04 UTC
  • mto: This revision was merged to the branch mainline in revision 724.
  • Revision ID: teddy@recompile.se-20140725233204-arvlsqrpfkfcwo10
Use the new auto-numbered "{}" syntax for the .format() string method.

* mandos (AvahiService.entry_group_state_changed): Use auto-numbering
                                                   for .format().
  (AvahiServiceToSyslog.rename): - '' -
  (Client.config_parser): - '' -
  (dbus_service_property): - '' -
  (DBusObjectWithProperties._is_dbus_thing): - '' -
  (DBusObjectWithProperties.Set): - '' -
  (alternate_dbus_interfaces/wrapper): - '' -
  (ClientDBus.notifychangeproperty): - '' -
  (string_to_delta): - '' -
  (daemon): - '' -
  (main): - '' -
  (main/cleanup): - '' -
* mandos-ctl (milliseconds_to_string): - '' -
  (main): - '' -
* mandos-monitor (MandosClientWidget.__init__): - '' -
  (MandosClientWidget.checker_completed): - '' -
  (MandosClientWidget.update): - '' -
  (UserInterface.client_not_found): - '' -
  (UserInterface.log_message): - '' -
  (UserInterface.toggle_log_display): - '' -
  (UserInterface.change_log_display): - '' -
  (UserInterface.find_and_remove_client): - '' -

Show diffs side-by-side

added added

removed removed

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