/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

  • Committer: Björn Påhlsson
  • Date: 2011-08-19 15:18:42 UTC
  • mfrom: (237.7.43 trunk)
  • mto: (237.7.45 trunk)
  • mto: This revision was merged to the branch mainline in revision 286.
  • Revision ID: belorn@fukt.bsnet.se-20110819151842-frluz9oo9v7l9fdz
Merge

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-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@fukt.bsnet.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
52
domain = 'se.bsnet.fukt'
21
53
server_interface = domain + '.Mandos'
22
54
client_interface = domain + '.Mandos.Client'
23
 
version = "1.0.14"
 
55
version = "1.3.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
            self._update_timer_callback_tag = (gobject.timeout_add
 
204
                                               (1000,
 
205
                                                self.update_timer))
 
206
        elif old and self._update_timer_callback_lock == 0:
 
207
            gobject.source_remove(self._update_timer_callback_tag)
 
208
            self._update_timer_callback_tag = None
 
209
    
 
210
    def checker_completed(self, exitstatus, condition, command):
 
211
        if exitstatus == 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))
 
218
            self.update()
 
219
            return
 
220
        # Checker failed
 
221
        if not self.last_checker_failed:
 
222
            self.last_checker_failed = True
 
223
            self.using_timer(True)
 
224
        if os.WIFEXITED(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)))
 
229
        elif os.WIFSIGNALED(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')
 
241
        self.update()
 
242
    
 
243
    def checker_started(self, command):
 
244
        #self.logger('Client %s started checker "%s"'
 
245
        #            % (self.properties["Name"], unicode(command)))
 
246
        pass
 
247
    
 
248
    def got_secret(self):
 
249
        self.last_checker_failed = False
 
250
        self.logger('Client %s received its secret'
 
251
                    % self.properties["Name"])
 
252
    
 
253
    def need_approval(self, timeout, default):
 
254
        if not default:
 
255
            message = 'Client %s needs approval within %s seconds'
 
256
        else:
 
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)
 
261
    
 
262
    def rejected(self, reason):
 
263
        self.logger('Client %s was rejected; reason: %s'
 
264
                    % (self.properties["Name"], reason))
130
265
    
131
266
    def selectable(self):
132
267
        """Make this a "selectable" widget.
133
268
        This overrides the method from urwid.FlowWidget."""
134
269
        return True
135
270
    
136
 
    def rows(self, (maxcol,), focus=False):
 
271
    def rows(self, maxcolrow, focus=False):
137
272
        """How many rows this widget will occupy might depend on
138
273
        whether we have focus or not.
139
274
        This overrides the method from urwid.FlowWidget"""
140
 
        return self.current_widget(focus).rows((maxcol,), focus=focus)
 
275
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
141
276
    
142
277
    def current_widget(self, focus=False):
143
278
        if focus or self.opened:
147
282
    def update(self):
148
283
        "Called when what is visible on the screen should be updated."
149
284
        # 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",
 
285
        with_standout = { "normal": "standout",
 
286
                          "bold": "bold-standout",
 
287
                          "underline-blink":
 
288
                              "underline-blink-standout",
 
289
                          "bold-underline-blink":
 
290
                              "bold-underline-blink-standout",
156
291
                          }
157
 
        
 
292
 
158
293
        # Rebuild focus and non-focus widgets using current properties
159
 
        self._text = (u'name="%(name)s", enabled=%(enabled)s'
160
 
                      % self.properties)
 
294
 
 
295
        # Base part of a client. Name!
 
296
        base = ('%(name)s: '
 
297
                      % {"name": self.properties["Name"]})
 
298
        if not self.properties["Enabled"]:
 
299
            message = "DISABLED"
 
300
        elif self.properties["ApprovalPending"]:
 
301
            timeout = datetime.timedelta(milliseconds
 
302
                                         = self.properties
 
303
                                         ["ApprovalDelay"])
 
304
            last_approval_request = isoformat_to_datetime(
 
305
                self.properties["LastApprovalRequest"])
 
306
            if last_approval_request is not None:
 
307
                timer = timeout - (datetime.datetime.utcnow()
 
308
                                   - last_approval_request)
 
309
            else:
 
310
                timer = datetime.timedelta()
 
311
            if self.properties["ApprovedByDefault"]:
 
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)
 
325
            message = ('A checker has failed! Time until client'
 
326
                       ' gets disabled: %s'
 
327
                           % unicode(timer).rsplit(".", 1)[0])
 
328
        else:
 
329
            message = "enabled"
 
330
        self._text = "%s%s" % (base, message)
 
331
            
161
332
        if not urwid.supports_unicode():
162
333
            self._text = self._text.encode("ascii", "replace")
163
 
        textlist = [(u"normal", u"BLÄRGH: "), (u"bold", self._text)]
 
334
        textlist = [("normal", self._text)]
164
335
        self._text_widget.set_text(textlist)
165
336
        self._focus_text_widget.set_text([(with_standout[text[0]],
166
337
                                           text[1])
174
345
        if self.update_hook is not None:
175
346
            self.update_hook()
176
347
    
177
 
    def delete(self):
 
348
    def update_timer(self):
 
349
        "called by gobject"
 
350
        self.update()
 
351
        return True             # Keep calling this
 
352
    
 
353
    def delete(self, *args, **kwargs):
 
354
        if self._update_timer_callback_tag is not None:
 
355
            gobject.source_remove(self._update_timer_callback_tag)
 
356
            self._update_timer_callback_tag = None
 
357
        for match in self.match_objects:
 
358
            match.remove()
 
359
        self.match_objects = ()
178
360
        if self.delete_hook is not None:
179
361
            self.delete_hook(self)
 
362
        return super(MandosClientWidget, self).delete(*args, **kwargs)
180
363
    
181
 
    def render(self, (maxcol,), focus=False):
 
364
    def render(self, maxcolrow, focus=False):
182
365
        """Render differently if we have focus.
183
366
        This overrides the method from urwid.FlowWidget"""
184
 
        return self.current_widget(focus).render((maxcol,),
 
367
        return self.current_widget(focus).render(maxcolrow,
185
368
                                                 focus=focus)
186
369
    
187
 
    def keypress(self, (maxcol,), key):
 
370
    def keypress(self, maxcolrow, key):
188
371
        """Handle keys.
189
372
        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"_":
 
373
        if key == "+":
 
374
            self.proxy.Enable(dbus_interface = client_interface,
 
375
                              ignore_reply=True)
 
376
        elif key == "-":
 
377
            self.proxy.Disable(dbus_interface = client_interface,
 
378
                               ignore_reply=True)
 
379
        elif key == "a":
 
380
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
 
381
                               dbus_interface = client_interface,
 
382
                               ignore_reply=True)
 
383
        elif key == "d":
 
384
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
 
385
                                  dbus_interface = client_interface,
 
386
                               ignore_reply=True)
 
387
        elif key == "R" or key == "_" or key == "ctrl k":
195
388
            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()
 
389
                                                  .object_path,
 
390
                                                  ignore_reply=True)
 
391
        elif key == "s":
 
392
            self.proxy.StartChecker(dbus_interface = client_interface,
 
393
                                    ignore_reply=True)
 
394
        elif key == "S":
 
395
            self.proxy.StopChecker(dbus_interface = client_interface,
 
396
                                   ignore_reply=True)
 
397
        elif key == "C":
 
398
            self.proxy.CheckedOK(dbus_interface = client_interface,
 
399
                                 ignore_reply=True)
203
400
        # xxx
204
 
#         elif key == u"p" or key == "=":
 
401
#         elif key == "p" or key == "=":
205
402
#             self.proxy.pause()
206
 
#         elif key == u"u" or key == ":":
 
403
#         elif key == "u" or key == ":":
207
404
#             self.proxy.unpause()
208
 
#         elif key == u"RET":
 
405
#         elif key == "RET":
209
406
#             self.open()
210
407
        else:
211
408
            return key
222
419
            self.update()
223
420
 
224
421
 
 
422
class ConstrainedListBox(urwid.ListBox):
 
423
    """Like a normal urwid.ListBox, but will consume all "up" or
 
424
    "down" key presses, thus not allowing any containing widgets to
 
425
    use them as an excuse to shift focus away from this widget.
 
426
    """
 
427
    def keypress(self, maxcolrow, key):
 
428
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
429
        if ret in ("up", "down"):
 
430
            return
 
431
        return ret
 
432
 
 
433
 
225
434
class UserInterface(object):
226
435
    """This is the entire user interface - the whole screen
227
436
    with boxes, lists of client widgets, etc.
228
437
    """
229
 
    def __init__(self):
230
 
        DBusGMainLoop(set_as_default=True )
 
438
    def __init__(self, max_log_length=1000):
 
439
        DBusGMainLoop(set_as_default=True)
231
440
        
232
441
        self.screen = urwid.curses_display.Screen()
233
442
        
234
443
        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")),
 
444
                ("normal",
 
445
                 "default", "default", None),
 
446
                ("bold",
 
447
                 "default", "default", "bold"),
 
448
                ("underline-blink",
 
449
                 "default", "default", "underline"),
 
450
                ("standout",
 
451
                 "default", "default", "standout"),
 
452
                ("bold-underline-blink",
 
453
                 "default", "default", ("bold", "underline")),
 
454
                ("bold-standout",
 
455
                 "default", "default", ("bold", "standout")),
 
456
                ("underline-blink-standout",
 
457
                 "default", "default", ("underline", "standout")),
 
458
                ("bold-underline-blink-standout",
 
459
                 "default", "default", ("bold", "underline",
 
460
                                          "standout")),
252
461
                ))
253
462
        
 
463
        if urwid.supports_unicode():
 
464
            self.divider = "─" # \u2500
 
465
            #self.divider = "━" # \u2501
 
466
        else:
 
467
            #self.divider = "-" # \u002d
 
468
            self.divider = "_" # \u005f
 
469
        
254
470
        self.screen.start()
255
471
        
256
472
        self.size = self.screen.get_cols_rows()
257
473
        
258
474
        self.clients = urwid.SimpleListWalker([])
259
475
        self.clients_dict = {}
260
 
        self.topwidget = urwid.LineBox(urwid.ListBox(self.clients))
261
 
        #self.topwidget = urwid.ListBox(clients)
 
476
        
 
477
        # We will add Text widgets to this list
 
478
        self.log = []
 
479
        self.max_log_length = max_log_length
 
480
        
 
481
        # We keep a reference to the log widget so we can remove it
 
482
        # from the ListWalker without it getting destroyed
 
483
        self.logbox = ConstrainedListBox(self.log)
 
484
        
 
485
        # This keeps track of whether self.uilist currently has
 
486
        # self.logbox in it or not
 
487
        self.log_visible = True
 
488
        self.log_wrap = "any"
 
489
        
 
490
        self.rebuild()
 
491
        self.log_message_raw(("bold",
 
492
                              "Mandos Monitor version " + version))
 
493
        self.log_message_raw(("bold",
 
494
                              "q: Quit  ?: Help"))
262
495
        
263
496
        self.busname = domain + '.Mandos'
264
497
        self.main_loop = gobject.MainLoop()
265
498
        self.bus = dbus.SystemBus()
266
499
        mandos_dbus_objc = self.bus.get_object(
267
 
            self.busname, u"/", follow_name_owner_changes=True)
 
500
            self.busname, "/", follow_name_owner_changes=True)
268
501
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
269
502
                                          dbus_interface
270
503
                                          = server_interface)
284
517
                            self.add_new_client,
285
518
                            dbus_interface=server_interface,
286
519
                            byte_arrays=True))
287
 
        for path, client in (mandos_clients.iteritems()):
 
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():
288
526
            client_proxy_object = self.bus.get_object(self.busname,
289
527
                                                      path)
290
528
            self.add_client(MandosClientWidget(server_proxy_object
295
533
                                               update_hook
296
534
                                               =self.refresh,
297
535
                                               delete_hook
298
 
                                               =self.remove_client),
 
536
                                               =self.remove_client,
 
537
                                               logger
 
538
                                               =self.log_message),
299
539
                            path=path)
300
540
    
 
541
    def client_not_found(self, fingerprint, address):
 
542
        self.log_message(("Client with address %s and fingerprint %s"
 
543
                          " could not be found" % (address,
 
544
                                                    fingerprint)))
 
545
    
 
546
    def rebuild(self):
 
547
        """This rebuilds the User Interface.
 
548
        Call this when the widget layout needs to change"""
 
549
        self.uilist = []
 
550
        #self.uilist.append(urwid.ListBox(self.clients))
 
551
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
552
                                                          clients),
 
553
                                       #header=urwid.Divider(),
 
554
                                       header=None,
 
555
                                       footer=
 
556
                                       urwid.Divider(div_char=
 
557
                                                     self.divider)))
 
558
        if self.log_visible:
 
559
            self.uilist.append(self.logbox)
 
560
            pass
 
561
        self.topwidget = urwid.Pile(self.uilist)
 
562
    
 
563
    def log_message(self, message):
 
564
        timestamp = datetime.datetime.now().isoformat()
 
565
        self.log_message_raw(timestamp + ": " + message)
 
566
    
 
567
    def log_message_raw(self, markup):
 
568
        """Add a log message to the log buffer."""
 
569
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
 
570
        if (self.max_log_length
 
571
            and len(self.log) > self.max_log_length):
 
572
            del self.log[0:len(self.log)-self.max_log_length-1]
 
573
        self.logbox.set_focus(len(self.logbox.body.contents),
 
574
                              coming_from="above")
 
575
        self.refresh()
 
576
    
 
577
    def toggle_log_display(self):
 
578
        """Toggle visibility of the log buffer."""
 
579
        self.log_visible = not self.log_visible
 
580
        self.rebuild()
 
581
        #self.log_message("Log visibility changed to: "
 
582
        #                 + unicode(self.log_visible))
 
583
    
 
584
    def change_log_display(self):
 
585
        """Change type of log display.
 
586
        Currently, this toggles wrapping of text lines."""
 
587
        if self.log_wrap == "clip":
 
588
            self.log_wrap = "any"
 
589
        else:
 
590
            self.log_wrap = "clip"
 
591
        for textwidget in self.log:
 
592
            textwidget.set_wrap_mode(self.log_wrap)
 
593
        #self.log_message("Wrap mode: " + self.log_wrap)
 
594
    
301
595
    def find_and_remove_client(self, path, name):
302
 
        """Find an client from its object path and remove it.
 
596
        """Find a client by its object path and remove it.
303
597
        
304
598
        This is connected to the ClientRemoved signal from the
305
599
        Mandos server object."""
307
601
            client = self.clients_dict[path]
308
602
        except KeyError:
309
603
            # not found?
 
604
            self.log_message("Unknown client %r (%r) removed", name,
 
605
                             path)
310
606
            return
311
 
        self.remove_client(client, path)
 
607
        client.delete()
312
608
    
313
 
    def add_new_client(self, path, properties):
 
609
    def add_new_client(self, path):
314
610
        client_proxy_object = self.bus.get_object(self.busname, path)
315
611
        self.add_client(MandosClientWidget(server_proxy_object
316
612
                                           =self.mandos_serv,
317
613
                                           proxy_object
318
614
                                           =client_proxy_object,
319
 
                                           properties=properties,
320
615
                                           update_hook
321
616
                                           =self.refresh,
322
617
                                           delete_hook
323
 
                                           =self.remove_client),
 
618
                                           =self.remove_client,
 
619
                                           logger
 
620
                                           =self.log_message),
324
621
                        path=path)
325
622
    
326
623
    def add_client(self, client, path=None):
328
625
        if path is None:
329
626
            path = client.proxy.object_path
330
627
        self.clients_dict[path] = client
331
 
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
628
        self.clients.sort(None, lambda c: c.properties["Name"])
332
629
        self.refresh()
333
630
    
334
631
    def remove_client(self, client, path=None):
336
633
        if path is None:
337
634
            path = client.proxy.object_path
338
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()
339
641
        self.refresh()
340
642
    
341
643
    def refresh(self):
360
662
    
361
663
    def process_input(self, source, condition):
362
664
        keys = self.screen.get_input()
363
 
        translations = { u"j": u"down",
364
 
                         u"k": u"up",
 
665
        translations = { "ctrl n": "down",      # Emacs
 
666
                         "ctrl p": "up",        # Emacs
 
667
                         "ctrl v": "page down", # Emacs
 
668
                         "meta v": "page up",   # Emacs
 
669
                         " ": "page down",      # less
 
670
                         "f": "page down",      # less
 
671
                         "b": "page up",        # less
 
672
                         "j": "down",           # vi
 
673
                         "k": "up",             # vi
365
674
                         }
366
675
        for key in keys:
367
676
            try:
369
678
            except KeyError:    # :-)
370
679
                pass
371
680
            
372
 
            if key == u"q" or key == u"Q":
 
681
            if key == "q" or key == "Q":
373
682
                self.stop()
374
683
                break
375
 
            elif key == u"window resize":
 
684
            elif key == "window resize":
376
685
                self.size = self.screen.get_cols_rows()
377
686
                self.refresh()
378
 
            elif key == " ":
379
 
                self.refresh()
 
687
            elif key == "\f":  # Ctrl-L
 
688
                self.refresh()
 
689
            elif key == "l" or key == "D":
 
690
                self.toggle_log_display()
 
691
                self.refresh()
 
692
            elif key == "w" or key == "i":
 
693
                self.change_log_display()
 
694
                self.refresh()
 
695
            elif key == "?" or key == "f1" or key == "esc":
 
696
                if not self.log_visible:
 
697
                    self.log_visible = True
 
698
                    self.rebuild()
 
699
                self.log_message_raw(("bold",
 
700
                                      "  ".
 
701
                                      join(("q: Quit",
 
702
                                            "?: Help",
 
703
                                            "l: Log window toggle",
 
704
                                            "TAB: Switch window",
 
705
                                            "w: Wrap (log)"))))
 
706
                self.log_message_raw(("bold",
 
707
                                      "  "
 
708
                                      .join(("Clients:",
 
709
                                             "+: Enable",
 
710
                                             "-: Disable",
 
711
                                             "R: Remove",
 
712
                                             "s: Start new checker",
 
713
                                             "S: Stop checker",
 
714
                                             "C: Checker OK",
 
715
                                             "a: Approve",
 
716
                                             "d: Deny"))))
 
717
                self.refresh()
 
718
            elif key == "tab":
 
719
                if self.topwidget.get_focus() is self.logbox:
 
720
                    self.topwidget.set_focus(0)
 
721
                else:
 
722
                    self.topwidget.set_focus(self.logbox)
 
723
                self.refresh()
 
724
            #elif (key == "end" or key == "meta >" or key == "G"
 
725
            #      or key == ">"):
 
726
            #    pass            # xxx end-of-buffer
 
727
            #elif (key == "home" or key == "meta <" or key == "g"
 
728
            #      or key == "<"):
 
729
            #    pass            # xxx beginning-of-buffer
 
730
            #elif key == "ctrl e" or key == "$":
 
731
            #    pass            # xxx move-end-of-line
 
732
            #elif key == "ctrl a" or key == "^":
 
733
            #    pass            # xxx move-beginning-of-line
 
734
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
735
            #    pass            # xxx left
 
736
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
737
            #    pass            # xxx right
 
738
            #elif key == "a":
 
739
            #    pass            # scroll up log
 
740
            #elif key == "z":
 
741
            #    pass            # scroll down log
380
742
            elif self.topwidget.selectable():
381
743
                self.topwidget.keypress(self.size, key)
382
744
                self.refresh()
385
747
ui = UserInterface()
386
748
try:
387
749
    ui.run()
388
 
except:
 
750
except KeyboardInterrupt:
 
751
    ui.screen.stop()
 
752
except Exception, e:
 
753
    ui.log_message(unicode(e))
389
754
    ui.screen.stop()
390
755
    raise