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