/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-08 00:03:43 UTC
  • Revision ID: teddy@recompile.se-20160308000343-kjoyixwksmboql1s
Server bug fix: Work around bug when stopping server

* init.d-mandos (do_stop): Work around SIGTERM ignoring bug by doing
  "mandos-ctl >/dev/null 2>&1" after sending signal.
* mandos.service (ExecStop): New; set to "/bin/kill -TERM $MAINPID ;
  /usr/sbin/mandos-ctl >/dev/null 2>&1" to work around SIGTERM
  ignoring bug.

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