78
int(second), # Whole seconds
79
int(fraction*1000000)) # Microseconds
82
int(second), # Whole seconds
83
int(fraction*1000000)) # Microseconds
81
86
class MandosClientPropertyCache(object):
82
87
"""This wraps a Mandos Client D-Bus proxy object, caches the
83
88
properties and calls a hook function when any of them are
86
def __init__(self, proxy_object=None, *args, **kwargs):
87
self.proxy = proxy_object # Mandos Client proxy object
89
self.properties = dict()
91
def __init__(self, proxy_object=None, properties=None, **kwargs):
92
self.proxy = proxy_object # Mandos Client proxy object
93
self.properties = dict() if properties is None else properties
90
94
self.property_changed_match = (
91
self.proxy.connect_to_signal("PropertyChanged",
92
self.property_changed,
95
self.proxy.connect_to_signal("PropertiesChanged",
96
self.properties_changed,
97
dbus.PROPERTIES_IFACE,
96
self.properties.update(
97
self.proxy.GetAll(client_interface,
98
dbus_interface = dbus.PROPERTIES_IFACE))
100
#XXX This breaks good super behaviour
101
# super(MandosClientPropertyCache, self).__init__(
104
def property_changed(self, property=None, value=None):
105
"""This is called whenever we get a PropertyChanged signal
106
It updates the changed property in the "properties" dict.
100
if properties is None:
101
self.properties.update(self.proxy.GetAll(
103
dbus_interface=dbus.PROPERTIES_IFACE))
105
super(MandosClientPropertyCache, self).__init__(**kwargs)
107
def properties_changed(self, interface, properties, invalidated):
108
"""This is called whenever we get a PropertiesChanged signal
109
It updates the changed properties in the "properties" dict.
108
111
# Update properties dict with new value
109
self.properties[property] = value
111
def delete(self, *args, **kwargs):
112
if interface == client_interface:
113
self.properties.update(properties)
112
116
self.property_changed_match.remove()
113
super(MandosClientPropertyCache, self).__init__(
117
119
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
118
120
"""A Mandos Client which is visible on the screen.
121
123
def __init__(self, server_proxy_object=None, update_hook=None,
122
delete_hook=None, logger=None, *args, **kwargs):
124
delete_hook=None, logger=None, **kwargs):
123
125
# Called on update
124
126
self.update_hook = update_hook
125
127
# Called on delete
173
163
client_interface,
174
164
byte_arrays=True))
175
#self.logger('Created client %s' % (self.properties["Name"]))
177
def property_changed(self, property=None, value=None):
178
super(self, MandosClientWidget).property_changed(property,
180
if property == "ApprovalPending":
181
using_timer(bool(value))
182
if property == "LastCheckerStatus":
183
using_timer(value != 0)
184
#self.logger('Checker for client %s (command "%s")'
186
# % (self.properties["Name"], command))
165
self.logger('Created client {}'
166
.format(self.properties["Name"]), level=0)
188
168
def using_timer(self, flag):
189
169
"""Call this method with True or False when timer should be
190
170
activated or deactivated.
192
old = self._update_timer_callback_lock
194
self._update_timer_callback_lock += 1
196
self._update_timer_callback_lock -= 1
197
if old == 0 and self._update_timer_callback_lock:
172
if flag and self._update_timer_callback_tag is None:
198
173
# Will update the shown timer value every second
199
self._update_timer_callback_tag = (gobject.timeout_add
174
self._update_timer_callback_tag = (GLib.timeout_add
201
176
self.update_timer))
202
elif old and self._update_timer_callback_lock == 0:
203
gobject.source_remove(self._update_timer_callback_tag)
177
elif not (flag or self._update_timer_callback_tag is None):
178
GLib.source_remove(self._update_timer_callback_tag)
204
179
self._update_timer_callback_tag = None
206
181
def checker_completed(self, exitstatus, condition, command):
207
182
if exitstatus == 0:
183
self.logger('Checker for client {} (command "{}")'
184
' succeeded'.format(self.properties["Name"],
211
189
if os.WIFEXITED(condition):
212
self.logger('Checker for client %s (command "%s")'
213
' failed with exit code %s'
214
% (self.properties["Name"], command,
215
os.WEXITSTATUS(condition)))
190
self.logger('Checker for client {} (command "{}") failed'
192
.format(self.properties["Name"], command,
193
os.WEXITSTATUS(condition)))
216
194
elif os.WIFSIGNALED(condition):
217
self.logger('Checker for client %s (command "%s")'
218
' was killed by signal %s'
219
% (self.properties["Name"], command,
220
os.WTERMSIG(condition)))
221
elif os.WCOREDUMP(condition):
222
self.logger('Checker for client %s (command "%s")'
224
% (self.properties["Name"], command))
226
self.logger('Checker for client %s completed'
195
self.logger('Checker for client {} (command "{}") was'
196
' killed by signal {}'
197
.format(self.properties["Name"], command,
198
os.WTERMSIG(condition)))
230
201
def checker_started(self, command):
231
"""Server signals that a checker started. This could be useful
232
to log in the future. """
233
#self.logger('Client %s started checker "%s"'
234
# % (self.properties["Name"], unicode(command)))
202
"""Server signals that a checker started."""
203
self.logger('Client {} started checker "{}"'
204
.format(self.properties["Name"],
237
207
def got_secret(self):
238
self.logger('Client %s received its secret'
239
% self.properties["Name"])
208
self.logger('Client {} received its secret'
209
.format(self.properties["Name"]))
241
211
def need_approval(self, timeout, default):
243
message = 'Client %s needs approval within %s seconds'
213
message = 'Client {} needs approval within {} seconds'
245
message = 'Client %s will get its secret in %s seconds'
247
% (self.properties["Name"], timeout/1000))
248
self.using_timer(True)
215
message = 'Client {} will get its secret in {} seconds'
216
self.logger(message.format(self.properties["Name"],
250
219
def rejected(self, reason):
251
self.logger('Client %s was rejected; reason: %s'
252
% (self.properties["Name"], reason))
220
self.logger('Client {} was rejected; reason: {}'
221
.format(self.properties["Name"], reason))
254
223
def selectable(self):
255
224
"""Make this a "selectable" widget.
256
225
This overrides the method from urwid.FlowWidget."""
259
228
def rows(self, maxcolrow, focus=False):
260
229
"""How many rows this widget will occupy might depend on
261
230
whether we have focus or not.
262
231
This overrides the method from urwid.FlowWidget"""
263
232
return self.current_widget(focus).rows(maxcolrow, focus=focus)
265
234
def current_widget(self, focus=False):
266
235
if focus or self.opened:
267
236
return self._focus_widget
268
237
return self._widget
270
239
def update(self):
271
240
"Called when what is visible on the screen should be updated."
272
241
# How to add standout mode to a style
273
with_standout = { "normal": "standout",
274
"bold": "bold-standout",
276
"underline-blink-standout",
277
"bold-underline-blink":
278
"bold-underline-blink-standout",
242
with_standout = {"normal": "standout",
243
"bold": "bold-standout",
245
"underline-blink-standout",
246
"bold-underline-blink":
247
"bold-underline-blink-standout",
281
250
# Rebuild focus and non-focus widgets using current properties
283
252
# Base part of a client. Name!
285
% {"name": self.properties["Name"]})
253
base = '{name}: '.format(name=self.properties["Name"])
286
254
if not self.properties["Enabled"]:
287
255
message = "DISABLED"
256
self.using_timer(False)
288
257
elif self.properties["ApprovalPending"]:
289
timeout = datetime.timedelta(milliseconds
258
timeout = datetime.timedelta(
259
milliseconds=self.properties["ApprovalDelay"])
292
260
last_approval_request = isoformat_to_datetime(
293
261
self.properties["LastApprovalRequest"])
294
262
if last_approval_request is not None:
295
timer = timeout - (datetime.datetime.utcnow()
296
- last_approval_request)
263
timer = max(timeout - (datetime.datetime.utcnow()
264
- last_approval_request),
265
datetime.timedelta())
298
267
timer = datetime.timedelta()
299
268
if self.properties["ApprovedByDefault"]:
300
message = "Approval in %s. (d)eny?"
269
message = "Approval in {}. (d)eny?"
302
message = "Denial in %s. (a)pprove?"
303
message = message % unicode(timer).rsplit(".", 1)[0]
271
message = "Denial in {}. (a)pprove?"
272
message = message.format(str(timer).rsplit(".", 1)[0])
273
self.using_timer(True)
304
274
elif self.properties["LastCheckerStatus"] != 0:
305
# When checker has failed, print a timer until client expires
275
# When checker has failed, show timer until client expires
306
276
expires = self.properties["Expires"]
307
277
if expires == "":
308
278
timer = datetime.timedelta(0)
310
expires = datetime.datetime.strptime(expires,
311
'%Y-%m-%dT%H:%M:%S.%f')
312
timer = expires - datetime.datetime.utcnow()
280
expires = (datetime.datetime.strptime
281
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
282
timer = max(expires - datetime.datetime.utcnow(),
283
datetime.timedelta())
313
284
message = ('A checker has failed! Time until client'
315
% unicode(timer).rsplit(".", 1)[0])
286
.format(str(timer).rsplit(".", 1)[0]))
287
self.using_timer(True)
317
289
message = "enabled"
318
self._text = "%s%s" % (base, message)
290
self.using_timer(False)
291
self._text = "{}{}".format(base, message)
320
293
if not urwid.supports_unicode():
321
294
self._text = self._text.encode("ascii", "replace")
322
295
textlist = [("normal", self._text)]
332
305
# Run update hook, if any
333
306
if self.update_hook is not None:
334
307
self.update_hook()
336
309
def update_timer(self):
337
"""called by gobject. Will indefinitely loop until
338
gobject.source_remove() on tag is called"""
310
"""called by GLib. Will indefinitely loop until
311
GLib.source_remove() on tag is called
340
314
return True # Keep calling this
342
def delete(self, *args, **kwargs):
316
def delete(self, **kwargs):
343
317
if self._update_timer_callback_tag is not None:
344
gobject.source_remove(self._update_timer_callback_tag)
318
GLib.source_remove(self._update_timer_callback_tag)
345
319
self._update_timer_callback_tag = None
346
320
for match in self.match_objects:
348
322
self.match_objects = ()
349
323
if self.delete_hook is not None:
350
324
self.delete_hook(self)
351
return super(MandosClientWidget, self).delete(*args, **kwargs)
325
return super(MandosClientWidget, self).delete(**kwargs)
353
327
def render(self, maxcolrow, focus=False):
354
328
"""Render differently if we have focus.
355
329
This overrides the method from urwid.FlowWidget"""
356
330
return self.current_widget(focus).render(maxcolrow,
359
333
def keypress(self, maxcolrow, key):
361
335
This overrides the method from urwid.FlowWidget"""
363
self.proxy.Enable(dbus_interface = client_interface,
337
self.proxy.Set(client_interface, "Enabled",
338
dbus.Boolean(True), ignore_reply=True,
339
dbus_interface=dbus.PROPERTIES_IFACE)
366
self.proxy.Disable(dbus_interface = client_interface,
341
self.proxy.Set(client_interface, "Enabled", False,
343
dbus_interface=dbus.PROPERTIES_IFACE)
369
345
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
370
dbus_interface = client_interface,
346
dbus_interface=client_interface,
371
347
ignore_reply=True)
373
349
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
374
dbus_interface = client_interface,
350
dbus_interface=client_interface,
375
351
ignore_reply=True)
376
352
elif key == "R" or key == "_" or key == "ctrl k":
377
353
self.server_proxy_object.RemoveClient(self.proxy
379
355
ignore_reply=True)
381
self.proxy.StartChecker(dbus_interface = client_interface,
357
self.proxy.Set(client_interface, "CheckerRunning",
358
dbus.Boolean(True), ignore_reply=True,
359
dbus_interface=dbus.PROPERTIES_IFACE)
384
self.proxy.StopChecker(dbus_interface = client_interface,
361
self.proxy.Set(client_interface, "CheckerRunning",
362
dbus.Boolean(False), ignore_reply=True,
363
dbus_interface=dbus.PROPERTIES_IFACE)
387
self.proxy.CheckedOK(dbus_interface = client_interface,
365
self.proxy.CheckedOK(dbus_interface=client_interface,
388
366
ignore_reply=True)
390
368
# elif key == "p" or key == "=":
424
403
"""This is the entire user interface - the whole screen
425
404
with boxes, lists of client widgets, etc.
427
def __init__(self, max_log_length=1000):
406
def __init__(self, max_log_length=1000, log_level=1):
428
407
DBusGMainLoop(set_as_default=True)
430
409
self.screen = urwid.curses_display.Screen()
432
411
self.screen.register_palette((
434
413
"default", "default", None),
436
"default", "default", "bold"),
415
"bold", "default", "bold"),
437
416
("underline-blink",
438
"default", "default", "underline"),
417
"underline,blink", "default", "underline,blink"),
440
"default", "default", "standout"),
419
"standout", "default", "standout"),
441
420
("bold-underline-blink",
442
"default", "default", ("bold", "underline")),
421
"bold,underline,blink", "default",
422
"bold,underline,blink"),
443
423
("bold-standout",
444
"default", "default", ("bold", "standout")),
424
"bold,standout", "default", "bold,standout"),
445
425
("underline-blink-standout",
446
"default", "default", ("underline", "standout")),
426
"underline,blink,standout", "default",
427
"underline,blink,standout"),
447
428
("bold-underline-blink-standout",
448
"default", "default", ("bold", "underline",
429
"bold,underline,blink,standout", "default",
430
"bold,underline,blink,standout"),
452
433
if urwid.supports_unicode():
453
self.divider = "─" # \u2500
454
#self.divider = "━" # \u2501
434
self.divider = "─" # \u2500
456
#self.divider = "-" # \u002d
457
self.divider = "_" # \u005f
436
self.divider = "_" # \u005f
459
438
self.screen.start()
461
440
self.size = self.screen.get_cols_rows()
463
442
self.clients = urwid.SimpleListWalker([])
464
443
self.clients_dict = {}
466
445
# We will add Text widgets to this list
468
447
self.max_log_length = max_log_length
449
self.log_level = log_level
470
451
# We keep a reference to the log widget so we can remove it
471
452
# from the ListWalker without it getting destroyed
472
453
self.logbox = ConstrainedListBox(self.log)
474
455
# This keeps track of whether self.uilist currently has
475
456
# self.logbox in it or not
476
457
self.log_visible = True
477
458
self.log_wrap = "any"
480
461
self.log_message_raw(("bold",
481
462
"Mandos Monitor version " + version))
482
463
self.log_message_raw(("bold",
483
464
"q: Quit ?: Help"))
485
466
self.busname = domain + '.Mandos'
486
self.main_loop = gobject.MainLoop()
467
self.main_loop = GLib.MainLoop()
488
469
def client_not_found(self, fingerprint, address):
489
self.log_message(("Client with address %s and fingerprint %s"
490
" could not be found" % (address,
470
self.log_message("Client with address {} and fingerprint {}"
471
" could not be found"
472
.format(address, fingerprint))
493
474
def rebuild(self):
494
475
"""This rebuilds the User Interface.
495
476
Call this when the widget layout needs to change"""
497
#self.uilist.append(urwid.ListBox(self.clients))
478
# self.uilist.append(urwid.ListBox(self.clients))
498
479
self.uilist.append(urwid.Frame(ConstrainedListBox(self.
500
#header=urwid.Divider(),
481
# header=urwid.Divider(),
503
urwid.Divider(div_char=
483
footer=urwid.Divider(
484
div_char=self.divider)))
505
485
if self.log_visible:
506
486
self.uilist.append(self.logbox)
507
487
self.topwidget = urwid.Pile(self.uilist)
509
def log_message(self, message):
489
def log_message(self, message, level=1):
490
"""Log message formatted with timestamp"""
491
if level < self.log_level:
510
493
timestamp = datetime.datetime.now().isoformat()
511
self.log_message_raw(timestamp + ": " + message)
513
def log_message_raw(self, markup):
494
self.log_message_raw("{}: {}".format(timestamp, message),
497
def log_message_raw(self, markup, level=1):
514
498
"""Add a log message to the log buffer."""
499
if level < self.log_level:
515
501
self.log.append(urwid.Text(markup, wrap=self.log_wrap))
516
if (self.max_log_length
517
and len(self.log) > self.max_log_length):
518
del self.log[0:len(self.log)-self.max_log_length-1]
502
if self.max_log_length:
503
if len(self.log) > self.max_log_length:
504
del self.log[0:len(self.log)-self.max_log_length-1]
519
505
self.logbox.set_focus(len(self.logbox.body.contents),
520
506
coming_from="above")
523
509
def toggle_log_display(self):
524
510
"""Toggle visibility of the log buffer."""
525
511
self.log_visible = not self.log_visible
527
#self.log_message("Log visibility changed to: "
528
# + unicode(self.log_visible))
513
self.log_message("Log visibility changed to: {}"
514
.format(self.log_visible), level=0)
530
516
def change_log_display(self):
531
517
"""Change type of log display.
532
518
Currently, this toggles wrapping of text lines."""
536
522
self.log_wrap = "clip"
537
523
for textwidget in self.log:
538
524
textwidget.set_wrap_mode(self.log_wrap)
539
#self.log_message("Wrap mode: " + self.log_wrap)
541
def find_and_remove_client(self, path, name):
525
self.log_message("Wrap mode: {}".format(self.log_wrap),
528
def find_and_remove_client(self, path, interfaces):
542
529
"""Find a client by its object path and remove it.
544
This is connected to the ClientRemoved signal from the
531
This is connected to the InterfacesRemoved signal from the
545
532
Mandos server object."""
533
if client_interface not in interfaces:
534
# Not a Mandos client object; ignore
547
537
client = self.clients_dict[path]
550
self.log_message("Unknown client %r (%r) removed", name,
540
self.log_message("Unknown client {!r} removed"
555
def add_new_client(self, path):
545
def add_new_client(self, path, ifs_and_props):
546
"""Find a client by its object path and remove it.
548
This is connected to the InterfacesAdded signal from the
549
Mandos server object.
551
if client_interface not in ifs_and_props:
552
# Not a Mandos client object; ignore
556
554
client_proxy_object = self.bus.get_object(self.busname, path)
557
self.add_client(MandosClientWidget(server_proxy_object
560
=client_proxy_object,
555
self.add_client(MandosClientWidget(
556
server_proxy_object=self.mandos_serv,
557
proxy_object=client_proxy_object,
558
update_hook=self.refresh,
559
delete_hook=self.remove_client,
560
logger=self.log_message,
561
properties=dict(ifs_and_props[client_interface])),
569
564
def add_client(self, client, path=None):
570
565
self.clients.append(client)
572
567
path = client.proxy.object_path
573
568
self.clients_dict[path] = client
574
self.clients.sort(None, lambda c: c.properties["Name"])
569
self.clients.sort(key=lambda c: c.properties["Name"])
577
572
def remove_client(self, client, path=None):
578
573
self.clients.remove(client)
580
575
path = client.proxy.object_path
581
576
del self.clients_dict[path]
582
if not self.clients_dict:
583
# Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
584
# is completely emptied, we need to recreate it.
585
self.clients = urwid.SimpleListWalker([])
589
579
def refresh(self):
590
580
"""Redraw the screen"""
591
581
canvas = self.topwidget.render(self.size, focus=True)
592
582
self.screen.draw_screen(self.size, canvas)
595
585
"""Start the main loop and exit when it's done."""
596
586
self.bus = dbus.SystemBus()
597
587
mandos_dbus_objc = self.bus.get_object(
598
588
self.busname, "/", follow_name_owner_changes=True)
599
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
589
self.mandos_serv = dbus.Interface(
590
mandos_dbus_objc, dbus_interface=server_interface)
603
592
mandos_clients = (self.mandos_serv
604
593
.GetAllClientsWithProperties())
594
if not mandos_clients:
595
self.log_message_raw(("bold",
596
"Note: Server has no clients."))
605
597
except dbus.exceptions.DBusException:
598
self.log_message_raw(("bold",
599
"Note: No Mandos server running."))
606
600
mandos_clients = dbus.Dictionary()
608
602
(self.mandos_serv
609
.connect_to_signal("ClientRemoved",
603
.connect_to_signal("InterfacesRemoved",
610
604
self.find_and_remove_client,
611
dbus_interface=server_interface,
605
dbus_interface=dbus.OBJECT_MANAGER_IFACE,
612
606
byte_arrays=True))
613
607
(self.mandos_serv
614
.connect_to_signal("ClientAdded",
608
.connect_to_signal("InterfacesAdded",
615
609
self.add_new_client,
616
dbus_interface=server_interface,
610
dbus_interface=dbus.OBJECT_MANAGER_IFACE,
617
611
byte_arrays=True))
618
612
(self.mandos_serv
619
613
.connect_to_signal("ClientNotFound",
620
614
self.client_not_found,
621
615
dbus_interface=server_interface,
622
616
byte_arrays=True))
623
for path, client in mandos_clients.iteritems():
617
for path, client in mandos_clients.items():
624
618
client_proxy_object = self.bus.get_object(self.busname,
626
self.add_client(MandosClientWidget(server_proxy_object
629
=client_proxy_object,
620
self.add_client(MandosClientWidget(
621
server_proxy_object=self.mandos_serv,
622
proxy_object=client_proxy_object,
624
update_hook=self.refresh,
625
delete_hook=self.remove_client,
626
logger=self.log_message),
640
self._input_callback_tag = (gobject.io_add_watch
630
self._input_callback_tag = (GLib.io_add_watch
641
631
(sys.stdin.fileno(),
643
633
self.process_input))
644
634
self.main_loop.run()
645
635
# Main loop has finished, we should close everything now
646
gobject.source_remove(self._input_callback_tag)
636
GLib.source_remove(self._input_callback_tag)
647
637
self.screen.stop()
650
640
self.main_loop.quit()
652
642
def process_input(self, source, condition):
653
643
keys = self.screen.get_input()
654
translations = { "ctrl n": "down", # Emacs
655
"ctrl p": "up", # Emacs
656
"ctrl v": "page down", # Emacs
657
"meta v": "page up", # Emacs
658
" ": "page down", # less
659
"f": "page down", # less
660
"b": "page up", # less
644
translations = {"ctrl n": "down", # Emacs
645
"ctrl p": "up", # Emacs
646
"ctrl v": "page down", # Emacs
647
"meta v": "page up", # Emacs
648
" ": "page down", # less
649
"f": "page down", # less
650
"b": "page up", # less
666
656
key = translations[key]
667
657
except KeyError: # :-)
670
660
if key == "q" or key == "Q":
673
663
elif key == "window resize":
674
664
self.size = self.screen.get_cols_rows()
676
elif key == "\f": # Ctrl-L
666
elif key == "ctrl l":
678
669
elif key == "l" or key == "D":
679
670
self.toggle_log_display()