/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2012-05-07 19:13:15 UTC
  • Revision ID: teddy@recompile.se-20120507191315-tbe55n4u1uq3l7ft
* mandos: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

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