/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.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)
 
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
 
        self.last_checker_failed = False
135
133
        
136
134
        # The widget shown normally
137
135
        self._text_widget = urwid.Text("")
138
136
        # The widget shown when we have focus
139
137
        self._focus_text_widget = urwid.Text("")
140
 
        super(MandosClientWidget, self).__init__(
141
 
            update_hook=update_hook, delete_hook=delete_hook,
142
 
            *args, **kwargs)
 
138
        super(MandosClientWidget, self).__init__(**kwargs)
143
139
        self.update()
144
140
        self.opened = False
145
141
        
146
 
        last_checked_ok = isoformat_to_datetime(self.properties
147
 
                                                ["LastCheckedOK"])
148
 
        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
142
        self.match_objects = (
165
143
            self.proxy.connect_to_signal("CheckerCompleted",
166
144
                                         self.checker_completed,
182
160
                                         self.rejected,
183
161
                                         client_interface,
184
162
                                         byte_arrays=True))
185
 
        #self.logger('Created client %s' % (self.properties["Name"]))
 
163
        self.logger('Created client {}'
 
164
                    .format(self.properties["Name"]), level=0)
186
165
    
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
166
    def using_timer(self, flag):
194
167
        """Call this method with True or False when timer should be
195
168
        activated or deactivated.
196
169
        """
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:
 
170
        if flag and self._update_timer_callback_tag is None:
203
171
            # Will update the shown timer value every second
204
 
            self._update_timer_callback_tag = (gobject.timeout_add
 
172
            self._update_timer_callback_tag = (GLib.timeout_add
205
173
                                               (1000,
206
174
                                                self.update_timer))
207
 
        elif old and self._update_timer_callback_lock == 0:
208
 
            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)
209
177
            self._update_timer_callback_tag = None
210
178
    
211
179
    def checker_completed(self, exitstatus, condition, command):
212
180
        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))
 
181
            self.logger('Checker for client {} (command "{}")'
 
182
                        ' succeeded'.format(self.properties["Name"],
 
183
                                            command), level=0)
219
184
            self.update()
220
185
            return
221
186
        # Checker failed
222
 
        if not self.last_checker_failed:
223
 
            self.last_checker_failed = True
224
 
            self.using_timer(True)
225
187
        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)))
 
188
            self.logger('Checker for client {} (command "{}") failed'
 
189
                        ' with exit code {}'
 
190
                        .format(self.properties["Name"], command,
 
191
                                os.WEXITSTATUS(condition)))
230
192
        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')
 
193
            self.logger('Checker for client {} (command "{}") was'
 
194
                        ' killed by signal {}'
 
195
                        .format(self.properties["Name"], command,
 
196
                                os.WTERMSIG(condition)))
242
197
        self.update()
243
198
    
244
199
    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
 
200
        """Server signals that a checker started."""
 
201
        self.logger('Client {} started checker "{}"'
 
202
                    .format(self.properties["Name"],
 
203
                            command), level=0)
250
204
    
251
205
    def got_secret(self):
252
 
        self.last_checker_failed = False
253
 
        self.logger('Client %s received its secret'
254
 
                    % self.properties["Name"])
 
206
        self.logger('Client {} received its secret'
 
207
                    .format(self.properties["Name"]))
255
208
    
256
209
    def need_approval(self, timeout, default):
257
210
        if not default:
258
 
            message = 'Client %s needs approval within %s seconds'
 
211
            message = 'Client {} needs approval within {} seconds'
259
212
        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)
 
213
            message = 'Client {} will get its secret in {} seconds'
 
214
        self.logger(message.format(self.properties["Name"],
 
215
                                   timeout/1000))
264
216
    
265
217
    def rejected(self, reason):
266
 
        self.logger('Client %s was rejected; reason: %s'
267
 
                    % (self.properties["Name"], reason))
 
218
        self.logger('Client {} was rejected; reason: {}'
 
219
                    .format(self.properties["Name"], reason))
268
220
    
269
221
    def selectable(self):
270
222
        """Make this a "selectable" widget.
292
244
                          "bold-underline-blink":
293
245
                              "bold-underline-blink-standout",
294
246
                          }
295
 
 
 
247
        
296
248
        # Rebuild focus and non-focus widgets using current properties
297
 
 
 
249
        
298
250
        # Base part of a client. Name!
299
 
        base = ('%(name)s: '
300
 
                      % {"name": self.properties["Name"]})
 
251
        base = '{name}: '.format(name=self.properties["Name"])
301
252
        if not self.properties["Enabled"]:
302
253
            message = "DISABLED"
 
254
            self.using_timer(False)
303
255
        elif self.properties["ApprovalPending"]:
304
256
            timeout = datetime.timedelta(milliseconds
305
257
                                         = self.properties
307
259
            last_approval_request = isoformat_to_datetime(
308
260
                self.properties["LastApprovalRequest"])
309
261
            if last_approval_request is not None:
310
 
                timer = timeout - (datetime.datetime.utcnow()
311
 
                                   - last_approval_request)
 
262
                timer = max(timeout - (datetime.datetime.utcnow()
 
263
                                       - last_approval_request),
 
264
                            datetime.timedelta())
312
265
            else:
313
266
                timer = datetime.timedelta()
314
267
            if self.properties["ApprovedByDefault"]:
315
 
                message = "Approval in %s. (d)eny?"
 
268
                message = "Approval in {}. (d)eny?"
316
269
            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
 
270
                message = "Denial in {}. (a)pprove?"
 
271
            message = message.format(str(timer).rsplit(".", 1)[0])
 
272
            self.using_timer(True)
 
273
        elif self.properties["LastCheckerStatus"] != 0:
 
274
            # When checker has failed, show timer until client expires
321
275
            expires = self.properties["Expires"]
322
276
            if expires == "":
323
277
                timer = datetime.timedelta(0)
324
278
            else:
325
 
                expires = datetime.datetime.strptime(expires,
326
 
                                                     '%Y-%m-%dT%H:%M:%S.%f')
327
 
                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())
328
283
            message = ('A checker has failed! Time until client'
329
 
                       ' gets disabled: %s'
330
 
                           % unicode(timer).rsplit(".", 1)[0])
 
284
                       ' gets disabled: {}'
 
285
                       .format(str(timer).rsplit(".", 1)[0]))
 
286
            self.using_timer(True)
331
287
        else:
332
288
            message = "enabled"
333
 
        self._text = "%s%s" % (base, message)
334
 
            
 
289
            self.using_timer(False)
 
290
        self._text = "{}{}".format(base, message)
 
291
        
335
292
        if not urwid.supports_unicode():
336
293
            self._text = self._text.encode("ascii", "replace")
337
294
        textlist = [("normal", self._text)]
349
306
            self.update_hook()
350
307
    
351
308
    def update_timer(self):
352
 
        """called by gobject. Will indefinitely loop until
353
 
        gobject.source_remove() on tag is called"""
 
309
        """called by GLib. Will indefinitely loop until
 
310
        GLib.source_remove() on tag is called
 
311
        """
354
312
        self.update()
355
313
        return True             # Keep calling this
356
314
    
357
 
    def delete(self, *args, **kwargs):
 
315
    def delete(self, **kwargs):
358
316
        if self._update_timer_callback_tag is not None:
359
 
            gobject.source_remove(self._update_timer_callback_tag)
 
317
            GLib.source_remove(self._update_timer_callback_tag)
360
318
            self._update_timer_callback_tag = None
361
319
        for match in self.match_objects:
362
320
            match.remove()
363
321
        self.match_objects = ()
364
322
        if self.delete_hook is not None:
365
323
            self.delete_hook(self)
366
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
 
324
        return super(MandosClientWidget, self).delete(**kwargs)
367
325
    
368
326
    def render(self, maxcolrow, focus=False):
369
327
        """Render differently if we have focus.
375
333
        """Handle keys.
376
334
        This overrides the method from urwid.FlowWidget"""
377
335
        if key == "+":
378
 
            self.proxy.Enable(dbus_interface = client_interface,
379
 
                              ignore_reply=True)
 
336
            self.proxy.Set(client_interface, "Enabled",
 
337
                           dbus.Boolean(True), ignore_reply = True,
 
338
                           dbus_interface = dbus.PROPERTIES_IFACE)
380
339
        elif key == "-":
381
 
            self.proxy.Disable(dbus_interface = client_interface,
382
 
                               ignore_reply=True)
 
340
            self.proxy.Set(client_interface, "Enabled", False,
 
341
                           ignore_reply = True,
 
342
                           dbus_interface = dbus.PROPERTIES_IFACE)
383
343
        elif key == "a":
384
344
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
385
345
                               dbus_interface = client_interface,
393
353
                                                  .object_path,
394
354
                                                  ignore_reply=True)
395
355
        elif key == "s":
396
 
            self.proxy.StartChecker(dbus_interface = client_interface,
397
 
                                    ignore_reply=True)
 
356
            self.proxy.Set(client_interface, "CheckerRunning",
 
357
                           dbus.Boolean(True), ignore_reply = True,
 
358
                           dbus_interface = dbus.PROPERTIES_IFACE)
398
359
        elif key == "S":
399
 
            self.proxy.StopChecker(dbus_interface = client_interface,
400
 
                                   ignore_reply=True)
 
360
            self.proxy.Set(client_interface, "CheckerRunning",
 
361
                           dbus.Boolean(False), ignore_reply = True,
 
362
                           dbus_interface = dbus.PROPERTIES_IFACE)
401
363
        elif key == "C":
402
364
            self.proxy.CheckedOK(dbus_interface = client_interface,
403
365
                                 ignore_reply=True)
411
373
        else:
412
374
            return key
413
375
    
414
 
    def property_changed(self, property=None, value=None,
415
 
                         *args, **kwargs):
416
 
        """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.
417
378
        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:
 
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):
423
385
            self.update()
424
386
 
425
387
 
428
390
    "down" key presses, thus not allowing any containing widgets to
429
391
    use them as an excuse to shift focus away from this widget.
430
392
    """
431
 
    def keypress(self, maxcolrow, key):
432
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
393
    def keypress(self, *args, **kwargs):
 
394
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
433
395
        if ret in ("up", "down"):
434
396
            return
435
397
        return ret
439
401
    """This is the entire user interface - the whole screen
440
402
    with boxes, lists of client widgets, etc.
441
403
    """
442
 
    def __init__(self, max_log_length=1000):
 
404
    def __init__(self, max_log_length=1000, log_level=1):
443
405
        DBusGMainLoop(set_as_default=True)
444
406
        
445
407
        self.screen = urwid.curses_display.Screen()
448
410
                ("normal",
449
411
                 "default", "default", None),
450
412
                ("bold",
451
 
                 "default", "default", "bold"),
 
413
                 "bold", "default", "bold"),
452
414
                ("underline-blink",
453
 
                 "default", "default", "underline"),
 
415
                 "underline,blink", "default", "underline,blink"),
454
416
                ("standout",
455
 
                 "default", "default", "standout"),
 
417
                 "standout", "default", "standout"),
456
418
                ("bold-underline-blink",
457
 
                 "default", "default", ("bold", "underline")),
 
419
                 "bold,underline,blink", "default", "bold,underline,blink"),
458
420
                ("bold-standout",
459
 
                 "default", "default", ("bold", "standout")),
 
421
                 "bold,standout", "default", "bold,standout"),
460
422
                ("underline-blink-standout",
461
 
                 "default", "default", ("underline", "standout")),
 
423
                 "underline,blink,standout", "default",
 
424
                 "underline,blink,standout"),
462
425
                ("bold-underline-blink-standout",
463
 
                 "default", "default", ("bold", "underline",
464
 
                                          "standout")),
 
426
                 "bold,underline,blink,standout", "default",
 
427
                 "bold,underline,blink,standout"),
465
428
                ))
466
429
        
467
430
        if urwid.supports_unicode():
482
445
        self.log = []
483
446
        self.max_log_length = max_log_length
484
447
        
 
448
        self.log_level = log_level
 
449
        
485
450
        # We keep a reference to the log widget so we can remove it
486
451
        # from the ListWalker without it getting destroyed
487
452
        self.logbox = ConstrainedListBox(self.log)
498
463
                              "q: Quit  ?: Help"))
499
464
        
500
465
        self.busname = domain + '.Mandos'
501
 
        self.main_loop = gobject.MainLoop()
 
466
        self.main_loop = GLib.MainLoop()
502
467
    
503
468
    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)))
 
469
        self.log_message("Client with address {} and fingerprint {}"
 
470
                         " could not be found"
 
471
                         .format(address, fingerprint))
507
472
    
508
473
    def rebuild(self):
509
474
        """This rebuilds the User Interface.
521
486
            self.uilist.append(self.logbox)
522
487
        self.topwidget = urwid.Pile(self.uilist)
523
488
    
524
 
    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
525
493
        timestamp = datetime.datetime.now().isoformat()
526
 
        self.log_message_raw(timestamp + ": " + message)
 
494
        self.log_message_raw("{}: {}".format(timestamp, message),
 
495
                             level=level)
527
496
    
528
 
    def log_message_raw(self, markup):
 
497
    def log_message_raw(self, markup, level=1):
529
498
        """Add a log message to the log buffer."""
 
499
        if level < self.log_level:
 
500
            return
530
501
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
531
502
        if (self.max_log_length
532
503
            and len(self.log) > self.max_log_length):
539
510
        """Toggle visibility of the log buffer."""
540
511
        self.log_visible = not self.log_visible
541
512
        self.rebuild()
542
 
        #self.log_message("Log visibility changed to: "
543
 
        #                 + unicode(self.log_visible))
 
513
        self.log_message("Log visibility changed to: {}"
 
514
                         .format(self.log_visible), level=0)
544
515
    
545
516
    def change_log_display(self):
546
517
        """Change type of log display.
551
522
            self.log_wrap = "clip"
552
523
        for textwidget in self.log:
553
524
            textwidget.set_wrap_mode(self.log_wrap)
554
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
525
        self.log_message("Wrap mode: {}".format(self.log_wrap),
 
526
                         level=0)
555
527
    
556
 
    def find_and_remove_client(self, path, name):
 
528
    def find_and_remove_client(self, path, interfaces):
557
529
        """Find a client by its object path and remove it.
558
530
        
559
 
        This is connected to the ClientRemoved signal from the
 
531
        This is connected to the InterfacesRemoved signal from the
560
532
        Mandos server object."""
 
533
        if client_interface not in interfaces:
 
534
            # Not a Mandos client object; ignore
 
535
            return
561
536
        try:
562
537
            client = self.clients_dict[path]
563
538
        except KeyError:
564
539
            # not found?
565
 
            self.log_message("Unknown client %r (%r) removed", name,
566
 
                             path)
 
540
            self.log_message("Unknown client {!r} removed"
 
541
                             .format(path))
567
542
            return
568
543
        client.delete()
569
544
    
570
 
    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
571
554
        client_proxy_object = self.bus.get_object(self.busname, path)
572
555
        self.add_client(MandosClientWidget(server_proxy_object
573
556
                                           =self.mandos_serv,
578
561
                                           delete_hook
579
562
                                           =self.remove_client,
580
563
                                           logger
581
 
                                           =self.log_message),
 
564
                                           =self.log_message,
 
565
                                           properties
 
566
                                           = dict(ifs_and_props[
 
567
                                               client_interface])),
582
568
                        path=path)
583
569
    
584
570
    def add_client(self, client, path=None):
586
572
        if path is None:
587
573
            path = client.proxy.object_path
588
574
        self.clients_dict[path] = client
589
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
575
        self.clients.sort(key=lambda c: c.properties["Name"])
590
576
        self.refresh()
591
577
    
592
578
    def remove_client(self, client, path=None):
594
580
        if path is None:
595
581
            path = client.proxy.object_path
596
582
        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
583
        self.refresh()
603
584
    
604
585
    def refresh(self):
617
598
        try:
618
599
            mandos_clients = (self.mandos_serv
619
600
                              .GetAllClientsWithProperties())
 
601
            if not mandos_clients:
 
602
                self.log_message_raw(("bold", "Note: Server has no clients."))
620
603
        except dbus.exceptions.DBusException:
 
604
            self.log_message_raw(("bold", "Note: No Mandos server running."))
621
605
            mandos_clients = dbus.Dictionary()
622
606
        
623
607
        (self.mandos_serv
624
 
         .connect_to_signal("ClientRemoved",
 
608
         .connect_to_signal("InterfacesRemoved",
625
609
                            self.find_and_remove_client,
626
 
                            dbus_interface=server_interface,
 
610
                            dbus_interface
 
611
                            = dbus.OBJECT_MANAGER_IFACE,
627
612
                            byte_arrays=True))
628
613
        (self.mandos_serv
629
 
         .connect_to_signal("ClientAdded",
 
614
         .connect_to_signal("InterfacesAdded",
630
615
                            self.add_new_client,
631
 
                            dbus_interface=server_interface,
 
616
                            dbus_interface
 
617
                            = dbus.OBJECT_MANAGER_IFACE,
632
618
                            byte_arrays=True))
633
619
        (self.mandos_serv
634
620
         .connect_to_signal("ClientNotFound",
635
621
                            self.client_not_found,
636
622
                            dbus_interface=server_interface,
637
623
                            byte_arrays=True))
638
 
        for path, client in mandos_clients.iteritems():
 
624
        for path, client in mandos_clients.items():
639
625
            client_proxy_object = self.bus.get_object(self.busname,
640
626
                                                      path)
641
627
            self.add_client(MandosClientWidget(server_proxy_object
650
636
                                               logger
651
637
                                               =self.log_message),
652
638
                            path=path)
653
 
 
 
639
        
654
640
        self.refresh()
655
 
        self._input_callback_tag = (gobject.io_add_watch
 
641
        self._input_callback_tag = (GLib.io_add_watch
656
642
                                    (sys.stdin.fileno(),
657
 
                                     gobject.IO_IN,
 
643
                                     GLib.IO_IN,
658
644
                                     self.process_input))
659
645
        self.main_loop.run()
660
646
        # Main loop has finished, we should close everything now
661
 
        gobject.source_remove(self._input_callback_tag)
 
647
        GLib.source_remove(self._input_callback_tag)
662
648
        self.screen.stop()
663
649
    
664
650
    def stop(self):
688
674
            elif key == "window resize":
689
675
                self.size = self.screen.get_cols_rows()
690
676
                self.refresh()
691
 
            elif key == "\f":  # Ctrl-L
 
677
            elif key == "ctrl l":
 
678
                self.screen.clear()
692
679
                self.refresh()
693
680
            elif key == "l" or key == "D":
694
681
                self.toggle_log_display()
706
693
                                            "?: Help",
707
694
                                            "l: Log window toggle",
708
695
                                            "TAB: Switch window",
709
 
                                            "w: Wrap (log)"))))
 
696
                                            "w: Wrap (log lines)",
 
697
                                            "v: Toggle verbose log",
 
698
                                            ))))
710
699
                self.log_message_raw(("bold",
711
700
                                      "  "
712
701
                                      .join(("Clients:",
725
714
                else:
726
715
                    self.topwidget.set_focus(self.logbox)
727
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")
728
724
            #elif (key == "end" or key == "meta >" or key == "G"
729
725
            #      or key == ">"):
730
726
            #    pass            # xxx end-of-buffer
753
749
    ui.run()
754
750
except KeyboardInterrupt:
755
751
    ui.screen.stop()
756
 
except Exception, e:
757
 
    ui.log_message(unicode(e))
 
752
except Exception as e:
 
753
    ui.log_message(str(e))
758
754
    ui.screen.stop()
759
755
    raise