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