/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2016-06-21 19:47:08 UTC
  • Revision ID: teddy@recompile.se-20160621194708-bmsd15fu32llgb4s
Fix typo in README.Debian for mandos-client package.

* debian/mandos.README.Debian: Replace "it it" with "it is", and make
  lintian warning tag "spelling-error-in-readme-debian" go away.

Show diffs side-by-side

added added

removed removed

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