/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: 2011-04-02 06:37:18 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110402063718-13ldrcuu0t33sdc4
* mandos: Tolerate restarting Avahi servers.  Also Changed to new
          "except x as y" exception syntax.
  (AvahiService.entry_group_state_changed_match): New; contains the
                                                  SignalMatch object.
  (AvahiService.remove): Really remove the group and the signal
                         connection, if any.
  (AvahiService.add): Always create a new group and signal connection.
  (AvahiService.cleanup): Changed to simply call remove().
  (AvahiService.server_state_changed): Handle and log more bad states.
  (AvahiService.activate): Set "follow_name_owner_changes=True" on the
                           Avahi Server proxy object.
  (ClientDBus.checked_ok): Do not return anything.
  (ClientDBus.CheckedOK): Do not return anything, as documented.
* mandos-monitor: Call D-Bus methods asynchronously.

Show diffs side-by-side

added added

removed removed

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