/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: 2010-09-25 23:52:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100925235217-4hhqfryz1ste6uw3
* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
                                to "_" in D-Bus object paths.
  (MandosServer.handle_ipc): Bug fix: Send only address string to
                             D-Bus signal, not whole tuple.

* mandos-ctl: New options "--approve-by-default", "--deny-by-default",
              "--approval-delay", and "--approval-duration".
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new options.

* mandos-monitor (MandosClientWidget.update): Fix spelling.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
8
8
import locale
9
9
import datetime
10
10
import re
 
11
import os
11
12
 
12
13
locale.setlocale(locale.LC_ALL, u'')
13
14
 
22
23
    'Fingerprint': u'Fingerprint',
23
24
    'CheckerRunning': u'Check Is Running',
24
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",
25
30
    'Checker': u'Checker',
26
31
    }
27
32
defaultkeywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK')
31
36
server_interface = domain + '.Mandos'
32
37
client_interface = domain + '.Mandos.Client'
33
38
version = "1.0.14"
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
 
    
40
 
mandos_serv = dbus.Interface(mandos_dbus_objc,
41
 
                             dbus_interface = server_interface)
42
 
mandos_clients = mandos_serv.GetAllClientsWithProperties()
43
39
 
44
40
def timedelta_to_milliseconds(td):
45
41
    "Convert a datetime.timedelta object to milliseconds"
97
93
        timevalue += delta
98
94
    return timevalue
99
95
 
100
 
def print_clients(clients):
 
96
def print_clients(clients, keywords):
101
97
    def valuetostring(value, keyword):
102
98
        if type(value) is dbus.Boolean:
103
99
            return u"Yes" if value else u"No"
104
 
        if keyword in (u"timeout", u"interval"):
 
100
        if keyword in (u"Timeout", u"Interval", u"ApprovalDelay",
 
101
                       u"ApprovalDuration"):
105
102
            return milliseconds_to_string(value)
106
103
        return unicode(value)
107
104
    
119
116
        print format_string % tuple(valuetostring(client[key], key)
120
117
                                    for key in keywords)
121
118
 
122
 
parser = OptionParser(version = "%%prog %s" % version)
123
 
parser.add_option("-a", "--all", action="store_true",
124
 
                  help="Print all fields")
125
 
parser.add_option("-e", "--enable", action="store_true",
126
 
                  help="Enable client")
127
 
parser.add_option("-d", "--disable", action="store_true",
128
 
                  help="disable client")
129
 
parser.add_option("-b", "--bump-timeout", action="store_true",
130
 
                  help="Bump timeout for client")
131
 
parser.add_option("--start-checker", action="store_true",
132
 
                  help="Start checker for client")
133
 
parser.add_option("--stop-checker", action="store_true",
134
 
                  help="Stop checker for client")
135
 
parser.add_option("-V", "--is-enabled", action="store_true",
136
 
                  help="Check if client is enabled")
137
 
parser.add_option("-r", "--remove", action="store_true",
138
 
                  help="Remove client")
139
 
parser.add_option("-c", "--checker", type="string",
140
 
                  help="Set checker command for client")
141
 
parser.add_option("-t", "--timeout", type="string",
142
 
                  help="Set timeout for client")
143
 
parser.add_option("-i", "--interval", type="string",
144
 
                  help="Set checker interval for client")
145
 
parser.add_option("-H", "--host", type="string",
146
 
                  help="Set host for client")
147
 
parser.add_option("-s", "--secret", type="string",
148
 
                  help="Set password blob (file) for client")
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")
153
 
options, client_names = parser.parse_args()
154
 
 
155
 
# Compile list of clients to process
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)
161
 
            clients.append(client_objc)
162
 
            break
163
 
    else:
164
 
        print >> sys.stderr, "Client not found on server: %r" % name
165
 
        sys.exit(1)
166
 
 
167
 
if not clients and mandos_clients.values():
168
 
    keywords = defaultkeywords
169
 
    if options.all:
170
 
        keywords = ('Name', 'Enabled', 'Timeout', 'LastCheckedOK',
171
 
                    'Created', 'Interval', 'Host', 'Fingerprint',
172
 
                    'CheckerRunning', 'LastEnabled', 'Checker')
173
 
    print_clients(mandos_clients.values())
174
 
 
175
 
# Process each client in the list by all selected options
176
 
for client in clients:
177
 
    if options.remove:
178
 
        mandos_serv.RemoveClient(client.__dbus_object_path__)
179
 
    if options.enable:
180
 
        client.Enable(dbus_interface=client_interface)
181
 
    if options.disable:
182
 
        client.Disable(dbus_interface=client_interface)
183
 
    if options.bump_timeout:
184
 
        client.CheckedOK(dbus_interface=client_interface)
185
 
    if options.start_checker:
186
 
        client.StartChecker(dbus_interface=client_interface)
187
 
    if options.stop_checker:
188
 
        client.StopChecker(dbus_interface=client_interface)
189
 
    if options.is_enabled:
190
 
        sys.exit(0 if client.Get(client_interface,
191
 
                                 u"Enabled",
192
 
                                 dbus_interface=dbus.PROPERTIES_IFACE)
193
 
                 else 1)
194
 
    if options.checker:
195
 
        client.Set(client_interface, u"Checker", options.checker,
196
 
                   dbus_interface=dbus.PROPERTIES_IFACE)
197
 
    if options.host:
198
 
        client.Set(client_interface, u"Host", options.host,
199
 
                   dbus_interface=dbus.PROPERTIES_IFACE)
200
 
    if options.interval:
201
 
        client.Set(client_interface, u"Interval",
202
 
                   timedelta_to_milliseconds
203
 
                   (string_to_delta(options.interval)),
204
 
                   dbus_interface=dbus.PROPERTIES_IFACE)
205
 
    if options.timeout:
206
 
        client.Set(client_interface, u"Timeout",
207
 
                   timedelta_to_milliseconds(string_to_delta
208
 
                                             (options.timeout)),
209
 
                   dbus_interface=dbus.PROPERTIES_IFACE)
210
 
    if options.secret:
211
 
        client.Set(client_interface, u"Secret",
212
 
                   dbus.ByteArray(open(options.secret, u'rb').read()),
213
 
                   dbus_interface=dbus.PROPERTIES_IFACE)
214
 
    if options.approve:
215
 
        client.Approve(dbus.Boolean(True),
216
 
                       dbus_interface=client_interface)
217
 
    if options.deny:
218
 
        client.Approve(dbus.Boolean(False),
219
 
                       dbus_interface=client_interface)
 
119
def has_actions(options):
 
120
    return any((options.enable,
 
121
                options.disable,
 
122
                options.bump_timeout,
 
123
                options.start_checker,
 
124
                options.stop_checker,
 
125
                options.is_enabled,
 
126
                options.remove,
 
127
                options.checker is not None,
 
128
                options.timeout is not None,
 
129
                options.interval is not None,
 
130
                options.approved_by_default is not None,
 
131
                options.approval_delay is not None,
 
132
                options.approval_duration is not None,
 
133
                options.host is not None,
 
134
                options.secret is not None,
 
135
                options.approve,
 
136
                options.deny))
 
137
        
 
138
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)
 
198
    
 
199
        mandos_serv = dbus.Interface(mandos_dbus_objc,
 
200
                                     dbus_interface = server_interface)
 
201
 
 
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)
 
207
        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')
 
244
            else:
 
245
                keywords = defaultkeywords
 
246
                
 
247
            print_clients(clients.values(), keywords)
 
248
        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__':
 
314
    main()