/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: teddy at recompile
  • Date: 2012-02-25 03:49:47 UTC
  • mto: (237.7.109 trunk)
  • mto: This revision was merged to the branch mainline in revision 300.
  • Revision ID: teddy@recompile.se-20120225034947-qdjgp2h92bpote0d
* mandos: Use os.devnull instead of os.path.devnull.  Fix some white
          space.
  (PGPEngine.encrypt, PGPEngine.decrypt): Bug fix: open /dev/null for
                                          writing, not reading.

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