/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: teddy at bsnet
  • Date: 2010-10-05 17:15:09 UTC
  • Revision ID: teddy@fukt.bsnet.se-20101005171509-xqxdzcgjjynchfyy
* debian/changelog: Include entry from 1.0.14-1.1 NMU.

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