/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-03 19:06:02 UTC
  • Revision ID: teddy@recompile.se-20120503190602-uqghef5rbpqdvybx
* mandos-monitor: Use new string format method.

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