2
2
# -*- mode: python; coding: utf-8 -*-
 
4
4
# Mandos Monitor - Control and monitor the Mandos server
 
6
 
# Copyright © 2009-2018 Teddy Hogeborn
 
7
 
# Copyright © 2009-2018 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-2011 Teddy Hogeborn
 
 
7
# Copyright © 2009-2011 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/>.
 
24
 
# Contact the authors at <mandos@recompile.se>.
 
 
20
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
22
# Contact the authors at <mandos@fukt.bsnet.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:
 
174
 
            # Will update the shown timer value every second
 
175
 
            self._update_timer_callback_tag = (GLib.timeout_add
 
 
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:
 
 
203
            self._update_timer_callback_tag = (gobject.timeout_add
 
177
205
                                                self.update_timer))
 
178
 
        elif not (flag or self._update_timer_callback_tag is None):
 
179
 
            GLib.source_remove(self._update_timer_callback_tag)
 
 
206
        elif old and self._update_timer_callback_lock == 0:
 
 
207
            gobject.source_remove(self._update_timer_callback_tag)
 
180
208
            self._update_timer_callback_tag = None
 
182
210
    def checker_completed(self, exitstatus, condition, command):
 
183
211
        if exitstatus == 0:
 
184
 
            self.logger('Checker for client {} (command "{}")'
 
185
 
                        ' succeeded'.format(self.properties["Name"],
 
 
212
            if self.last_checker_failed:
 
 
213
                self.last_checker_failed = False
 
 
214
                self.using_timer(False)
 
 
215
            #self.logger('Checker for client %s (command "%s")'
 
 
217
            #            % (self.properties["Name"], command))
 
 
221
        if not self.last_checker_failed:
 
 
222
            self.last_checker_failed = True
 
 
223
            self.using_timer(True)
 
190
224
        if os.WIFEXITED(condition):
 
191
 
            self.logger('Checker for client {} (command "{}") failed'
 
193
 
                        .format(self.properties["Name"], command,
 
194
 
                                os.WEXITSTATUS(condition)))
 
 
225
            self.logger('Checker for client %s (command "%s")'
 
 
226
                        ' failed with exit code %s'
 
 
227
                        % (self.properties["Name"], command,
 
 
228
                           os.WEXITSTATUS(condition)))
 
195
229
        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)))
 
 
230
            self.logger('Checker for client %s (command "%s")'
 
 
231
                        ' was killed by signal %s'
 
 
232
                        % (self.properties["Name"], command,
 
 
233
                           os.WTERMSIG(condition)))
 
 
234
        elif os.WCOREDUMP(condition):
 
 
235
            self.logger('Checker for client %s (command "%s")'
 
 
237
                        % (self.properties["Name"], command))
 
 
239
            self.logger('Checker for client %s completed'
 
202
243
    def checker_started(self, command):
 
203
 
        """Server signals that a checker started."""
 
204
 
        self.logger('Client {} started checker "{}"'
 
205
 
                    .format(self.properties["Name"],
 
 
244
        #self.logger('Client %s started checker "%s"'
 
 
245
        #            % (self.properties["Name"], unicode(command)))
 
208
248
    def got_secret(self):
 
209
 
        self.logger('Client {} received its secret'
 
210
 
                    .format(self.properties["Name"]))
 
 
249
        self.last_checker_failed = False
 
 
250
        self.logger('Client %s received its secret'
 
 
251
                    % self.properties["Name"])
 
212
253
    def need_approval(self, timeout, default):
 
214
 
            message = 'Client {} needs approval within {} seconds'
 
 
255
            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"],
 
 
257
            message = 'Client %s will get its secret in %s seconds'
 
 
259
                    % (self.properties["Name"], timeout/1000))
 
 
260
        self.using_timer(True)
 
220
262
    def rejected(self, reason):
 
221
 
        self.logger('Client {} was rejected; reason: {}'
 
222
 
                    .format(self.properties["Name"], reason))
 
 
263
        self.logger('Client %s was rejected; reason: %s'
 
 
264
                    % (self.properties["Name"], reason))
 
224
266
    def selectable(self):
 
225
267
        """Make this a "selectable" widget.
 
226
268
        This overrides the method from urwid.FlowWidget."""
 
229
271
    def rows(self, maxcolrow, focus=False):
 
230
272
        """How many rows this widget will occupy might depend on
 
231
273
        whether we have focus or not.
 
232
274
        This overrides the method from urwid.FlowWidget"""
 
233
275
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
 
235
277
    def current_widget(self, focus=False):
 
236
278
        if focus or self.opened:
 
237
279
            return self._focus_widget
 
238
280
        return self._widget
 
240
282
    def update(self):
 
241
283
        "Called when what is visible on the screen should be updated."
 
242
284
        # 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",
 
 
285
        with_standout = { "normal": "standout",
 
 
286
                          "bold": "bold-standout",
 
 
288
                              "underline-blink-standout",
 
 
289
                          "bold-underline-blink":
 
 
290
                              "bold-underline-blink-standout",
 
251
293
        # Rebuild focus and non-focus widgets using current properties
 
253
295
        # Base part of a client. Name!
 
254
 
        base = '{name}: '.format(name=self.properties["Name"])
 
 
297
                      % {"name": self.properties["Name"]})
 
255
298
        if not self.properties["Enabled"]:
 
256
299
            message = "DISABLED"
 
257
 
            self.using_timer(False)
 
258
300
        elif self.properties["ApprovalPending"]:
 
259
 
            timeout = datetime.timedelta(
 
260
 
                milliseconds=self.properties["ApprovalDelay"])
 
 
301
            timeout = datetime.timedelta(milliseconds
 
261
304
            last_approval_request = isoformat_to_datetime(
 
262
305
                self.properties["LastApprovalRequest"])
 
263
306
            if last_approval_request is not None:
 
264
 
                timer = max(timeout - (datetime.datetime.utcnow()
 
265
 
                                       - last_approval_request),
 
266
 
                            datetime.timedelta())
 
 
307
                timer = timeout - (datetime.datetime.utcnow()
 
 
308
                                   - last_approval_request)
 
268
310
                timer = datetime.timedelta()
 
269
311
            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())
 
 
312
                message = "Approval in %s. (d)eny?"
 
 
314
                message = "Denial in %s. (a)pprove?"
 
 
315
            message = message % unicode(timer).rsplit(".", 1)[0]
 
 
316
        elif self.last_checker_failed:
 
 
317
            timeout = datetime.timedelta(milliseconds
 
 
320
            last_ok = isoformat_to_datetime(
 
 
321
                max((self.properties["LastCheckedOK"]
 
 
322
                     or self.properties["Created"]),
 
 
323
                    self.properties["LastEnabled"]))
 
 
324
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
 
285
325
            message = ('A checker has failed! Time until client'
 
287
 
                       .format(str(timer).rsplit(".", 1)[0]))
 
288
 
            self.using_timer(True)
 
 
327
                           % unicode(timer).rsplit(".", 1)[0])
 
290
329
            message = "enabled"
 
291
 
            self.using_timer(False)
 
292
 
        self._text = "{}{}".format(base, message)
 
 
330
        self._text = "%s%s" % (base, message)
 
294
332
        if not urwid.supports_unicode():
 
295
333
            self._text = self._text.encode("ascii", "replace")
 
296
334
        textlist = [("normal", self._text)]
 
 
306
344
        # Run update hook, if any
 
307
345
        if self.update_hook is not None:
 
308
346
            self.update_hook()
 
310
348
    def update_timer(self):
 
311
 
        """called by GLib. Will indefinitely loop until
 
312
 
        GLib.source_remove() on tag is called
 
315
351
        return True             # Keep calling this
 
317
 
    def delete(self, **kwargs):
 
 
353
    def delete(self, *args, **kwargs):
 
318
354
        if self._update_timer_callback_tag is not None:
 
319
 
            GLib.source_remove(self._update_timer_callback_tag)
 
 
355
            gobject.source_remove(self._update_timer_callback_tag)
 
320
356
            self._update_timer_callback_tag = None
 
321
357
        for match in self.match_objects:
 
323
359
        self.match_objects = ()
 
324
360
        if self.delete_hook is not None:
 
325
361
            self.delete_hook(self)
 
326
 
        return super(MandosClientWidget, self).delete(**kwargs)
 
 
362
        return super(MandosClientWidget, self).delete(*args, **kwargs)
 
328
364
    def render(self, maxcolrow, focus=False):
 
329
365
        """Render differently if we have focus.
 
330
366
        This overrides the method from urwid.FlowWidget"""
 
331
367
        return self.current_widget(focus).render(maxcolrow,
 
334
370
    def keypress(self, maxcolrow, key):
 
336
372
        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)
 
 
374
            self.proxy.Enable(dbus_interface = client_interface,
 
342
 
            self.proxy.Set(client_interface, "Enabled", False,
 
344
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
 
377
            self.proxy.Disable(dbus_interface = client_interface,
 
346
380
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
 
347
 
                               dbus_interface=client_interface,
 
 
381
                               dbus_interface = client_interface,
 
348
382
                               ignore_reply=True)
 
350
384
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
 
351
 
                               dbus_interface=client_interface,
 
 
385
                                  dbus_interface = client_interface,
 
352
386
                               ignore_reply=True)
 
353
387
        elif key == "R" or key == "_" or key == "ctrl k":
 
354
388
            self.server_proxy_object.RemoveClient(self.proxy
 
356
390
                                                  ignore_reply=True)
 
358
 
            self.proxy.Set(client_interface, "CheckerRunning",
 
359
 
                           dbus.Boolean(True), ignore_reply=True,
 
360
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
 
392
            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)
 
 
395
            self.proxy.StopChecker(dbus_interface = client_interface,
 
366
 
            self.proxy.CheckedOK(dbus_interface=client_interface,
 
 
398
            self.proxy.CheckedOK(dbus_interface = client_interface,
 
367
399
                                 ignore_reply=True)
 
369
401
#         elif key == "p" or key == "=":
 
 
404
435
    """This is the entire user interface - the whole screen
 
405
436
    with boxes, lists of client widgets, etc.
 
407
 
    def __init__(self, max_log_length=1000, log_level=1):
 
 
438
    def __init__(self, max_log_length=1000):
 
408
439
        DBusGMainLoop(set_as_default=True)
 
410
441
        self.screen = urwid.curses_display.Screen()
 
412
443
        self.screen.register_palette((
 
414
445
                 "default", "default", None),
 
416
 
                 "bold", "default", "bold"),
 
 
447
                 "default", "default", "bold"),
 
417
448
                ("underline-blink",
 
418
 
                 "underline,blink", "default", "underline,blink"),
 
 
449
                 "default", "default", "underline"),
 
420
 
                 "standout", "default", "standout"),
 
 
451
                 "default", "default", "standout"),
 
421
452
                ("bold-underline-blink",
 
422
 
                 "bold,underline,blink", "default",
 
423
 
                 "bold,underline,blink"),
 
 
453
                 "default", "default", ("bold", "underline")),
 
424
454
                ("bold-standout",
 
425
 
                 "bold,standout", "default", "bold,standout"),
 
 
455
                 "default", "default", ("bold", "standout")),
 
426
456
                ("underline-blink-standout",
 
427
 
                 "underline,blink,standout", "default",
 
428
 
                 "underline,blink,standout"),
 
 
457
                 "default", "default", ("underline", "standout")),
 
429
458
                ("bold-underline-blink-standout",
 
430
 
                 "bold,underline,blink,standout", "default",
 
431
 
                 "bold,underline,blink,standout"),
 
 
459
                 "default", "default", ("bold", "underline",
 
434
463
        if urwid.supports_unicode():
 
435
 
            self.divider = "─"  # \u2500
 
 
464
            self.divider = "─" # \u2500
 
 
465
            #self.divider = "━" # \u2501
 
437
 
            self.divider = "_"  # \u005f
 
 
467
            #self.divider = "-" # \u002d
 
 
468
            self.divider = "_" # \u005f
 
439
470
        self.screen.start()
 
441
472
        self.size = self.screen.get_cols_rows()
 
443
474
        self.clients = urwid.SimpleListWalker([])
 
444
475
        self.clients_dict = {}
 
446
477
        # We will add Text widgets to this list
 
448
479
        self.max_log_length = max_log_length
 
450
 
        self.log_level = log_level
 
452
481
        # We keep a reference to the log widget so we can remove it
 
453
482
        # from the ListWalker without it getting destroyed
 
454
483
        self.logbox = ConstrainedListBox(self.log)
 
456
485
        # This keeps track of whether self.uilist currently has
 
457
486
        # self.logbox in it or not
 
458
487
        self.log_visible = True
 
459
488
        self.log_wrap = "any"
 
462
491
        self.log_message_raw(("bold",
 
463
492
                              "Mandos Monitor version " + version))
 
464
493
        self.log_message_raw(("bold",
 
465
494
                              "q: Quit  ?: Help"))
 
467
496
        self.busname = domain + '.Mandos'
 
468
 
        self.main_loop = GLib.MainLoop()
 
 
497
        self.main_loop = gobject.MainLoop()
 
 
498
        self.bus = dbus.SystemBus()
 
 
499
        mandos_dbus_objc = self.bus.get_object(
 
 
500
            self.busname, "/", follow_name_owner_changes=True)
 
 
501
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
 
505
            mandos_clients = (self.mandos_serv
 
 
506
                              .GetAllClientsWithProperties())
 
 
507
        except dbus.exceptions.DBusException:
 
 
508
            mandos_clients = dbus.Dictionary()
 
 
511
         .connect_to_signal("ClientRemoved",
 
 
512
                            self.find_and_remove_client,
 
 
513
                            dbus_interface=server_interface,
 
 
516
         .connect_to_signal("ClientAdded",
 
 
518
                            dbus_interface=server_interface,
 
 
521
         .connect_to_signal("ClientNotFound",
 
 
522
                            self.client_not_found,
 
 
523
                            dbus_interface=server_interface,
 
 
525
        for path, client in mandos_clients.iteritems():
 
 
526
            client_proxy_object = self.bus.get_object(self.busname,
 
 
528
            self.add_client(MandosClientWidget(server_proxy_object
 
 
531
                                               =client_proxy_object,
 
470
541
    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))
 
 
542
        self.log_message(("Client with address %s and fingerprint %s"
 
 
543
                          " could not be found" % (address,
 
475
546
    def rebuild(self):
 
476
547
        """This rebuilds the User Interface.
 
477
548
        Call this when the widget layout needs to change"""
 
479
 
        # self.uilist.append(urwid.ListBox(self.clients))
 
 
550
        #self.uilist.append(urwid.ListBox(self.clients))
 
480
551
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
482
 
                                       # header=urwid.Divider(),
 
 
553
                                       #header=urwid.Divider(),
 
484
 
                                       footer=urwid.Divider(
 
485
 
                                           div_char=self.divider)))
 
 
556
                                       urwid.Divider(div_char=
 
486
558
        if self.log_visible:
 
487
559
            self.uilist.append(self.logbox)
 
488
561
        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:
 
 
563
    def log_message(self, message):
 
494
564
        timestamp = datetime.datetime.now().isoformat()
 
495
 
        self.log_message_raw("{}: {}".format(timestamp, message),
 
498
 
    def log_message_raw(self, markup, level=1):
 
 
565
        self.log_message_raw(timestamp + ": " + message)
 
 
567
    def log_message_raw(self, markup):
 
499
568
        """Add a log message to the log buffer."""
 
500
 
        if level < self.log_level:
 
502
569
        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]
 
 
570
        if (self.max_log_length
 
 
571
            and len(self.log) > self.max_log_length):
 
 
572
            del self.log[0:len(self.log)-self.max_log_length-1]
 
506
573
        self.logbox.set_focus(len(self.logbox.body.contents),
 
507
574
                              coming_from="above")
 
510
577
    def toggle_log_display(self):
 
511
578
        """Toggle visibility of the log buffer."""
 
512
579
        self.log_visible = not self.log_visible
 
514
 
        self.log_message("Log visibility changed to: {}"
 
515
 
                         .format(self.log_visible), level=0)
 
 
581
        #self.log_message("Log visibility changed to: "
 
 
582
        #                 + unicode(self.log_visible))
 
517
584
    def change_log_display(self):
 
518
585
        """Change type of log display.
 
519
586
        Currently, this toggles wrapping of text lines."""
 
 
523
590
            self.log_wrap = "clip"
 
524
591
        for textwidget in self.log:
 
525
592
            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):
 
 
593
        #self.log_message("Wrap mode: " + self.log_wrap)
 
 
595
    def find_and_remove_client(self, path, name):
 
530
596
        """Find a client by its object path and remove it.
 
532
 
        This is connected to the InterfacesRemoved signal from the
 
 
598
        This is connected to the ClientRemoved signal from the
 
533
599
        Mandos server object."""
 
534
 
        if client_interface not in interfaces:
 
535
 
            # Not a Mandos client object; ignore
 
538
601
            client = self.clients_dict[path]
 
541
 
            self.log_message("Unknown client {!r} removed"
 
 
604
            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
 
 
609
    def add_new_client(self, path):
 
555
610
        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])),
 
 
611
        self.add_client(MandosClientWidget(server_proxy_object
 
 
614
                                           =client_proxy_object,
 
565
623
    def add_client(self, client, path=None):
 
566
624
        self.clients.append(client)
 
568
626
            path = client.proxy.object_path
 
569
627
        self.clients_dict[path] = client
 
570
 
        self.clients.sort(key=lambda c: c.properties["Name"])
 
 
628
        self.clients.sort(None, lambda c: c.properties["Name"])
 
573
631
    def remove_client(self, client, path=None):
 
574
632
        self.clients.remove(client)
 
576
634
            path = client.proxy.object_path
 
577
635
        del self.clients_dict[path]
 
 
636
        if not self.clients_dict:
 
 
637
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
 
 
638
            # is completely emptied, we need to recreate it.
 
 
639
            self.clients = urwid.SimpleListWalker([])
 
580
643
    def refresh(self):
 
581
644
        """Redraw the screen"""
 
582
645
        canvas = self.topwidget.render(self.size, focus=True)
 
583
646
        self.screen.draw_screen(self.size, canvas)
 
586
649
        """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
 
 
651
        self._input_callback_tag = (gobject.io_add_watch
 
632
652
                                    (sys.stdin.fileno(),
 
634
654
                                     self.process_input))
 
635
655
        self.main_loop.run()
 
636
656
        # Main loop has finished, we should close everything now
 
637
 
        GLib.source_remove(self._input_callback_tag)
 
 
657
        gobject.source_remove(self._input_callback_tag)
 
638
658
        self.screen.stop()
 
641
661
        self.main_loop.quit()
 
643
663
    def process_input(self, source, condition):
 
644
664
        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
 
 
665
        translations = { "ctrl n": "down",      # Emacs
 
 
666
                         "ctrl p": "up",        # Emacs
 
 
667
                         "ctrl v": "page down", # Emacs
 
 
668
                         "meta v": "page up",   # Emacs
 
 
669
                         " ": "page down",      # less
 
 
670
                         "f": "page down",      # less
 
 
671
                         "b": "page up",        # less
 
657
677
                key = translations[key]
 
658
678
            except KeyError:    # :-)
 
661
681
            if key == "q" or key == "Q":
 
664
684
            elif key == "window resize":
 
665
685
                self.size = self.screen.get_cols_rows()
 
667
 
            elif key == "ctrl l":
 
 
687
            elif key == "\f":  # Ctrl-L
 
670
689
            elif key == "l" or key == "D":
 
671
690
                self.toggle_log_display()