/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: 2016-02-28 12:33:38 UTC
  • Revision ID: teddy@recompile.se-20160228123338-l1v2745d89r4xofe
Also accept python-gi as alternative to python-gobject

* debian/control (Source: mandos/Build-Depends-Indep): Change
                     "python-gobject" to "python-gobject | python-gi".
  (Package: mandos/Depends): - '' -

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