/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-03-17 18:13:40 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110317181340-nf79nlcbilqx3ccg
* debian/control (mandos-client): Conflict with correct version of
                                  dropbear.

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-2014 Teddy Hogeborn
7
 
# Copyright © 2009-2014 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
 
try:
43
 
    import gobject
44
 
except ImportError:
45
 
    from gi.repository import GObject as gobject
 
37
import gobject
46
38
 
47
39
import dbus
48
40
 
 
41
import UserList
 
42
 
49
43
import locale
50
44
 
51
 
if sys.version_info[0] == 2:
52
 
    str = unicode
53
 
 
54
45
locale.setlocale(locale.LC_ALL, '')
55
46
 
56
47
import logging
57
48
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
58
49
 
59
50
# Some useful constants
60
 
domain = 'se.recompile'
 
51
domain = 'se.bsnet.fukt'
61
52
server_interface = domain + '.Mandos'
62
53
client_interface = domain + '.Mandos.Client'
63
 
version = "1.6.4"
 
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)
64
63
 
65
64
def isoformat_to_datetime(iso):
66
65
    "Parse an ISO 8601 date string to a datetime.datetime()"
83
82
    properties and calls a hook function when any of them are
84
83
    changed.
85
84
    """
86
 
    def __init__(self, proxy_object=None, properties=None, **kwargs):
 
85
    def __init__(self, proxy_object=None, *args, **kwargs):
87
86
        self.proxy = proxy_object # Mandos Client proxy object
88
 
        self.properties = dict() if properties is None else properties
89
 
        self.property_changed_match = (
90
 
            self.proxy.connect_to_signal("PropertyChanged",
91
 
                                         self._property_changed,
92
 
                                         client_interface,
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)
102
 
    
103
 
    def _property_changed(self, property, value):
104
 
        """Helper which takes positional arguments"""
105
 
        return self.property_changed(property=property, value=value)
 
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)
106
101
    
107
102
    def property_changed(self, property=None, value=None):
108
103
        """This is called whenever we get a PropertyChanged signal
110
105
        """
111
106
        # Update properties dict with new value
112
107
        self.properties[property] = value
113
 
    
114
 
    def delete(self):
115
 
        self.property_changed_match.remove()
116
108
 
117
109
 
118
110
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
120
112
    """
121
113
    
122
114
    def __init__(self, server_proxy_object=None, update_hook=None,
123
 
                 delete_hook=None, logger=None, **kwargs):
 
115
                 delete_hook=None, logger=None, *args, **kwargs):
124
116
        # Called on update
125
117
        self.update_hook = update_hook
126
118
        # Called on delete
131
123
        self.logger = logger
132
124
        
133
125
        self._update_timer_callback_tag = None
 
126
        self._update_timer_callback_lock = 0
 
127
        self.last_checker_failed = False
134
128
        
135
129
        # The widget shown normally
136
130
        self._text_widget = urwid.Text("")
137
131
        # The widget shown when we have focus
138
132
        self._focus_text_widget = urwid.Text("")
139
 
        super(MandosClientWidget, self).__init__(**kwargs)
 
133
        super(MandosClientWidget, self).__init__(
 
134
            update_hook=update_hook, delete_hook=delete_hook,
 
135
            *args, **kwargs)
140
136
        self.update()
141
137
        self.opened = False
142
138
        
143
 
        self.match_objects = (
144
 
            self.proxy.connect_to_signal("CheckerCompleted",
145
 
                                         self.checker_completed,
146
 
                                         client_interface,
147
 
                                         byte_arrays=True),
148
 
            self.proxy.connect_to_signal("CheckerStarted",
149
 
                                         self.checker_started,
150
 
                                         client_interface,
151
 
                                         byte_arrays=True),
152
 
            self.proxy.connect_to_signal("GotSecret",
153
 
                                         self.got_secret,
154
 
                                         client_interface,
155
 
                                         byte_arrays=True),
156
 
            self.proxy.connect_to_signal("NeedApproval",
157
 
                                         self.need_approval,
158
 
                                         client_interface,
159
 
                                         byte_arrays=True),
160
 
            self.proxy.connect_to_signal("Rejected",
161
 
                                         self.rejected,
162
 
                                         client_interface,
163
 
                                         byte_arrays=True))
164
 
        #self.logger('Created client {0}'
165
 
        #            .format(self.properties["Name"]))
 
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)
166
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
        
167
184
    def using_timer(self, flag):
168
185
        """Call this method with True or False when timer should be
169
186
        activated or deactivated.
170
187
        """
171
 
        if flag and self._update_timer_callback_tag is None:
172
 
            # Will update the shown timer value every second
 
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:
173
194
            self._update_timer_callback_tag = (gobject.timeout_add
174
195
                                               (1000,
175
196
                                                self.update_timer))
176
 
        elif not (flag or self._update_timer_callback_tag is None):
 
197
        elif old and self._update_timer_callback_lock == 0:
177
198
            gobject.source_remove(self._update_timer_callback_tag)
178
199
            self._update_timer_callback_tag = None
179
200
    
180
201
    def checker_completed(self, exitstatus, condition, command):
181
202
        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))
182
209
            self.update()
183
210
            return
184
211
        # Checker failed
 
212
        if not self.last_checker_failed:
 
213
            self.last_checker_failed = True
 
214
            self.using_timer(True)
185
215
        if os.WIFEXITED(condition):
186
 
            self.logger('Checker for client {0} (command "{1}")'
187
 
                        ' failed with exit code {2}'
188
 
                        .format(self.properties["Name"], command,
189
 
                                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)))
190
220
        elif os.WIFSIGNALED(condition):
191
 
            self.logger('Checker for client {0} (command "{1}") was'
192
 
                        ' killed by signal {2}'
193
 
                        .format(self.properties["Name"], command,
194
 
                                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)))
195
225
        elif os.WCOREDUMP(condition):
196
 
            self.logger('Checker for client {0} (command "{1}")'
 
226
            self.logger('Checker for client %s (command "%s")'
197
227
                        ' dumped core'
198
 
                        .format(self.properties["Name"], command))
 
228
                        % (self.properties["Name"], command))
199
229
        else:
200
 
            self.logger('Checker for client {0} completed'
201
 
                        ' mysteriously'
202
 
                        .format(self.properties["Name"]))
 
230
            self.logger('Checker for client %s completed'
 
231
                        ' mysteriously')
203
232
        self.update()
204
233
    
205
234
    def checker_started(self, command):
206
 
        """Server signals that a checker started. This could be useful
207
 
           to log in the future. """
208
 
        #self.logger('Client {0} started checker "{1}"'
209
 
        #            .format(self.properties["Name"],
210
 
        #                    str(command)))
 
235
        #self.logger('Client %s started checker "%s"'
 
236
        #            % (self.properties["Name"], unicode(command)))
211
237
        pass
212
238
    
213
239
    def got_secret(self):
214
 
        self.logger('Client {0} received its secret'
215
 
                    .format(self.properties["Name"]))
 
240
        self.last_checker_failed = False
 
241
        self.logger('Client %s received its secret'
 
242
                    % self.properties["Name"])
216
243
    
217
244
    def need_approval(self, timeout, default):
218
245
        if not default:
219
 
            message = 'Client {0} needs approval within {1} seconds'
 
246
            message = 'Client %s needs approval within %s seconds'
220
247
        else:
221
 
            message = 'Client {0} will get its secret in {1} seconds'
222
 
        self.logger(message.format(self.properties["Name"],
223
 
                                   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)
224
252
    
225
253
    def rejected(self, reason):
226
 
        self.logger('Client {0} was rejected; reason: {1}'
227
 
                    .format(self.properties["Name"], reason))
 
254
        self.logger('Client %s was rejected; reason: %s'
 
255
                    % (self.properties["Name"], reason))
228
256
    
229
257
    def selectable(self):
230
258
        """Make this a "selectable" widget.
252
280
                          "bold-underline-blink":
253
281
                              "bold-underline-blink-standout",
254
282
                          }
255
 
        
 
283
 
256
284
        # Rebuild focus and non-focus widgets using current properties
257
 
        
 
285
 
258
286
        # Base part of a client. Name!
259
 
        base = '{name}: '.format(name=self.properties["Name"])
 
287
        base = ('%(name)s: '
 
288
                      % {"name": self.properties["Name"]})
260
289
        if not self.properties["Enabled"]:
261
290
            message = "DISABLED"
262
 
            self.using_timer(False)
263
291
        elif self.properties["ApprovalPending"]:
264
292
            timeout = datetime.timedelta(milliseconds
265
293
                                         = self.properties
267
295
            last_approval_request = isoformat_to_datetime(
268
296
                self.properties["LastApprovalRequest"])
269
297
            if last_approval_request is not None:
270
 
                timer = max(timeout - (datetime.datetime.utcnow()
271
 
                                       - last_approval_request),
272
 
                            datetime.timedelta())
 
298
                timer = timeout - (datetime.datetime.utcnow()
 
299
                                   - last_approval_request)
273
300
            else:
274
301
                timer = datetime.timedelta()
275
302
            if self.properties["ApprovedByDefault"]:
276
 
                message = "Approval in {0}. (d)eny?"
277
 
            else:
278
 
                message = "Denial in {0}. (a)pprove?"
279
 
            message = message.format(str(timer).rsplit(".", 1)[0])
280
 
            self.using_timer(True)
281
 
        elif self.properties["LastCheckerStatus"] != 0:
282
 
            # When checker has failed, show timer until client expires
283
 
            expires = self.properties["Expires"]
284
 
            if expires == "":
285
 
                timer = datetime.timedelta(0)
286
 
            else:
287
 
                expires = (datetime.datetime.strptime
288
 
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
289
 
                timer = max(expires - datetime.datetime.utcnow(),
290
 
                            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)
291
316
            message = ('A checker has failed! Time until client'
292
 
                       ' gets disabled: {0}'
293
 
                       .format(str(timer).rsplit(".", 1)[0]))
294
 
            self.using_timer(True)
 
317
                       ' gets disabled: %s'
 
318
                           % unicode(timer).rsplit(".", 1)[0])
295
319
        else:
296
320
            message = "enabled"
297
 
            self.using_timer(False)
298
 
        self._text = "{0}{1}".format(base, message)
299
 
        
 
321
        self._text = "%s%s" % (base, message)
 
322
            
300
323
        if not urwid.supports_unicode():
301
324
            self._text = self._text.encode("ascii", "replace")
302
325
        textlist = [("normal", self._text)]
314
337
            self.update_hook()
315
338
    
316
339
    def update_timer(self):
317
 
        """called by gobject. Will indefinitely loop until
318
 
        gobject.source_remove() on tag is called"""
 
340
        "called by gobject"
319
341
        self.update()
320
342
        return True             # Keep calling this
321
343
    
322
 
    def delete(self, **kwargs):
 
344
    def delete(self):
323
345
        if self._update_timer_callback_tag is not None:
324
346
            gobject.source_remove(self._update_timer_callback_tag)
325
347
            self._update_timer_callback_tag = None
326
 
        for match in self.match_objects:
327
 
            match.remove()
328
 
        self.match_objects = ()
329
348
        if self.delete_hook is not None:
330
349
            self.delete_hook(self)
331
 
        return super(MandosClientWidget, self).delete(**kwargs)
332
350
    
333
351
    def render(self, maxcolrow, focus=False):
334
352
        """Render differently if we have focus.
340
358
        """Handle keys.
341
359
        This overrides the method from urwid.FlowWidget"""
342
360
        if key == "+":
343
 
            self.proxy.Enable(dbus_interface = client_interface,
344
 
                              ignore_reply=True)
 
361
            self.proxy.Enable(dbus_interface = client_interface)
345
362
        elif key == "-":
346
 
            self.proxy.Disable(dbus_interface = client_interface,
347
 
                               ignore_reply=True)
 
363
            self.proxy.Disable(dbus_interface = client_interface)
348
364
        elif key == "a":
349
365
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
350
 
                               dbus_interface = client_interface,
351
 
                               ignore_reply=True)
 
366
                               dbus_interface = client_interface)
352
367
        elif key == "d":
353
368
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
354
 
                                  dbus_interface = client_interface,
355
 
                               ignore_reply=True)
 
369
                                  dbus_interface = client_interface)
356
370
        elif key == "R" or key == "_" or key == "ctrl k":
357
371
            self.server_proxy_object.RemoveClient(self.proxy
358
 
                                                  .object_path,
359
 
                                                  ignore_reply=True)
 
372
                                                  .object_path)
360
373
        elif key == "s":
361
 
            self.proxy.StartChecker(dbus_interface = client_interface,
362
 
                                    ignore_reply=True)
 
374
            self.proxy.StartChecker(dbus_interface = client_interface)
363
375
        elif key == "S":
364
 
            self.proxy.StopChecker(dbus_interface = client_interface,
365
 
                                   ignore_reply=True)
 
376
            self.proxy.StopChecker(dbus_interface = client_interface)
366
377
        elif key == "C":
367
 
            self.proxy.CheckedOK(dbus_interface = client_interface,
368
 
                                 ignore_reply=True)
 
378
            self.proxy.CheckedOK(dbus_interface = client_interface)
369
379
        # xxx
370
380
#         elif key == "p" or key == "=":
371
381
#             self.proxy.pause()
376
386
        else:
377
387
            return key
378
388
    
379
 
    def property_changed(self, property=None, **kwargs):
 
389
    def property_changed(self, property=None, value=None,
 
390
                         *args, **kwargs):
380
391
        """Call self.update() if old value is not new value.
381
392
        This overrides the method from MandosClientPropertyCache"""
382
 
        property_name = str(property)
 
393
        property_name = unicode(property)
383
394
        old_value = self.properties.get(property_name)
384
395
        super(MandosClientWidget, self).property_changed(
385
 
            property=property, **kwargs)
 
396
            property=property, value=value, *args, **kwargs)
386
397
        if self.properties.get(property_name) != old_value:
387
398
            self.update()
388
399
 
392
403
    "down" key presses, thus not allowing any containing widgets to
393
404
    use them as an excuse to shift focus away from this widget.
394
405
    """
395
 
    def keypress(self, *args, **kwargs):
396
 
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
 
406
    def keypress(self, maxcolrow, key):
 
407
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
397
408
        if ret in ("up", "down"):
398
409
            return
399
410
        return ret
412
423
                ("normal",
413
424
                 "default", "default", None),
414
425
                ("bold",
415
 
                 "bold", "default", "bold"),
 
426
                 "default", "default", "bold"),
416
427
                ("underline-blink",
417
 
                 "underline,blink", "default", "underline,blink"),
 
428
                 "default", "default", "underline"),
418
429
                ("standout",
419
 
                 "standout", "default", "standout"),
 
430
                 "default", "default", "standout"),
420
431
                ("bold-underline-blink",
421
 
                 "bold,underline,blink", "default", "bold,underline,blink"),
 
432
                 "default", "default", ("bold", "underline")),
422
433
                ("bold-standout",
423
 
                 "bold,standout", "default", "bold,standout"),
 
434
                 "default", "default", ("bold", "standout")),
424
435
                ("underline-blink-standout",
425
 
                 "underline,blink,standout", "default",
426
 
                 "underline,blink,standout"),
 
436
                 "default", "default", ("underline", "standout")),
427
437
                ("bold-underline-blink-standout",
428
 
                 "bold,underline,blink,standout", "default",
429
 
                 "bold,underline,blink,standout"),
 
438
                 "default", "default", ("bold", "underline",
 
439
                                          "standout")),
430
440
                ))
431
441
        
432
442
        if urwid.supports_unicode():
464
474
        
465
475
        self.busname = domain + '.Mandos'
466
476
        self.main_loop = gobject.MainLoop()
 
477
        self.bus = dbus.SystemBus()
 
478
        mandos_dbus_objc = self.bus.get_object(
 
479
            self.busname, "/", follow_name_owner_changes=True)
 
480
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
481
                                          dbus_interface
 
482
                                          = server_interface)
 
483
        try:
 
484
            mandos_clients = (self.mandos_serv
 
485
                              .GetAllClientsWithProperties())
 
486
        except dbus.exceptions.DBusException:
 
487
            mandos_clients = dbus.Dictionary()
 
488
        
 
489
        (self.mandos_serv
 
490
         .connect_to_signal("ClientRemoved",
 
491
                            self.find_and_remove_client,
 
492
                            dbus_interface=server_interface,
 
493
                            byte_arrays=True))
 
494
        (self.mandos_serv
 
495
         .connect_to_signal("ClientAdded",
 
496
                            self.add_new_client,
 
497
                            dbus_interface=server_interface,
 
498
                            byte_arrays=True))
 
499
        (self.mandos_serv
 
500
         .connect_to_signal("ClientNotFound",
 
501
                            self.client_not_found,
 
502
                            dbus_interface=server_interface,
 
503
                            byte_arrays=True))
 
504
        for path, client in mandos_clients.iteritems():
 
505
            client_proxy_object = self.bus.get_object(self.busname,
 
506
                                                      path)
 
507
            self.add_client(MandosClientWidget(server_proxy_object
 
508
                                               =self.mandos_serv,
 
509
                                               proxy_object
 
510
                                               =client_proxy_object,
 
511
                                               properties=client,
 
512
                                               update_hook
 
513
                                               =self.refresh,
 
514
                                               delete_hook
 
515
                                               =self.remove_client,
 
516
                                               logger
 
517
                                               =self.log_message),
 
518
                            path=path)
467
519
    
468
520
    def client_not_found(self, fingerprint, address):
469
 
        self.log_message("Client with address {0} and fingerprint"
470
 
                         " {1} could not be found"
471
 
                         .format(address, fingerprint))
 
521
        self.log_message(("Client with address %s and fingerprint %s"
 
522
                          " could not be found" % (address,
 
523
                                                    fingerprint)))
472
524
    
473
525
    def rebuild(self):
474
526
        """This rebuilds the User Interface.
484
536
                                                     self.divider)))
485
537
        if self.log_visible:
486
538
            self.uilist.append(self.logbox)
 
539
            pass
487
540
        self.topwidget = urwid.Pile(self.uilist)
488
541
    
489
542
    def log_message(self, message):
490
 
        """Log message formatted with timestamp"""
491
543
        timestamp = datetime.datetime.now().isoformat()
492
544
        self.log_message_raw(timestamp + ": " + message)
493
545
    
506
558
        self.log_visible = not self.log_visible
507
559
        self.rebuild()
508
560
        #self.log_message("Log visibility changed to: "
509
 
        #                 + str(self.log_visible))
 
561
        #                 + unicode(self.log_visible))
510
562
    
511
563
    def change_log_display(self):
512
564
        """Change type of log display.
520
572
        #self.log_message("Wrap mode: " + self.log_wrap)
521
573
    
522
574
    def find_and_remove_client(self, path, name):
523
 
        """Find a client by its object path and remove it.
 
575
        """Find an client from its object path and remove it.
524
576
        
525
577
        This is connected to the ClientRemoved signal from the
526
578
        Mandos server object."""
528
580
            client = self.clients_dict[path]
529
581
        except KeyError:
530
582
            # not found?
531
 
            self.log_message("Unknown client {0!r} ({1!r}) removed"
532
 
                             .format(name, path))
533
583
            return
534
 
        client.delete()
 
584
        self.remove_client(client, path)
535
585
    
536
586
    def add_new_client(self, path):
537
587
        client_proxy_object = self.bus.get_object(self.busname, path)
552
602
        if path is None:
553
603
            path = client.proxy.object_path
554
604
        self.clients_dict[path] = client
555
 
        self.clients.sort(key=lambda c: c.properties["Name"])
 
605
        self.clients.sort(None, lambda c: c.properties["Name"])
556
606
        self.refresh()
557
607
    
558
608
    def remove_client(self, client, path=None):
560
610
        if path is None:
561
611
            path = client.proxy.object_path
562
612
        del self.clients_dict[path]
 
613
        if not self.clients_dict:
 
614
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
 
615
            # is completely emptied, we need to recreate it.
 
616
            self.clients = urwid.SimpleListWalker([])
 
617
            self.rebuild()
563
618
        self.refresh()
564
619
    
565
620
    def refresh(self):
569
624
    
570
625
    def run(self):
571
626
        """Start the main loop and exit when it's done."""
572
 
        self.bus = dbus.SystemBus()
573
 
        mandos_dbus_objc = self.bus.get_object(
574
 
            self.busname, "/", follow_name_owner_changes=True)
575
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
576
 
                                          dbus_interface
577
 
                                          = server_interface)
578
 
        try:
579
 
            mandos_clients = (self.mandos_serv
580
 
                              .GetAllClientsWithProperties())
581
 
            if not mandos_clients:
582
 
                self.log_message_raw(("bold", "Note: Server has no clients."))
583
 
        except dbus.exceptions.DBusException:
584
 
            self.log_message_raw(("bold", "Note: No Mandos server running."))
585
 
            mandos_clients = dbus.Dictionary()
586
 
        
587
 
        (self.mandos_serv
588
 
         .connect_to_signal("ClientRemoved",
589
 
                            self.find_and_remove_client,
590
 
                            dbus_interface=server_interface,
591
 
                            byte_arrays=True))
592
 
        (self.mandos_serv
593
 
         .connect_to_signal("ClientAdded",
594
 
                            self.add_new_client,
595
 
                            dbus_interface=server_interface,
596
 
                            byte_arrays=True))
597
 
        (self.mandos_serv
598
 
         .connect_to_signal("ClientNotFound",
599
 
                            self.client_not_found,
600
 
                            dbus_interface=server_interface,
601
 
                            byte_arrays=True))
602
 
        for path, client in mandos_clients.items():
603
 
            client_proxy_object = self.bus.get_object(self.busname,
604
 
                                                      path)
605
 
            self.add_client(MandosClientWidget(server_proxy_object
606
 
                                               =self.mandos_serv,
607
 
                                               proxy_object
608
 
                                               =client_proxy_object,
609
 
                                               properties=client,
610
 
                                               update_hook
611
 
                                               =self.refresh,
612
 
                                               delete_hook
613
 
                                               =self.remove_client,
614
 
                                               logger
615
 
                                               =self.log_message),
616
 
                            path=path)
617
 
        
618
627
        self.refresh()
619
628
        self._input_callback_tag = (gobject.io_add_watch
620
629
                                    (sys.stdin.fileno(),
717
726
    ui.run()
718
727
except KeyboardInterrupt:
719
728
    ui.screen.stop()
720
 
except Exception as e:
721
 
    ui.log_message(str(e))
 
729
except Exception, e:
 
730
    ui.log_message(unicode(e))
722
731
    ui.screen.stop()
723
732
    raise