/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

* mandos-ctl (main): Use D-Bus properties instead of methods.

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