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