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-monitor
- browse files at revision 791
- compare with another revision
- download diff
- download tarball
- view history from revision 791
- Committer: Teddy Hogeborn
- Date: 2015-10-24 18:33:55 UTC
- mfrom: (237.4.59 release)
- Revision ID: teddy@recompile.se-20151024183355-czoyd2jv7u4ijpss
Merge from release branch.
- files modified:
- DBUS-API
added
removed
mandos-monitor
60
60
domain = 'se.recompile'
61
61
server_interface = domain + '.Mandos'
62
62
client_interface = domain + '.Mandos.Client'
63
version = "1.6.9"
63
version = "1.7.1"
64
65
try:
66
dbus.OBJECT_MANAGER_IFACE
67
except AttributeError:
68
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
64
69
65
70
def isoformat_to_datetime(iso):
66
71
"Parse an ISO 8601 date string to a datetime.datetime()"
105
110
It updates the changed properties in the "properties" dict.
106
111
"""
107
112
# Update properties dict with new value
108
self.properties.update(properties)
113
if interface == client_interface:
114
self.properties.update(properties)
109
115
110
116
def delete(self):
111
117
self.property_changed_match.remove()
173
179
gobject.source_remove(self._update_timer_callback_tag)
174
180
self._update_timer_callback_tag = None
175
181
176
def checker_completed(self, exitstatus, signal, command):
182
def checker_completed(self, exitstatus, condition, command):
177
183
if exitstatus == 0:
178
184
self.logger('Checker for client {} (command "{}")'
179
185
' succeeded'.format(self.properties["Name"],
181
187
self.update()
182
188
return
183
189
# Checker failed
184
if exitstatus >= 0:
190
if os.WIFEXITED(condition):
185
191
self.logger('Checker for client {} (command "{}") failed'
186
192
' with exit code {}'
187
193
.format(self.properties["Name"], command,
188
exitstatus))
189
elif signal != 0:
194
os.WEXITSTATUS(condition)))
195
elif os.WIFSIGNALED(condition):
190
196
self.logger('Checker for client {} (command "{}") was'
191
197
' killed by signal {}'
192
198
.format(self.properties["Name"], command,
193
signal))
194
else:
195
self.logger('Checker for client {} completed'
196
' mysteriously'
197
.format(self.properties["Name"]))
199
os.WTERMSIG(condition)))
198
200
self.update()
199
201
200
202
def checker_started(self, command):
333
335
"""Handle keys.
334
336
This overrides the method from urwid.FlowWidget"""
335
337
if key == "+":
336
self.proxy.Enable(dbus_interface = client_interface,
337
ignore_reply=True)
338
self.proxy.Set(client_interface, "Enabled",
339
dbus.Boolean(True), ignore_reply = True,
340
dbus_interface = dbus.PROPERTIES_IFACE)
338
341
elif key == "-":
339
self.proxy.Disable(dbus_interface = client_interface,
340
ignore_reply=True)
342
self.proxy.Set(client_interface, "Enabled", False,
343
ignore_reply = True,
344
dbus_interface = dbus.PROPERTIES_IFACE)
341
345
elif key == "a":
342
346
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
343
347
dbus_interface = client_interface,
351
355
.object_path,
352
356
ignore_reply=True)
353
357
elif key == "s":
354
self.proxy.StartChecker(dbus_interface = client_interface,
355
ignore_reply=True)
358
self.proxy.Set(client_interface, "CheckerRunning",
359
dbus.Boolean(True), ignore_reply = True,
360
dbus_interface = dbus.PROPERTIES_IFACE)
356
361
elif key == "S":
357
self.proxy.StopChecker(dbus_interface = client_interface,
358
ignore_reply=True)
362
self.proxy.Set(client_interface, "CheckerRunning",
363
dbus.Boolean(False), ignore_reply = True,
364
dbus_interface = dbus.PROPERTIES_IFACE)
359
365
elif key == "C":
360
366
self.proxy.CheckedOK(dbus_interface = client_interface,
361
367
ignore_reply=True)
521
527
self.log_message("Wrap mode: {}".format(self.log_wrap),
522
528
level=0)
523
529
524
def find_and_remove_client(self, path, name):
530
def find_and_remove_client(self, path, interfaces):
525
531
"""Find a client by its object path and remove it.
526
532
527
This is connected to the ClientRemoved signal from the
533
This is connected to the InterfacesRemoved signal from the
528
534
Mandos server object."""
535
if client_interface not in interfaces:
536
# Not a Mandos client object; ignore
537
return
529
538
try:
530
539
client = self.clients_dict[path]
531
540
except KeyError:
532
541
# not found?
533
self.log_message("Unknown client {!r} ({!r}) removed"
534
.format(name, path))
542
self.log_message("Unknown client {!r} removed"
543
.format(path))
535
544
return
536
545
client.delete()
537
546
538
def add_new_client(self, path):
547
def add_new_client(self, path, ifs_and_props):
548
"""Find a client by its object path and remove it.
549
550
This is connected to the InterfacesAdded signal from the
551
Mandos server object.
552
"""
553
if client_interface not in ifs_and_props:
554
# Not a Mandos client object; ignore
555
return
539
556
client_proxy_object = self.bus.get_object(self.busname, path)
540
557
self.add_client(MandosClientWidget(server_proxy_object
541
558
=self.mandos_serv,
546
563
delete_hook
547
564
=self.remove_client,
548
565
logger
549
=self.log_message),
566
=self.log_message,
567
properties
568
= dict(ifs_and_props[
569
client_interface])),
550
570
path=path)
551
571
552
572
def add_client(self, client, path=None):
587
607
mandos_clients = dbus.Dictionary()
588
608
589
609
(self.mandos_serv
590
.connect_to_signal("ClientRemoved",
610
.connect_to_signal("InterfacesRemoved",
591
611
self.find_and_remove_client,
592
dbus_interface=server_interface,
612
dbus_interface
613
= dbus.OBJECT_MANAGER_IFACE,
593
614
byte_arrays=True))
594
615
(self.mandos_serv
595
.connect_to_signal("ClientAdded",
616
.connect_to_signal("InterfacesAdded",
596
617
self.add_new_client,
597
dbus_interface=server_interface,
618
dbus_interface
619
= dbus.OBJECT_MANAGER_IFACE,
598
620
byte_arrays=True))
599
621
(self.mandos_serv
600
622
.connect_to_signal("ClientNotFound",
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0