/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 Hogeborn
  • Date: 2010-09-25 19:55:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100925195517-u0qfi01huxl72f75
* mandos (Client.runtime_expansions): New attribute containing the
                                      allowed runtime expansions.

* mandos-clients.conf.xml (OPTIONS): Reordered alphabetically.

* mandos-ctl: Bug fix: print timeout and interval values pretty again.

* mandos-ctl.xml (EXAMPLE): Added more examples.

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