/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 at bsnet
  • Date: 2010-09-09 18:16:14 UTC
  • mfrom: (237.2.35 mandos-empty-device)
  • Revision ID: teddy@fukt.bsnet.se-20100909181614-oanlmvkzsiodbo3c
Merge in branch to interpret an empty device name to mean
"autodetect".

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
12
11
 
13
12
locale.setlocale(locale.LC_ALL, u'')
14
13
 
32
31
server_interface = domain + '.Mandos'
33
32
client_interface = domain + '.Mandos.Client'
34
33
version = "1.0.14"
 
34
bus = dbus.SystemBus()
 
35
mandos_dbus_objc = bus.get_object(busname, server_path)
 
36
mandos_serv = dbus.Interface(mandos_dbus_objc,
 
37
                             dbus_interface = server_interface)
 
38
mandos_clients = mandos_serv.GetAllClientsWithProperties()
35
39
 
36
40
def timedelta_to_milliseconds(td):
37
41
    "Convert a datetime.timedelta object to milliseconds"
89
93
        timevalue += delta
90
94
    return timevalue
91
95
 
92
 
def print_clients(clients, keywords):
 
96
def print_clients(clients):
93
97
    def valuetostring(value, keyword):
94
98
        if type(value) is dbus.Boolean:
95
99
            return u"Yes" if value else u"No"
109
113
    for client in clients:
110
114
        print format_string % tuple(valuetostring(client[key], key)
111
115
                                    for key in keywords)
112
 
def has_actions(options):
113
 
    return any((options.enable,
114
 
                options.disable,
115
 
                options.bump_timeout,
116
 
                options.start_checker,
117
 
                options.stop_checker,
118
 
                options.is_enabled,
119
 
                options.remove,
120
 
                options.checker is not None,
121
 
                options.timeout is not None,
122
 
                options.interval is not None,
123
 
                options.host is not None,
124
 
                options.secret is not None,
125
 
                options.approve,
126
 
                options.deny))
127
 
        
128
 
def main():
129
 
        parser = OptionParser(version = "%%prog %s" % version)
130
 
        parser.add_option("-a", "--all", action="store_true",
131
 
                          help="Select all clients")
132
 
        parser.add_option("-v", "--verbose", action="store_true",
133
 
                          help="Print all fields")
134
 
        parser.add_option("-e", "--enable", action="store_true",
135
 
                          help="Enable client")
136
 
        parser.add_option("-d", "--disable", action="store_true",
137
 
                          help="disable client")
138
 
        parser.add_option("-b", "--bump-timeout", action="store_true",
139
 
                          help="Bump timeout for client")
140
 
        parser.add_option("--start-checker", action="store_true",
141
 
                          help="Start checker for client")
142
 
        parser.add_option("--stop-checker", action="store_true",
143
 
                          help="Stop checker for client")
144
 
        parser.add_option("-V", "--is-enabled", action="store_true",
145
 
                          help="Check if client is enabled")
146
 
        parser.add_option("-r", "--remove", action="store_true",
147
 
                          help="Remove client")
148
 
        parser.add_option("-c", "--checker", type="string",
149
 
                          help="Set checker command for client")
150
 
        parser.add_option("-t", "--timeout", type="string",
151
 
                          help="Set timeout for client")
152
 
        parser.add_option("-i", "--interval", type="string",
153
 
                          help="Set checker interval for client")
154
 
        parser.add_option("-H", "--host", type="string",
155
 
                          help="Set host for client")
156
 
        parser.add_option("-s", "--secret", type="string",
157
 
                          help="Set password blob (file) for client")
158
 
        parser.add_option("-A", "--approve", action="store_true",
159
 
                          help="Approve any current client request")
160
 
        parser.add_option("-D", "--deny", action="store_true",
161
 
                          help="Deny any current client request")
162
 
        options, client_names = parser.parse_args()
163
 
 
164
 
        if has_actions(options) and not client_names and not options.all:
165
 
            parser.error('Options requires clients names or --all.')
166
 
        if options.verbose and has_actions(options):
167
 
            parser.error('Verbose option can only be used alone or with --all.')
168
 
        if options.all and not has_actions(options):
169
 
            parser.error('--all requires an action')
170
 
            
171
 
        try:
172
 
            bus = dbus.SystemBus()
173
 
            mandos_dbus_objc = bus.get_object(busname, server_path)
174
 
        except dbus.exceptions.DBusException:
175
 
            print >> sys.stderr, "Could not connect to Mandos server"
176
 
            sys.exit(1)
177
 
    
178
 
        mandos_serv = dbus.Interface(mandos_dbus_objc,
179
 
                                     dbus_interface = server_interface)
180
 
 
181
 
        #block stderr since dbus library prints to stderr
182
 
        null = os.open(os.path.devnull, os.O_RDWR)
183
 
        stderrcopy = os.dup(sys.stderr.fileno())
184
 
        os.dup2(null, sys.stderr.fileno())
185
 
        os.close(null)
186
 
        try:
187
 
            try:
188
 
                mandos_clients = mandos_serv.GetAllClientsWithProperties()
189
 
            finally:
190
 
                #restore stderr
191
 
                os.dup2(stderrcopy, sys.stderr.fileno())
192
 
                os.close(stderrcopy)
193
 
        except dbus.exceptions.DBusException, e:
194
 
            print >> sys.stderr, "Access denied: Accessing mandos server through dbus."
195
 
            sys.exit(1)
196
 
            
197
 
        # Compile list of clients to process
198
 
        clients=[]
199
 
 
200
 
        if options.all or not client_names:
201
 
            clients = (bus.get_object(busname, path) for path in mandos_clients.iterkeys())
202
 
        else:
203
 
            for name in client_names:
204
 
                for path, client in mandos_clients.iteritems():
205
 
                    if client['name'] == name:
206
 
                        client_objc = bus.get_object(busname, path)
207
 
                        clients.append(client_objc)
208
 
                        break
209
 
                else:
210
 
                    print >> sys.stderr, "Client not found on server: %r" % name
211
 
                    sys.exit(1)
212
 
            
213
 
        if not has_actions(options) and clients:
214
 
            if options.verbose:
215
 
                keywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
216
 
                            'created', 'interval', 'host', 'fingerprint',
217
 
                            'checker_running', 'last_enabled', 'checker')
218
 
            else:
219
 
                keywords = defaultkeywords
220
 
                
221
 
            print_clients(mandos_clients.values(), keywords)
222
 
        else:
223
 
            # Process each client in the list by all selected options
224
 
            for client in clients:
225
 
                if options.remove:
226
 
                    mandos_serv.RemoveClient(client.__dbus_object_path__)
227
 
                if options.enable:
228
 
                    client.Enable(dbus_interface=client_interface)
229
 
                if options.disable:
230
 
                    client.Disable(dbus_interface=client_interface)
231
 
                if options.bump_timeout:
232
 
                    client.CheckedOK(dbus_interface=client_interface)
233
 
                if options.start_checker:
234
 
                    client.StartChecker(dbus_interface=client_interface)
235
 
                if options.stop_checker:
236
 
                    client.StopChecker(dbus_interface=client_interface)
237
 
                if options.is_enabled:
238
 
                    sys.exit(0 if client.Get(client_interface,
239
 
                                             u"enabled",
240
 
                                             dbus_interface=dbus.PROPERTIES_IFACE)
241
 
                             else 1)
242
 
                if options.checker:
243
 
                    client.Set(client_interface, u"checker", options.checker,
244
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
245
 
                if options.host:
246
 
                    client.Set(client_interface, u"host", options.host,
247
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
248
 
                if options.interval:
249
 
                    client.Set(client_interface, u"interval",
250
 
                               timedelta_to_milliseconds
251
 
                               (string_to_delta(options.interval)),
252
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
253
 
                if options.timeout:
254
 
                    client.Set(client_interface, u"timeout",
255
 
                               timedelta_to_milliseconds(string_to_delta
256
 
                                                         (options.timeout)),
257
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
258
 
                if options.secret:
259
 
                    client.Set(client_interface, u"secret",
260
 
                               dbus.ByteArray(open(options.secret, u'rb').read()),
261
 
                               dbus_interface=dbus.PROPERTIES_IFACE)
262
 
                if options.approve:
263
 
                    client.Approve(dbus.Boolean(True), dbus_interface=client_interface)
264
 
                if options.deny:
265
 
                    client.Approve(dbus.Boolean(False), dbus_interface=client_interface)
266
 
 
267
 
if __name__ == '__main__':
268
 
    main()
 
116
 
 
117
parser = OptionParser(version = "%%prog %s" % version)
 
118
parser.add_option("-a", "--all", action="store_true",
 
119
                  help="Print all fields")
 
120
parser.add_option("-e", "--enable", action="store_true",
 
121
                  help="Enable client")
 
122
parser.add_option("-d", "--disable", action="store_true",
 
123
                  help="disable client")
 
124
parser.add_option("-b", "--bump-timeout", action="store_true",
 
125
                  help="Bump timeout for client")
 
126
parser.add_option("--start-checker", action="store_true",
 
127
                  help="Start checker for client")
 
128
parser.add_option("--stop-checker", action="store_true",
 
129
                  help="Stop checker for client")
 
130
parser.add_option("-V", "--is-enabled", action="store_true",
 
131
                  help="Check if client is enabled")
 
132
parser.add_option("-r", "--remove", action="store_true",
 
133
                  help="Remove client")
 
134
parser.add_option("-c", "--checker", type="string",
 
135
                  help="Set checker command for client")
 
136
parser.add_option("-t", "--timeout", type="string",
 
137
                  help="Set timeout for client")
 
138
parser.add_option("-i", "--interval", type="string",
 
139
                  help="Set checker interval for client")
 
140
parser.add_option("-H", "--host", type="string",
 
141
                  help="Set host for client")
 
142
parser.add_option("-s", "--secret", type="string",
 
143
                  help="Set password blob (file) for client")
 
144
options, client_names = parser.parse_args()
 
145
 
 
146
# Compile list of clients to process
 
147
clients=[]
 
148
for name in client_names:
 
149
    for path, client in mandos_clients.iteritems():
 
150
        if client['name'] == name:
 
151
            client_objc = bus.get_object(busname, path)
 
152
            clients.append(client_objc)
 
153
            break
 
154
    else:
 
155
        print >> sys.stderr, "Client not found on server: %r" % name
 
156
        sys.exit(1)
 
157
 
 
158
if not clients and mandos_clients.values():
 
159
    keywords = defaultkeywords
 
160
    if options.all:
 
161
        keywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
 
162
                    'created', 'interval', 'host', 'fingerprint',
 
163
                    'checker_running', 'last_enabled', 'checker')
 
164
    print_clients(mandos_clients.values())
 
165
 
 
166
# Process each client in the list by all selected options
 
167
for client in clients:
 
168
    if options.remove:
 
169
        mandos_serv.RemoveClient(client.__dbus_object_path__)
 
170
    if options.enable:
 
171
        client.Enable(dbus_interface=client_interface)
 
172
    if options.disable:
 
173
        client.Disable(dbus_interface=client_interface)
 
174
    if options.bump_timeout:
 
175
        client.CheckedOK(dbus_interface=client_interface)
 
176
    if options.start_checker:
 
177
        client.StartChecker(dbus_interface=client_interface)
 
178
    if options.stop_checker:
 
179
        client.StopChecker(dbus_interface=client_interface)
 
180
    if options.is_enabled:
 
181
        sys.exit(0 if client.Get(client_interface,
 
182
                                 u"enabled",
 
183
                                 dbus_interface=dbus.PROPERTIES_IFACE)
 
184
                 else 1)
 
185
    if options.checker:
 
186
        client.Set(client_interface, u"checker", options.checker,
 
187
                   dbus_interface=dbus.PROPERTIES_IFACE)
 
188
    if options.host:
 
189
        client.Set(client_interface, u"host", options.host,
 
190
                   dbus_interface=dbus.PROPERTIES_IFACE)
 
191
    if options.interval:
 
192
        client.Set(client_interface, u"interval",
 
193
                   timedelta_to_milliseconds
 
194
                   (string_to_delta(options.interval)),
 
195
                   dbus_interface=dbus.PROPERTIES_IFACE)
 
196
    if options.timeout:
 
197
        client.Set(client_interface, u"timeout",
 
198
                   timedelta_to_milliseconds(string_to_delta
 
199
                                             (options.timeout)),
 
200
                   dbus_interface=dbus.PROPERTIES_IFACE)
 
201
    if options.secret:
 
202
        client.Set(client_interface, u"secret",
 
203
                   dbus.ByteArray(open(options.secret, u'rb').read()),
 
204
                   dbus_interface=dbus.PROPERTIES_IFACE)