2
2
# -*- mode: python; coding: utf-8 -*-
4
4
# Mandos Monitor - Control and monitor the Mandos server
6
# Copyright © 2009-2019 Teddy Hogeborn
7
# Copyright © 2009-2019 Björn Påhlsson
9
# This file is part of Mandos.
11
# Mandos is free software: you can redistribute it and/or modify it
12
# under the terms of the GNU General Public License as published by
6
# Copyright © 2009-2012 Teddy Hogeborn
7
# Copyright © 2009-2012 Björn Påhlsson
9
# This program is free software: you can redistribute it and/or modify
10
# it under the terms of the GNU General Public License as published by
13
11
# the Free Software Foundation, either version 3 of the License, or
14
12
# (at your option) any later version.
16
# Mandos is distributed in the hope that it will be useful, but
17
# WITHOUT ANY WARRANTY; without even the implied warranty of
14
# This program is distributed in the hope that it will be useful,
15
# but WITHOUT ANY WARRANTY; without even the implied warranty of
18
16
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19
17
# GNU General Public License for more details.
21
19
# You should have received a copy of the GNU General Public License
22
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
20
# along with this program. If not, see <http://www.gnu.org/licenses/>.
24
22
# Contact the authors at <mandos@recompile.se>.
27
25
from __future__ import (division, absolute_import, print_function,
30
from future_builtins import *
83
int(second), # Whole seconds
84
int(fraction*1000000)) # Microseconds
78
int(second), # Whole seconds
79
int(fraction*1000000)) # Microseconds
87
81
class MandosClientPropertyCache(object):
88
82
"""This wraps a Mandos Client D-Bus proxy object, caches the
89
83
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
86
def __init__(self, proxy_object=None, *args, **kwargs):
87
self.proxy = proxy_object # Mandos Client proxy object
89
self.properties = dict()
95
90
self.property_changed_match = (
96
self.proxy.connect_to_signal("PropertiesChanged",
97
self.properties_changed,
98
dbus.PROPERTIES_IFACE,
91
self.proxy.connect_to_signal("PropertyChanged",
92
self.property_changed,
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.
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.
112
108
# Update properties dict with new value
113
if interface == client_interface:
114
self.properties.update(properties)
109
self.properties[property] = value
111
def delete(self, *args, **kwargs):
117
112
self.property_changed_match.remove()
113
super(MandosClientPropertyCache, self).__init__(
120
117
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
121
118
"""A Mandos Client which is visible on the screen.
124
121
def __init__(self, server_proxy_object=None, update_hook=None,
125
delete_hook=None, logger=None, **kwargs):
122
delete_hook=None, logger=None, *args, **kwargs):
126
123
# Called on update
127
124
self.update_hook = update_hook
128
125
# Called on delete
164
183
client_interface,
165
184
byte_arrays=True))
166
self.logger('Created client {}'
167
.format(self.properties["Name"]), level=0)
185
#self.logger('Created client %s' % (self.properties["Name"]))
187
def property_changed(self, property=None, value=None):
188
super(self, MandosClientWidget).property_changed(property,
190
if property == "ApprovalPending":
191
using_timer(bool(value))
169
193
def using_timer(self, flag):
170
194
"""Call this method with True or False when timer should be
171
195
activated or deactivated.
173
if flag and self._update_timer_callback_tag is None:
197
old = self._update_timer_callback_lock
199
self._update_timer_callback_lock += 1
201
self._update_timer_callback_lock -= 1
202
if old == 0 and self._update_timer_callback_lock:
174
203
# Will update the shown timer value every second
175
self._update_timer_callback_tag = (GLib.timeout_add
204
self._update_timer_callback_tag = (gobject.timeout_add
177
206
self.update_timer))
178
elif not (flag or self._update_timer_callback_tag is None):
179
GLib.source_remove(self._update_timer_callback_tag)
207
elif old and self._update_timer_callback_lock == 0:
208
gobject.source_remove(self._update_timer_callback_tag)
180
209
self._update_timer_callback_tag = None
182
211
def checker_completed(self, exitstatus, condition, command):
183
212
if exitstatus == 0:
184
self.logger('Checker for client {} (command "{}")'
185
' succeeded'.format(self.properties["Name"],
213
if self.last_checker_failed:
214
self.last_checker_failed = False
215
self.using_timer(False)
216
#self.logger('Checker for client %s (command "%s")'
218
# % (self.properties["Name"], command))
222
if not self.last_checker_failed:
223
self.last_checker_failed = True
224
self.using_timer(True)
190
225
if os.WIFEXITED(condition):
191
self.logger('Checker for client {} (command "{}") failed'
193
.format(self.properties["Name"], command,
194
os.WEXITSTATUS(condition)))
226
self.logger('Checker for client %s (command "%s")'
227
' failed with exit code %s'
228
% (self.properties["Name"], command,
229
os.WEXITSTATUS(condition)))
195
230
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)))
231
self.logger('Checker for client %s (command "%s")'
232
' was killed by signal %s'
233
% (self.properties["Name"], command,
234
os.WTERMSIG(condition)))
235
elif os.WCOREDUMP(condition):
236
self.logger('Checker for client %s (command "%s")'
238
% (self.properties["Name"], command))
240
self.logger('Checker for client %s completed'
202
244
def checker_started(self, command):
203
"""Server signals that a checker started."""
204
self.logger('Client {} started checker "{}"'
205
.format(self.properties["Name"],
245
"""Server signals that a checker started. This could be useful
246
to log in the future. """
247
#self.logger('Client %s started checker "%s"'
248
# % (self.properties["Name"], unicode(command)))
208
251
def got_secret(self):
209
self.logger('Client {} received its secret'
210
.format(self.properties["Name"]))
252
self.last_checker_failed = False
253
self.logger('Client %s received its secret'
254
% self.properties["Name"])
212
256
def need_approval(self, timeout, default):
214
message = 'Client {} needs approval within {} seconds'
258
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"],
260
message = 'Client %s will get its secret in %s seconds'
262
% (self.properties["Name"], timeout/1000))
263
self.using_timer(True)
220
265
def rejected(self, reason):
221
self.logger('Client {} was rejected; reason: {}'
222
.format(self.properties["Name"], reason))
266
self.logger('Client %s was rejected; reason: %s'
267
% (self.properties["Name"], reason))
224
269
def selectable(self):
225
270
"""Make this a "selectable" widget.
226
271
This overrides the method from urwid.FlowWidget."""
229
274
def rows(self, maxcolrow, focus=False):
230
275
"""How many rows this widget will occupy might depend on
231
276
whether we have focus or not.
232
277
This overrides the method from urwid.FlowWidget"""
233
278
return self.current_widget(focus).rows(maxcolrow, focus=focus)
235
280
def current_widget(self, focus=False):
236
281
if focus or self.opened:
237
282
return self._focus_widget
238
283
return self._widget
240
285
def update(self):
241
286
"Called when what is visible on the screen should be updated."
242
287
# 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",
288
with_standout = { "normal": "standout",
289
"bold": "bold-standout",
291
"underline-blink-standout",
292
"bold-underline-blink":
293
"bold-underline-blink-standout",
251
296
# Rebuild focus and non-focus widgets using current properties
253
298
# Base part of a client. Name!
254
base = '{name}: '.format(name=self.properties["Name"])
300
% {"name": self.properties["Name"]})
255
301
if not self.properties["Enabled"]:
256
302
message = "DISABLED"
257
self.using_timer(False)
258
303
elif self.properties["ApprovalPending"]:
259
timeout = datetime.timedelta(
260
milliseconds=self.properties["ApprovalDelay"])
304
timeout = datetime.timedelta(milliseconds
261
307
last_approval_request = isoformat_to_datetime(
262
308
self.properties["LastApprovalRequest"])
263
309
if last_approval_request is not None:
264
timer = max(timeout - (datetime.datetime.utcnow()
265
- last_approval_request),
266
datetime.timedelta())
310
timer = timeout - (datetime.datetime.utcnow()
311
- last_approval_request)
268
313
timer = datetime.timedelta()
269
314
if self.properties["ApprovedByDefault"]:
270
message = "Approval in {}. (d)eny?"
315
message = "Approval in %s. (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
317
message = "Denial in %s. (a)pprove?"
318
message = message % unicode(timer).rsplit(".", 1)[0]
319
elif self.last_checker_failed:
320
# When checker has failed, print a timer until client expires
277
321
expires = self.properties["Expires"]
278
322
if expires == "":
279
323
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())
325
expires = datetime.datetime.strptime(expires,
326
'%Y-%m-%dT%H:%M:%S.%f')
327
timer = expires - datetime.datetime.utcnow()
285
328
message = ('A checker has failed! Time until client'
287
.format(str(timer).rsplit(".", 1)[0]))
288
self.using_timer(True)
330
% unicode(timer).rsplit(".", 1)[0])
290
332
message = "enabled"
291
self.using_timer(False)
292
self._text = "{}{}".format(base, message)
333
self._text = "%s%s" % (base, message)
294
335
if not urwid.supports_unicode():
295
336
self._text = self._text.encode("ascii", "replace")
296
337
textlist = [("normal", self._text)]
306
347
# Run update hook, if any
307
348
if self.update_hook is not None:
308
349
self.update_hook()
310
351
def update_timer(self):
311
"""called by GLib. Will indefinitely loop until
312
GLib.source_remove() on tag is called
352
"""called by gobject. Will indefinitely loop until
353
gobject.source_remove() on tag is called"""
315
355
return True # Keep calling this
317
def delete(self, **kwargs):
357
def delete(self, *args, **kwargs):
318
358
if self._update_timer_callback_tag is not None:
319
GLib.source_remove(self._update_timer_callback_tag)
359
gobject.source_remove(self._update_timer_callback_tag)
320
360
self._update_timer_callback_tag = None
321
361
for match in self.match_objects:
323
363
self.match_objects = ()
324
364
if self.delete_hook is not None:
325
365
self.delete_hook(self)
326
return super(MandosClientWidget, self).delete(**kwargs)
366
return super(MandosClientWidget, self).delete(*args, **kwargs)
328
368
def render(self, maxcolrow, focus=False):
329
369
"""Render differently if we have focus.
330
370
This overrides the method from urwid.FlowWidget"""
331
371
return self.current_widget(focus).render(maxcolrow,
334
374
def keypress(self, maxcolrow, key):
336
376
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)
378
self.proxy.Enable(dbus_interface = client_interface,
342
self.proxy.Set(client_interface, "Enabled", False,
344
dbus_interface=dbus.PROPERTIES_IFACE)
381
self.proxy.Disable(dbus_interface = client_interface,
346
384
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
347
dbus_interface=client_interface,
385
dbus_interface = client_interface,
348
386
ignore_reply=True)
350
388
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
351
dbus_interface=client_interface,
389
dbus_interface = client_interface,
352
390
ignore_reply=True)
353
391
elif key == "R" or key == "_" or key == "ctrl k":
354
392
self.server_proxy_object.RemoveClient(self.proxy
356
394
ignore_reply=True)
358
self.proxy.Set(client_interface, "CheckerRunning",
359
dbus.Boolean(True), ignore_reply=True,
360
dbus_interface=dbus.PROPERTIES_IFACE)
396
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)
399
self.proxy.StopChecker(dbus_interface = client_interface,
366
self.proxy.CheckedOK(dbus_interface=client_interface,
402
self.proxy.CheckedOK(dbus_interface = client_interface,
367
403
ignore_reply=True)
369
405
# elif key == "p" or key == "=":
404
439
"""This is the entire user interface - the whole screen
405
440
with boxes, lists of client widgets, etc.
407
def __init__(self, max_log_length=1000, log_level=1):
442
def __init__(self, max_log_length=1000):
408
443
DBusGMainLoop(set_as_default=True)
410
445
self.screen = urwid.curses_display.Screen()
412
447
self.screen.register_palette((
414
449
"default", "default", None),
416
"bold", "default", "bold"),
451
"default", "default", "bold"),
417
452
("underline-blink",
418
"underline,blink", "default", "underline,blink"),
453
"default", "default", "underline"),
420
"standout", "default", "standout"),
455
"default", "default", "standout"),
421
456
("bold-underline-blink",
422
"bold,underline,blink", "default",
423
"bold,underline,blink"),
457
"default", "default", ("bold", "underline")),
424
458
("bold-standout",
425
"bold,standout", "default", "bold,standout"),
459
"default", "default", ("bold", "standout")),
426
460
("underline-blink-standout",
427
"underline,blink,standout", "default",
428
"underline,blink,standout"),
461
"default", "default", ("underline", "standout")),
429
462
("bold-underline-blink-standout",
430
"bold,underline,blink,standout", "default",
431
"bold,underline,blink,standout"),
463
"default", "default", ("bold", "underline",
434
467
if urwid.supports_unicode():
435
self.divider = "─" # \u2500
468
self.divider = "─" # \u2500
469
#self.divider = "━" # \u2501
437
self.divider = "_" # \u005f
471
#self.divider = "-" # \u002d
472
self.divider = "_" # \u005f
439
474
self.screen.start()
441
476
self.size = self.screen.get_cols_rows()
443
478
self.clients = urwid.SimpleListWalker([])
444
479
self.clients_dict = {}
446
481
# We will add Text widgets to this list
447
self.log = urwid.SimpleListWalker([])
448
483
self.max_log_length = max_log_length
450
self.log_level = log_level
452
485
# We keep a reference to the log widget so we can remove it
453
486
# from the ListWalker without it getting destroyed
454
487
self.logbox = ConstrainedListBox(self.log)
456
489
# This keeps track of whether self.uilist currently has
457
490
# self.logbox in it or not
458
491
self.log_visible = True
459
492
self.log_wrap = "any"
462
495
self.log_message_raw(("bold",
463
496
"Mandos Monitor version " + version))
464
497
self.log_message_raw(("bold",
465
498
"q: Quit ?: Help"))
467
500
self.busname = domain + '.Mandos'
468
self.main_loop = GLib.MainLoop()
501
self.main_loop = gobject.MainLoop()
470
503
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))
504
self.log_message(("Client with address %s and fingerprint %s"
505
" could not be found" % (address,
475
508
def rebuild(self):
476
509
"""This rebuilds the User Interface.
477
510
Call this when the widget layout needs to change"""
479
# self.uilist.append(urwid.ListBox(self.clients))
512
#self.uilist.append(urwid.ListBox(self.clients))
480
513
self.uilist.append(urwid.Frame(ConstrainedListBox(self.
482
# header=urwid.Divider(),
515
#header=urwid.Divider(),
484
footer=urwid.Divider(
485
div_char=self.divider)))
518
urwid.Divider(div_char=
486
520
if self.log_visible:
487
521
self.uilist.append(self.logbox)
488
522
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:
524
def log_message(self, message):
494
525
timestamp = datetime.datetime.now().isoformat()
495
self.log_message_raw("{}: {}".format(timestamp, message),
498
def log_message_raw(self, markup, level=1):
526
self.log_message_raw(timestamp + ": " + message)
528
def log_message_raw(self, markup):
499
529
"""Add a log message to the log buffer."""
500
if level < self.log_level:
502
530
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,
531
if (self.max_log_length
532
and len(self.log) > self.max_log_length):
533
del self.log[0:len(self.log)-self.max_log_length-1]
534
self.logbox.set_focus(len(self.logbox.body.contents),
507
535
coming_from="above")
510
538
def toggle_log_display(self):
511
539
"""Toggle visibility of the log buffer."""
512
540
self.log_visible = not self.log_visible
514
self.log_message("Log visibility changed to: {}"
515
.format(self.log_visible), level=0)
542
#self.log_message("Log visibility changed to: "
543
# + unicode(self.log_visible))
517
545
def change_log_display(self):
518
546
"""Change type of log display.
519
547
Currently, this toggles wrapping of text lines."""
523
551
self.log_wrap = "clip"
524
552
for textwidget in self.log:
525
553
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):
554
#self.log_message("Wrap mode: " + self.log_wrap)
556
def find_and_remove_client(self, path, name):
530
557
"""Find a client by its object path and remove it.
532
This is connected to the InterfacesRemoved signal from the
559
This is connected to the ClientRemoved signal from the
533
560
Mandos server object."""
534
if client_interface not in interfaces:
535
# Not a Mandos client object; ignore
538
562
client = self.clients_dict[path]
541
self.log_message("Unknown client {!r} removed"
565
self.log_message("Unknown client %r (%r) removed", name,
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
570
def add_new_client(self, path):
555
571
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])),
572
self.add_client(MandosClientWidget(server_proxy_object
575
=client_proxy_object,
565
584
def add_client(self, client, path=None):
566
585
self.clients.append(client)
568
587
path = client.proxy.object_path
569
588
self.clients_dict[path] = client
570
self.clients.sort(key=lambda c: c.properties["Name"])
589
self.clients.sort(None, lambda c: c.properties["Name"])
573
592
def remove_client(self, client, path=None):
574
593
self.clients.remove(client)
576
595
path = client.proxy.object_path
577
596
del self.clients_dict[path]
597
if not self.clients_dict:
598
# Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
599
# is completely emptied, we need to recreate it.
600
self.clients = urwid.SimpleListWalker([])
580
604
def refresh(self):
581
605
"""Redraw the screen"""
582
606
canvas = self.topwidget.render(self.size, focus=True)
583
607
self.screen.draw_screen(self.size, canvas)
586
610
"""Start the main loop and exit when it's done."""
587
611
self.bus = dbus.SystemBus()
588
612
mandos_dbus_objc = self.bus.get_object(
589
613
self.busname, "/", follow_name_owner_changes=True)
590
self.mandos_serv = dbus.Interface(
591
mandos_dbus_objc, dbus_interface=server_interface)
614
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
593
618
mandos_clients = (self.mandos_serv
594
619
.GetAllClientsWithProperties())
595
if not mandos_clients:
596
self.log_message_raw(("bold",
597
"Note: Server has no clients."))
598
620
except dbus.exceptions.DBusException:
599
self.log_message_raw(("bold",
600
"Note: No Mandos server running."))
601
621
mandos_clients = dbus.Dictionary()
603
623
(self.mandos_serv
604
.connect_to_signal("InterfacesRemoved",
624
.connect_to_signal("ClientRemoved",
605
625
self.find_and_remove_client,
606
dbus_interface=dbus.OBJECT_MANAGER_IFACE,
626
dbus_interface=server_interface,
607
627
byte_arrays=True))
608
628
(self.mandos_serv
609
.connect_to_signal("InterfacesAdded",
629
.connect_to_signal("ClientAdded",
610
630
self.add_new_client,
611
dbus_interface=dbus.OBJECT_MANAGER_IFACE,
631
dbus_interface=server_interface,
612
632
byte_arrays=True))
613
633
(self.mandos_serv
614
634
.connect_to_signal("ClientNotFound",
615
635
self.client_not_found,
616
636
dbus_interface=server_interface,
617
637
byte_arrays=True))
618
for path, client in mandos_clients.items():
638
for path, client in mandos_clients.iteritems():
619
639
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),
641
self.add_client(MandosClientWidget(server_proxy_object
644
=client_proxy_object,
631
self._input_callback_tag = (
633
GLib.IOChannel.unix_new(sys.stdin.fileno()),
634
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
655
self._input_callback_tag = (gobject.io_add_watch
636
659
self.main_loop.run()
637
660
# Main loop has finished, we should close everything now
638
GLib.source_remove(self._input_callback_tag)
661
gobject.source_remove(self._input_callback_tag)
639
662
self.screen.stop()
642
665
self.main_loop.quit()
644
667
def process_input(self, source, condition):
645
668
keys = self.screen.get_input()
646
translations = {"ctrl n": "down", # Emacs
647
"ctrl p": "up", # Emacs
648
"ctrl v": "page down", # Emacs
649
"meta v": "page up", # Emacs
650
" ": "page down", # less
651
"f": "page down", # less
652
"b": "page up", # less
669
translations = { "ctrl n": "down", # Emacs
670
"ctrl p": "up", # Emacs
671
"ctrl v": "page down", # Emacs
672
"meta v": "page up", # Emacs
673
" ": "page down", # less
674
"f": "page down", # less
675
"b": "page up", # less
658
681
key = translations[key]
659
682
except KeyError: # :-)
662
685
if key == "q" or key == "Q":
665
688
elif key == "window resize":
666
689
self.size = self.screen.get_cols_rows()
668
elif key == "ctrl l":
691
elif key == "\f": # Ctrl-L
671
693
elif key == "l" or key == "D":
672
694
self.toggle_log_display()