/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-27 17:58:27 UTC
  • mto: (237.4.29 release)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: teddy@fukt.bsnet.se-20110727175827-nrd1ysjl4jrh6qw1
Tags: version-1.3.1-1
* Makefile (version): Changed to "1.3.1".
* NEWS (Version 1.3.1): New entry.
* debian/changelog (1.3.1-1): - '' -

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