/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-monitor

* mandos-monitor: New prototype version of interactive server
                  administraton tool using D-Bus.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
 
4
 
# Mandos Monitor - Control and monitor the Mandos server
5
 
6
 
# Copyright © 2009-2012 Teddy Hogeborn
7
 
# Copyright © 2009-2012 Björn Påhlsson
8
 
9
 
# This program is free software: you can redistribute it and/or modify
10
 
# it under the terms of the GNU General Public License as published by
11
 
# the Free Software Foundation, either version 3 of the License, or
12
 
# (at your option) any later version.
13
 
#
14
 
#     This program is distributed in the hope that it will be useful,
15
 
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
16
 
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
 
#     GNU General Public License for more details.
18
 
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/>.
22
 
23
 
# Contact the authors at <mandos@recompile.se>.
24
 
25
 
 
26
 
from __future__ import (division, absolute_import, print_function,
27
 
                        unicode_literals)
28
 
 
29
 
from future_builtins import *
 
3
 
 
4
from __future__ import division, absolute_import, with_statement
30
5
 
31
6
import sys
32
 
import os
33
7
import signal
34
8
 
35
 
import datetime
36
 
 
37
9
import urwid.curses_display
38
10
import urwid
39
11
 
44
16
 
45
17
import UserList
46
18
 
47
 
import locale
48
 
 
49
 
locale.setlocale(locale.LC_ALL, '')
50
 
 
51
 
import logging
52
 
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
53
 
 
54
19
# Some useful constants
55
 
domain = 'se.recompile'
 
20
domain = 'se.bsnet.fukt'
56
21
server_interface = domain + '.Mandos'
57
22
client_interface = domain + '.Mandos.Client'
58
 
version = "1.5.5"
 
23
version = "1.0.14"
59
24
 
60
25
# Always run in monochrome mode
61
26
urwid.curses_display.curses.has_colors = lambda : False
65
30
urwid.curses_display.curses.A_UNDERLINE |= (
66
31
    urwid.curses_display.curses.A_BLINK)
67
32
 
68
 
def isoformat_to_datetime(iso):
69
 
    "Parse an ISO 8601 date string to a datetime.datetime()"
70
 
    if not iso:
71
 
        return None
72
 
    d, t = iso.split("T", 1)
73
 
    year, month, day = d.split("-", 2)
74
 
    hour, minute, second = t.split(":", 2)
75
 
    second, fraction = divmod(float(second), 1)
76
 
    return datetime.datetime(int(year),
77
 
                             int(month),
78
 
                             int(day),
79
 
                             int(hour),
80
 
                             int(minute),
81
 
                             int(second),           # Whole seconds
82
 
                             int(fraction*1000000)) # Microseconds
83
 
 
84
33
class MandosClientPropertyCache(object):
85
34
    """This wraps a Mandos Client D-Bus proxy object, caches the
86
35
    properties and calls a hook function when any of them are
87
36
    changed.
88
37
    """
89
 
    def __init__(self, proxy_object=None, properties=None, **kwargs):
 
38
    def __init__(self, proxy_object=None, properties=None, *args,
 
39
                 **kwargs):
 
40
        # Type conversion mapping
 
41
        self.type_map = {
 
42
            dbus.ObjectPath: unicode,
 
43
            dbus.ByteArray: str,
 
44
            dbus.Signature: unicode,
 
45
            dbus.Byte: chr,
 
46
            dbus.Int16: int,
 
47
            dbus.UInt16: int,
 
48
            dbus.Int32: int,
 
49
            dbus.UInt32: int,
 
50
            dbus.Int64: int,
 
51
            dbus.UInt64: int,
 
52
            dbus.Dictionary: dict,
 
53
            dbus.Array: list,
 
54
            dbus.String: unicode,
 
55
            dbus.Boolean: bool,
 
56
            dbus.Double: float,
 
57
            dbus.Struct: tuple,
 
58
            }
90
59
        self.proxy = proxy_object # Mandos Client proxy object
91
 
        self.properties = dict() if properties is None else properties
92
 
        self.property_changed_match = (
93
 
            self.proxy.connect_to_signal("PropertyChanged",
94
 
                                         self._property_changed,
95
 
                                         client_interface,
96
 
                                         byte_arrays=True))
 
60
        
 
61
        if properties is None:
 
62
            self.properties = dict()
 
63
        else:
 
64
            self.properties = dict(self.convert_property(prop, val)
 
65
                                   for prop, val in
 
66
                                   properties.iteritems())
 
67
        self.proxy.connect_to_signal("PropertyChanged",
 
68
                                     self.property_changed,
 
69
                                     client_interface,
 
70
                                     byte_arrays=True)
97
71
        
98
72
        if properties is None:
99
73
            self.properties.update(
 
74
                self.convert_property(prop, val)
 
75
                for prop, val in
100
76
                self.proxy.GetAll(client_interface,
101
 
                                  dbus_interface
102
 
                                  = dbus.PROPERTIES_IFACE))
103
 
        
104
 
        super(MandosClientPropertyCache, self).__init__(**kwargs)
105
 
    
106
 
    def _property_changed(self, property, value):
107
 
        """Helper which takes positional arguments"""
108
 
        return self.property_changed(property=property, value=value)
109
 
    
 
77
                                  dbus_interface =
 
78
                                  dbus.PROPERTIES_IFACE).iteritems())
 
79
        super(MandosClientPropertyCache, self).__init__(
 
80
            proxy_object=proxy_object,
 
81
            properties=properties, *args, **kwargs)
 
82
    
 
83
    def convert_property(self, property, value):
 
84
        """This converts the arguments from a D-Bus signal, which are
 
85
        D-Bus types, into normal Python types, using a conversion
 
86
        function from "self.type_map".
 
87
        """
 
88
        property_name = unicode(property) # Always a dbus.String
 
89
        if isinstance(value, dbus.UTF8String):
 
90
            # Should not happen, but prepare for it anyway
 
91
            value = dbus.String(str(value).decode("utf-8"))
 
92
        try:
 
93
            convfunc = self.type_map[type(value)]
 
94
        except KeyError:
 
95
            # Unknown type, return unmodified
 
96
            return property_name, value
 
97
        return property_name, convfunc(value)
110
98
    def property_changed(self, property=None, value=None):
111
99
        """This is called whenever we get a PropertyChanged signal
112
100
        It updates the changed property in the "properties" dict.
113
101
        """
 
102
        # Convert name and value
 
103
        property_name, cvalue = self.convert_property(property, value)
114
104
        # Update properties dict with new value
115
 
        self.properties[property] = value
116
 
    
117
 
    def delete(self):
118
 
        self.property_changed_match.remove()
 
105
        self.properties[property_name] = cvalue
119
106
 
120
107
 
121
108
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
123
110
    """
124
111
    
125
112
    def __init__(self, server_proxy_object=None, update_hook=None,
126
 
                 delete_hook=None, logger=None, **kwargs):
 
113
                 delete_hook=None, *args, **kwargs):
127
114
        # Called on update
128
115
        self.update_hook = update_hook
129
116
        # Called on delete
130
117
        self.delete_hook = delete_hook
131
118
        # Mandos Server proxy object
132
119
        self.server_proxy_object = server_proxy_object
133
 
        # Logger
134
 
        self.logger = logger
135
 
        
136
 
        self._update_timer_callback_tag = None
137
120
        
138
121
        # The widget shown normally
139
122
        self._text_widget = urwid.Text("")
140
123
        # The widget shown when we have focus
141
124
        self._focus_text_widget = urwid.Text("")
142
 
        super(MandosClientWidget, self).__init__(**kwargs)
 
125
        super(MandosClientWidget, self).__init__(
 
126
            update_hook=update_hook, delete_hook=delete_hook,
 
127
            *args, **kwargs)
143
128
        self.update()
144
129
        self.opened = False
145
 
        
146
 
        self.match_objects = (
147
 
            self.proxy.connect_to_signal("CheckerCompleted",
148
 
                                         self.checker_completed,
149
 
                                         client_interface,
150
 
                                         byte_arrays=True),
151
 
            self.proxy.connect_to_signal("CheckerStarted",
152
 
                                         self.checker_started,
153
 
                                         client_interface,
154
 
                                         byte_arrays=True),
155
 
            self.proxy.connect_to_signal("GotSecret",
156
 
                                         self.got_secret,
157
 
                                         client_interface,
158
 
                                         byte_arrays=True),
159
 
            self.proxy.connect_to_signal("NeedApproval",
160
 
                                         self.need_approval,
161
 
                                         client_interface,
162
 
                                         byte_arrays=True),
163
 
            self.proxy.connect_to_signal("Rejected",
164
 
                                         self.rejected,
165
 
                                         client_interface,
166
 
                                         byte_arrays=True))
167
 
        #self.logger('Created client {0}'
168
 
        #            .format(self.properties["Name"]))
169
 
    
170
 
    def using_timer(self, flag):
171
 
        """Call this method with True or False when timer should be
172
 
        activated or deactivated.
173
 
        """
174
 
        if flag and self._update_timer_callback_tag is None:
175
 
            # Will update the shown timer value every second
176
 
            self._update_timer_callback_tag = (gobject.timeout_add
177
 
                                               (1000,
178
 
                                                self.update_timer))
179
 
        elif not (flag or self._update_timer_callback_tag is None):
180
 
            gobject.source_remove(self._update_timer_callback_tag)
181
 
            self._update_timer_callback_tag = None
182
 
    
183
 
    def checker_completed(self, exitstatus, condition, command):
184
 
        if exitstatus == 0:
185
 
            self.update()
186
 
            return
187
 
        # Checker failed
188
 
        if os.WIFEXITED(condition):
189
 
            self.logger('Checker for client {0} (command "{1}")'
190
 
                        ' failed with exit code {2}'
191
 
                        .format(self.properties["Name"], command,
192
 
                                os.WEXITSTATUS(condition)))
193
 
        elif os.WIFSIGNALED(condition):
194
 
            self.logger('Checker for client {0} (command "{1}") was'
195
 
                        ' killed by signal {2}'
196
 
                        .format(self.properties["Name"], command,
197
 
                                os.WTERMSIG(condition)))
198
 
        elif os.WCOREDUMP(condition):
199
 
            self.logger('Checker for client {0} (command "{1}")'
200
 
                        ' dumped core'
201
 
                        .format(self.properties["Name"], command))
202
 
        else:
203
 
            self.logger('Checker for client {0} completed'
204
 
                        ' mysteriously'
205
 
                        .format(self.properties["Name"]))
206
 
        self.update()
207
 
    
208
 
    def checker_started(self, command):
209
 
        """Server signals that a checker started. This could be useful
210
 
           to log in the future. """
211
 
        #self.logger('Client {0} started checker "{1}"'
212
 
        #            .format(self.properties["Name"],
213
 
        #                    unicode(command)))
214
 
        pass
215
 
    
216
 
    def got_secret(self):
217
 
        self.logger('Client {0} received its secret'
218
 
                    .format(self.properties["Name"]))
219
 
    
220
 
    def need_approval(self, timeout, default):
221
 
        if not default:
222
 
            message = 'Client {0} needs approval within {1} seconds'
223
 
        else:
224
 
            message = 'Client {0} will get its secret in {1} seconds'
225
 
        self.logger(message.format(self.properties["Name"],
226
 
                                   timeout/1000))
227
 
    
228
 
    def rejected(self, reason):
229
 
        self.logger('Client {0} was rejected; reason: {1}'
230
 
                    .format(self.properties["Name"], reason))
231
130
    
232
131
    def selectable(self):
233
132
        """Make this a "selectable" widget.
234
133
        This overrides the method from urwid.FlowWidget."""
235
134
        return True
236
135
    
237
 
    def rows(self, maxcolrow, focus=False):
 
136
    def rows(self, (maxcol,), focus=False):
238
137
        """How many rows this widget will occupy might depend on
239
138
        whether we have focus or not.
240
139
        This overrides the method from urwid.FlowWidget"""
241
 
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
 
140
        return self.current_widget(focus).rows((maxcol,), focus=focus)
242
141
    
243
142
    def current_widget(self, focus=False):
244
143
        if focus or self.opened:
248
147
    def update(self):
249
148
        "Called when what is visible on the screen should be updated."
250
149
        # How to add standout mode to a style
251
 
        with_standout = { "normal": "standout",
252
 
                          "bold": "bold-standout",
253
 
                          "underline-blink":
254
 
                              "underline-blink-standout",
255
 
                          "bold-underline-blink":
256
 
                              "bold-underline-blink-standout",
 
150
        with_standout = { u"normal": u"standout",
 
151
                          u"bold": u"bold-standout",
 
152
                          u"underline-blink":
 
153
                              u"underline-blink-standout",
 
154
                          u"bold-underline-blink":
 
155
                              u"bold-underline-blink-standout",
257
156
                          }
258
157
        
259
158
        # Rebuild focus and non-focus widgets using current properties
260
 
        
261
 
        # Base part of a client. Name!
262
 
        base = '{name}: '.format(name=self.properties["Name"])
263
 
        if not self.properties["Enabled"]:
264
 
            message = "DISABLED"
265
 
            self.using_timer(False)
266
 
        elif self.properties["ApprovalPending"]:
267
 
            timeout = datetime.timedelta(milliseconds
268
 
                                         = self.properties
269
 
                                         ["ApprovalDelay"])
270
 
            last_approval_request = isoformat_to_datetime(
271
 
                self.properties["LastApprovalRequest"])
272
 
            if last_approval_request is not None:
273
 
                timer = max(timeout - (datetime.datetime.utcnow()
274
 
                                       - last_approval_request),
275
 
                            datetime.timedelta())
276
 
            else:
277
 
                timer = datetime.timedelta()
278
 
            if self.properties["ApprovedByDefault"]:
279
 
                message = "Approval in {0}. (d)eny?"
280
 
            else:
281
 
                message = "Denial in {0}. (a)pprove?"
282
 
            message = message.format(unicode(timer).rsplit(".", 1)[0])
283
 
            self.using_timer(True)
284
 
        elif self.properties["LastCheckerStatus"] != 0:
285
 
            # When checker has failed, show timer until client expires
286
 
            expires = self.properties["Expires"]
287
 
            if expires == "":
288
 
                timer = datetime.timedelta(0)
289
 
            else:
290
 
                expires = (datetime.datetime.strptime
291
 
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
292
 
                timer = max(expires - datetime.datetime.utcnow(),
293
 
                            datetime.timedelta())
294
 
            message = ('A checker has failed! Time until client'
295
 
                       ' gets disabled: {0}'
296
 
                       .format(unicode(timer).rsplit(".", 1)[0]))
297
 
            self.using_timer(True)
298
 
        else:
299
 
            message = "enabled"
300
 
            self.using_timer(False)
301
 
        self._text = "{0}{1}".format(base, message)
302
 
        
 
159
        self._text = (u'name="%(name)s", enabled=%(enabled)s'
 
160
                      % self.properties)
303
161
        if not urwid.supports_unicode():
304
162
            self._text = self._text.encode("ascii", "replace")
305
 
        textlist = [("normal", self._text)]
 
163
        textlist = [(u"normal", u"BLÄRGH: "), (u"bold", self._text)]
306
164
        self._text_widget.set_text(textlist)
307
165
        self._focus_text_widget.set_text([(with_standout[text[0]],
308
166
                                           text[1])
316
174
        if self.update_hook is not None:
317
175
            self.update_hook()
318
176
    
319
 
    def update_timer(self):
320
 
        """called by gobject. Will indefinitely loop until
321
 
        gobject.source_remove() on tag is called"""
322
 
        self.update()
323
 
        return True             # Keep calling this
324
 
    
325
 
    def delete(self, **kwargs):
326
 
        if self._update_timer_callback_tag is not None:
327
 
            gobject.source_remove(self._update_timer_callback_tag)
328
 
            self._update_timer_callback_tag = None
329
 
        for match in self.match_objects:
330
 
            match.remove()
331
 
        self.match_objects = ()
 
177
    def delete(self):
332
178
        if self.delete_hook is not None:
333
179
            self.delete_hook(self)
334
 
        return super(MandosClientWidget, self).delete(**kwargs)
335
180
    
336
 
    def render(self, maxcolrow, focus=False):
 
181
    def render(self, (maxcol,), focus=False):
337
182
        """Render differently if we have focus.
338
183
        This overrides the method from urwid.FlowWidget"""
339
 
        return self.current_widget(focus).render(maxcolrow,
 
184
        return self.current_widget(focus).render((maxcol,),
340
185
                                                 focus=focus)
341
186
    
342
 
    def keypress(self, maxcolrow, key):
 
187
    def keypress(self, (maxcol,), key):
343
188
        """Handle keys.
344
189
        This overrides the method from urwid.FlowWidget"""
345
 
        if key == "+":
346
 
            self.proxy.Enable(dbus_interface = client_interface,
347
 
                              ignore_reply=True)
348
 
        elif key == "-":
349
 
            self.proxy.Disable(dbus_interface = client_interface,
350
 
                               ignore_reply=True)
351
 
        elif key == "a":
352
 
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
353
 
                               dbus_interface = client_interface,
354
 
                               ignore_reply=True)
355
 
        elif key == "d":
356
 
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
357
 
                                  dbus_interface = client_interface,
358
 
                               ignore_reply=True)
359
 
        elif key == "R" or key == "_" or key == "ctrl k":
 
190
        if key == u"e" or key == u"+":
 
191
            self.proxy.Enable()
 
192
        elif key == u"d" or key == u"-":
 
193
            self.proxy.Disable()
 
194
        elif key == u"r" or key == u"_":
360
195
            self.server_proxy_object.RemoveClient(self.proxy
361
 
                                                  .object_path,
362
 
                                                  ignore_reply=True)
363
 
        elif key == "s":
364
 
            self.proxy.StartChecker(dbus_interface = client_interface,
365
 
                                    ignore_reply=True)
366
 
        elif key == "S":
367
 
            self.proxy.StopChecker(dbus_interface = client_interface,
368
 
                                   ignore_reply=True)
369
 
        elif key == "C":
370
 
            self.proxy.CheckedOK(dbus_interface = client_interface,
371
 
                                 ignore_reply=True)
 
196
                                                  .object_path)
 
197
        elif key == u"s":
 
198
            self.proxy.StartChecker()
 
199
        elif key == u"c":
 
200
            self.proxy.StopChecker()
 
201
        elif key == u"S":
 
202
            self.proxy.CheckedOK()
372
203
        # xxx
373
 
#         elif key == "p" or key == "=":
 
204
#         elif key == u"p" or key == "=":
374
205
#             self.proxy.pause()
375
 
#         elif key == "u" or key == ":":
 
206
#         elif key == u"u" or key == ":":
376
207
#             self.proxy.unpause()
377
 
#         elif key == "RET":
 
208
#         elif key == u"RET":
378
209
#             self.open()
379
210
        else:
380
211
            return key
381
212
    
382
 
    def property_changed(self, property=None, **kwargs):
 
213
    def property_changed(self, property=None, value=None,
 
214
                         *args, **kwargs):
383
215
        """Call self.update() if old value is not new value.
384
216
        This overrides the method from MandosClientPropertyCache"""
385
217
        property_name = unicode(property)
386
218
        old_value = self.properties.get(property_name)
387
219
        super(MandosClientWidget, self).property_changed(
388
 
            property=property, **kwargs)
 
220
            property=property, value=value, *args, **kwargs)
389
221
        if self.properties.get(property_name) != old_value:
390
222
            self.update()
391
223
 
392
224
 
393
 
class ConstrainedListBox(urwid.ListBox):
394
 
    """Like a normal urwid.ListBox, but will consume all "up" or
395
 
    "down" key presses, thus not allowing any containing widgets to
396
 
    use them as an excuse to shift focus away from this widget.
397
 
    """
398
 
    def keypress(self, *args, **kwargs):
399
 
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
400
 
        if ret in ("up", "down"):
401
 
            return
402
 
        return ret
403
 
 
404
 
 
405
225
class UserInterface(object):
406
226
    """This is the entire user interface - the whole screen
407
227
    with boxes, lists of client widgets, etc.
408
228
    """
409
 
    def __init__(self, max_log_length=1000):
410
 
        DBusGMainLoop(set_as_default=True)
 
229
    def __init__(self):
 
230
        DBusGMainLoop(set_as_default=True )
411
231
        
412
232
        self.screen = urwid.curses_display.Screen()
413
233
        
414
234
        self.screen.register_palette((
415
 
                ("normal",
416
 
                 "default", "default", None),
417
 
                ("bold",
418
 
                 "default", "default", "bold"),
419
 
                ("underline-blink",
420
 
                 "default", "default", "underline"),
421
 
                ("standout",
422
 
                 "default", "default", "standout"),
423
 
                ("bold-underline-blink",
424
 
                 "default", "default", ("bold", "underline")),
425
 
                ("bold-standout",
426
 
                 "default", "default", ("bold", "standout")),
427
 
                ("underline-blink-standout",
428
 
                 "default", "default", ("underline", "standout")),
429
 
                ("bold-underline-blink-standout",
430
 
                 "default", "default", ("bold", "underline",
431
 
                                          "standout")),
 
235
                (u"normal",
 
236
                 u"default", u"default", None),
 
237
                (u"bold",
 
238
                 u"default", u"default", u"bold"),
 
239
                (u"underline-blink",
 
240
                 u"default", u"default", u"underline"),
 
241
                (u"standout",
 
242
                 u"default", u"default", u"standout"),
 
243
                (u"bold-underline-blink",
 
244
                 u"default", u"default", (u"bold", u"underline")),
 
245
                (u"bold-standout",
 
246
                 u"default", u"default", (u"bold", u"standout")),
 
247
                (u"underline-blink-standout",
 
248
                 u"default", u"default", (u"underline", u"standout")),
 
249
                (u"bold-underline-blink-standout",
 
250
                 u"default", u"default", (u"bold", u"underline",
 
251
                                          u"standout")),
432
252
                ))
433
253
        
434
 
        if urwid.supports_unicode():
435
 
            self.divider = "─" # \u2500
436
 
            #self.divider = "━" # \u2501
437
 
        else:
438
 
            #self.divider = "-" # \u002d
439
 
            self.divider = "_" # \u005f
440
 
        
441
254
        self.screen.start()
442
255
        
443
256
        self.size = self.screen.get_cols_rows()
444
257
        
445
258
        self.clients = urwid.SimpleListWalker([])
446
259
        self.clients_dict = {}
447
 
        
448
 
        # We will add Text widgets to this list
449
 
        self.log = []
450
 
        self.max_log_length = max_log_length
451
 
        
452
 
        # We keep a reference to the log widget so we can remove it
453
 
        # from the ListWalker without it getting destroyed
454
 
        self.logbox = ConstrainedListBox(self.log)
455
 
        
456
 
        # This keeps track of whether self.uilist currently has
457
 
        # self.logbox in it or not
458
 
        self.log_visible = True
459
 
        self.log_wrap = "any"
460
 
        
461
 
        self.rebuild()
462
 
        self.log_message_raw(("bold",
463
 
                              "Mandos Monitor version " + version))
464
 
        self.log_message_raw(("bold",
465
 
                              "q: Quit  ?: Help"))
 
260
        self.topwidget = urwid.LineBox(urwid.ListBox(self.clients))
 
261
        #self.topwidget = urwid.ListBox(clients)
466
262
        
467
263
        self.busname = domain + '.Mandos'
468
264
        self.main_loop = gobject.MainLoop()
469
 
    
470
 
    def client_not_found(self, fingerprint, address):
471
 
        self.log_message("Client with address {0} and fingerprint"
472
 
                         " {1} could not be found"
473
 
                         .format(address, fingerprint))
474
 
    
475
 
    def rebuild(self):
476
 
        """This rebuilds the User Interface.
477
 
        Call this when the widget layout needs to change"""
478
 
        self.uilist = []
479
 
        #self.uilist.append(urwid.ListBox(self.clients))
480
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
481
 
                                                          clients),
482
 
                                       #header=urwid.Divider(),
483
 
                                       header=None,
484
 
                                       footer=
485
 
                                       urwid.Divider(div_char=
486
 
                                                     self.divider)))
487
 
        if self.log_visible:
488
 
            self.uilist.append(self.logbox)
489
 
        self.topwidget = urwid.Pile(self.uilist)
490
 
    
491
 
    def log_message(self, message):
492
 
        timestamp = datetime.datetime.now().isoformat()
493
 
        self.log_message_raw(timestamp + ": " + message)
494
 
    
495
 
    def log_message_raw(self, markup):
496
 
        """Add a log message to the log buffer."""
497
 
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
498
 
        if (self.max_log_length
499
 
            and len(self.log) > self.max_log_length):
500
 
            del self.log[0:len(self.log)-self.max_log_length-1]
501
 
        self.logbox.set_focus(len(self.logbox.body.contents),
502
 
                              coming_from="above")
503
 
        self.refresh()
504
 
    
505
 
    def toggle_log_display(self):
506
 
        """Toggle visibility of the log buffer."""
507
 
        self.log_visible = not self.log_visible
508
 
        self.rebuild()
509
 
        #self.log_message("Log visibility changed to: "
510
 
        #                 + unicode(self.log_visible))
511
 
    
512
 
    def change_log_display(self):
513
 
        """Change type of log display.
514
 
        Currently, this toggles wrapping of text lines."""
515
 
        if self.log_wrap == "clip":
516
 
            self.log_wrap = "any"
517
 
        else:
518
 
            self.log_wrap = "clip"
519
 
        for textwidget in self.log:
520
 
            textwidget.set_wrap_mode(self.log_wrap)
521
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
265
        self.bus = dbus.SystemBus()
 
266
        mandos_dbus_objc = self.bus.get_object(
 
267
            self.busname, u"/", follow_name_owner_changes=True)
 
268
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
269
                                          dbus_interface
 
270
                                          = server_interface)
 
271
        try:
 
272
            mandos_clients = (self.mandos_serv
 
273
                              .GetAllClientsWithProperties())
 
274
        except dbus.exceptions.DBusException:
 
275
            mandos_clients = dbus.Dictionary()
 
276
        
 
277
        (self.mandos_serv
 
278
         .connect_to_signal("ClientRemoved",
 
279
                            self.find_and_remove_client,
 
280
                            dbus_interface=server_interface,
 
281
                            byte_arrays=True))
 
282
        (self.mandos_serv
 
283
         .connect_to_signal("ClientAdded",
 
284
                            self.add_new_client,
 
285
                            dbus_interface=server_interface,
 
286
                            byte_arrays=True))
 
287
        for path, client in (mandos_clients.iteritems()):
 
288
            client_proxy_object = self.bus.get_object(self.busname,
 
289
                                                      path)
 
290
            self.add_client(MandosClientWidget(server_proxy_object
 
291
                                               =self.mandos_serv,
 
292
                                               proxy_object
 
293
                                               =client_proxy_object,
 
294
                                               properties=client,
 
295
                                               update_hook
 
296
                                               =self.refresh,
 
297
                                               delete_hook
 
298
                                               =self.remove_client),
 
299
                            path=path)
522
300
    
523
301
    def find_and_remove_client(self, path, name):
524
 
        """Find a client by its object path and remove it.
 
302
        """Find an client from its object path and remove it.
525
303
        
526
304
        This is connected to the ClientRemoved signal from the
527
305
        Mandos server object."""
529
307
            client = self.clients_dict[path]
530
308
        except KeyError:
531
309
            # not found?
532
 
            self.log_message("Unknown client {0!r} ({1!r}) removed"
533
 
                             .format(name, path))
534
310
            return
535
 
        client.delete()
 
311
        self.remove_client(client, path)
536
312
    
537
 
    def add_new_client(self, path):
 
313
    def add_new_client(self, path, properties):
538
314
        client_proxy_object = self.bus.get_object(self.busname, path)
539
315
        self.add_client(MandosClientWidget(server_proxy_object
540
316
                                           =self.mandos_serv,
541
317
                                           proxy_object
542
318
                                           =client_proxy_object,
 
319
                                           properties=properties,
543
320
                                           update_hook
544
321
                                           =self.refresh,
545
322
                                           delete_hook
546
 
                                           =self.remove_client,
547
 
                                           logger
548
 
                                           =self.log_message),
 
323
                                           =self.remove_client),
549
324
                        path=path)
550
325
    
551
326
    def add_client(self, client, path=None):
553
328
        if path is None:
554
329
            path = client.proxy.object_path
555
330
        self.clients_dict[path] = client
556
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
331
        self.clients.sort(None, lambda c: c.properties[u"name"])
557
332
        self.refresh()
558
333
    
559
334
    def remove_client(self, client, path=None):
561
336
        if path is None:
562
337
            path = client.proxy.object_path
563
338
        del self.clients_dict[path]
564
 
        if not self.clients_dict:
565
 
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
566
 
            # is completely emptied, we need to recreate it.
567
 
            self.clients = urwid.SimpleListWalker([])
568
 
            self.rebuild()
569
339
        self.refresh()
570
340
    
571
341
    def refresh(self):
575
345
    
576
346
    def run(self):
577
347
        """Start the main loop and exit when it's done."""
578
 
        self.bus = dbus.SystemBus()
579
 
        mandos_dbus_objc = self.bus.get_object(
580
 
            self.busname, "/", follow_name_owner_changes=True)
581
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
582
 
                                          dbus_interface
583
 
                                          = server_interface)
584
 
        try:
585
 
            mandos_clients = (self.mandos_serv
586
 
                              .GetAllClientsWithProperties())
587
 
        except dbus.exceptions.DBusException:
588
 
            mandos_clients = dbus.Dictionary()
589
 
        
590
 
        (self.mandos_serv
591
 
         .connect_to_signal("ClientRemoved",
592
 
                            self.find_and_remove_client,
593
 
                            dbus_interface=server_interface,
594
 
                            byte_arrays=True))
595
 
        (self.mandos_serv
596
 
         .connect_to_signal("ClientAdded",
597
 
                            self.add_new_client,
598
 
                            dbus_interface=server_interface,
599
 
                            byte_arrays=True))
600
 
        (self.mandos_serv
601
 
         .connect_to_signal("ClientNotFound",
602
 
                            self.client_not_found,
603
 
                            dbus_interface=server_interface,
604
 
                            byte_arrays=True))
605
 
        for path, client in mandos_clients.iteritems():
606
 
            client_proxy_object = self.bus.get_object(self.busname,
607
 
                                                      path)
608
 
            self.add_client(MandosClientWidget(server_proxy_object
609
 
                                               =self.mandos_serv,
610
 
                                               proxy_object
611
 
                                               =client_proxy_object,
612
 
                                               properties=client,
613
 
                                               update_hook
614
 
                                               =self.refresh,
615
 
                                               delete_hook
616
 
                                               =self.remove_client,
617
 
                                               logger
618
 
                                               =self.log_message),
619
 
                            path=path)
620
 
        
621
348
        self.refresh()
622
349
        self._input_callback_tag = (gobject.io_add_watch
623
350
                                    (sys.stdin.fileno(),
633
360
    
634
361
    def process_input(self, source, condition):
635
362
        keys = self.screen.get_input()
636
 
        translations = { "ctrl n": "down",      # Emacs
637
 
                         "ctrl p": "up",        # Emacs
638
 
                         "ctrl v": "page down", # Emacs
639
 
                         "meta v": "page up",   # Emacs
640
 
                         " ": "page down",      # less
641
 
                         "f": "page down",      # less
642
 
                         "b": "page up",        # less
643
 
                         "j": "down",           # vi
644
 
                         "k": "up",             # vi
 
363
        translations = { u"j": u"down",
 
364
                         u"k": u"up",
645
365
                         }
646
366
        for key in keys:
647
367
            try:
649
369
            except KeyError:    # :-)
650
370
                pass
651
371
            
652
 
            if key == "q" or key == "Q":
 
372
            if key == u"q" or key == u"Q":
653
373
                self.stop()
654
374
                break
655
 
            elif key == "window resize":
 
375
            elif key == u"window resize":
656
376
                self.size = self.screen.get_cols_rows()
657
377
                self.refresh()
658
 
            elif key == "\f":  # Ctrl-L
659
 
                self.refresh()
660
 
            elif key == "l" or key == "D":
661
 
                self.toggle_log_display()
662
 
                self.refresh()
663
 
            elif key == "w" or key == "i":
664
 
                self.change_log_display()
665
 
                self.refresh()
666
 
            elif key == "?" or key == "f1" or key == "esc":
667
 
                if not self.log_visible:
668
 
                    self.log_visible = True
669
 
                    self.rebuild()
670
 
                self.log_message_raw(("bold",
671
 
                                      "  ".
672
 
                                      join(("q: Quit",
673
 
                                            "?: Help",
674
 
                                            "l: Log window toggle",
675
 
                                            "TAB: Switch window",
676
 
                                            "w: Wrap (log)"))))
677
 
                self.log_message_raw(("bold",
678
 
                                      "  "
679
 
                                      .join(("Clients:",
680
 
                                             "+: Enable",
681
 
                                             "-: Disable",
682
 
                                             "R: Remove",
683
 
                                             "s: Start new checker",
684
 
                                             "S: Stop checker",
685
 
                                             "C: Checker OK",
686
 
                                             "a: Approve",
687
 
                                             "d: Deny"))))
688
 
                self.refresh()
689
 
            elif key == "tab":
690
 
                if self.topwidget.get_focus() is self.logbox:
691
 
                    self.topwidget.set_focus(0)
692
 
                else:
693
 
                    self.topwidget.set_focus(self.logbox)
694
 
                self.refresh()
695
 
            #elif (key == "end" or key == "meta >" or key == "G"
696
 
            #      or key == ">"):
697
 
            #    pass            # xxx end-of-buffer
698
 
            #elif (key == "home" or key == "meta <" or key == "g"
699
 
            #      or key == "<"):
700
 
            #    pass            # xxx beginning-of-buffer
701
 
            #elif key == "ctrl e" or key == "$":
702
 
            #    pass            # xxx move-end-of-line
703
 
            #elif key == "ctrl a" or key == "^":
704
 
            #    pass            # xxx move-beginning-of-line
705
 
            #elif key == "ctrl b" or key == "meta (" or key == "h":
706
 
            #    pass            # xxx left
707
 
            #elif key == "ctrl f" or key == "meta )" or key == "l":
708
 
            #    pass            # xxx right
709
 
            #elif key == "a":
710
 
            #    pass            # scroll up log
711
 
            #elif key == "z":
712
 
            #    pass            # scroll down log
 
378
            elif key == " ":
 
379
                self.refresh()
713
380
            elif self.topwidget.selectable():
714
381
                self.topwidget.keypress(self.size, key)
715
382
                self.refresh()
718
385
ui = UserInterface()
719
386
try:
720
387
    ui.run()
721
 
except KeyboardInterrupt:
722
 
    ui.screen.stop()
723
 
except Exception, e:
724
 
    ui.log_message(unicode(e))
 
388
except:
725
389
    ui.screen.stop()
726
390
    raise