/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 03:51:23 UTC
  • Revision ID: teddy@recompile.se-20160319035123-53w4dbzdyjef29m1
Server: New tmpfiles.d file for persistent state directory

Provide a tmpfiles.d(5) file for systemd to create persistent state
directory on so-called "volatile" systems.

* Makefile (TMPFILES): New.
  (install-server): Also install "tmpfiles.d-mandos.conf" file as
                    "/usr/lib/tmpfiles.d/mandos.conf".
* tmpfiles.d-mandos.conf: New.

Show diffs side-by-side

added added

removed removed

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