/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: 2011-12-31 23:00:36 UTC
  • Revision ID: teddy@recompile.se-20111231230036-dokyri4qljllv7ro
* mandos: Break some long lines.
  (ClientDBus.Timeout_dbus_property): If changed, only reschedule
                                      timeout if enabled.

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