/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: 2015-05-23 20:18:34 UTC
  • mto: This revision was merged to the branch mainline in revision 756.
  • Revision ID: teddy@recompile.se-20150523201834-e89ex4ito93yni8x
mandos: Use multiprocessing module to run checkers.

For a long time, the Mandos server has occasionally logged the message
"ERROR: Child process vanished".  This was never a fatal error, but it
has been annoying and slightly worrying, since a definite cause was
not found.  One potential cause could be the "multiprocessing" and
"subprocess" modules conflicting w.r.t. SIGCHLD.  To avoid this,
change the running of checkers from using subprocess.Popen
asynchronously to instead first create a multiprocessing.Process()
(which is asynchronous) calling a function, and have that function
then call subprocess.call() (which is synchronous).  In this way, the
only thing using any asynchronous subprocesses is the multiprocessing
module.

This makes it necessary to change one small thing in the D-Bus API,
since the subprocesses.call() function does not expose the raw wait(2)
status value.

DBUS-API (CheckerCompleted): Change the second value provided by this
                             D-Bus signal from the raw wait(2) status
                             to the actual terminating signal number.
mandos (subprocess_call_pipe): New function to be called by
                               multiprocessing.Process (starting a
                               separate process).
(Client.last_checker signal): New attribute for signal which
                              terminated last checker.  Like
                              last_checker_status, only not accessible
                              via D-Bus.
(Client.checker_callback): Take new "connection" argument and use it
                           to get returncode; set last_checker_signal.
                           Return False so gobject does not call this
                           callback again.
(Client.start_checker): Start checker using a multiprocessing.Process
                        instead of a subprocess.Popen.
(ClientDBus.checker_callback): Take new "connection" argument.        Call
                               Client.checker_callback early to have
                               it set last_checker_status and
                               last_checker_signal; use those.  Change
                               second value provided to D-Bus signal
                               CheckerCompleted to use
                               last_checker_signal if checker was
                               terminated by signal.
mandos-monitor: Update to reflect DBus API change.
(MandosClientWidget.checker_completed): Take "signal" instead of
                                        "condition" argument.  Use it
                                        accordingly.  Remove dead code
                                        (os.WCOREDUMP case).

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