To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to mandos-ctl
- browse files at revision 24.1.159
- compare with another revision
- download diff
- download tarball
- view history from revision 24.1.159
- Committer: Björn Påhlsson
- Date: 2010-09-08 19:12:04 UTC
- mto: (237.7.1 mandos)
- mto: This revision was merged to the branch mainline in revision 270.
- Revision ID: belorn@fukt.bsnet.se-20100908191204-svjb4wktrd0unu3m
added approval to mandos-ctl
- files added:
- dbus-mandos.conf
- files modified:
- INSTALL
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',
28
'checker')
27
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok')
29
28
domain = 'se.bsnet.fukt'
30
29
busname = domain + '.Mandos'
31
30
server_path = '/'
32
31
server_interface = domain + '.Mandos'
33
32
client_interface = domain + '.Mandos.Client'
34
version = "1.0.5"
35
bus = dbus.SystemBus()
36
mandos_dbus_objc = bus.get_object(busname, server_path)
33
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
37
40
mandos_serv = dbus.Interface(mandos_dbus_objc,
38
41
dbus_interface = server_interface)
39
42
mandos_clients = mandos_serv.GetAllClientsWithProperties()
40
43
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))
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))
46
49
47
50
def milliseconds_to_string(ms):
48
51
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
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
})
53
58
54
59
55
60
def string_to_delta(interval):
96
101
def valuetostring(value, keyword):
97
102
if type(value) is dbus.Boolean:
98
103
return u"Yes" if value else u"No"
99
if keyword in ("timeout", "interval"):
104
if keyword in (u"timeout", u"interval"):
100
105
return milliseconds_to_string(value)
101
106
return unicode(value)
102
107
108
# Create format string to print table rows
103
109
format_string = u' '.join(u'%%-%ds' %
104
110
max(len(tablewords[key]),
105
111
max(len(valuetostring(client[key], key))
106
112
for client in
107
113
clients))
108
114
for key in keywords)
109
print format_string % tuple(tablewords[key] for key in keywords)
115
# Print header line
116
print format_string % tuple(tablewords[key] for key in keywords)
110
117
for client in clients:
111
118
print format_string % tuple(valuetostring(client[key], key)
112
119
for key in keywords)
124
131
help="Start checker for client")
125
132
parser.add_option("--stop-checker", action="store_true",
126
133
help="Stop checker for client")
127
parser.add_option("-V", "--is-valid", action="store_true",
128
help="Check if client is still valid")
134
parser.add_option("-V", "--is-enabled", action="store_true",
135
help="Check if client is enabled")
129
136
parser.add_option("-r", "--remove", action="store_true",
130
137
help="Remove client")
131
138
parser.add_option("-c", "--checker", type="string",
138
145
help="Set host for client")
139
146
parser.add_option("-s", "--secret", type="string",
140
147
help="Set password blob (file) for client")
148
parser.add_option("-A", "--approve", action="store_true",
149
help="Approve any current client request")
150
parser.add_option("-D", "--deny", action="store_true",
151
help="Deny any current client request")
141
152
options, client_names = parser.parse_args()
142
153
143
154
# Compile list of clients to process
146
157
for path, client in mandos_clients.iteritems():
147
158
if client['name'] == name:
148
159
client_objc = bus.get_object(busname, path)
149
clients.append(dbus.Interface(client_objc,
150
dbus_interface
151
= client_interface))
160
clients.append(client_objc)
152
161
break
153
162
else:
154
163
print >> sys.stderr, "Client not found on server: %r" % name
167
176
if options.remove:
168
177
mandos_serv.RemoveClient(client.__dbus_object_path__)
169
178
if options.enable:
170
client.Enable()
179
client.Enable(dbus_interface=client_interface)
171
180
if options.disable:
172
client.Disable()
181
client.Disable(dbus_interface=client_interface)
173
182
if options.bump_timeout:
174
client.BumpTimeout()
183
client.CheckedOK(dbus_interface=client_interface)
175
184
if options.start_checker:
176
client.StartChecker()
185
client.StartChecker(dbus_interface=client_interface)
177
186
if options.stop_checker:
178
client.StopChecker()
179
if options.is_valid:
180
sys.exit(0 if client.IsStillValid() else 1)
187
client.StopChecker(dbus_interface=client_interface)
188
if options.is_enabled:
189
sys.exit(0 if client.Get(client_interface,
190
u"enabled",
191
dbus_interface=dbus.PROPERTIES_IFACE)
192
else 1)
181
193
if options.checker:
182
client.SetChecker(options.checker)
194
client.Set(client_interface, u"checker", options.checker,
195
dbus_interface=dbus.PROPERTIES_IFACE)
183
196
if options.host:
184
client.SetHost(options.host)
197
client.Set(client_interface, u"host", options.host,
198
dbus_interface=dbus.PROPERTIES_IFACE)
185
199
if options.interval:
186
client.SetInterval(datetime_to_milliseconds
187
(string_to_delta(options.interval)))
200
client.Set(client_interface, u"interval",
201
timedelta_to_milliseconds
202
(string_to_delta(options.interval)),
203
dbus_interface=dbus.PROPERTIES_IFACE)
188
204
if options.timeout:
189
client.SetTimeout(datetime_to_milliseconds
190
(string_to_delta(options.timeout)))
205
client.Set(client_interface, u"timeout",
206
timedelta_to_milliseconds(string_to_delta
207
(options.timeout)),
208
dbus_interface=dbus.PROPERTIES_IFACE)
191
209
if options.secret:
192
client.SetSecret(dbus.ByteArray(open(options.secret, 'rb').read()))
193
210
client.Set(client_interface, u"secret",
211
dbus.ByteArray(open(options.secret, u'rb').read()),
212
dbus_interface=dbus.PROPERTIES_IFACE)
213
if options.approve:
214
client.Approve(dbus.Boolean(True), dbus_interface=client_interface)
215
if options.deny:
216
client.Approve(dbus.Boolean(False), dbus_interface=client_interface)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0