/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-19 12:10:15 UTC
  • Revision ID: teddy@recompile.se-20160319121015-ywrw6qx3srtj2dix
Server: Debian package bug fix: Include /usr/lib/tmpfiles.d dir

The Debian package for the server needs the /usr/lib/tmpfiles.d
directory in its .dirs file in order for the directory to exist when
the Makefile "install-server" rule is run, otherwise the
tmpfiles.d-mandos.conf file will not be installed.

* debian/mandos.dirs (usr/lib/tmpfiles.d): Added.

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