91
89
def __init__(self, proxy_object=None, properties=None, **kwargs):
92
self.proxy = proxy_object # Mandos Client proxy object
90
self.proxy = proxy_object # Mandos Client proxy object
93
91
self.properties = dict() if properties is None else properties
94
92
self.property_changed_match = (
95
self.proxy.connect_to_signal("PropertiesChanged",
96
self.properties_changed,
97
dbus.PROPERTIES_IFACE,
93
self.proxy.connect_to_signal("PropertyChanged",
94
self._property_changed,
100
98
if properties is None:
101
self.properties.update(self.proxy.GetAll(
103
dbus_interface=dbus.PROPERTIES_IFACE))
99
self.properties.update(
100
self.proxy.GetAll(client_interface,
102
= dbus.PROPERTIES_IFACE))
105
104
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.
106
def _property_changed(self, property, value):
107
"""Helper which takes positional arguments"""
108
return self.property_changed(property=property, value=value)
110
def property_changed(self, property=None, value=None):
111
"""This is called whenever we get a PropertyChanged signal
112
It updates the changed property in the "properties" dict.
111
114
# Update properties dict with new value
112
if interface == client_interface:
113
self.properties.update(properties)
115
self.properties[property] = value
115
117
def delete(self):
116
118
self.property_changed_match.remove()
163
175
client_interface,
164
176
byte_arrays=True))
165
self.logger('Created client {}'
166
.format(self.properties["Name"]), level=0)
177
#self.logger('Created client {0}'
178
# .format(self.properties["Name"]))
180
def property_changed(self, property=None, value=None):
181
super(self, MandosClientWidget).property_changed(property,
183
if property == "ApprovalPending":
184
using_timer(bool(value))
185
if property == "LastCheckerStatus":
186
using_timer(value != 0)
187
#self.logger('Checker for client {0} (command "{1}") was '
188
# ' successful'.format(self.properties["Name"],
168
191
def using_timer(self, flag):
169
192
"""Call this method with True or False when timer should be
170
193
activated or deactivated.
172
if flag and self._update_timer_callback_tag is None:
195
old = self._update_timer_callback_lock
197
self._update_timer_callback_lock += 1
199
self._update_timer_callback_lock -= 1
200
if old == 0 and self._update_timer_callback_lock:
173
201
# Will update the shown timer value every second
174
self._update_timer_callback_tag = (GLib.timeout_add
202
self._update_timer_callback_tag = (gobject.timeout_add
176
204
self.update_timer))
177
elif not (flag or self._update_timer_callback_tag is None):
178
GLib.source_remove(self._update_timer_callback_tag)
205
elif old and self._update_timer_callback_lock == 0:
206
gobject.source_remove(self._update_timer_callback_tag)
179
207
self._update_timer_callback_tag = None
181
209
def checker_completed(self, exitstatus, condition, command):
182
210
if exitstatus == 0:
183
self.logger('Checker for client {} (command "{}")'
184
' succeeded'.format(self.properties["Name"],
189
214
if os.WIFEXITED(condition):
190
self.logger('Checker for client {} (command "{}") failed'
215
self.logger('Checker for client {0} (command "{1}")'
216
' failed with exit code {2}'
192
217
.format(self.properties["Name"], command,
193
218
os.WEXITSTATUS(condition)))
194
219
elif os.WIFSIGNALED(condition):
195
self.logger('Checker for client {} (command "{}") was'
196
' killed by signal {}'
220
self.logger('Checker for client {0} (command "{1}") was'
221
' killed by signal {2}'
197
222
.format(self.properties["Name"], command,
198
223
os.WTERMSIG(condition)))
224
elif os.WCOREDUMP(condition):
225
self.logger('Checker for client {0} (command "{1}")'
227
.format(self.properties["Name"], command))
229
self.logger('Checker for client {0} completed'
231
.format(self.properties["Name"]))
201
234
def checker_started(self, command):
202
"""Server signals that a checker started."""
203
self.logger('Client {} started checker "{}"'
204
.format(self.properties["Name"],
235
"""Server signals that a checker started. This could be useful
236
to log in the future. """
237
#self.logger('Client {0} started checker "{1}"'
238
# .format(self.properties["Name"],
207
242
def got_secret(self):
208
self.logger('Client {} received its secret'
243
self.logger('Client {0} received its secret'
209
244
.format(self.properties["Name"]))
211
246
def need_approval(self, timeout, default):
213
message = 'Client {} needs approval within {} seconds'
248
message = 'Client {0} needs approval within {1} seconds'
215
message = 'Client {} will get its secret in {} seconds'
250
message = 'Client {0} will get its secret in {1} seconds'
216
251
self.logger(message.format(self.properties["Name"],
253
self.using_timer(True)
219
255
def rejected(self, reason):
220
self.logger('Client {} was rejected; reason: {}'
256
self.logger('Client {0} was rejected; reason: {1}'
221
257
.format(self.properties["Name"], reason))
223
259
def selectable(self):
224
260
"""Make this a "selectable" widget.
225
261
This overrides the method from urwid.FlowWidget."""
228
264
def rows(self, maxcolrow, focus=False):
229
265
"""How many rows this widget will occupy might depend on
230
266
whether we have focus or not.
231
267
This overrides the method from urwid.FlowWidget"""
232
268
return self.current_widget(focus).rows(maxcolrow, focus=focus)
234
270
def current_widget(self, focus=False):
235
271
if focus or self.opened:
236
272
return self._focus_widget
237
273
return self._widget
239
275
def update(self):
240
276
"Called when what is visible on the screen should be updated."
241
277
# 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",
278
with_standout = { "normal": "standout",
279
"bold": "bold-standout",
281
"underline-blink-standout",
282
"bold-underline-blink":
283
"bold-underline-blink-standout",
250
286
# Rebuild focus and non-focus widgets using current properties
253
289
base = '{name}: '.format(name=self.properties["Name"])
254
290
if not self.properties["Enabled"]:
255
291
message = "DISABLED"
256
self.using_timer(False)
257
292
elif self.properties["ApprovalPending"]:
258
timeout = datetime.timedelta(
259
milliseconds=self.properties["ApprovalDelay"])
293
timeout = datetime.timedelta(milliseconds
260
296
last_approval_request = isoformat_to_datetime(
261
297
self.properties["LastApprovalRequest"])
262
298
if last_approval_request is not None:
263
timer = max(timeout - (datetime.datetime.utcnow()
264
- last_approval_request),
265
datetime.timedelta())
299
timer = timeout - (datetime.datetime.utcnow()
300
- last_approval_request)
267
302
timer = datetime.timedelta()
268
303
if self.properties["ApprovedByDefault"]:
269
message = "Approval in {}. (d)eny?"
304
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)
306
message = "Denial in {0}. (a)pprove?"
307
message = message.format(unicode(timer).rsplit(".", 1)[0])
274
308
elif self.properties["LastCheckerStatus"] != 0:
275
309
# When checker has failed, show timer until client expires
276
310
expires = self.properties["Expires"]
323
353
if self.delete_hook is not None:
324
354
self.delete_hook(self)
325
355
return super(MandosClientWidget, self).delete(**kwargs)
327
357
def render(self, maxcolrow, focus=False):
328
358
"""Render differently if we have focus.
329
359
This overrides the method from urwid.FlowWidget"""
330
360
return self.current_widget(focus).render(maxcolrow,
333
363
def keypress(self, maxcolrow, key):
335
365
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)
367
self.proxy.Enable(dbus_interface = client_interface,
341
self.proxy.Set(client_interface, "Enabled", False,
343
dbus_interface=dbus.PROPERTIES_IFACE)
370
self.proxy.Disable(dbus_interface = client_interface,
345
373
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
346
dbus_interface=client_interface,
374
dbus_interface = client_interface,
347
375
ignore_reply=True)
349
377
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
350
dbus_interface=client_interface,
378
dbus_interface = client_interface,
351
379
ignore_reply=True)
352
380
elif key == "R" or key == "_" or key == "ctrl k":
353
381
self.server_proxy_object.RemoveClient(self.proxy
355
383
ignore_reply=True)
357
self.proxy.Set(client_interface, "CheckerRunning",
358
dbus.Boolean(True), ignore_reply=True,
359
dbus_interface=dbus.PROPERTIES_IFACE)
385
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)
388
self.proxy.StopChecker(dbus_interface = client_interface,
365
self.proxy.CheckedOK(dbus_interface=client_interface,
391
self.proxy.CheckedOK(dbus_interface = client_interface,
366
392
ignore_reply=True)
368
394
# elif key == "p" or key == "=":
403
427
"""This is the entire user interface - the whole screen
404
428
with boxes, lists of client widgets, etc.
406
def __init__(self, max_log_length=1000, log_level=1):
430
def __init__(self, max_log_length=1000):
407
431
DBusGMainLoop(set_as_default=True)
409
433
self.screen = urwid.curses_display.Screen()
411
435
self.screen.register_palette((
413
437
"default", "default", None),
415
"bold", "default", "bold"),
439
"default", "default", "bold"),
416
440
("underline-blink",
417
"underline,blink", "default", "underline,blink"),
441
"default", "default", "underline"),
419
"standout", "default", "standout"),
443
"default", "default", "standout"),
420
444
("bold-underline-blink",
421
"bold,underline,blink", "default",
422
"bold,underline,blink"),
445
"default", "default", ("bold", "underline")),
423
446
("bold-standout",
424
"bold,standout", "default", "bold,standout"),
447
"default", "default", ("bold", "standout")),
425
448
("underline-blink-standout",
426
"underline,blink,standout", "default",
427
"underline,blink,standout"),
449
"default", "default", ("underline", "standout")),
428
450
("bold-underline-blink-standout",
429
"bold,underline,blink,standout", "default",
430
"bold,underline,blink,standout"),
451
"default", "default", ("bold", "underline",
433
455
if urwid.supports_unicode():
434
self.divider = "─" # \u2500
456
self.divider = "─" # \u2500
457
#self.divider = "━" # \u2501
436
self.divider = "_" # \u005f
459
#self.divider = "-" # \u002d
460
self.divider = "_" # \u005f
438
462
self.screen.start()
440
464
self.size = self.screen.get_cols_rows()
442
466
self.clients = urwid.SimpleListWalker([])
443
467
self.clients_dict = {}
445
469
# We will add Text widgets to this list
447
471
self.max_log_length = max_log_length
449
self.log_level = log_level
451
473
# We keep a reference to the log widget so we can remove it
452
474
# from the ListWalker without it getting destroyed
453
475
self.logbox = ConstrainedListBox(self.log)
455
477
# This keeps track of whether self.uilist currently has
456
478
# self.logbox in it or not
457
479
self.log_visible = True
458
480
self.log_wrap = "any"
461
483
self.log_message_raw(("bold",
462
484
"Mandos Monitor version " + version))
463
485
self.log_message_raw(("bold",
464
486
"q: Quit ?: Help"))
466
488
self.busname = domain + '.Mandos'
467
self.main_loop = GLib.MainLoop()
489
self.main_loop = gobject.MainLoop()
469
491
def client_not_found(self, fingerprint, address):
470
self.log_message("Client with address {} and fingerprint {}"
471
" could not be found"
492
self.log_message("Client with address {0} and fingerprint"
493
" {1} could not be found"
472
494
.format(address, fingerprint))
474
496
def rebuild(self):
475
497
"""This rebuilds the User Interface.
476
498
Call this when the widget layout needs to change"""
478
# self.uilist.append(urwid.ListBox(self.clients))
500
#self.uilist.append(urwid.ListBox(self.clients))
479
501
self.uilist.append(urwid.Frame(ConstrainedListBox(self.
481
# header=urwid.Divider(),
503
#header=urwid.Divider(),
483
footer=urwid.Divider(
484
div_char=self.divider)))
506
urwid.Divider(div_char=
485
508
if self.log_visible:
486
509
self.uilist.append(self.logbox)
487
510
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:
512
def log_message(self, message):
493
513
timestamp = datetime.datetime.now().isoformat()
494
self.log_message_raw("{}: {}".format(timestamp, message),
497
def log_message_raw(self, markup, level=1):
514
self.log_message_raw(timestamp + ": " + message)
516
def log_message_raw(self, markup):
498
517
"""Add a log message to the log buffer."""
499
if level < self.log_level:
501
518
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]
519
if (self.max_log_length
520
and len(self.log) > self.max_log_length):
521
del self.log[0:len(self.log)-self.max_log_length-1]
505
522
self.logbox.set_focus(len(self.logbox.body.contents),
506
523
coming_from="above")
509
526
def toggle_log_display(self):
510
527
"""Toggle visibility of the log buffer."""
511
528
self.log_visible = not self.log_visible
513
self.log_message("Log visibility changed to: {}"
514
.format(self.log_visible), level=0)
530
#self.log_message("Log visibility changed to: "
531
# + unicode(self.log_visible))
516
533
def change_log_display(self):
517
534
"""Change type of log display.
518
535
Currently, this toggles wrapping of text lines."""
522
539
self.log_wrap = "clip"
523
540
for textwidget in self.log:
524
541
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):
542
#self.log_message("Wrap mode: " + self.log_wrap)
544
def find_and_remove_client(self, path, name):
529
545
"""Find a client by its object path and remove it.
531
This is connected to the InterfacesRemoved signal from the
547
This is connected to the ClientRemoved signal from the
532
548
Mandos server object."""
533
if client_interface not in interfaces:
534
# Not a Mandos client object; ignore
537
550
client = self.clients_dict[path]
540
self.log_message("Unknown client {!r} removed"
553
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
558
def add_new_client(self, path):
554
559
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])),
560
self.add_client(MandosClientWidget(server_proxy_object
563
=client_proxy_object,
564
572
def add_client(self, client, path=None):
565
573
self.clients.append(client)
567
575
path = client.proxy.object_path
568
576
self.clients_dict[path] = client
569
self.clients.sort(key=lambda c: c.properties["Name"])
577
self.clients.sort(None, lambda c: c.properties["Name"])
572
580
def remove_client(self, client, path=None):
573
581
self.clients.remove(client)
575
583
path = client.proxy.object_path
576
584
del self.clients_dict[path]
585
if not self.clients_dict:
586
# Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
587
# is completely emptied, we need to recreate it.
588
self.clients = urwid.SimpleListWalker([])
579
592
def refresh(self):
580
593
"""Redraw the screen"""
581
594
canvas = self.topwidget.render(self.size, focus=True)
582
595
self.screen.draw_screen(self.size, canvas)
585
598
"""Start the main loop and exit when it's done."""
586
599
self.bus = dbus.SystemBus()
587
600
mandos_dbus_objc = self.bus.get_object(
588
601
self.busname, "/", follow_name_owner_changes=True)
589
self.mandos_serv = dbus.Interface(
590
mandos_dbus_objc, dbus_interface=server_interface)
602
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
592
606
mandos_clients = (self.mandos_serv
593
607
.GetAllClientsWithProperties())
594
if not mandos_clients:
595
self.log_message_raw(("bold",
596
"Note: Server has no clients."))
597
608
except dbus.exceptions.DBusException:
598
self.log_message_raw(("bold",
599
"Note: No Mandos server running."))
600
609
mandos_clients = dbus.Dictionary()
602
611
(self.mandos_serv
603
.connect_to_signal("InterfacesRemoved",
612
.connect_to_signal("ClientRemoved",
604
613
self.find_and_remove_client,
605
dbus_interface=dbus.OBJECT_MANAGER_IFACE,
614
dbus_interface=server_interface,
606
615
byte_arrays=True))
607
616
(self.mandos_serv
608
.connect_to_signal("InterfacesAdded",
617
.connect_to_signal("ClientAdded",
609
618
self.add_new_client,
610
dbus_interface=dbus.OBJECT_MANAGER_IFACE,
619
dbus_interface=server_interface,
611
620
byte_arrays=True))
612
621
(self.mandos_serv
613
622
.connect_to_signal("ClientNotFound",
614
623
self.client_not_found,
615
624
dbus_interface=server_interface,
616
625
byte_arrays=True))
617
for path, client in mandos_clients.items():
626
for path, client in mandos_clients.iteritems():
618
627
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),
629
self.add_client(MandosClientWidget(server_proxy_object
632
=client_proxy_object,
630
self._input_callback_tag = (GLib.io_add_watch
643
self._input_callback_tag = (gobject.io_add_watch
631
644
(sys.stdin.fileno(),
633
646
self.process_input))
634
647
self.main_loop.run()
635
648
# Main loop has finished, we should close everything now
636
GLib.source_remove(self._input_callback_tag)
649
gobject.source_remove(self._input_callback_tag)
637
650
self.screen.stop()
640
653
self.main_loop.quit()
642
655
def process_input(self, source, condition):
643
656
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
657
translations = { "ctrl n": "down", # Emacs
658
"ctrl p": "up", # Emacs
659
"ctrl v": "page down", # Emacs
660
"meta v": "page up", # Emacs
661
" ": "page down", # less
662
"f": "page down", # less
663
"b": "page up", # less
656
669
key = translations[key]
657
670
except KeyError: # :-)
660
673
if key == "q" or key == "Q":
663
676
elif key == "window resize":
664
677
self.size = self.screen.get_cols_rows()
666
elif key == "ctrl l":
679
elif key == "\f": # Ctrl-L
669
681
elif key == "l" or key == "D":
670
682
self.toggle_log_display()
704
714
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
716
#elif (key == "end" or key == "meta >" or key == "G"
718
# pass # xxx end-of-buffer
719
#elif (key == "home" or key == "meta <" or key == "g"
721
# pass # xxx beginning-of-buffer
722
#elif key == "ctrl e" or key == "$":
723
# pass # xxx move-end-of-line
724
#elif key == "ctrl a" or key == "^":
725
# pass # xxx move-beginning-of-line
726
#elif key == "ctrl b" or key == "meta (" or key == "h":
728
#elif key == "ctrl f" or key == "meta )" or key == "l":
731
# pass # scroll up log
733
# pass # scroll down log
731
734
elif self.topwidget.selectable():
732
735
self.topwidget.keypress(self.size, key)