/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2019-11-03 19:09:41 UTC
  • mto: This revision was merged to the branch mainline in revision 396.
  • Revision ID: teddy@recompile.se-20191103190941-9gfivh2mjuvi4z3f
Add -I option to python 3 on the interpreter script ("shebang") line

* mandos: Add -I option to /usr/bin/python3.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

Show diffs side-by-side

added added

removed removed

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