/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: 2011-07-16 00:29:19 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110716002919-r77yikuiulj42o40
* initramfs-tools-script: Abort if plugin-runner is missing.  Removed
                          workaround for Debian bug #633582; the
                          workaround required getopt, which can not be
                          guaranteed.
* plugin-runner.c (main): Work around Debian bug #633582.
* plugins.d/mandos-client.c (main): - '' -

Show diffs side-by-side

added added

removed removed

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