/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk
24.1.116 by Björn Påhlsson
added a mandos list client program
1
#!/usr/bin/python
240 by Teddy Hogeborn
Merge "mandos-list" from belorn.
2
# -*- mode: python; coding: utf-8 -*-
24.1.116 by Björn Påhlsson
added a mandos list client program
3
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
4
from __future__ import division
24.1.119 by Björn Påhlsson
Added more method support for mandos clients through mandos-ctl
5
import sys
24.1.116 by Björn Påhlsson
added a mandos list client program
6
import dbus
7
from optparse import OptionParser
240 by Teddy Hogeborn
Merge "mandos-list" from belorn.
8
import locale
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
9
import datetime
10
import re
240 by Teddy Hogeborn
Merge "mandos-list" from belorn.
11
12
locale.setlocale(locale.LC_ALL, u'')
24.1.116 by Björn Påhlsson
added a mandos list client program
13
14
tablewords = {
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
15
    'Name': u'Name',
16
    'Enabled': u'Enabled',
17
    'Timeout': u'Timeout',
18
    'LastCheckedOK': u'Last Successful Check',
19
    'Created': u'Created',
20
    'Interval': u'Interval',
21
    'Host': u'Host',
22
    'Fingerprint': u'Fingerprint',
23
    'CheckerRunning': u'Check Is Running',
24
    'LastEnabled': u'Last Enabled',
25
    'Checker': u'Checker',
24.1.116 by Björn Påhlsson
added a mandos list client program
26
    }
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
27
defaultkeywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK')
24.1.130 by Björn Påhlsson
new domain name for d-bus
28
domain = 'se.bsnet.fukt'
29
busname = domain + '.Mandos'
30
server_path = '/'
31
server_interface = domain + '.Mandos'
32
client_interface = domain + '.Mandos.Client'
237.2.32 by Teddy Hogeborn
* Makefile (version): Changed to "1.0.14".
33
version = "1.0.14"
24.1.159 by Björn Påhlsson
added approval to mandos-ctl
34
try:
35
    bus = dbus.SystemBus()
36
    mandos_dbus_objc = bus.get_object(busname, server_path)
37
except dbus.exceptions.DBusException:
38
    sys.exit(1)
39
    
24.1.118 by Björn Påhlsson
Added enable/disable
40
mandos_serv = dbus.Interface(mandos_dbus_objc,
41
                             dbus_interface = server_interface)
42
mandos_clients = mandos_serv.GetAllClientsWithProperties()
43
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
44
def timedelta_to_milliseconds(td):
45
    "Convert a datetime.timedelta object to milliseconds"
46
    return ((td.days * 24 * 60 * 60 * 1000)
47
            + (td.seconds * 1000)
48
            + (td.microseconds // 1000))
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
49
50
def milliseconds_to_string(ms):
51
    td = datetime.timedelta(0, 0, 0, ms)
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
52
    return (u"%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
53
            % { "days": "%dT" % td.days if td.days else "",
54
                "hours": td.seconds // 3600,
55
                "minutes": (td.seconds % 3600) // 60,
56
                "seconds": td.seconds % 60,
57
                })
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
58
59
60
def string_to_delta(interval):
61
    """Parse a string and return a datetime.timedelta
62
63
    >>> string_to_delta('7d')
64
    datetime.timedelta(7)
65
    >>> string_to_delta('60s')
66
    datetime.timedelta(0, 60)
67
    >>> string_to_delta('60m')
68
    datetime.timedelta(0, 3600)
69
    >>> string_to_delta('24h')
70
    datetime.timedelta(1)
71
    >>> string_to_delta(u'1w')
72
    datetime.timedelta(7)
73
    >>> string_to_delta('5m 30s')
74
    datetime.timedelta(0, 330)
75
    """
76
    timevalue = datetime.timedelta(0)
77
    regexp = re.compile("\d+[dsmhw]")
78
    
79
    for s in regexp.findall(interval):
80
        try:
81
            suffix = unicode(s[-1])
82
            value = int(s[:-1])
83
            if suffix == u"d":
84
                delta = datetime.timedelta(value)
85
            elif suffix == u"s":
86
                delta = datetime.timedelta(0, value)
87
            elif suffix == u"m":
88
                delta = datetime.timedelta(0, 0, 0, 0, value)
89
            elif suffix == u"h":
90
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
91
            elif suffix == u"w":
92
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
93
            else:
94
                raise ValueError
95
        except (ValueError, IndexError):
96
            raise ValueError
97
        timevalue += delta
98
    return timevalue
99
100
def print_clients(clients):
101
    def valuetostring(value, keyword):
102
        if type(value) is dbus.Boolean:
103
            return u"Yes" if value else u"No"
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
104
        if keyword in (u"timeout", u"interval"):
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
105
            return milliseconds_to_string(value)
106
        return unicode(value)
107
    
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
108
    # Create format string to print table rows
24.1.118 by Björn Påhlsson
Added enable/disable
109
    format_string = u' '.join(u'%%-%ds' %
110
                              max(len(tablewords[key]),
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
111
                                  max(len(valuetostring(client[key],
112
                                                        key))
24.1.118 by Björn Påhlsson
Added enable/disable
113
                                      for client in
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
114
                                      clients))
24.1.118 by Björn Påhlsson
Added enable/disable
115
                              for key in keywords)
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
116
    # Print header line
355 by Teddy Hogeborn
* mandos: White-space fixes only.
117
    print format_string % tuple(tablewords[key] for key in keywords)
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
118
    for client in clients:
119
        print format_string % tuple(valuetostring(client[key], key)
24.1.118 by Björn Påhlsson
Added enable/disable
120
                                    for key in keywords)
121
24.1.116 by Björn Påhlsson
added a mandos list client program
122
parser = OptionParser(version = "%%prog %s" % version)
24.1.119 by Björn Påhlsson
Added more method support for mandos clients through mandos-ctl
123
parser.add_option("-a", "--all", action="store_true",
240 by Teddy Hogeborn
Merge "mandos-list" from belorn.
124
                  help="Print all fields")
24.1.119 by Björn Påhlsson
Added more method support for mandos clients through mandos-ctl
125
parser.add_option("-e", "--enable", action="store_true",
24.1.128 by Björn Påhlsson
fixed a bugg in mandos-ctl + added remove client option
126
                  help="Enable client")
24.1.119 by Björn Påhlsson
Added more method support for mandos clients through mandos-ctl
127
parser.add_option("-d", "--disable", action="store_true",
24.1.128 by Björn Påhlsson
fixed a bugg in mandos-ctl + added remove client option
128
                  help="disable client")
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
129
parser.add_option("-b", "--bump-timeout", action="store_true",
24.1.128 by Björn Påhlsson
fixed a bugg in mandos-ctl + added remove client option
130
                  help="Bump timeout for client")
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
131
parser.add_option("--start-checker", action="store_true",
24.1.128 by Björn Påhlsson
fixed a bugg in mandos-ctl + added remove client option
132
                  help="Start checker for client")
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
133
parser.add_option("--stop-checker", action="store_true",
24.1.128 by Björn Påhlsson
fixed a bugg in mandos-ctl + added remove client option
134
                  help="Stop checker for client")
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
135
parser.add_option("-V", "--is-enabled", action="store_true",
136
                  help="Check if client is enabled")
24.1.128 by Björn Påhlsson
fixed a bugg in mandos-ctl + added remove client option
137
parser.add_option("-r", "--remove", action="store_true",
138
                  help="Remove client")
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
139
parser.add_option("-c", "--checker", type="string",
24.1.128 by Björn Påhlsson
fixed a bugg in mandos-ctl + added remove client option
140
                  help="Set checker command for client")
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
141
parser.add_option("-t", "--timeout", type="string",
24.1.128 by Björn Påhlsson
fixed a bugg in mandos-ctl + added remove client option
142
                  help="Set timeout for client")
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
143
parser.add_option("-i", "--interval", type="string",
24.1.128 by Björn Påhlsson
fixed a bugg in mandos-ctl + added remove client option
144
                  help="Set checker interval for client")
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
145
parser.add_option("-H", "--host", type="string",
24.1.128 by Björn Påhlsson
fixed a bugg in mandos-ctl + added remove client option
146
                  help="Set host for client")
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
147
parser.add_option("-s", "--secret", type="string",
24.1.128 by Björn Påhlsson
fixed a bugg in mandos-ctl + added remove client option
148
                  help="Set password blob (file) for client")
24.1.159 by Björn Påhlsson
added approval to mandos-ctl
149
parser.add_option("-A", "--approve", action="store_true",
150
                  help="Approve any current client request")
151
parser.add_option("-D", "--deny", action="store_true",
152
                  help="Deny any current client request")
24.1.119 by Björn Påhlsson
Added more method support for mandos clients through mandos-ctl
153
options, client_names = parser.parse_args()
154
291 by Teddy Hogeborn
Merge from Björn:
155
# Compile list of clients to process
24.1.119 by Björn Påhlsson
Added more method support for mandos clients through mandos-ctl
156
clients=[]
157
for name in client_names:
158
    for path, client in mandos_clients.iteritems():
159
        if client['name'] == name:
160
            client_objc = bus.get_object(busname, path)
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
161
            clients.append(client_objc)
24.1.119 by Björn Påhlsson
Added more method support for mandos clients through mandos-ctl
162
            break
163
    else:
164
        print >> sys.stderr, "Client not found on server: %r" % name
165
        sys.exit(1)
166
24.1.128 by Björn Påhlsson
fixed a bugg in mandos-ctl + added remove client option
167
if not clients and mandos_clients.values():
24.1.116 by Björn Påhlsson
added a mandos list client program
168
    keywords = defaultkeywords
24.1.119 by Björn Påhlsson
Added more method support for mandos clients through mandos-ctl
169
    if options.all:
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
170
        keywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK',
171
                    'Created', 'Interval', 'Host', 'Fingerprint',
172
                    'CheckerRunning', 'LastEnabled', 'Checker')
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
173
    print_clients(mandos_clients.values())
24.1.128 by Björn Påhlsson
fixed a bugg in mandos-ctl + added remove client option
174
175
# Process each client in the list by all selected options
24.1.119 by Björn Påhlsson
Added more method support for mandos clients through mandos-ctl
176
for client in clients:
24.1.128 by Björn Påhlsson
fixed a bugg in mandos-ctl + added remove client option
177
    if options.remove:
178
        mandos_serv.RemoveClient(client.__dbus_object_path__)
24.1.119 by Björn Påhlsson
Added more method support for mandos clients through mandos-ctl
179
    if options.enable:
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
180
        client.Enable(dbus_interface=client_interface)
24.1.119 by Björn Påhlsson
Added more method support for mandos clients through mandos-ctl
181
    if options.disable:
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
182
        client.Disable(dbus_interface=client_interface)
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
183
    if options.bump_timeout:
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
184
        client.CheckedOK(dbus_interface=client_interface)
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
185
    if options.start_checker:
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
186
        client.StartChecker(dbus_interface=client_interface)
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
187
    if options.stop_checker:
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
188
        client.StopChecker(dbus_interface=client_interface)
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
189
    if options.is_enabled:
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
190
        sys.exit(0 if client.Get(client_interface,
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
191
                                 u"Enabled",
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
192
                                 dbus_interface=dbus.PROPERTIES_IFACE)
193
                 else 1)
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
194
    if options.checker:
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
195
        client.Set(client_interface, u"Checker", options.checker,
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
196
                   dbus_interface=dbus.PROPERTIES_IFACE)
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
197
    if options.host:
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
198
        client.Set(client_interface, u"Host", options.host,
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
199
                   dbus_interface=dbus.PROPERTIES_IFACE)
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
200
    if options.interval:
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
201
        client.Set(client_interface, u"Interval",
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
202
                   timedelta_to_milliseconds
203
                   (string_to_delta(options.interval)),
204
                   dbus_interface=dbus.PROPERTIES_IFACE)
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
205
    if options.timeout:
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
206
        client.Set(client_interface, u"Timeout",
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
207
                   timedelta_to_milliseconds(string_to_delta
208
                                             (options.timeout)),
209
                   dbus_interface=dbus.PROPERTIES_IFACE)
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
210
    if options.secret:
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
211
        client.Set(client_interface, u"Secret",
382 by Teddy Hogeborn
* mandos-ctl: Made work again after D-Bus API changes.
212
                   dbus.ByteArray(open(options.secret, u'rb').read()),
213
                   dbus_interface=dbus.PROPERTIES_IFACE)
24.1.159 by Björn Påhlsson
added approval to mandos-ctl
214
    if options.approve:
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
215
        client.Approve(dbus.Boolean(True),
216
                       dbus_interface=client_interface)
24.1.159 by Björn Påhlsson
added approval to mandos-ctl
217
    if options.deny:
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
218
        client.Approve(dbus.Boolean(False),
219
                       dbus_interface=client_interface)