/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: Björn Påhlsson
  • Date: 2011-06-23 22:27:15 UTC
  • mto: This revision was merged to the branch mainline in revision 485.
  • Revision ID: belorn@fukt.bsnet.se-20110623222715-q5wro9ma9iyjl367
* Makefile (CFLAGS): Added "-lrt" to include real time library.
* plugins.d/mandos-client.c: use scandir(3) instead of readdir(3)
                             Prefix all debug output with "Mandos plugin " + program_invocation_short_name
                             Retry servers that failed to provide password.
                             New option --retry SECONDS that sets the interval between rechecking.
                             --retry also controls how often it retries a server when using --connect.
* plugins.d/splashy.c:  Prefix all debug output with "Mandos plugin " + program_invocation_short_name
* plugins.d/usplash.c: --||--
* plugins.d/askpass-fifo.c: --||--
* plugins.d/password-prompt.c: --||--
* plugins.d/plymouth.c: --||--
* mandos: Lower logger level from warning to info on failed client requests because client was disabled or unknown fingerprint.
* plugins.d/plymouth.c (get_pid): bug fix. Was not calling free on direntries. 

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
19
19
# You should have received a copy of the GNU General Public License
20
20
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
21
# 
22
 
# Contact the authors at <mandos@recompile.se>.
 
22
# Contact the authors at <mandos@fukt.bsnet.se>.
23
23
# 
24
24
 
25
25
from __future__ import (division, absolute_import, print_function,
52
52
    "ApprovalDelay": "Approval Delay",
53
53
    "ApprovalDuration": "Approval Duration",
54
54
    "Checker": "Checker",
55
 
    "ExtendedTimeout" : "Extended Timeout"
56
55
    }
57
56
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
58
 
domain = "se.recompile"
 
57
domain = "se.bsnet.fukt"
59
58
busname = domain + ".Mandos"
60
59
server_path = "/"
61
60
server_interface = domain + ".Mandos"
62
61
client_interface = domain + ".Mandos.Client"
63
 
version = "1.5.3"
 
62
version = "1.3.0"
64
63
 
65
64
def timedelta_to_milliseconds(td):
66
65
    """Convert a datetime.timedelta object to milliseconds"""
70
69
 
71
70
def milliseconds_to_string(ms):
72
71
    td = datetime.timedelta(0, 0, 0, ms)
73
 
    return ("{days}{hours:02}:{minutes:02}:{seconds:02}"
74
 
            .format(days = "{0}T".format(td.days) if td.days else "",
75
 
                    hours = td.seconds // 3600,
76
 
                    minutes = (td.seconds % 3600) // 60,
77
 
                    seconds = td.seconds % 60,
78
 
                    ))
 
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
                })
79
78
 
80
79
def string_to_delta(interval):
81
80
    """Parse a string and return a datetime.timedelta
93
92
    >>> string_to_delta("5m 30s")
94
93
    datetime.timedelta(0, 330)
95
94
    """
96
 
    value = datetime.timedelta(0)
97
 
    regexp = re.compile("(\d+)([dsmhw]?)")
 
95
    timevalue = datetime.timedelta(0)
 
96
    regexp = re.compile("\d+[dsmhw]")
98
97
    
99
 
    for num, suffix in regexp.findall(interval):
100
 
        if suffix == "d":
101
 
            value += datetime.timedelta(int(num))
102
 
        elif suffix == "s":
103
 
            value += datetime.timedelta(0, int(num))
104
 
        elif suffix == "m":
105
 
            value += datetime.timedelta(0, 0, 0, 0, int(num))
106
 
        elif suffix == "h":
107
 
            value += datetime.timedelta(0, 0, 0, 0, 0, int(num))
108
 
        elif suffix == "w":
109
 
            value += datetime.timedelta(0, 0, 0, 0, 0, 0, int(num))
110
 
        elif suffix == "":
111
 
            value += datetime.timedelta(0, 0, 0, int(num))
112
 
    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
113
118
 
114
119
def print_clients(clients, keywords):
115
120
    def valuetostring(value, keyword):
121
126
        return unicode(value)
122
127
    
123
128
    # Create format string to print table rows
124
 
    format_string = " ".join("{{{key}:{width}}}".format(
125
 
            width = max(len(tablewords[key]),
126
 
                        max(len(valuetostring(client[key],
127
 
                                              key))
128
 
                            for client in
129
 
                            clients)),
130
 
            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)
131
136
    # Print header line
132
 
    print(format_string.format(**tablewords))
 
137
    print(format_string % tuple(tablewords[key] for key in keywords))
133
138
    for client in clients:
134
 
        print(format_string.format(**dict((key,
135
 
                                           valuetostring(client[key],
136
 
                                                         key))
137
 
                                          for key in keywords)))
 
139
        print(format_string % tuple(valuetostring(client[key], key)
 
140
                                    for key in keywords))
138
141
 
139
142
def has_actions(options):
140
143
    return any((options.enable,
146
149
                options.remove,
147
150
                options.checker is not None,
148
151
                options.timeout is not None,
149
 
                options.extended_timeout is not None,
150
152
                options.interval is not None,
151
153
                options.approved_by_default is not None,
152
154
                options.approval_delay is not None,
159
161
def main():
160
162
    parser = argparse.ArgumentParser()
161
163
    parser.add_argument("--version", action="version",
162
 
                        version = "%(prog)s {0}".format(version),
 
164
                        version = "%%prog %s" % version,
163
165
                        help="show version number and exit")
164
166
    parser.add_argument("-a", "--all", action="store_true",
165
167
                        help="Select all clients")
183
185
                        help="Set checker command for client")
184
186
    parser.add_argument("-t", "--timeout",
185
187
                        help="Set timeout for client")
186
 
    parser.add_argument("--extended-timeout",
187
 
                        help="Set extended timeout for client")
188
188
    parser.add_argument("-i", "--interval",
189
189
                        help="Set checker interval for client")
190
190
    parser.add_argument("--approve-by-default", action="store_true",
238
238
            #restore stderr
239
239
            os.dup2(stderrcopy, sys.stderr.fileno())
240
240
            os.close(stderrcopy)
241
 
    except dbus.exceptions.DBusException:
 
241
    except dbus.exceptions.DBusException, e:
242
242
        print("Access denied: Accessing mandos server through dbus.",
243
243
              file=sys.stderr)
244
244
        sys.exit(1)
258
258
                    clients[client_objc] = client
259
259
                    break
260
260
            else:
261
 
                print("Client not found on server: {0!r}"
262
 
                      .format(name), file=sys.stderr)
 
261
                print("Client not found on server: %r" % name,
 
262
                      file=sys.stderr)
263
263
                sys.exit(1)
264
264
    
265
265
    if not has_actions(options) and clients:
270
270
                        "LastEnabled", "ApprovalPending",
271
271
                        "ApprovedByDefault",
272
272
                        "LastApprovalRequest", "ApprovalDelay",
273
 
                        "ApprovalDuration", "Checker",
274
 
                        "ExtendedTimeout")
 
273
                        "ApprovalDuration", "Checker")
275
274
        else:
276
275
            keywords = defaultkeywords
277
276
        
297
296
                                         dbus_interface=
298
297
                                         dbus.PROPERTIES_IFACE)
299
298
                         else 1)
300
 
            if options.checker is not None:
 
299
            if options.checker:
301
300
                client.Set(client_interface, "Checker",
302
301
                           options.checker,
303
302
                           dbus_interface=dbus.PROPERTIES_IFACE)
304
 
            if options.host is not None:
 
303
            if options.host:
305
304
                client.Set(client_interface, "Host", options.host,
306
305
                           dbus_interface=dbus.PROPERTIES_IFACE)
307
 
            if options.interval is not None:
 
306
            if options.interval:
308
307
                client.Set(client_interface, "Interval",
309
308
                           timedelta_to_milliseconds
310
309
                           (string_to_delta(options.interval)),
311
310
                           dbus_interface=dbus.PROPERTIES_IFACE)
312
 
            if options.approval_delay is not None:
 
311
            if options.approval_delay:
313
312
                client.Set(client_interface, "ApprovalDelay",
314
313
                           timedelta_to_milliseconds
315
314
                           (string_to_delta(options.
316
315
                                            approval_delay)),
317
316
                           dbus_interface=dbus.PROPERTIES_IFACE)
318
 
            if options.approval_duration is not None:
 
317
            if options.approval_duration:
319
318
                client.Set(client_interface, "ApprovalDuration",
320
319
                           timedelta_to_milliseconds
321
320
                           (string_to_delta(options.
322
321
                                            approval_duration)),
323
322
                           dbus_interface=dbus.PROPERTIES_IFACE)
324
 
            if options.timeout is not None:
 
323
            if options.timeout:
325
324
                client.Set(client_interface, "Timeout",
326
325
                           timedelta_to_milliseconds
327
326
                           (string_to_delta(options.timeout)),
328
327
                           dbus_interface=dbus.PROPERTIES_IFACE)
329
 
            if options.extended_timeout is not None:
330
 
                client.Set(client_interface, "ExtendedTimeout",
331
 
                           timedelta_to_milliseconds
332
 
                           (string_to_delta(options.extended_timeout)),
333
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
334
 
            if options.secret is not None:
 
328
            if options.secret:
335
329
                client.Set(client_interface, "Secret",
336
 
                           dbus.ByteArray(options.secret.read()),
 
330
                           dbus.ByteArray(open(options.secret,
 
331
                                               "rb").read()),
337
332
                           dbus_interface=dbus.PROPERTIES_IFACE)
338
333
            if options.approved_by_default is not None:
339
334
                client.Set(client_interface, "ApprovedByDefault",