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.11
- compare with another revision
- download diff
- download tarball
- view history from revision 237.2.11
- Committer: Teddy Hogeborn
- Date: 2009-01-17 02:12:05 UTC
- mto: (24.1.170 mandos) (237.4.29 release)
- mto: This revision was merged to the branch mainline in revision 273.
- Revision ID: teddy@fukt.bsnet.se-20090117021205-581c9f5ccub4576r
Tags: version-1.0.5-1
* Makefile (version): Changed to "1.0.5".
* NEWS (1.0.5): New entry.
* debian/changelog (1.0.5-1): - '' -
* NEWS (1.0.5): New entry.
* debian/changelog (1.0.5-1): - '' -
- files modified:
- INSTALL
added
removed
mandos-ctl
26
26
}
27
27
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
28
28
'checker')
29
domain = 'se.bsnet.fukt'
30
busname = domain + '.Mandos'
31
server_path = '/'
32
server_interface = domain + '.Mandos'
33
client_interface = domain + '.Mandos.Client'
34
version = "1.0.14"
29
busname = 'org.mandos-system.Mandos'
30
server_path = '/Mandos'
31
server_interface = 'org.mandos_system.Mandos'
32
client_interface = 'org.mandos_system.Mandos.Client'
33
version = "1.0.5"
34
35
35
bus = dbus.SystemBus()
36
36
mandos_dbus_objc = bus.get_object(busname, server_path)
37
37
mandos_serv = dbus.Interface(mandos_dbus_objc,
38
38
dbus_interface = server_interface)
39
39
mandos_clients = mandos_serv.GetAllClientsWithProperties()
40
40
41
def timedelta_to_milliseconds(td):
42
"Convert a datetime.timedelta object to milliseconds"
43
return ((td.days * 24 * 60 * 60 * 1000)
44
+ (td.seconds * 1000)
45
+ (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))
46
46
47
47
def milliseconds_to_string(ms):
48
48
td = datetime.timedelta(0, 0, 0, ms)
49
return (u"%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
50
% { "days": "%dT" % td.days if td.days else "",
51
"hours": td.seconds // 3600,
52
"minutes": (td.seconds % 3600) // 60,
53
"seconds": td.seconds % 60,
54
})
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
55
53
56
54
57
55
def string_to_delta(interval):
98
96
def valuetostring(value, keyword):
99
97
if type(value) is dbus.Boolean:
100
98
return u"Yes" if value else u"No"
101
if keyword in (u"timeout", u"interval"):
99
if keyword in ("timeout", "interval"):
102
100
return milliseconds_to_string(value)
103
101
return unicode(value)
104
102
105
# Create format string to print table rows
106
103
format_string = u' '.join(u'%%-%ds' %
107
104
max(len(tablewords[key]),
108
105
max(len(valuetostring(client[key], key))
109
106
for client in
110
107
clients))
111
108
for key in keywords)
112
# Print header line
113
print format_string % tuple(tablewords[key] for key in keywords)
109
print format_string % tuple(tablewords[key] for key in keywords)
114
110
for client in clients:
115
111
print format_string % tuple(valuetostring(client[key], key)
116
112
for key in keywords)
119
115
parser.add_option("-a", "--all", action="store_true",
120
116
help="Print all fields")
121
117
parser.add_option("-e", "--enable", action="store_true",
122
help="Enable client")
118
help="Enable specified client")
123
119
parser.add_option("-d", "--disable", action="store_true",
124
help="disable client")
120
help="disable specified client")
125
121
parser.add_option("-b", "--bump-timeout", action="store_true",
126
help="Bump timeout for client")
122
help="Bump timeout of specified client")
127
123
parser.add_option("--start-checker", action="store_true",
128
help="Start checker for client")
124
help="Start checker for specified client")
129
125
parser.add_option("--stop-checker", action="store_true",
130
help="Stop checker for client")
131
parser.add_option("-V", "--is-valid", action="store_true",
132
help="Check if client is still valid")
133
parser.add_option("-r", "--remove", action="store_true",
134
help="Remove client")
126
help="Stop checker for specified client")
127
parser.add_option("-v", "--is-valid", action="store_true",
128
help="Stop checker for specified client")
135
129
parser.add_option("-c", "--checker", type="string",
136
help="Set checker command for client")
130
help="Set checker command for specified client")
137
131
parser.add_option("-t", "--timeout", type="string",
138
help="Set timeout for client")
132
help="Set timeout for specified client")
139
133
parser.add_option("-i", "--interval", type="string",
140
help="Set checker interval for client")
134
help="Set checker interval for specified client")
141
135
parser.add_option("-H", "--host", type="string",
142
help="Set host for client")
136
help="Set host for specified client")
143
137
parser.add_option("-s", "--secret", type="string",
144
help="Set password blob (file) for client")
138
help="Set password blob (file) for specified client")
145
139
options, client_names = parser.parse_args()
146
140
147
# Compile list of clients to process
148
141
clients=[]
149
142
for name in client_names:
150
143
for path, client in mandos_clients.iteritems():
151
144
if client['name'] == name:
152
145
client_objc = bus.get_object(busname, path)
153
clients.append(client_objc)
146
clients.append(dbus.Interface(client_objc,
147
dbus_interface
148
= client_interface))
154
149
break
155
150
else:
156
151
print >> sys.stderr, "Client not found on server: %r" % name
157
152
sys.exit(1)
158
153
159
if not clients and mandos_clients.values():
154
if not clients:
160
155
keywords = defaultkeywords
161
156
if options.all:
162
157
keywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
163
158
'created', 'interval', 'host', 'fingerprint',
164
159
'checker_running', 'last_enabled', 'checker')
165
160
print_clients(mandos_clients.values())
166
167
# Process each client in the list by all selected options
161
168
162
for client in clients:
169
if options.remove:
170
mandos_serv.RemoveClient(client.__dbus_object_path__)
171
163
if options.enable:
172
client.Enable(dbus_interface=client_interface)
164
client.Enable()
173
165
if options.disable:
174
client.Disable(dbus_interface=client_interface)
166
client.Disable()
175
167
if options.bump_timeout:
176
client.CheckedOK(dbus_interface=client_interface)
168
client.BumpTimeout()
177
169
if options.start_checker:
178
client.StartChecker(dbus_interface=client_interface)
170
client.StartChecker()
179
171
if options.stop_checker:
180
client.StopChecker(dbus_interface=client_interface)
172
client.StopChecker()
181
173
if options.is_valid:
182
sys.exit(0 if client.Get(client_interface,
183
u"enabled",
184
dbus_interface=dbus.PROPERTIES_IFACE)
185
else 1)
174
sys.exit(0 if client.IsStillValid() else 1)
186
175
if options.checker:
187
client.Set(client_interface, u"checker", options.checker,
188
dbus_interface=dbus.PROPERTIES_IFACE)
176
client.SetChecker(options.checker)
189
177
if options.host:
190
client.Set(client_interface, u"host", options.host,
191
dbus_interface=dbus.PROPERTIES_IFACE)
178
client.SetHost(options.host)
192
179
if options.interval:
193
client.Set(client_interface, u"interval",
194
timedelta_to_milliseconds
195
(string_to_delta(options.interval)),
196
dbus_interface=dbus.PROPERTIES_IFACE)
180
client.SetInterval(datetime_to_milliseconds
181
(string_to_delta(options.interval)))
197
182
if options.timeout:
198
client.Set(client_interface, u"timeout",
199
timedelta_to_milliseconds(string_to_delta
200
(options.timeout)),
201
dbus_interface=dbus.PROPERTIES_IFACE)
183
client.SetTimeout(datetime_to_milliseconds
184
(string_to_delta(options.timeout)))
202
185
if options.secret:
203
client.Set(client_interface, u"secret",
204
dbus.ByteArray(open(options.secret, u'rb').read()),
205
dbus_interface=dbus.PROPERTIES_IFACE)
186
client.SetSecret(dbus.ByteArray(open(options.secret, 'rb').read()))
187
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0