/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

Merge in branch to interpret an empty device name to mean
"autodetect".

Show diffs side-by-side

added added

removed removed

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