/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: 2015-08-10 07:34:37 UTC
  • Revision ID: teddy@recompile.se-20150810073437-3m8jgt13nqric6vf
Revert change to D-Bus API.

The D-Bus API signal CheckerCompleted is documented to provide a
wait(2) status value.  Since the server switched to using subprocess
to run checkers, it no longer has access to a wait(2) status value.  A
previous change to work around this made the D-Bus API incompatible.
Revert this change by constructing a fake wait(2) status value; this
keeps the D-Bus API stable.

* DBUS-API (CheckerCompleted): Revert incompatible change.
* mandos (ClientDBus.checker_callback): Construct fake wait(2) status.
* mandos-monitor (MandosClientWidget.checker_completed): Revert to
                                                         using
                                                         original API
                                                         with wait(2)
                                                         condition
                                                         value.

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