1
#!/usr/bin/python3 -bbI
 
2
2
# -*- mode: python; coding: utf-8 -*-
 
4
4
# Mandos Monitor - Control and monitor the Mandos server
 
6
 
# Copyright © 2009-2013 Teddy Hogeborn
 
7
 
# Copyright © 2009-2013 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
 
 
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
 
11
13
# the Free Software Foundation, either version 3 of the License, or
 
12
14
# (at your option) any later version.
 
14
 
#     This program is distributed in the hope that it will be useful,
 
15
 
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 
16
#     Mandos is distributed in the hope that it will be useful, but
 
 
17
#     WITHOUT ANY WARRANTY; without even the implied warranty of
 
16
18
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
17
19
#     GNU General Public License for more details.
 
19
21
# You should have received a copy of the GNU General Public License
 
20
 
# along with this program.  If not, see
 
21
 
# <http://www.gnu.org/licenses/>.
 
 
22
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
23
24
# Contact the authors at <mandos@recompile.se>.
 
26
27
from __future__ import (division, absolute_import, print_function,
 
 
39
41
import urwid.curses_display
 
42
44
from dbus.mainloop.glib import DBusGMainLoop
 
46
 
    from gi.repository import GObject as gobject
 
 
45
from gi.repository import GLib
 
52
 
if sys.version_info[0] == 2:
 
 
49
if sys.version_info.major == 2:
 
55
 
locale.setlocale(locale.LC_ALL, '')
 
58
 
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
 
 
53
log = logging.getLogger(os.path.basename(sys.argv[0]))
 
 
54
logging.basicConfig(level="NOTSET", # Show all messages
 
 
55
                    format="%(message)s") # Show basic log messages
 
 
57
logging.captureWarnings(True)   # Show warnings via the logging system
 
 
59
locale.setlocale(locale.LC_ALL, "")
 
 
61
logging.getLogger("dbus.proxies").setLevel(logging.CRITICAL)
 
60
63
# Some useful constants
 
61
 
domain = 'se.recompile'
 
62
 
server_interface = domain + '.Mandos'
 
63
 
client_interface = domain + '.Mandos.Client'
 
 
64
domain = "se.recompile"
 
 
65
server_interface = domain + ".Mandos"
 
 
66
client_interface = domain + ".Mandos.Client"
 
 
70
    dbus.OBJECT_MANAGER_IFACE
 
 
71
except AttributeError:
 
 
72
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
66
75
def isoformat_to_datetime(iso):
 
67
76
    "Parse an ISO 8601 date string to a datetime.datetime()"
 
 
79
 
                             int(second),           # Whole seconds
 
80
 
                             int(fraction*1000000)) # Microseconds
 
82
 
class MandosClientPropertyCache(object):
 
 
88
                             int(second),            # Whole seconds
 
 
89
                             int(fraction*1000000))  # Microseconds
 
 
92
class MandosClientPropertyCache:
 
83
93
    """This wraps a Mandos Client D-Bus proxy object, caches the
 
84
94
    properties and calls a hook function when any of them are
 
87
97
    def __init__(self, proxy_object=None, properties=None, **kwargs):
 
88
 
        self.proxy = proxy_object # Mandos Client proxy object
 
 
98
        self.proxy = proxy_object  # Mandos Client proxy object
 
89
99
        self.properties = dict() if properties is None else properties
 
90
100
        self.property_changed_match = (
 
91
 
            self.proxy.connect_to_signal("PropertyChanged",
 
92
 
                                         self._property_changed,
 
 
101
            self.proxy.connect_to_signal("PropertiesChanged",
 
 
102
                                         self.properties_changed,
 
 
103
                                         dbus.PROPERTIES_IFACE,
 
94
104
                                         byte_arrays=True))
 
96
106
        if properties is None:
 
97
 
            self.properties.update(
 
98
 
                self.proxy.GetAll(client_interface,
 
100
 
                                  = dbus.PROPERTIES_IFACE))
 
 
107
            self.properties.update(self.proxy.GetAll(
 
 
109
                dbus_interface=dbus.PROPERTIES_IFACE))
 
102
111
        super(MandosClientPropertyCache, self).__init__(**kwargs)
 
104
 
    def _property_changed(self, property, value):
 
105
 
        """Helper which takes positional arguments"""
 
106
 
        return self.property_changed(property=property, value=value)
 
108
 
    def property_changed(self, property=None, value=None):
 
109
 
        """This is called whenever we get a PropertyChanged signal
 
110
 
        It updates the changed property in the "properties" dict.
 
 
113
    def properties_changed(self, interface, properties, invalidated):
 
 
114
        """This is called whenever we get a PropertiesChanged signal
 
 
115
        It updates the changed properties in the "properties" dict.
 
112
117
        # Update properties dict with new value
 
113
 
        self.properties[property] = value
 
 
118
        if interface == client_interface:
 
 
119
            self.properties.update(properties)
 
115
121
    def delete(self):
 
116
122
        self.property_changed_match.remove()
 
 
163
167
                                         client_interface,
 
164
168
                                         byte_arrays=True))
 
165
 
        #self.logger('Created client {0}'
 
166
 
        #            .format(self.properties["Name"]))
 
 
169
        log.debug("Created client %s", self.properties["Name"])
 
168
171
    def using_timer(self, flag):
 
169
172
        """Call this method with True or False when timer should be
 
170
173
        activated or deactivated.
 
172
175
        if flag and self._update_timer_callback_tag is None:
 
173
176
            # Will update the shown timer value every second
 
174
 
            self._update_timer_callback_tag = (gobject.timeout_add
 
 
177
            self._update_timer_callback_tag = (
 
 
178
                GLib.timeout_add(1000,
 
 
179
                                 glib_safely(self.update_timer)))
 
177
180
        elif not (flag or self._update_timer_callback_tag is None):
 
178
 
            gobject.source_remove(self._update_timer_callback_tag)
 
 
181
            GLib.source_remove(self._update_timer_callback_tag)
 
179
182
            self._update_timer_callback_tag = None
 
181
184
    def checker_completed(self, exitstatus, condition, command):
 
182
185
        if exitstatus == 0:
 
 
186
            log.debug('Checker for client %s (command "%s")'
 
 
187
                      " succeeded", self.properties["Name"], command)
 
186
191
        if os.WIFEXITED(condition):
 
187
 
            self.logger('Checker for client {0} (command "{1}")'
 
188
 
                        ' failed with exit code {2}'
 
189
 
                        .format(self.properties["Name"], command,
 
190
 
                                os.WEXITSTATUS(condition)))
 
 
192
            log.info('Checker for client %s (command "%s") failed'
 
 
193
                     " with exit code %d", self.properties["Name"],
 
 
194
                     command, os.WEXITSTATUS(condition))
 
191
195
        elif os.WIFSIGNALED(condition):
 
192
 
            self.logger('Checker for client {0} (command "{1}") was'
 
193
 
                        ' killed by signal {2}'
 
194
 
                        .format(self.properties["Name"], command,
 
195
 
                                os.WTERMSIG(condition)))
 
196
 
        elif os.WCOREDUMP(condition):
 
197
 
            self.logger('Checker for client {0} (command "{1}")'
 
199
 
                        .format(self.properties["Name"], command))
 
201
 
            self.logger('Checker for client {0} completed'
 
203
 
                        .format(self.properties["Name"]))
 
 
196
            log.info('Checker for client %s (command "%s") was'
 
 
197
                     " killed by signal %d", self.properties["Name"],
 
 
198
                     command, os.WTERMSIG(condition))
 
206
201
    def checker_started(self, command):
 
207
 
        """Server signals that a checker started. This could be useful
 
208
 
           to log in the future. """
 
209
 
        #self.logger('Client {0} started checker "{1}"'
 
210
 
        #            .format(self.properties["Name"],
 
 
202
        """Server signals that a checker started."""
 
 
203
        log.debug('Client %s started checker "%s"',
 
 
204
                  self.properties["Name"], command)
 
214
206
    def got_secret(self):
 
215
 
        self.logger('Client {0} received its secret'
 
216
 
                    .format(self.properties["Name"]))
 
 
207
        log.info("Client %s received its secret",
 
 
208
                 self.properties["Name"])
 
218
210
    def need_approval(self, timeout, default):
 
220
 
            message = 'Client {0} needs approval within {1} seconds'
 
 
212
            message = "Client %s needs approval within %f seconds"
 
222
 
            message = 'Client {0} will get its secret in {1} seconds'
 
223
 
        self.logger(message.format(self.properties["Name"],
 
 
214
            message = "Client %s will get its secret in %f seconds"
 
 
215
        log.info(message, self.properties["Name"], timeout/1000)
 
226
217
    def rejected(self, reason):
 
227
 
        self.logger('Client {0} was rejected; reason: {1}'
 
228
 
                    .format(self.properties["Name"], reason))
 
 
218
        log.info("Client %s was rejected; reason: %s",
 
 
219
                 self.properties["Name"], reason)
 
230
221
    def selectable(self):
 
231
222
        """Make this a "selectable" widget.
 
232
223
        This overrides the method from urwid.FlowWidget."""
 
235
226
    def rows(self, maxcolrow, focus=False):
 
236
227
        """How many rows this widget will occupy might depend on
 
237
228
        whether we have focus or not.
 
238
229
        This overrides the method from urwid.FlowWidget"""
 
239
230
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
 
241
232
    def current_widget(self, focus=False):
 
242
233
        if focus or self.opened:
 
243
234
            return self._focus_widget
 
244
235
        return self._widget
 
246
237
    def update(self):
 
247
238
        "Called when what is visible on the screen should be updated."
 
248
239
        # How to add standout mode to a style
 
249
 
        with_standout = { "normal": "standout",
 
250
 
                          "bold": "bold-standout",
 
252
 
                              "underline-blink-standout",
 
253
 
                          "bold-underline-blink":
 
254
 
                              "bold-underline-blink-standout",
 
 
240
        with_standout = {"normal": "standout",
 
 
241
                         "bold": "bold-standout",
 
 
243
                         "underline-blink-standout",
 
 
244
                         "bold-underline-blink":
 
 
245
                         "bold-underline-blink-standout",
 
257
248
        # Rebuild focus and non-focus widgets using current properties
 
259
250
        # Base part of a client. Name!
 
260
 
        base = '{name}: '.format(name=self.properties["Name"])
 
 
251
        base = "{name}: ".format(name=self.properties["Name"])
 
261
252
        if not self.properties["Enabled"]:
 
262
253
            message = "DISABLED"
 
263
254
            self.using_timer(False)
 
264
255
        elif self.properties["ApprovalPending"]:
 
265
 
            timeout = datetime.timedelta(milliseconds
 
 
256
            timeout = datetime.timedelta(
 
 
257
                milliseconds=self.properties["ApprovalDelay"])
 
268
258
            last_approval_request = isoformat_to_datetime(
 
269
259
                self.properties["LastApprovalRequest"])
 
270
260
            if last_approval_request is not None:
 
 
330
321
        if self.delete_hook is not None:
 
331
322
            self.delete_hook(self)
 
332
323
        return super(MandosClientWidget, self).delete(**kwargs)
 
334
325
    def render(self, maxcolrow, focus=False):
 
335
326
        """Render differently if we have focus.
 
336
327
        This overrides the method from urwid.FlowWidget"""
 
337
328
        return self.current_widget(focus).render(maxcolrow,
 
340
331
    def keypress(self, maxcolrow, key):
 
342
333
        This overrides the method from urwid.FlowWidget"""
 
344
 
            self.proxy.Enable(dbus_interface = client_interface,
 
 
335
            self.proxy.Set(client_interface, "Enabled",
 
 
336
                           dbus.Boolean(True), ignore_reply=True,
 
 
337
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
347
 
            self.proxy.Disable(dbus_interface = client_interface,
 
 
339
            self.proxy.Set(client_interface, "Enabled", False,
 
 
341
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
350
343
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
 
351
 
                               dbus_interface = client_interface,
 
 
344
                               dbus_interface=client_interface,
 
352
345
                               ignore_reply=True)
 
354
347
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
 
355
 
                                  dbus_interface = client_interface,
 
 
348
                               dbus_interface=client_interface,
 
356
349
                               ignore_reply=True)
 
357
350
        elif key == "R" or key == "_" or key == "ctrl k":
 
358
351
            self.server_proxy_object.RemoveClient(self.proxy
 
360
353
                                                  ignore_reply=True)
 
362
 
            self.proxy.StartChecker(dbus_interface = client_interface,
 
 
355
            self.proxy.Set(client_interface, "CheckerRunning",
 
 
356
                           dbus.Boolean(True), ignore_reply=True,
 
 
357
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
365
 
            self.proxy.StopChecker(dbus_interface = client_interface,
 
 
359
            self.proxy.Set(client_interface, "CheckerRunning",
 
 
360
                           dbus.Boolean(False), ignore_reply=True,
 
 
361
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
368
 
            self.proxy.CheckedOK(dbus_interface = client_interface,
 
 
363
            self.proxy.CheckedOK(dbus_interface=client_interface,
 
369
364
                                 ignore_reply=True)
 
371
366
#         elif key == "p" or key == "=":
 
 
380
 
    def property_changed(self, property=None, **kwargs):
 
381
 
        """Call self.update() if old value is not new value.
 
 
375
    def properties_changed(self, interface, properties, invalidated):
 
 
376
        """Call self.update() if any properties changed.
 
382
377
        This overrides the method from MandosClientPropertyCache"""
 
383
 
        property_name = str(property)
 
384
 
        old_value = self.properties.get(property_name)
 
385
 
        super(MandosClientWidget, self).property_changed(
 
386
 
            property=property, **kwargs)
 
387
 
        if self.properties.get(property_name) != old_value:
 
 
378
        old_values = {key: self.properties.get(key)
 
 
379
                      for key in properties.keys()}
 
 
380
        super(MandosClientWidget, self).properties_changed(
 
 
381
            interface, properties, invalidated)
 
 
382
        if any(old_values[key] != self.properties.get(key)
 
 
383
               for key in old_values):
 
 
387
def glib_safely(func, retval=True):
 
 
388
    def safe_func(*args, **kwargs):
 
 
390
            return func(*args, **kwargs)
 
391
397
class ConstrainedListBox(urwid.ListBox):
 
392
398
    """Like a normal urwid.ListBox, but will consume all "up" or
 
393
399
    "down" key presses, thus not allowing any containing widgets to
 
394
400
    use them as an excuse to shift focus away from this widget.
 
396
402
    def keypress(self, *args, **kwargs):
 
397
 
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
 
 
403
        ret = (super(ConstrainedListBox, self)
 
 
404
               .keypress(*args, **kwargs))
 
398
405
        if ret in ("up", "down"):
 
403
 
class UserInterface(object):
 
404
411
    """This is the entire user interface - the whole screen
 
405
412
    with boxes, lists of client widgets, etc.
 
407
414
    def __init__(self, max_log_length=1000):
 
408
415
        DBusGMainLoop(set_as_default=True)
 
410
417
        self.screen = urwid.curses_display.Screen()
 
412
419
        self.screen.register_palette((
 
414
421
                 "default", "default", None),
 
 
429
437
                 "bold,underline,blink,standout", "default",
 
430
438
                 "bold,underline,blink,standout"),
 
433
441
        if urwid.supports_unicode():
 
434
 
            self.divider = "─" # \u2500
 
435
 
            #self.divider = "━" # \u2501
 
 
442
            self.divider = "─"  # \u2500
 
437
 
            #self.divider = "-" # \u002d
 
438
 
            self.divider = "_" # \u005f
 
 
444
            self.divider = "_"  # \u005f
 
440
446
        self.screen.start()
 
442
448
        self.size = self.screen.get_cols_rows()
 
444
450
        self.clients = urwid.SimpleListWalker([])
 
445
451
        self.clients_dict = {}
 
447
453
        # We will add Text widgets to this list
 
 
454
        self.log = urwid.SimpleListWalker([])
 
449
455
        self.max_log_length = max_log_length
 
451
457
        # We keep a reference to the log widget so we can remove it
 
452
458
        # from the ListWalker without it getting destroyed
 
453
459
        self.logbox = ConstrainedListBox(self.log)
 
455
461
        # This keeps track of whether self.uilist currently has
 
456
462
        # self.logbox in it or not
 
457
463
        self.log_visible = True
 
458
464
        self.log_wrap = "any"
 
 
466
        self.loghandler = UILogHandler(self)
 
461
 
        self.log_message_raw(("bold",
 
462
 
                              "Mandos Monitor version " + version))
 
463
 
        self.log_message_raw(("bold",
 
466
 
        self.busname = domain + '.Mandos'
 
467
 
        self.main_loop = gobject.MainLoop()
 
469
 
    def client_not_found(self, fingerprint, address):
 
470
 
        self.log_message("Client with address {0} and fingerprint"
 
471
 
                         " {1} could not be found"
 
472
 
                         .format(address, fingerprint))
 
 
469
        self.add_log_line(("bold",
 
 
470
                           "Mandos Monitor version " + version))
 
 
471
        self.add_log_line(("bold", "q: Quit  ?: Help"))
 
 
473
        self.busname = domain + ".Mandos"
 
 
474
        self.main_loop = GLib.MainLoop()
 
 
476
    def client_not_found(self, key_id, address):
 
 
477
        log.info("Client with address %s and key ID %s could"
 
 
478
                 " not be found", address, key_id)
 
474
480
    def rebuild(self):
 
475
481
        """This rebuilds the User Interface.
 
476
482
        Call this when the widget layout needs to change"""
 
478
 
        #self.uilist.append(urwid.ListBox(self.clients))
 
 
484
        # self.uilist.append(urwid.ListBox(self.clients))
 
479
485
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
481
 
                                       #header=urwid.Divider(),
 
 
487
                                       # header=urwid.Divider(),
 
484
 
                                       urwid.Divider(div_char=
 
 
489
                                       footer=urwid.Divider(
 
 
490
                                           div_char=self.divider)))
 
486
491
        if self.log_visible:
 
487
492
            self.uilist.append(self.logbox)
 
488
493
        self.topwidget = urwid.Pile(self.uilist)
 
490
 
    def log_message(self, message):
 
491
 
        """Log message formatted with timestamp"""
 
492
 
        timestamp = datetime.datetime.now().isoformat()
 
493
 
        self.log_message_raw(timestamp + ": " + message)
 
495
 
    def log_message_raw(self, markup):
 
496
 
        """Add a log message to the log buffer."""
 
 
495
    def add_log_line(self, markup):
 
497
496
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
 
498
 
        if (self.max_log_length
 
499
 
            and len(self.log) > self.max_log_length):
 
500
 
            del self.log[0:len(self.log)-self.max_log_length-1]
 
501
 
        self.logbox.set_focus(len(self.logbox.body.contents),
 
 
497
        if self.max_log_length:
 
 
498
            if len(self.log) > self.max_log_length:
 
 
499
                del self.log[0:(len(self.log) - self.max_log_length)]
 
 
500
        self.logbox.set_focus(len(self.logbox.body.contents)-1,
 
502
501
                              coming_from="above")
 
505
504
    def toggle_log_display(self):
 
506
505
        """Toggle visibility of the log buffer."""
 
507
506
        self.log_visible = not self.log_visible
 
509
 
        #self.log_message("Log visibility changed to: "
 
510
 
        #                 + str(self.log_visible))
 
 
508
        log.debug("Log visibility changed to: %s", self.log_visible)
 
512
510
    def change_log_display(self):
 
513
511
        """Change type of log display.
 
514
512
        Currently, this toggles wrapping of text lines."""
 
 
518
516
            self.log_wrap = "clip"
 
519
517
        for textwidget in self.log:
 
520
518
            textwidget.set_wrap_mode(self.log_wrap)
 
521
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
523
 
    def find_and_remove_client(self, path, name):
 
 
519
        log.debug("Wrap mode: %s", self.log_wrap)
 
 
521
    def find_and_remove_client(self, path, interfaces):
 
524
522
        """Find a client by its object path and remove it.
 
526
 
        This is connected to the ClientRemoved signal from the
 
 
524
        This is connected to the InterfacesRemoved signal from the
 
527
525
        Mandos server object."""
 
 
526
        if client_interface not in interfaces:
 
 
527
            # Not a Mandos client object; ignore
 
529
530
            client = self.clients_dict[path]
 
532
 
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
 
533
            log.warning("Unknown client %s removed", path)
 
537
 
    def add_new_client(self, path):
 
 
537
    def add_new_client(self, path, ifs_and_props):
 
 
538
        """Find a client by its object path and remove it.
 
 
540
        This is connected to the InterfacesAdded signal from the
 
 
541
        Mandos server object.
 
 
543
        if client_interface not in ifs_and_props:
 
 
544
            # Not a Mandos client object; ignore
 
538
546
        client_proxy_object = self.bus.get_object(self.busname, path)
 
539
 
        self.add_client(MandosClientWidget(server_proxy_object
 
542
 
                                           =client_proxy_object,
 
 
547
        self.add_client(MandosClientWidget(
 
 
548
            server_proxy_object=self.mandos_serv,
 
 
549
            proxy_object=client_proxy_object,
 
 
550
            update_hook=self.refresh,
 
 
551
            delete_hook=self.remove_client,
 
 
552
            properties=dict(ifs_and_props[client_interface])),
 
551
555
    def add_client(self, client, path=None):
 
552
556
        self.clients.append(client)
 
 
555
559
        self.clients_dict[path] = client
 
556
560
        self.clients.sort(key=lambda c: c.properties["Name"])
 
559
563
    def remove_client(self, client, path=None):
 
560
564
        self.clients.remove(client)
 
562
566
            path = client.proxy.object_path
 
563
567
        del self.clients_dict[path]
 
566
570
    def refresh(self):
 
567
571
        """Redraw the screen"""
 
568
572
        canvas = self.topwidget.render(self.size, focus=True)
 
569
573
        self.screen.draw_screen(self.size, canvas)
 
572
576
        """Start the main loop and exit when it's done."""
 
 
577
        log.addHandler(self.loghandler)
 
 
578
        self.orig_log_propagate = log.propagate
 
 
579
        log.propagate = False
 
 
580
        self.orig_log_level = log.level
 
573
582
        self.bus = dbus.SystemBus()
 
574
583
        mandos_dbus_objc = self.bus.get_object(
 
575
584
            self.busname, "/", follow_name_owner_changes=True)
 
576
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
 
585
        self.mandos_serv = dbus.Interface(
 
 
586
            mandos_dbus_objc, dbus_interface=server_interface)
 
580
588
            mandos_clients = (self.mandos_serv
 
581
589
                              .GetAllClientsWithProperties())
 
582
590
            if not mandos_clients:
 
583
 
                self.log_message_raw(("bold", "Note: Server has no clients."))
 
 
591
                log.warning("Note: Server has no clients.")
 
584
592
        except dbus.exceptions.DBusException:
 
585
 
            self.log_message_raw(("bold", "Note: No Mandos server running."))
 
 
593
            log.warning("Note: No Mandos server running.")
 
586
594
            mandos_clients = dbus.Dictionary()
 
588
596
        (self.mandos_serv
 
589
 
         .connect_to_signal("ClientRemoved",
 
 
597
         .connect_to_signal("InterfacesRemoved",
 
590
598
                            self.find_and_remove_client,
 
591
 
                            dbus_interface=server_interface,
 
 
599
                            dbus_interface=dbus.OBJECT_MANAGER_IFACE,
 
592
600
                            byte_arrays=True))
 
593
601
        (self.mandos_serv
 
594
 
         .connect_to_signal("ClientAdded",
 
 
602
         .connect_to_signal("InterfacesAdded",
 
595
603
                            self.add_new_client,
 
596
 
                            dbus_interface=server_interface,
 
 
604
                            dbus_interface=dbus.OBJECT_MANAGER_IFACE,
 
597
605
                            byte_arrays=True))
 
598
606
        (self.mandos_serv
 
599
607
         .connect_to_signal("ClientNotFound",
 
 
603
611
        for path, client in mandos_clients.items():
 
604
612
            client_proxy_object = self.bus.get_object(self.busname,
 
606
 
            self.add_client(MandosClientWidget(server_proxy_object
 
609
 
                                               =client_proxy_object,
 
 
614
            self.add_client(MandosClientWidget(
 
 
615
                server_proxy_object=self.mandos_serv,
 
 
616
                proxy_object=client_proxy_object,
 
 
618
                update_hook=self.refresh,
 
 
619
                delete_hook=self.remove_client),
 
620
 
        self._input_callback_tag = (gobject.io_add_watch
 
 
623
        self._input_callback_tag = (
 
 
625
                GLib.IOChannel.unix_new(sys.stdin.fileno()),
 
 
626
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
 
 
627
                glib_safely(self.process_input)))
 
624
628
        self.main_loop.run()
 
625
629
        # Main loop has finished, we should close everything now
 
626
 
        gobject.source_remove(self._input_callback_tag)
 
 
630
        GLib.source_remove(self._input_callback_tag)
 
 
631
        with warnings.catch_warnings():
 
 
632
            warnings.simplefilter("ignore", BytesWarning)
 
630
636
        self.main_loop.quit()
 
 
637
        log.removeHandler(self.loghandler)
 
 
638
        log.propagate = self.orig_log_propagate
 
632
640
    def process_input(self, source, condition):
 
633
641
        keys = self.screen.get_input()
 
634
 
        translations = { "ctrl n": "down",      # Emacs
 
635
 
                         "ctrl p": "up",        # Emacs
 
636
 
                         "ctrl v": "page down", # Emacs
 
637
 
                         "meta v": "page up",   # Emacs
 
638
 
                         " ": "page down",      # less
 
639
 
                         "f": "page down",      # less
 
640
 
                         "b": "page up",        # less
 
 
642
        translations = {"ctrl n": "down",       # Emacs
 
 
643
                        "ctrl p": "up",         # Emacs
 
 
644
                        "ctrl v": "page down",  # Emacs
 
 
645
                        "meta v": "page up",    # Emacs
 
 
646
                        " ": "page down",       # less
 
 
647
                        "f": "page down",       # less
 
 
648
                        "b": "page up",         # less
 
646
654
                key = translations[key]
 
647
655
            except KeyError:    # :-)
 
650
658
            if key == "q" or key == "Q":
 
653
661
            elif key == "window resize":
 
654
662
                self.size = self.screen.get_cols_rows()
 
656
 
            elif key == "\f":  # Ctrl-L
 
 
664
            elif key == "ctrl l":
 
658
667
            elif key == "l" or key == "D":
 
659
668
                self.toggle_log_display()
 
 
691
701
                    self.topwidget.set_focus(self.logbox)
 
693
 
            #elif (key == "end" or key == "meta >" or key == "G"
 
695
 
            #    pass            # xxx end-of-buffer
 
696
 
            #elif (key == "home" or key == "meta <" or key == "g"
 
698
 
            #    pass            # xxx beginning-of-buffer
 
699
 
            #elif key == "ctrl e" or key == "$":
 
700
 
            #    pass            # xxx move-end-of-line
 
701
 
            #elif key == "ctrl a" or key == "^":
 
702
 
            #    pass            # xxx move-beginning-of-line
 
703
 
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
705
 
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
708
 
            #    pass            # scroll up log
 
710
 
            #    pass            # scroll down log
 
 
704
                if log.level < logging.INFO:
 
 
705
                    log.setLevel(logging.INFO)
 
 
706
                    log.info("Verbose mode: Off")
 
 
708
                    log.setLevel(logging.NOTSET)
 
 
709
                    log.info("Verbose mode: On")
 
 
710
            # elif (key == "end" or key == "meta >" or key == "G"
 
 
712
            #     pass            # xxx end-of-buffer
 
 
713
            # elif (key == "home" or key == "meta <" or key == "g"
 
 
715
            #     pass            # xxx beginning-of-buffer
 
 
716
            # elif key == "ctrl e" or key == "$":
 
 
717
            #     pass            # xxx move-end-of-line
 
 
718
            # elif key == "ctrl a" or key == "^":
 
 
719
            #     pass            # xxx move-beginning-of-line
 
 
720
            # elif key == "ctrl b" or key == "meta (" or key == "h":
 
 
722
            # elif key == "ctrl f" or key == "meta )" or key == "l":
 
 
725
            #     pass            # scroll up log
 
 
727
            #     pass            # scroll down log
 
711
728
            elif self.topwidget.selectable():
 
712
729
                self.topwidget.keypress(self.size, key)
 
 
734
class UILogHandler(logging.Handler):
 
 
735
    def __init__(self, ui, *args, **kwargs):
 
 
737
        super(UILogHandler, self).__init__(*args, **kwargs)
 
 
739
            logging.Formatter("%(asctime)s: %(message)s"))
 
 
740
    def emit(self, record):
 
 
741
        msg = self.format(record)
 
 
742
        if record.levelno > logging.INFO:
 
 
744
        self.ui.add_log_line(msg)
 
716
747
ui = UserInterface()
 
719
750
except KeyboardInterrupt:
 
721
 
except Exception as e:
 
722
 
    ui.log_message(str(e))
 
 
751
    with warnings.catch_warnings():
 
 
752
        warnings.filterwarnings("ignore", "", BytesWarning)
 
 
755
    with warnings.catch_warnings():
 
 
756
        warnings.filterwarnings("ignore", "", BytesWarning)