/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-01 20:33:23 UTC
  • Revision ID: teddy@recompile.se-20120501203323-l9biqff88d41cllz
* mandos (AvahiService.rename, Client.start_checker,
          DBusObjectWithProperties.Introspect, main): Use new
          "exc_info" keyword argument to logger to log exception
          information.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
3
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
# 
6
 
# Copyright © 2009-2016 Teddy Hogeborn
7
 
# Copyright © 2009-2016 Björn Påhlsson
 
6
# Copyright © 2009-2012 Teddy Hogeborn
 
7
# Copyright © 2009-2012 Björn Påhlsson
8
8
# 
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
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
 
    from gi.repository import GObject
44
 
except ImportError:
45
 
    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.3"
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 %s' % (self.properties["Name"]))
 
176
    
 
177
    def property_changed(self, property=None, value=None):
 
178
        super(self, MandosClientWidget).property_changed(property,
 
179
                                                         value)
 
180
        if property == "ApprovalPending":
 
181
            using_timer(bool(value))
 
182
        if property == "LastCheckerStatus":
 
183
            using_timer(value != 0)
 
184
            #self.logger('Checker for client %s (command "%s")'
 
185
            #            ' was successful'
 
186
            #            % (self.properties["Name"], command))
168
187
    
169
188
    def using_timer(self, flag):
170
189
        """Call this method with True or False when timer should be
171
190
        activated or deactivated.
172
191
        """
173
 
        if flag and self._update_timer_callback_tag is None:
 
192
        old = self._update_timer_callback_lock
 
193
        if flag:
 
194
            self._update_timer_callback_lock += 1
 
195
        else:
 
196
            self._update_timer_callback_lock -= 1
 
197
        if old == 0 and self._update_timer_callback_lock:
174
198
            # Will update the shown timer value every second
175
 
            self._update_timer_callback_tag = (GObject.timeout_add
 
199
            self._update_timer_callback_tag = (gobject.timeout_add
176
200
                                               (1000,
177
201
                                                self.update_timer))
178
 
        elif not (flag or self._update_timer_callback_tag is None):
179
 
            GObject.source_remove(self._update_timer_callback_tag)
 
202
        elif old and self._update_timer_callback_lock == 0:
 
203
            gobject.source_remove(self._update_timer_callback_tag)
180
204
            self._update_timer_callback_tag = None
181
205
    
182
206
    def checker_completed(self, exitstatus, condition, command):
183
207
        if exitstatus == 0:
184
 
            self.logger('Checker for client {} (command "{}")'
185
 
                        ' succeeded'.format(self.properties["Name"],
186
 
                                            command), level=0)
187
208
            self.update()
188
209
            return
189
210
        # Checker failed
190
211
        if os.WIFEXITED(condition):
191
 
            self.logger('Checker for client {} (command "{}") failed'
192
 
                        ' with exit code {}'
193
 
                        .format(self.properties["Name"], command,
194
 
                                os.WEXITSTATUS(condition)))
 
212
            self.logger('Checker for client %s (command "%s")'
 
213
                        ' failed with exit code %s'
 
214
                        % (self.properties["Name"], command,
 
215
                           os.WEXITSTATUS(condition)))
195
216
        elif os.WIFSIGNALED(condition):
196
 
            self.logger('Checker for client {} (command "{}") was'
197
 
                        ' killed by signal {}'
198
 
                        .format(self.properties["Name"], command,
199
 
                                os.WTERMSIG(condition)))
 
217
            self.logger('Checker for client %s (command "%s")'
 
218
                        ' was killed by signal %s'
 
219
                        % (self.properties["Name"], command,
 
220
                           os.WTERMSIG(condition)))
 
221
        elif os.WCOREDUMP(condition):
 
222
            self.logger('Checker for client %s (command "%s")'
 
223
                        ' dumped core'
 
224
                        % (self.properties["Name"], command))
 
225
        else:
 
226
            self.logger('Checker for client %s completed'
 
227
                        ' mysteriously')
200
228
        self.update()
201
229
    
202
230
    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)
 
231
        """Server signals that a checker started. This could be useful
 
232
           to log in the future. """
 
233
        #self.logger('Client %s started checker "%s"'
 
234
        #            % (self.properties["Name"], unicode(command)))
 
235
        pass
207
236
    
208
237
    def got_secret(self):
209
 
        self.logger('Client {} received its secret'
210
 
                    .format(self.properties["Name"]))
 
238
        self.logger('Client %s received its secret'
 
239
                    % self.properties["Name"])
211
240
    
212
241
    def need_approval(self, timeout, default):
213
242
        if not default:
214
 
            message = 'Client {} needs approval within {} seconds'
 
243
            message = 'Client %s needs approval within %s seconds'
215
244
        else:
216
 
            message = 'Client {} will get its secret in {} seconds'
217
 
        self.logger(message.format(self.properties["Name"],
218
 
                                   timeout/1000))
 
245
            message = 'Client %s will get its secret in %s seconds'
 
246
        self.logger(message
 
247
                    % (self.properties["Name"], timeout/1000))
 
248
        self.using_timer(True)
219
249
    
220
250
    def rejected(self, reason):
221
 
        self.logger('Client {} was rejected; reason: {}'
222
 
                    .format(self.properties["Name"], reason))
 
251
        self.logger('Client %s was rejected; reason: %s'
 
252
                    % (self.properties["Name"], reason))
223
253
    
224
254
    def selectable(self):
225
255
        """Make this a "selectable" widget.
247
277
                          "bold-underline-blink":
248
278
                              "bold-underline-blink-standout",
249
279
                          }
250
 
        
 
280
 
251
281
        # Rebuild focus and non-focus widgets using current properties
252
 
        
 
282
 
253
283
        # Base part of a client. Name!
254
 
        base = '{name}: '.format(name=self.properties["Name"])
 
284
        base = ('%(name)s: '
 
285
                      % {"name": self.properties["Name"]})
255
286
        if not self.properties["Enabled"]:
256
287
            message = "DISABLED"
257
 
            self.using_timer(False)
258
288
        elif self.properties["ApprovalPending"]:
259
289
            timeout = datetime.timedelta(milliseconds
260
290
                                         = self.properties
262
292
            last_approval_request = isoformat_to_datetime(
263
293
                self.properties["LastApprovalRequest"])
264
294
            if last_approval_request is not None:
265
 
                timer = max(timeout - (datetime.datetime.utcnow()
266
 
                                       - last_approval_request),
267
 
                            datetime.timedelta())
 
295
                timer = timeout - (datetime.datetime.utcnow()
 
296
                                   - last_approval_request)
268
297
            else:
269
298
                timer = datetime.timedelta()
270
299
            if self.properties["ApprovedByDefault"]:
271
 
                message = "Approval in {}. (d)eny?"
 
300
                message = "Approval in %s. (d)eny?"
272
301
            else:
273
 
                message = "Denial in {}. (a)pprove?"
274
 
            message = message.format(str(timer).rsplit(".", 1)[0])
275
 
            self.using_timer(True)
 
302
                message = "Denial in %s. (a)pprove?"
 
303
            message = message % unicode(timer).rsplit(".", 1)[0]
276
304
        elif self.properties["LastCheckerStatus"] != 0:
277
 
            # When checker has failed, show timer until client expires
 
305
            # When checker has failed, print a timer until client expires
278
306
            expires = self.properties["Expires"]
279
307
            if expires == "":
280
308
                timer = datetime.timedelta(0)
281
309
            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())
 
310
                expires = datetime.datetime.strptime(expires,
 
311
                                                     '%Y-%m-%dT%H:%M:%S.%f')
 
312
                timer = expires - datetime.datetime.utcnow()
286
313
            message = ('A checker has failed! Time until client'
287
 
                       ' gets disabled: {}'
288
 
                       .format(str(timer).rsplit(".", 1)[0]))
289
 
            self.using_timer(True)
 
314
                       ' gets disabled: %s'
 
315
                           % unicode(timer).rsplit(".", 1)[0])
290
316
        else:
291
317
            message = "enabled"
292
 
            self.using_timer(False)
293
 
        self._text = "{}{}".format(base, message)
294
 
        
 
318
        self._text = "%s%s" % (base, message)
 
319
            
295
320
        if not urwid.supports_unicode():
296
321
            self._text = self._text.encode("ascii", "replace")
297
322
        textlist = [("normal", self._text)]
309
334
            self.update_hook()
310
335
    
311
336
    def update_timer(self):
312
 
        """called by GObject. Will indefinitely loop until
313
 
        GObject.source_remove() on tag is called"""
 
337
        """called by gobject. Will indefinitely loop until
 
338
        gobject.source_remove() on tag is called"""
314
339
        self.update()
315
340
        return True             # Keep calling this
316
341
    
317
 
    def delete(self, **kwargs):
 
342
    def delete(self, *args, **kwargs):
318
343
        if self._update_timer_callback_tag is not None:
319
 
            GObject.source_remove(self._update_timer_callback_tag)
 
344
            gobject.source_remove(self._update_timer_callback_tag)
320
345
            self._update_timer_callback_tag = None
321
346
        for match in self.match_objects:
322
347
            match.remove()
323
348
        self.match_objects = ()
324
349
        if self.delete_hook is not None:
325
350
            self.delete_hook(self)
326
 
        return super(MandosClientWidget, self).delete(**kwargs)
 
351
        return super(MandosClientWidget, self).delete(*args, **kwargs)
327
352
    
328
353
    def render(self, maxcolrow, focus=False):
329
354
        """Render differently if we have focus.
335
360
        """Handle keys.
336
361
        This overrides the method from urwid.FlowWidget"""
337
362
        if key == "+":
338
 
            self.proxy.Set(client_interface, "Enabled",
339
 
                           dbus.Boolean(True), ignore_reply = True,
340
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
363
            self.proxy.Enable(dbus_interface = client_interface,
 
364
                              ignore_reply=True)
341
365
        elif key == "-":
342
 
            self.proxy.Set(client_interface, "Enabled", False,
343
 
                           ignore_reply = True,
344
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
366
            self.proxy.Disable(dbus_interface = client_interface,
 
367
                               ignore_reply=True)
345
368
        elif key == "a":
346
369
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
347
370
                               dbus_interface = client_interface,
355
378
                                                  .object_path,
356
379
                                                  ignore_reply=True)
357
380
        elif key == "s":
358
 
            self.proxy.Set(client_interface, "CheckerRunning",
359
 
                           dbus.Boolean(True), ignore_reply = True,
360
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
381
            self.proxy.StartChecker(dbus_interface = client_interface,
 
382
                                    ignore_reply=True)
361
383
        elif key == "S":
362
 
            self.proxy.Set(client_interface, "CheckerRunning",
363
 
                           dbus.Boolean(False), ignore_reply = True,
364
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
384
            self.proxy.StopChecker(dbus_interface = client_interface,
 
385
                                   ignore_reply=True)
365
386
        elif key == "C":
366
387
            self.proxy.CheckedOK(dbus_interface = client_interface,
367
388
                                 ignore_reply=True)
375
396
        else:
376
397
            return key
377
398
    
378
 
    def properties_changed(self, interface, properties, invalidated):
379
 
        """Call self.update() if any properties changed.
 
399
    def property_changed(self, property=None, value=None,
 
400
                         *args, **kwargs):
 
401
        """Call self.update() if old value is not new value.
380
402
        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):
 
403
        property_name = unicode(property)
 
404
        old_value = self.properties.get(property_name)
 
405
        super(MandosClientWidget, self).property_changed(
 
406
            property=property, value=value, *args, **kwargs)
 
407
        if self.properties.get(property_name) != old_value:
387
408
            self.update()
388
409
 
389
410
 
392
413
    "down" key presses, thus not allowing any containing widgets to
393
414
    use them as an excuse to shift focus away from this widget.
394
415
    """
395
 
    def keypress(self, *args, **kwargs):
396
 
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
 
416
    def keypress(self, maxcolrow, key):
 
417
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
397
418
        if ret in ("up", "down"):
398
419
            return
399
420
        return ret
403
424
    """This is the entire user interface - the whole screen
404
425
    with boxes, lists of client widgets, etc.
405
426
    """
406
 
    def __init__(self, max_log_length=1000, log_level=1):
 
427
    def __init__(self, max_log_length=1000):
407
428
        DBusGMainLoop(set_as_default=True)
408
429
        
409
430
        self.screen = urwid.curses_display.Screen()
412
433
                ("normal",
413
434
                 "default", "default", None),
414
435
                ("bold",
415
 
                 "bold", "default", "bold"),
 
436
                 "default", "default", "bold"),
416
437
                ("underline-blink",
417
 
                 "underline,blink", "default", "underline,blink"),
 
438
                 "default", "default", "underline"),
418
439
                ("standout",
419
 
                 "standout", "default", "standout"),
 
440
                 "default", "default", "standout"),
420
441
                ("bold-underline-blink",
421
 
                 "bold,underline,blink", "default", "bold,underline,blink"),
 
442
                 "default", "default", ("bold", "underline")),
422
443
                ("bold-standout",
423
 
                 "bold,standout", "default", "bold,standout"),
 
444
                 "default", "default", ("bold", "standout")),
424
445
                ("underline-blink-standout",
425
 
                 "underline,blink,standout", "default",
426
 
                 "underline,blink,standout"),
 
446
                 "default", "default", ("underline", "standout")),
427
447
                ("bold-underline-blink-standout",
428
 
                 "bold,underline,blink,standout", "default",
429
 
                 "bold,underline,blink,standout"),
 
448
                 "default", "default", ("bold", "underline",
 
449
                                          "standout")),
430
450
                ))
431
451
        
432
452
        if urwid.supports_unicode():
447
467
        self.log = []
448
468
        self.max_log_length = max_log_length
449
469
        
450
 
        self.log_level = log_level
451
 
        
452
470
        # We keep a reference to the log widget so we can remove it
453
471
        # from the ListWalker without it getting destroyed
454
472
        self.logbox = ConstrainedListBox(self.log)
465
483
                              "q: Quit  ?: Help"))
466
484
        
467
485
        self.busname = domain + '.Mandos'
468
 
        self.main_loop = GObject.MainLoop()
 
486
        self.main_loop = gobject.MainLoop()
469
487
    
470
488
    def client_not_found(self, fingerprint, address):
471
 
        self.log_message("Client with address {} and fingerprint {}"
472
 
                         " could not be found"
473
 
                         .format(address, fingerprint))
 
489
        self.log_message(("Client with address %s and fingerprint %s"
 
490
                          " could not be found" % (address,
 
491
                                                    fingerprint)))
474
492
    
475
493
    def rebuild(self):
476
494
        """This rebuilds the User Interface.
488
506
            self.uilist.append(self.logbox)
489
507
        self.topwidget = urwid.Pile(self.uilist)
490
508
    
491
 
    def log_message(self, message, level=1):
492
 
        """Log message formatted with timestamp"""
493
 
        if level < self.log_level:
494
 
            return
 
509
    def log_message(self, message):
495
510
        timestamp = datetime.datetime.now().isoformat()
496
 
        self.log_message_raw("{}: {}".format(timestamp, message),
497
 
                             level=level)
 
511
        self.log_message_raw(timestamp + ": " + message)
498
512
    
499
 
    def log_message_raw(self, markup, level=1):
 
513
    def log_message_raw(self, markup):
500
514
        """Add a log message to the log buffer."""
501
 
        if level < self.log_level:
502
 
            return
503
515
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
504
516
        if (self.max_log_length
505
517
            and len(self.log) > self.max_log_length):
512
524
        """Toggle visibility of the log buffer."""
513
525
        self.log_visible = not self.log_visible
514
526
        self.rebuild()
515
 
        self.log_message("Log visibility changed to: {}"
516
 
                         .format(self.log_visible), level=0)
 
527
        #self.log_message("Log visibility changed to: "
 
528
        #                 + unicode(self.log_visible))
517
529
    
518
530
    def change_log_display(self):
519
531
        """Change type of log display.
524
536
            self.log_wrap = "clip"
525
537
        for textwidget in self.log:
526
538
            textwidget.set_wrap_mode(self.log_wrap)
527
 
        self.log_message("Wrap mode: {}".format(self.log_wrap),
528
 
                         level=0)
 
539
        #self.log_message("Wrap mode: " + self.log_wrap)
529
540
    
530
 
    def find_and_remove_client(self, path, interfaces):
 
541
    def find_and_remove_client(self, path, name):
531
542
        """Find a client by its object path and remove it.
532
543
        
533
 
        This is connected to the InterfacesRemoved signal from the
 
544
        This is connected to the ClientRemoved signal from the
534
545
        Mandos server object."""
535
 
        if client_interface not in interfaces:
536
 
            # Not a Mandos client object; ignore
537
 
            return
538
546
        try:
539
547
            client = self.clients_dict[path]
540
548
        except KeyError:
541
549
            # not found?
542
 
            self.log_message("Unknown client {!r} removed"
543
 
                             .format(path))
 
550
            self.log_message("Unknown client %r (%r) removed", name,
 
551
                             path)
544
552
            return
545
553
        client.delete()
546
554
    
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
 
555
    def add_new_client(self, path):
556
556
        client_proxy_object = self.bus.get_object(self.busname, path)
557
557
        self.add_client(MandosClientWidget(server_proxy_object
558
558
                                           =self.mandos_serv,
563
563
                                           delete_hook
564
564
                                           =self.remove_client,
565
565
                                           logger
566
 
                                           =self.log_message,
567
 
                                           properties
568
 
                                           = dict(ifs_and_props[
569
 
                                               client_interface])),
 
566
                                           =self.log_message),
570
567
                        path=path)
571
568
    
572
569
    def add_client(self, client, path=None):
574
571
        if path is None:
575
572
            path = client.proxy.object_path
576
573
        self.clients_dict[path] = client
577
 
        self.clients.sort(key=lambda c: c.properties["Name"])
 
574
        self.clients.sort(None, lambda c: c.properties["Name"])
578
575
        self.refresh()
579
576
    
580
577
    def remove_client(self, client, path=None):
582
579
        if path is None:
583
580
            path = client.proxy.object_path
584
581
        del self.clients_dict[path]
 
582
        if not self.clients_dict:
 
583
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
 
584
            # is completely emptied, we need to recreate it.
 
585
            self.clients = urwid.SimpleListWalker([])
 
586
            self.rebuild()
585
587
        self.refresh()
586
588
    
587
589
    def refresh(self):
600
602
        try:
601
603
            mandos_clients = (self.mandos_serv
602
604
                              .GetAllClientsWithProperties())
603
 
            if not mandos_clients:
604
 
                self.log_message_raw(("bold", "Note: Server has no clients."))
605
605
        except dbus.exceptions.DBusException:
606
 
            self.log_message_raw(("bold", "Note: No Mandos server running."))
607
606
            mandos_clients = dbus.Dictionary()
608
607
        
609
608
        (self.mandos_serv
610
 
         .connect_to_signal("InterfacesRemoved",
 
609
         .connect_to_signal("ClientRemoved",
611
610
                            self.find_and_remove_client,
612
 
                            dbus_interface
613
 
                            = dbus.OBJECT_MANAGER_IFACE,
 
611
                            dbus_interface=server_interface,
614
612
                            byte_arrays=True))
615
613
        (self.mandos_serv
616
 
         .connect_to_signal("InterfacesAdded",
 
614
         .connect_to_signal("ClientAdded",
617
615
                            self.add_new_client,
618
 
                            dbus_interface
619
 
                            = dbus.OBJECT_MANAGER_IFACE,
 
616
                            dbus_interface=server_interface,
620
617
                            byte_arrays=True))
621
618
        (self.mandos_serv
622
619
         .connect_to_signal("ClientNotFound",
623
620
                            self.client_not_found,
624
621
                            dbus_interface=server_interface,
625
622
                            byte_arrays=True))
626
 
        for path, client in mandos_clients.items():
 
623
        for path, client in mandos_clients.iteritems():
627
624
            client_proxy_object = self.bus.get_object(self.busname,
628
625
                                                      path)
629
626
            self.add_client(MandosClientWidget(server_proxy_object
638
635
                                               logger
639
636
                                               =self.log_message),
640
637
                            path=path)
641
 
        
 
638
 
642
639
        self.refresh()
643
 
        self._input_callback_tag = (GObject.io_add_watch
 
640
        self._input_callback_tag = (gobject.io_add_watch
644
641
                                    (sys.stdin.fileno(),
645
 
                                     GObject.IO_IN,
 
642
                                     gobject.IO_IN,
646
643
                                     self.process_input))
647
644
        self.main_loop.run()
648
645
        # Main loop has finished, we should close everything now
649
 
        GObject.source_remove(self._input_callback_tag)
 
646
        gobject.source_remove(self._input_callback_tag)
650
647
        self.screen.stop()
651
648
    
652
649
    def stop(self):
676
673
            elif key == "window resize":
677
674
                self.size = self.screen.get_cols_rows()
678
675
                self.refresh()
679
 
            elif key == "ctrl l":
680
 
                self.screen.clear()
 
676
            elif key == "\f":  # Ctrl-L
681
677
                self.refresh()
682
678
            elif key == "l" or key == "D":
683
679
                self.toggle_log_display()
695
691
                                            "?: Help",
696
692
                                            "l: Log window toggle",
697
693
                                            "TAB: Switch window",
698
 
                                            "w: Wrap (log lines)",
699
 
                                            "v: Toggle verbose log",
700
 
                                            ))))
 
694
                                            "w: Wrap (log)"))))
701
695
                self.log_message_raw(("bold",
702
696
                                      "  "
703
697
                                      .join(("Clients:",
716
710
                else:
717
711
                    self.topwidget.set_focus(self.logbox)
718
712
                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
713
            #elif (key == "end" or key == "meta >" or key == "G"
727
714
            #      or key == ">"):
728
715
            #    pass            # xxx end-of-buffer
751
738
    ui.run()
752
739
except KeyboardInterrupt:
753
740
    ui.screen.stop()
754
 
except Exception as e:
755
 
    ui.log_message(str(e))
 
741
except Exception, e:
 
742
    ui.log_message(unicode(e))
756
743
    ui.screen.stop()
757
744
    raise