/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: 2010-09-12 18:12:11 UTC
  • mto: (237.4.3 mandos-release)
  • mto: This revision was merged to the branch mainline in revision 428.
  • Revision ID: belorn@fukt.bsnet.se-20100912181211-wvkt0sk37zhx7tws
mandos-client: Added never ending loop for --connect
mandos-ctl: Better option parsing.

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
 
24
25
    'last_enabled': u'Last Enabled',
25
26
    'checker': u'Checker',
26
27
    }
27
 
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
28
 
                   'checker')
 
28
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok')
29
29
domain = 'se.bsnet.fukt'
30
30
busname = domain + '.Mandos'
31
31
server_path = '/'
32
32
server_interface = domain + '.Mandos'
33
33
client_interface = domain + '.Mandos.Client'
34
 
version = "1.0.5"
35
 
bus = dbus.SystemBus()
36
 
mandos_dbus_objc = bus.get_object(busname, server_path)
37
 
mandos_serv = dbus.Interface(mandos_dbus_objc,
38
 
                             dbus_interface = server_interface)
39
 
mandos_clients = mandos_serv.GetAllClientsWithProperties()
 
34
version = "1.0.14"
40
35
 
41
 
def datetime_to_milliseconds(dt):
42
 
    "Return the 'timeout' attribute in milliseconds"
43
 
    return ((dt.days * 24 * 60 * 60 * 1000)
44
 
            + (dt.seconds * 1000)
45
 
            + (dt.microseconds // 1000))
 
36
def timedelta_to_milliseconds(td):
 
37
    "Convert a datetime.timedelta object to milliseconds"
 
38
    return ((td.days * 24 * 60 * 60 * 1000)
 
39
            + (td.seconds * 1000)
 
40
            + (td.microseconds // 1000))
46
41
 
47
42
def milliseconds_to_string(ms):
48
43
    td = datetime.timedelta(0, 0, 0, ms)
49
 
    return "%s%02d:%02d:%02d" % (("%dT" % td.days) if td.days else "", # days
50
 
                           td.seconds // 3600,        # hours
51
 
                           (td.seconds % 3600) // 60, # minutes
52
 
                           (td.seconds % 60))         # seconds
 
44
    return (u"%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
 
45
            % { "days": "%dT" % td.days if td.days else "",
 
46
                "hours": td.seconds // 3600,
 
47
                "minutes": (td.seconds % 3600) // 60,
 
48
                "seconds": td.seconds % 60,
 
49
                })
53
50
 
54
51
 
55
52
def string_to_delta(interval):
92
89
        timevalue += delta
93
90
    return timevalue
94
91
 
95
 
def print_clients(clients):
 
92
def print_clients(clients, keywords):
96
93
    def valuetostring(value, keyword):
97
94
        if type(value) is dbus.Boolean:
98
95
            return u"Yes" if value else u"No"
99
 
        if keyword in ("timeout", "interval"):
 
96
        if keyword in (u"timeout", u"interval"):
100
97
            return milliseconds_to_string(value)
101
98
        return unicode(value)
102
99
    
 
100
    # Create format string to print table rows
103
101
    format_string = u' '.join(u'%%-%ds' %
104
102
                              max(len(tablewords[key]),
105
103
                                  max(len(valuetostring(client[key], key))
106
104
                                      for client in
107
105
                                      clients))
108
106
                              for key in keywords)
109
 
    print format_string % tuple(tablewords[key] for key in keywords) 
 
107
    # Print header line
 
108
    print format_string % tuple(tablewords[key] for key in keywords)
110
109
    for client in clients:
111
110
        print format_string % tuple(valuetostring(client[key], key)
112
111
                                    for key in keywords)
113
 
 
114
 
parser = OptionParser(version = "%%prog %s" % version)
115
 
parser.add_option("-a", "--all", action="store_true",
116
 
                  help="Print all fields")
117
 
parser.add_option("-e", "--enable", action="store_true",
118
 
                  help="Enable client")
119
 
parser.add_option("-d", "--disable", action="store_true",
120
 
                  help="disable client")
121
 
parser.add_option("-b", "--bump-timeout", action="store_true",
122
 
                  help="Bump timeout for client")
123
 
parser.add_option("--start-checker", action="store_true",
124
 
                  help="Start checker for client")
125
 
parser.add_option("--stop-checker", action="store_true",
126
 
                  help="Stop checker for client")
127
 
parser.add_option("-V", "--is-valid", action="store_true",
128
 
                  help="Check if client is still valid")
129
 
parser.add_option("-r", "--remove", action="store_true",
130
 
                  help="Remove client")
131
 
parser.add_option("-c", "--checker", type="string",
132
 
                  help="Set checker command for client")
133
 
parser.add_option("-t", "--timeout", type="string",
134
 
                  help="Set timeout for client")
135
 
parser.add_option("-i", "--interval", type="string",
136
 
                  help="Set checker interval for client")
137
 
parser.add_option("-H", "--host", type="string",
138
 
                  help="Set host for client")
139
 
parser.add_option("-s", "--secret", type="string",
140
 
                  help="Set password blob (file) for client")
141
 
options, client_names = parser.parse_args()
142
 
 
143
 
# Compile list of clients to process
144
 
clients=[]
145
 
for name in client_names:
146
 
    for path, client in mandos_clients.iteritems():
147
 
        if client['name'] == name:
148
 
            client_objc = bus.get_object(busname, path)
149
 
            clients.append(dbus.Interface(client_objc,
150
 
                                          dbus_interface
151
 
                                          = client_interface))
152
 
            break
153
 
    else:
154
 
        print >> sys.stderr, "Client not found on server: %r" % name
155
 
        sys.exit(1)
156
 
 
157
 
if not clients and mandos_clients.values():
158
 
    keywords = defaultkeywords
159
 
    if options.all:
160
 
        keywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
161
 
                    'created', 'interval', 'host', 'fingerprint',
162
 
                    'checker_running', 'last_enabled', 'checker')
163
 
    print_clients(mandos_clients.values())
164
 
 
165
 
# Process each client in the list by all selected options
166
 
for client in clients:
167
 
    if options.remove:
168
 
        mandos_serv.RemoveClient(client.__dbus_object_path__)
169
 
    if options.enable:
170
 
        client.Enable()
171
 
    if options.disable:
172
 
        client.Disable()
173
 
    if options.bump_timeout:
174
 
        client.BumpTimeout()
175
 
    if options.start_checker:
176
 
        client.StartChecker()
177
 
    if options.stop_checker:
178
 
        client.StopChecker()
179
 
    if options.is_valid:
180
 
        sys.exit(0 if client.IsStillValid() else 1)
181
 
    if options.checker:
182
 
        client.SetChecker(options.checker)
183
 
    if options.host:
184
 
        client.SetHost(options.host)
185
 
    if options.interval:
186
 
        client.SetInterval(datetime_to_milliseconds
187
 
                           (string_to_delta(options.interval)))
188
 
    if options.timeout:
189
 
        client.SetTimeout(datetime_to_milliseconds
190
 
                          (string_to_delta(options.timeout)))
191
 
    if options.secret:
192
 
        client.SetSecret(dbus.ByteArray(open(options.secret, 'rb').read()))
 
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)
193
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()