/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-03-17 21:14:12 UTC
  • Revision ID: teddy@recompile.se-20160317211412-yp8msw4v4ifx4i4x
Client: Remove dead code in plugin-runner

WCOREDUMP is always a subset of WTERMSIG; ignore WCOREDUMP.

* plugin-runner.c (main): Remove WCOREDUMP clause.

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