/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-06 17:23:08 UTC
  • Revision ID: teddy@recompile.se-20120506172308-xw7368koksmjmnv3
* mandos (Client.start_checker): Reworded comment.
 (MandosServer.handle_ipc): Removed dead code.

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