/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-monitor

* mandos: White space and other misc. format fixes only.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
3
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
# 
6
 
# Copyright © 2009-2016 Teddy Hogeborn
7
 
# Copyright © 2009-2016 Björn Påhlsson
 
6
# Copyright © 2009-2012 Teddy Hogeborn
 
7
# Copyright © 2009-2012 Björn Påhlsson
8
8
# 
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
25
25
 
26
26
from __future__ import (division, absolute_import, print_function,
27
27
                        unicode_literals)
28
 
try:
29
 
    from future_builtins import *
30
 
except ImportError:
31
 
    pass
32
28
 
33
29
import sys
34
30
import os
 
31
import signal
35
32
 
36
33
import datetime
37
34
 
39
36
import urwid
40
37
 
41
38
from dbus.mainloop.glib import DBusGMainLoop
42
 
from gi.repository import GLib
 
39
import gobject
43
40
 
44
41
import dbus
45
42
 
 
43
import UserList
 
44
 
46
45
import locale
47
46
 
48
 
if sys.version_info.major == 2:
49
 
    str = unicode
50
 
 
51
47
locale.setlocale(locale.LC_ALL, '')
52
48
 
53
49
import logging
57
53
domain = 'se.recompile'
58
54
server_interface = domain + '.Mandos'
59
55
client_interface = domain + '.Mandos.Client'
60
 
version = "1.7.10"
61
 
 
62
 
try:
63
 
    dbus.OBJECT_MANAGER_IFACE
64
 
except AttributeError:
65
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
56
version = "1.5.3"
 
57
 
 
58
# Always run in monochrome mode
 
59
urwid.curses_display.curses.has_colors = lambda : False
 
60
 
 
61
# Urwid doesn't support blinking, but we want it.  Since we have no
 
62
# use for underline on its own, we make underline also always blink.
 
63
urwid.curses_display.curses.A_UNDERLINE |= (
 
64
    urwid.curses_display.curses.A_BLINK)
66
65
 
67
66
def isoformat_to_datetime(iso):
68
67
    "Parse an ISO 8601 date string to a datetime.datetime()"
85
84
    properties and calls a hook function when any of them are
86
85
    changed.
87
86
    """
88
 
    def __init__(self, proxy_object=None, properties=None, **kwargs):
 
87
    def __init__(self, proxy_object=None, *args, **kwargs):
89
88
        self.proxy = proxy_object # Mandos Client proxy object
90
 
        self.properties = dict() if properties is None else properties
 
89
        
 
90
        self.properties = dict()
91
91
        self.property_changed_match = (
92
 
            self.proxy.connect_to_signal("PropertiesChanged",
93
 
                                         self.properties_changed,
94
 
                                         dbus.PROPERTIES_IFACE,
 
92
            self.proxy.connect_to_signal("PropertyChanged",
 
93
                                         self.property_changed,
 
94
                                         client_interface,
95
95
                                         byte_arrays=True))
96
96
        
97
 
        if properties is None:
98
 
            self.properties.update(
99
 
                self.proxy.GetAll(client_interface,
100
 
                                  dbus_interface
101
 
                                  = dbus.PROPERTIES_IFACE))
102
 
        
103
 
        super(MandosClientPropertyCache, self).__init__(**kwargs)
 
97
        self.properties.update(
 
98
            self.proxy.GetAll(client_interface,
 
99
                              dbus_interface = dbus.PROPERTIES_IFACE))
 
100
 
 
101
        #XXX This breaks good super behaviour
 
102
#        super(MandosClientPropertyCache, self).__init__(
 
103
#            *args, **kwargs)
104
104
    
105
 
    def properties_changed(self, interface, properties, invalidated):
106
 
        """This is called whenever we get a PropertiesChanged signal
107
 
        It updates the changed properties in the "properties" dict.
 
105
    def property_changed(self, property=None, value=None):
 
106
        """This is called whenever we get a PropertyChanged signal
 
107
        It updates the changed property in the "properties" dict.
108
108
        """
109
109
        # Update properties dict with new value
110
 
        if interface == client_interface:
111
 
            self.properties.update(properties)
 
110
        self.properties[property] = value
112
111
    
113
 
    def delete(self):
 
112
    def delete(self, *args, **kwargs):
114
113
        self.property_changed_match.remove()
 
114
        super(MandosClientPropertyCache, self).__init__(
 
115
            *args, **kwargs)
115
116
 
116
117
 
117
118
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
119
120
    """
120
121
    
121
122
    def __init__(self, server_proxy_object=None, update_hook=None,
122
 
                 delete_hook=None, logger=None, **kwargs):
 
123
                 delete_hook=None, logger=None, *args, **kwargs):
123
124
        # Called on update
124
125
        self.update_hook = update_hook
125
126
        # Called on delete
130
131
        self.logger = logger
131
132
        
132
133
        self._update_timer_callback_tag = None
 
134
        self._update_timer_callback_lock = 0
133
135
        
134
136
        # The widget shown normally
135
137
        self._text_widget = urwid.Text("")
136
138
        # The widget shown when we have focus
137
139
        self._focus_text_widget = urwid.Text("")
138
 
        super(MandosClientWidget, self).__init__(**kwargs)
 
140
        super(MandosClientWidget, self).__init__(
 
141
            update_hook=update_hook, delete_hook=delete_hook,
 
142
            *args, **kwargs)
139
143
        self.update()
140
144
        self.opened = False
141
145
        
 
146
        last_checked_ok = isoformat_to_datetime(self.properties
 
147
                                                ["LastCheckedOK"])
 
148
        
 
149
        if self.properties ["LastCheckerStatus"] != 0:
 
150
            self.using_timer(True)
 
151
        
 
152
        if self.need_approval:
 
153
            self.using_timer(True)
 
154
        
142
155
        self.match_objects = (
143
156
            self.proxy.connect_to_signal("CheckerCompleted",
144
157
                                         self.checker_completed,
160
173
                                         self.rejected,
161
174
                                         client_interface,
162
175
                                         byte_arrays=True))
163
 
        self.logger('Created client {}'
164
 
                    .format(self.properties["Name"]), level=0)
 
176
        #self.logger('Created client {0}'
 
177
        #            .format(self.properties["Name"]))
 
178
    
 
179
    def property_changed(self, property=None, value=None):
 
180
        super(self, MandosClientWidget).property_changed(property,
 
181
                                                         value)
 
182
        if property == "ApprovalPending":
 
183
            using_timer(bool(value))
 
184
        if property == "LastCheckerStatus":
 
185
            using_timer(value != 0)
 
186
            #self.logger('Checker for client {0} (command "{1}") was '
 
187
            #            ' successful'.format(self.properties["Name"],
 
188
            #                                 command))
165
189
    
166
190
    def using_timer(self, flag):
167
191
        """Call this method with True or False when timer should be
168
192
        activated or deactivated.
169
193
        """
170
 
        if flag and self._update_timer_callback_tag is None:
 
194
        old = self._update_timer_callback_lock
 
195
        if flag:
 
196
            self._update_timer_callback_lock += 1
 
197
        else:
 
198
            self._update_timer_callback_lock -= 1
 
199
        if old == 0 and self._update_timer_callback_lock:
171
200
            # Will update the shown timer value every second
172
 
            self._update_timer_callback_tag = (GLib.timeout_add
 
201
            self._update_timer_callback_tag = (gobject.timeout_add
173
202
                                               (1000,
174
203
                                                self.update_timer))
175
 
        elif not (flag or self._update_timer_callback_tag is None):
176
 
            GLib.source_remove(self._update_timer_callback_tag)
 
204
        elif old and self._update_timer_callback_lock == 0:
 
205
            gobject.source_remove(self._update_timer_callback_tag)
177
206
            self._update_timer_callback_tag = None
178
207
    
179
208
    def checker_completed(self, exitstatus, condition, command):
180
209
        if exitstatus == 0:
181
 
            self.logger('Checker for client {} (command "{}")'
182
 
                        ' succeeded'.format(self.properties["Name"],
183
 
                                            command), level=0)
184
210
            self.update()
185
211
            return
186
212
        # Checker failed
187
213
        if os.WIFEXITED(condition):
188
 
            self.logger('Checker for client {} (command "{}") failed'
189
 
                        ' with exit code {}'
 
214
            self.logger('Checker for client {0} (command "{1}")'
 
215
                        ' failed with exit code {2}'
190
216
                        .format(self.properties["Name"], command,
191
217
                                os.WEXITSTATUS(condition)))
192
218
        elif os.WIFSIGNALED(condition):
193
 
            self.logger('Checker for client {} (command "{}") was'
194
 
                        ' killed by signal {}'
 
219
            self.logger('Checker for client {0} (command "{1}") was'
 
220
                        ' killed by signal {2}'
195
221
                        .format(self.properties["Name"], command,
196
222
                                os.WTERMSIG(condition)))
 
223
        elif os.WCOREDUMP(condition):
 
224
            self.logger('Checker for client {0} (command "{1}")'
 
225
                        ' dumped core'
 
226
                        .format(self.properties["Name"], command))
 
227
        else:
 
228
            self.logger('Checker for client {0} completed'
 
229
                        ' mysteriously'
 
230
                        .format(self.properties["Name"]))
197
231
        self.update()
198
232
    
199
233
    def checker_started(self, command):
200
 
        """Server signals that a checker started."""
201
 
        self.logger('Client {} started checker "{}"'
202
 
                    .format(self.properties["Name"],
203
 
                            command), level=0)
 
234
        """Server signals that a checker started. This could be useful
 
235
           to log in the future. """
 
236
        #self.logger('Client {0} started checker "{1}"'
 
237
        #            .format(self.properties["Name"],
 
238
        #                    unicode(command)))
 
239
        pass
204
240
    
205
241
    def got_secret(self):
206
 
        self.logger('Client {} received its secret'
 
242
        self.logger('Client {0} received its secret'
207
243
                    .format(self.properties["Name"]))
208
244
    
209
245
    def need_approval(self, timeout, default):
210
246
        if not default:
211
 
            message = 'Client {} needs approval within {} seconds'
 
247
            message = 'Client {0} needs approval within {1} seconds'
212
248
        else:
213
 
            message = 'Client {} will get its secret in {} seconds'
 
249
            message = 'Client {0} will get its secret in {1} seconds'
214
250
        self.logger(message.format(self.properties["Name"],
215
251
                                   timeout/1000))
 
252
        self.using_timer(True)
216
253
    
217
254
    def rejected(self, reason):
218
 
        self.logger('Client {} was rejected; reason: {}'
 
255
        self.logger('Client {0} was rejected; reason: {1}'
219
256
                    .format(self.properties["Name"], reason))
220
257
    
221
258
    def selectable(self):
244
281
                          "bold-underline-blink":
245
282
                              "bold-underline-blink-standout",
246
283
                          }
247
 
        
 
284
 
248
285
        # Rebuild focus and non-focus widgets using current properties
249
 
        
 
286
 
250
287
        # Base part of a client. Name!
251
288
        base = '{name}: '.format(name=self.properties["Name"])
252
289
        if not self.properties["Enabled"]:
253
290
            message = "DISABLED"
254
 
            self.using_timer(False)
255
291
        elif self.properties["ApprovalPending"]:
256
292
            timeout = datetime.timedelta(milliseconds
257
293
                                         = self.properties
259
295
            last_approval_request = isoformat_to_datetime(
260
296
                self.properties["LastApprovalRequest"])
261
297
            if last_approval_request is not None:
262
 
                timer = max(timeout - (datetime.datetime.utcnow()
263
 
                                       - last_approval_request),
264
 
                            datetime.timedelta())
 
298
                timer = timeout - (datetime.datetime.utcnow()
 
299
                                   - last_approval_request)
265
300
            else:
266
301
                timer = datetime.timedelta()
267
302
            if self.properties["ApprovedByDefault"]:
268
 
                message = "Approval in {}. (d)eny?"
 
303
                message = "Approval in {0}. (d)eny?"
269
304
            else:
270
 
                message = "Denial in {}. (a)pprove?"
271
 
            message = message.format(str(timer).rsplit(".", 1)[0])
272
 
            self.using_timer(True)
 
305
                message = "Denial in {0}. (a)pprove?"
 
306
            message = message.format(unicode(timer).rsplit(".", 1)[0])
273
307
        elif self.properties["LastCheckerStatus"] != 0:
274
308
            # When checker has failed, show timer until client expires
275
309
            expires = self.properties["Expires"]
278
312
            else:
279
313
                expires = (datetime.datetime.strptime
280
314
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
281
 
                timer = max(expires - datetime.datetime.utcnow(),
282
 
                            datetime.timedelta())
 
315
                timer = expires - datetime.datetime.utcnow()
283
316
            message = ('A checker has failed! Time until client'
284
 
                       ' gets disabled: {}'
285
 
                       .format(str(timer).rsplit(".", 1)[0]))
286
 
            self.using_timer(True)
 
317
                       ' gets disabled: {0}'
 
318
                       .format(unicode(timer).rsplit(".", 1)[0]))
287
319
        else:
288
320
            message = "enabled"
289
 
            self.using_timer(False)
290
 
        self._text = "{}{}".format(base, message)
291
 
        
 
321
        self._text = "{0}{1}".format(base, message)
 
322
            
292
323
        if not urwid.supports_unicode():
293
324
            self._text = self._text.encode("ascii", "replace")
294
325
        textlist = [("normal", self._text)]
306
337
            self.update_hook()
307
338
    
308
339
    def update_timer(self):
309
 
        """called by GLib. Will indefinitely loop until
310
 
        GLib.source_remove() on tag is called
311
 
        """
 
340
        """called by gobject. Will indefinitely loop until
 
341
        gobject.source_remove() on tag is called"""
312
342
        self.update()
313
343
        return True             # Keep calling this
314
344
    
315
 
    def delete(self, **kwargs):
 
345
    def delete(self, *args, **kwargs):
316
346
        if self._update_timer_callback_tag is not None:
317
 
            GLib.source_remove(self._update_timer_callback_tag)
 
347
            gobject.source_remove(self._update_timer_callback_tag)
318
348
            self._update_timer_callback_tag = None
319
349
        for match in self.match_objects:
320
350
            match.remove()
321
351
        self.match_objects = ()
322
352
        if self.delete_hook is not None:
323
353
            self.delete_hook(self)
324
 
        return super(MandosClientWidget, self).delete(**kwargs)
 
354
        return super(MandosClientWidget, self).delete(*args, **kwargs)
325
355
    
326
356
    def render(self, maxcolrow, focus=False):
327
357
        """Render differently if we have focus.
333
363
        """Handle keys.
334
364
        This overrides the method from urwid.FlowWidget"""
335
365
        if key == "+":
336
 
            self.proxy.Set(client_interface, "Enabled",
337
 
                           dbus.Boolean(True), ignore_reply = True,
338
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
366
            self.proxy.Enable(dbus_interface = client_interface,
 
367
                              ignore_reply=True)
339
368
        elif key == "-":
340
 
            self.proxy.Set(client_interface, "Enabled", False,
341
 
                           ignore_reply = True,
342
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
369
            self.proxy.Disable(dbus_interface = client_interface,
 
370
                               ignore_reply=True)
343
371
        elif key == "a":
344
372
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
345
373
                               dbus_interface = client_interface,
353
381
                                                  .object_path,
354
382
                                                  ignore_reply=True)
355
383
        elif key == "s":
356
 
            self.proxy.Set(client_interface, "CheckerRunning",
357
 
                           dbus.Boolean(True), ignore_reply = True,
358
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
384
            self.proxy.StartChecker(dbus_interface = client_interface,
 
385
                                    ignore_reply=True)
359
386
        elif key == "S":
360
 
            self.proxy.Set(client_interface, "CheckerRunning",
361
 
                           dbus.Boolean(False), ignore_reply = True,
362
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
387
            self.proxy.StopChecker(dbus_interface = client_interface,
 
388
                                   ignore_reply=True)
363
389
        elif key == "C":
364
390
            self.proxy.CheckedOK(dbus_interface = client_interface,
365
391
                                 ignore_reply=True)
373
399
        else:
374
400
            return key
375
401
    
376
 
    def properties_changed(self, interface, properties, invalidated):
377
 
        """Call self.update() if any properties changed.
 
402
    def property_changed(self, property=None, value=None,
 
403
                         *args, **kwargs):
 
404
        """Call self.update() if old value is not new value.
378
405
        This overrides the method from MandosClientPropertyCache"""
379
 
        old_values = { key: self.properties.get(key)
380
 
                       for key in properties.keys() }
381
 
        super(MandosClientWidget, self).properties_changed(
382
 
            interface, properties, invalidated)
383
 
        if any(old_values[key] != self.properties.get(key)
384
 
               for key in old_values):
 
406
        property_name = unicode(property)
 
407
        old_value = self.properties.get(property_name)
 
408
        super(MandosClientWidget, self).property_changed(
 
409
            property=property, value=value, *args, **kwargs)
 
410
        if self.properties.get(property_name) != old_value:
385
411
            self.update()
386
412
 
387
413
 
390
416
    "down" key presses, thus not allowing any containing widgets to
391
417
    use them as an excuse to shift focus away from this widget.
392
418
    """
393
 
    def keypress(self, *args, **kwargs):
394
 
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
 
419
    def keypress(self, maxcolrow, key):
 
420
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
395
421
        if ret in ("up", "down"):
396
422
            return
397
423
        return ret
401
427
    """This is the entire user interface - the whole screen
402
428
    with boxes, lists of client widgets, etc.
403
429
    """
404
 
    def __init__(self, max_log_length=1000, log_level=1):
 
430
    def __init__(self, max_log_length=1000):
405
431
        DBusGMainLoop(set_as_default=True)
406
432
        
407
433
        self.screen = urwid.curses_display.Screen()
410
436
                ("normal",
411
437
                 "default", "default", None),
412
438
                ("bold",
413
 
                 "bold", "default", "bold"),
 
439
                 "default", "default", "bold"),
414
440
                ("underline-blink",
415
 
                 "underline,blink", "default", "underline,blink"),
 
441
                 "default", "default", "underline"),
416
442
                ("standout",
417
 
                 "standout", "default", "standout"),
 
443
                 "default", "default", "standout"),
418
444
                ("bold-underline-blink",
419
 
                 "bold,underline,blink", "default", "bold,underline,blink"),
 
445
                 "default", "default", ("bold", "underline")),
420
446
                ("bold-standout",
421
 
                 "bold,standout", "default", "bold,standout"),
 
447
                 "default", "default", ("bold", "standout")),
422
448
                ("underline-blink-standout",
423
 
                 "underline,blink,standout", "default",
424
 
                 "underline,blink,standout"),
 
449
                 "default", "default", ("underline", "standout")),
425
450
                ("bold-underline-blink-standout",
426
 
                 "bold,underline,blink,standout", "default",
427
 
                 "bold,underline,blink,standout"),
 
451
                 "default", "default", ("bold", "underline",
 
452
                                          "standout")),
428
453
                ))
429
454
        
430
455
        if urwid.supports_unicode():
445
470
        self.log = []
446
471
        self.max_log_length = max_log_length
447
472
        
448
 
        self.log_level = log_level
449
 
        
450
473
        # We keep a reference to the log widget so we can remove it
451
474
        # from the ListWalker without it getting destroyed
452
475
        self.logbox = ConstrainedListBox(self.log)
463
486
                              "q: Quit  ?: Help"))
464
487
        
465
488
        self.busname = domain + '.Mandos'
466
 
        self.main_loop = GLib.MainLoop()
 
489
        self.main_loop = gobject.MainLoop()
467
490
    
468
491
    def client_not_found(self, fingerprint, address):
469
 
        self.log_message("Client with address {} and fingerprint {}"
470
 
                         " could not be found"
 
492
        self.log_message("Client with address {0} and fingerprint"
 
493
                         " {1} could not be found"
471
494
                         .format(address, fingerprint))
472
495
    
473
496
    def rebuild(self):
486
509
            self.uilist.append(self.logbox)
487
510
        self.topwidget = urwid.Pile(self.uilist)
488
511
    
489
 
    def log_message(self, message, level=1):
490
 
        """Log message formatted with timestamp"""
491
 
        if level < self.log_level:
492
 
            return
 
512
    def log_message(self, message):
493
513
        timestamp = datetime.datetime.now().isoformat()
494
 
        self.log_message_raw("{}: {}".format(timestamp, message),
495
 
                             level=level)
 
514
        self.log_message_raw(timestamp + ": " + message)
496
515
    
497
 
    def log_message_raw(self, markup, level=1):
 
516
    def log_message_raw(self, markup):
498
517
        """Add a log message to the log buffer."""
499
 
        if level < self.log_level:
500
 
            return
501
518
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
502
519
        if (self.max_log_length
503
520
            and len(self.log) > self.max_log_length):
510
527
        """Toggle visibility of the log buffer."""
511
528
        self.log_visible = not self.log_visible
512
529
        self.rebuild()
513
 
        self.log_message("Log visibility changed to: {}"
514
 
                         .format(self.log_visible), level=0)
 
530
        #self.log_message("Log visibility changed to: "
 
531
        #                 + unicode(self.log_visible))
515
532
    
516
533
    def change_log_display(self):
517
534
        """Change type of log display.
522
539
            self.log_wrap = "clip"
523
540
        for textwidget in self.log:
524
541
            textwidget.set_wrap_mode(self.log_wrap)
525
 
        self.log_message("Wrap mode: {}".format(self.log_wrap),
526
 
                         level=0)
 
542
        #self.log_message("Wrap mode: " + self.log_wrap)
527
543
    
528
 
    def find_and_remove_client(self, path, interfaces):
 
544
    def find_and_remove_client(self, path, name):
529
545
        """Find a client by its object path and remove it.
530
546
        
531
 
        This is connected to the InterfacesRemoved signal from the
 
547
        This is connected to the ClientRemoved signal from the
532
548
        Mandos server object."""
533
 
        if client_interface not in interfaces:
534
 
            # Not a Mandos client object; ignore
535
 
            return
536
549
        try:
537
550
            client = self.clients_dict[path]
538
551
        except KeyError:
539
552
            # not found?
540
 
            self.log_message("Unknown client {!r} removed"
541
 
                             .format(path))
 
553
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
554
                             .format(name, path))
542
555
            return
543
556
        client.delete()
544
557
    
545
 
    def add_new_client(self, path, ifs_and_props):
546
 
        """Find a client by its object path and remove it.
547
 
        
548
 
        This is connected to the InterfacesAdded signal from the
549
 
        Mandos server object.
550
 
        """
551
 
        if client_interface not in ifs_and_props:
552
 
            # Not a Mandos client object; ignore
553
 
            return
 
558
    def add_new_client(self, path):
554
559
        client_proxy_object = self.bus.get_object(self.busname, path)
555
560
        self.add_client(MandosClientWidget(server_proxy_object
556
561
                                           =self.mandos_serv,
561
566
                                           delete_hook
562
567
                                           =self.remove_client,
563
568
                                           logger
564
 
                                           =self.log_message,
565
 
                                           properties
566
 
                                           = dict(ifs_and_props[
567
 
                                               client_interface])),
 
569
                                           =self.log_message),
568
570
                        path=path)
569
571
    
570
572
    def add_client(self, client, path=None):
572
574
        if path is None:
573
575
            path = client.proxy.object_path
574
576
        self.clients_dict[path] = client
575
 
        self.clients.sort(key=lambda c: c.properties["Name"])
 
577
        self.clients.sort(None, lambda c: c.properties["Name"])
576
578
        self.refresh()
577
579
    
578
580
    def remove_client(self, client, path=None):
580
582
        if path is None:
581
583
            path = client.proxy.object_path
582
584
        del self.clients_dict[path]
 
585
        if not self.clients_dict:
 
586
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
 
587
            # is completely emptied, we need to recreate it.
 
588
            self.clients = urwid.SimpleListWalker([])
 
589
            self.rebuild()
583
590
        self.refresh()
584
591
    
585
592
    def refresh(self):
598
605
        try:
599
606
            mandos_clients = (self.mandos_serv
600
607
                              .GetAllClientsWithProperties())
601
 
            if not mandos_clients:
602
 
                self.log_message_raw(("bold", "Note: Server has no clients."))
603
608
        except dbus.exceptions.DBusException:
604
 
            self.log_message_raw(("bold", "Note: No Mandos server running."))
605
609
            mandos_clients = dbus.Dictionary()
606
610
        
607
611
        (self.mandos_serv
608
 
         .connect_to_signal("InterfacesRemoved",
 
612
         .connect_to_signal("ClientRemoved",
609
613
                            self.find_and_remove_client,
610
 
                            dbus_interface
611
 
                            = dbus.OBJECT_MANAGER_IFACE,
 
614
                            dbus_interface=server_interface,
612
615
                            byte_arrays=True))
613
616
        (self.mandos_serv
614
 
         .connect_to_signal("InterfacesAdded",
 
617
         .connect_to_signal("ClientAdded",
615
618
                            self.add_new_client,
616
 
                            dbus_interface
617
 
                            = dbus.OBJECT_MANAGER_IFACE,
 
619
                            dbus_interface=server_interface,
618
620
                            byte_arrays=True))
619
621
        (self.mandos_serv
620
622
         .connect_to_signal("ClientNotFound",
621
623
                            self.client_not_found,
622
624
                            dbus_interface=server_interface,
623
625
                            byte_arrays=True))
624
 
        for path, client in mandos_clients.items():
 
626
        for path, client in mandos_clients.iteritems():
625
627
            client_proxy_object = self.bus.get_object(self.busname,
626
628
                                                      path)
627
629
            self.add_client(MandosClientWidget(server_proxy_object
636
638
                                               logger
637
639
                                               =self.log_message),
638
640
                            path=path)
639
 
        
 
641
 
640
642
        self.refresh()
641
 
        self._input_callback_tag = (GLib.io_add_watch
 
643
        self._input_callback_tag = (gobject.io_add_watch
642
644
                                    (sys.stdin.fileno(),
643
 
                                     GLib.IO_IN,
 
645
                                     gobject.IO_IN,
644
646
                                     self.process_input))
645
647
        self.main_loop.run()
646
648
        # Main loop has finished, we should close everything now
647
 
        GLib.source_remove(self._input_callback_tag)
 
649
        gobject.source_remove(self._input_callback_tag)
648
650
        self.screen.stop()
649
651
    
650
652
    def stop(self):
674
676
            elif key == "window resize":
675
677
                self.size = self.screen.get_cols_rows()
676
678
                self.refresh()
677
 
            elif key == "ctrl l":
678
 
                self.screen.clear()
 
679
            elif key == "\f":  # Ctrl-L
679
680
                self.refresh()
680
681
            elif key == "l" or key == "D":
681
682
                self.toggle_log_display()
693
694
                                            "?: Help",
694
695
                                            "l: Log window toggle",
695
696
                                            "TAB: Switch window",
696
 
                                            "w: Wrap (log lines)",
697
 
                                            "v: Toggle verbose log",
698
 
                                            ))))
 
697
                                            "w: Wrap (log)"))))
699
698
                self.log_message_raw(("bold",
700
699
                                      "  "
701
700
                                      .join(("Clients:",
714
713
                else:
715
714
                    self.topwidget.set_focus(self.logbox)
716
715
                self.refresh()
717
 
            elif key == "v":
718
 
                if self.log_level == 0:
719
 
                    self.log_level = 1
720
 
                    self.log_message("Verbose mode: Off")
721
 
                else:
722
 
                    self.log_level = 0
723
 
                    self.log_message("Verbose mode: On")
724
716
            #elif (key == "end" or key == "meta >" or key == "G"
725
717
            #      or key == ">"):
726
718
            #    pass            # xxx end-of-buffer
749
741
    ui.run()
750
742
except KeyboardInterrupt:
751
743
    ui.screen.stop()
752
 
except Exception as e:
753
 
    ui.log_message(str(e))
 
744
except Exception, e:
 
745
    ui.log_message(unicode(e))
754
746
    ui.screen.stop()
755
747
    raise