/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

* Makefile (install-client-nokey): Create network hook directory.
* debian/mandos-client.README.Debian: Corrected mail address.

Show diffs side-by-side

added added

removed removed

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