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