/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-26 17:36:30 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100926173630-zk7pe17fp2bv6zr7
* DBUS-API: Document new "LastApprovalRequest" client property.

* mandos (Client.last_approval_request): New attribute.
  (Client.need_approval): New method.
  (ClientDBus.need_approval): - '' -
  (ClientDBus.NeedApproval): Call self.need_approval().
  (ClientDBus.LastApprovalRequest_dbus_property): New D-Bus property.

* mandos-monitor: Show timeout counter during approval delay.
  (MandosClientWidget._update_timer_callback_lock): New.
  (MandosClientWidget.property_changed): Override to also call
                                         using_timer if
                                         ApprovalPending property is
                                         changed.
  (MandosClientWidget.using_timer): New method.
  (MandosClientWidget.checker_completed): Use "using_timer".
  (MandosClientWidget.need_approval): - '' -
  (MandosClientWidget.update): Show approval delay timer.

Show diffs side-by-side

added added

removed removed

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