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
- browse files at revision 237.2.27
- compare with another revision
- download diff
- download tarball
- view history from revision 237.2.27
- Committer: Teddy Hogeborn
- Date: 2009-09-17 11:47:22 UTC
- mfrom: (375 mandos)
- mto: (24.1.170 mandos) (237.4.29 release)
- mto: This revision was merged to the branch mainline in revision 419.
- Revision ID: teddy@fukt.bsnet.se-20090917114722-azcwe7sdowxc95ba
Merge from trunk. Lots of bug fixes, including Debian bug #546928.
- files removed:
- dbus-mandos.conf
- files modified:
- Makefile
added
removed
mandos-ctl
24
24
'last_enabled': u'Last Enabled',
25
25
'checker': u'Checker',
26
26
}
27
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok')
27
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
28
'checker')
28
29
domain = 'se.bsnet.fukt'
29
30
busname = domain + '.Mandos'
30
31
server_path = '/'
31
32
server_interface = domain + '.Mandos'
32
33
client_interface = domain + '.Mandos.Client'
33
version = "1.0.14"
34
version = "1.0.11"
34
35
bus = dbus.SystemBus()
35
36
mandos_dbus_objc = bus.get_object(busname, server_path)
36
37
mandos_serv = dbus.Interface(mandos_dbus_objc,
37
38
dbus_interface = server_interface)
38
39
mandos_clients = mandos_serv.GetAllClientsWithProperties()
39
40
40
def timedelta_to_milliseconds(td):
41
"Convert a datetime.timedelta object to milliseconds"
42
return ((td.days * 24 * 60 * 60 * 1000)
43
+ (td.seconds * 1000)
44
+ (td.microseconds // 1000))
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))
45
46
46
47
def milliseconds_to_string(ms):
47
48
td = datetime.timedelta(0, 0, 0, ms)
48
return (u"%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
49
% { "days": "%dT" % td.days if td.days else "",
50
"hours": td.seconds // 3600,
51
"minutes": (td.seconds % 3600) // 60,
52
"seconds": td.seconds % 60,
53
})
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
54
53
55
54
56
55
def string_to_delta(interval):
97
96
def valuetostring(value, keyword):
98
97
if type(value) is dbus.Boolean:
99
98
return u"Yes" if value else u"No"
100
if keyword in (u"timeout", u"interval"):
99
if keyword in ("timeout", "interval"):
101
100
return milliseconds_to_string(value)
102
101
return unicode(value)
103
102
104
# Create format string to print table rows
105
103
format_string = u' '.join(u'%%-%ds' %
106
104
max(len(tablewords[key]),
107
105
max(len(valuetostring(client[key], key))
108
106
for client in
109
107
clients))
110
108
for key in keywords)
111
# Print header line
112
109
print format_string % tuple(tablewords[key] for key in keywords)
113
110
for client in clients:
114
111
print format_string % tuple(valuetostring(client[key], key)
127
124
help="Start checker for client")
128
125
parser.add_option("--stop-checker", action="store_true",
129
126
help="Stop checker for client")
130
parser.add_option("-V", "--is-enabled", action="store_true",
131
help="Check if client is enabled")
127
parser.add_option("-V", "--is-valid", action="store_true",
128
help="Check if client is still valid")
132
129
parser.add_option("-r", "--remove", action="store_true",
133
130
help="Remove client")
134
131
parser.add_option("-c", "--checker", type="string",
149
146
for path, client in mandos_clients.iteritems():
150
147
if client['name'] == name:
151
148
client_objc = bus.get_object(busname, path)
152
clients.append(client_objc)
149
clients.append(dbus.Interface(client_objc,
150
dbus_interface
151
= client_interface))
153
152
break
154
153
else:
155
154
print >> sys.stderr, "Client not found on server: %r" % name
168
167
if options.remove:
169
168
mandos_serv.RemoveClient(client.__dbus_object_path__)
170
169
if options.enable:
171
client.Enable(dbus_interface=client_interface)
170
client.Enable()
172
171
if options.disable:
173
client.Disable(dbus_interface=client_interface)
172
client.Disable()
174
173
if options.bump_timeout:
175
client.CheckedOK(dbus_interface=client_interface)
174
client.BumpTimeout()
176
175
if options.start_checker:
177
client.StartChecker(dbus_interface=client_interface)
176
client.StartChecker()
178
177
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)
178
client.StopChecker()
179
if options.is_valid:
180
sys.exit(0 if client.IsStillValid() else 1)
185
181
if options.checker:
186
client.Set(client_interface, u"checker", options.checker,
187
dbus_interface=dbus.PROPERTIES_IFACE)
182
client.SetChecker(options.checker)
188
183
if options.host:
189
client.Set(client_interface, u"host", options.host,
190
dbus_interface=dbus.PROPERTIES_IFACE)
184
client.SetHost(options.host)
191
185
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)
186
client.SetInterval(datetime_to_milliseconds
187
(string_to_delta(options.interval)))
196
188
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)
189
client.SetTimeout(datetime_to_milliseconds
190
(string_to_delta(options.timeout)))
201
191
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)
192
client.SetSecret(dbus.ByteArray(open(options.secret, 'rb').read()))
193
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0