/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:
mandos-ctl
3
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
# 
6
 
# Copyright © 2008-2012 Teddy Hogeborn
7
 
# Copyright © 2008-2012 Björn Påhlsson
 
6
# Copyright © 2008-2010 Teddy Hogeborn
 
7
# Copyright © 2008-2010 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
21
 
# <http://www.gnu.org/licenses/>.
 
20
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
21
# 
23
 
# Contact the authors at <mandos@recompile.se>.
 
22
# Contact the authors at <mandos@fukt.bsnet.se>.
24
23
# 
25
24
 
26
25
from __future__ import (division, absolute_import, print_function,
53
52
    "ApprovalDelay": "Approval Delay",
54
53
    "ApprovalDuration": "Approval Duration",
55
54
    "Checker": "Checker",
56
 
    "ExtendedTimeout" : "Extended Timeout"
57
55
    }
58
56
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
59
 
domain = "se.recompile"
 
57
domain = "se.bsnet.fukt"
60
58
busname = domain + ".Mandos"
61
59
server_path = "/"
62
60
server_interface = domain + ".Mandos"
63
61
client_interface = domain + ".Mandos.Client"
64
 
version = "1.5.3"
 
62
version = "1.3.0"
65
63
 
66
64
def timedelta_to_milliseconds(td):
67
65
    """Convert a datetime.timedelta object to milliseconds"""
71
69
 
72
70
def milliseconds_to_string(ms):
73
71
    td = datetime.timedelta(0, 0, 0, ms)
74
 
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
75
 
            .format(days = "{0}T".format(td.days) if td.days else "",
76
 
                    hours = td.seconds // 3600,
77
 
                    minutes = (td.seconds % 3600) // 60,
78
 
                    seconds = td.seconds % 60,
79
 
                    ))
 
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
                })
80
78
 
81
79
def string_to_delta(interval):
82
80
    """Parse a string and return a datetime.timedelta
94
92
    >>> string_to_delta("5m 30s")
95
93
    datetime.timedelta(0, 330)
96
94
    """
97
 
    value = datetime.timedelta(0)
98
 
    regexp = re.compile("(\d+)([dsmhw]?)")
 
95
    timevalue = datetime.timedelta(0)
 
96
    regexp = re.compile("\d+[dsmhw]")
99
97
    
100
 
    for num, suffix in regexp.findall(interval):
101
 
        if suffix == "d":
102
 
            value += datetime.timedelta(int(num))
103
 
        elif suffix == "s":
104
 
            value += datetime.timedelta(0, int(num))
105
 
        elif suffix == "m":
106
 
            value += datetime.timedelta(0, 0, 0, 0, int(num))
107
 
        elif suffix == "h":
108
 
            value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
109
 
        elif suffix == "w":
110
 
            value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
111
 
        elif suffix == "":
112
 
            value += datetime.timedelta(0, 0, 0, int(num))
113
 
    return value
 
98
    for s in regexp.findall(interval):
 
99
        try:
 
100
            suffix = unicode(s[-1])
 
101
            value = int(s[:-1])
 
102
            if suffix == "d":
 
103
                delta = datetime.timedelta(value)
 
104
            elif suffix == "s":
 
105
                delta = datetime.timedelta(0, value)
 
106
            elif suffix == "m":
 
107
                delta = datetime.timedelta(0, 0, 0, 0, value)
 
108
            elif suffix == "h":
 
109
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
110
            elif suffix == "w":
 
111
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
112
            else:
 
113
                raise ValueError
 
114
        except (ValueError, IndexError):
 
115
            raise ValueError
 
116
        timevalue += delta
 
117
    return timevalue
114
118
 
115
119
def print_clients(clients, keywords):
116
120
    def valuetostring(value, keyword):
117
121
        if type(value) is dbus.Boolean:
118
122
            return "Yes" if value else "No"
119
123
        if keyword in ("Timeout", "Interval", "ApprovalDelay",
120
 
                       "ApprovalDuration", "ExtendedTimeout"):
 
124
                       "ApprovalDuration"):
121
125
            return milliseconds_to_string(value)
122
126
        return unicode(value)
123
127
    
124
128
    # Create format string to print table rows
125
 
    format_string = " ".join("{{{key}:{width}}}".format(
126
 
            width = max(len(tablewords[key]),
127
 
                        max(len(valuetostring(client[key],
128
 
                                              key))
129
 
                            for client in
130
 
                            clients)),
131
 
            key = key) for key in keywords)
 
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)
132
136
    # Print header line
133
 
    print(format_string.format(**tablewords))
 
137
    print(format_string % tuple(tablewords[key] for key in keywords))
134
138
    for client in clients:
135
 
        print(format_string.format(**dict((key,
136
 
                                           valuetostring(client[key],
137
 
                                                         key))
138
 
                                          for key in keywords)))
 
139
        print(format_string % tuple(valuetostring(client[key], key)
 
140
                                    for key in keywords))
139
141
 
140
142
def has_actions(options):
141
143
    return any((options.enable,
147
149
                options.remove,
148
150
                options.checker is not None,
149
151
                options.timeout is not None,
150
 
                options.extended_timeout is not None,
151
152
                options.interval is not None,
152
153
                options.approved_by_default is not None,
153
154
                options.approval_delay is not None,
160
161
def main():
161
162
    parser = argparse.ArgumentParser()
162
163
    parser.add_argument("--version", action="version",
163
 
                        version = "%(prog)s {0}".format(version),
 
164
                        version = "%%prog %s" % version,
164
165
                        help="show version number and exit")
165
166
    parser.add_argument("-a", "--all", action="store_true",
166
167
                        help="Select all clients")
184
185
                        help="Set checker command for client")
185
186
    parser.add_argument("-t", "--timeout",
186
187
                        help="Set timeout for client")
187
 
    parser.add_argument("--extended-timeout",
188
 
                        help="Set extended timeout for client")
189
188
    parser.add_argument("-i", "--interval",
190
189
                        help="Set checker interval for client")
191
190
    parser.add_argument("--approve-by-default", action="store_true",
208
207
    parser.add_argument("client", nargs="*", help="Client name")
209
208
    options = parser.parse_args()
210
209
    
211
 
    if has_actions(options) and not (options.client or options.all):
 
210
    if has_actions(options) and not options.client and not options.all:
212
211
        parser.error("Options require clients names or --all.")
213
212
    if options.verbose and has_actions(options):
214
213
        parser.error("--verbose can only be used alone or with"
239
238
            #restore stderr
240
239
            os.dup2(stderrcopy, sys.stderr.fileno())
241
240
            os.close(stderrcopy)
242
 
    except dbus.exceptions.DBusException:
 
241
    except dbus.exceptions.DBusException, e:
243
242
        print("Access denied: Accessing mandos server through dbus.",
244
243
              file=sys.stderr)
245
244
        sys.exit(1)
259
258
                    clients[client_objc] = client
260
259
                    break
261
260
            else:
262
 
                print("Client not found on server: {0!r}"
263
 
                      .format(name), file=sys.stderr)
 
261
                print("Client not found on server: %r" % name,
 
262
                      file=sys.stderr)
264
263
                sys.exit(1)
265
264
    
266
265
    if not has_actions(options) and clients:
271
270
                        "LastEnabled", "ApprovalPending",
272
271
                        "ApprovedByDefault",
273
272
                        "LastApprovalRequest", "ApprovalDelay",
274
 
                        "ApprovalDuration", "Checker",
275
 
                        "ExtendedTimeout")
 
273
                        "ApprovalDuration", "Checker")
276
274
        else:
277
275
            keywords = defaultkeywords
278
276
        
280
278
    else:
281
279
        # Process each client in the list by all selected options
282
280
        for client in clients:
283
 
            def set_client_prop(prop, value):
284
 
                """Set a Client D-Bus property"""
285
 
                client.Set(client_interface, prop, value,
286
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
287
 
            def set_client_prop_ms(prop, value):
288
 
                """Set a Client D-Bus property, converted
289
 
                from a string to milliseconds."""
290
 
                set_client_prop(prop,
291
 
                                timedelta_to_milliseconds
292
 
                                (string_to_delta(value)))
293
281
            if options.remove:
294
282
                mandos_serv.RemoveClient(client.__dbus_object_path__)
295
283
            if options.enable:
296
 
                set_client_prop("Enabled", dbus.Boolean(True))
 
284
                client.Enable(dbus_interface=client_interface)
297
285
            if options.disable:
298
 
                set_client_prop("Enabled", dbus.Boolean(False))
 
286
                client.Disable(dbus_interface=client_interface)
299
287
            if options.bump_timeout:
300
 
                set_client_prop("LastCheckedOK", "")
 
288
                client.CheckedOK(dbus_interface=client_interface)
301
289
            if options.start_checker:
302
 
                set_client_prop("CheckerRunning", dbus.Boolean(True))
 
290
                client.StartChecker(dbus_interface=client_interface)
303
291
            if options.stop_checker:
304
 
                set_client_prop("CheckerRunning", dbus.Boolean(False))
 
292
                client.StopChecker(dbus_interface=client_interface)
305
293
            if options.is_enabled:
306
294
                sys.exit(0 if client.Get(client_interface,
307
295
                                         "Enabled",
308
296
                                         dbus_interface=
309
297
                                         dbus.PROPERTIES_IFACE)
310
298
                         else 1)
311
 
            if options.checker is not None:
312
 
                set_client_prop("Checker", options.checker)
313
 
            if options.host is not None:
314
 
                set_client_prop("Host", options.host)
315
 
            if options.interval is not None:
316
 
                set_client_prop_ms("Interval", options.interval)
317
 
            if options.approval_delay is not None:
318
 
                set_client_prop_ms("ApprovalDelay",
319
 
                                   options.approval_delay)
320
 
            if options.approval_duration is not None:
321
 
                set_client_prop_ms("ApprovalDuration",
322
 
                                   options.approval_duration)
323
 
            if options.timeout is not None:
324
 
                set_client_prop_ms("Timeout", options.timeout)
325
 
            if options.extended_timeout is not None:
326
 
                set_client_prop_ms("ExtendedTimeout",
327
 
                                   options.extended_timeout)
328
 
            if options.secret is not None:
329
 
                set_client_prop("Secret",
330
 
                                dbus.ByteArray(options.secret.read()))
 
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)
331
333
            if options.approved_by_default is not None:
332
 
                set_client_prop("ApprovedByDefault",
333
 
                                dbus.Boolean(options
334
 
                                             .approved_by_default))
 
334
                client.Set(client_interface, "ApprovedByDefault",
 
335
                           dbus.Boolean(options
 
336
                                        .approved_by_default),
 
337
                           dbus_interface=dbus.PROPERTIES_IFACE)
335
338
            if options.approve:
336
339
                client.Approve(dbus.Boolean(True),
337
340
                               dbus_interface=client_interface)