/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: 2015-07-01 20:01:26 UTC
  • mto: This revision was merged to the branch mainline in revision 759.
  • Revision ID: teddy@recompile.se-20150701200126-qb3f6c3jcas2f4og
mandos-client: Try to start a plugin to add and remove a local route.

* debian/mandos-client.README.Debian: Add setting of environment
                                      variable MANDOSPLUGINHELPERDIR
                                      to command line testing
                                      mandos-client.
* mandos-client.c (raise_privileges): Moved to top of file.
                  (raise_privileges_permanently): - '' -
                  (lower_privileges): - '' -
                  (lower_privileges_permanently): - '' -
  (add_remove_local_route, add_local_route, remove_local_route): New.
  (start_mandos_communication): Set SOCK_CLOEXEC flag on socket.  Run
                                the above functions to add (and
                                remove) local route, if the conditions
                                indicates it could help.
  (run_network_hooks): Use O_DIRECTORY, O_PATH, and O_CLOEXEC flags
                       when opening network hook directory. Do
                       TEMP_FAILURE_RETRY around opening of /dev/null
                       and network hook executables.  Move redirecting
                       of stdout and stderr to as late as possible
                       before fexecve().
  (main): Use O_DIRECTORY and O_PATH when opening temporary directory.
* plugins.d/mandos-client.xml (ENVIRONMENT): Document usage of the
                                             MANDOSPLUGINHELPERDIR
                                             environment variable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
3
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
# 
6
 
# Copyright © 2009-2012 Teddy Hogeborn
7
 
# Copyright © 2009-2012 Björn Påhlsson
 
6
# Copyright © 2009-2014 Teddy Hogeborn
 
7
# Copyright © 2009-2014 Björn Påhlsson
8
8
# 
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
25
25
 
26
26
from __future__ import (division, absolute_import, print_function,
27
27
                        unicode_literals)
28
 
 
29
 
from future_builtins import *
 
28
try:
 
29
    from future_builtins import *
 
30
except ImportError:
 
31
    pass
30
32
 
31
33
import sys
32
34
import os
33
 
import signal
34
35
 
35
36
import datetime
36
37
 
38
39
import urwid
39
40
 
40
41
from dbus.mainloop.glib import DBusGMainLoop
41
 
import gobject
 
42
try:
 
43
    import gobject
 
44
except ImportError:
 
45
    from gi.repository import GObject as gobject
42
46
 
43
47
import dbus
44
48
 
45
 
import UserList
46
 
 
47
49
import locale
48
50
 
 
51
if sys.version_info.major == 2:
 
52
    str = unicode
 
53
 
49
54
locale.setlocale(locale.LC_ALL, '')
50
55
 
51
56
import logging
55
60
domain = 'se.recompile'
56
61
server_interface = domain + '.Mandos'
57
62
client_interface = domain + '.Mandos.Client'
58
 
version = "1.5.3"
59
 
 
60
 
# Always run in monochrome mode
61
 
urwid.curses_display.curses.has_colors = lambda : False
62
 
 
63
 
# Urwid doesn't support blinking, but we want it.  Since we have no
64
 
# use for underline on its own, we make underline also always blink.
65
 
urwid.curses_display.curses.A_UNDERLINE |= (
66
 
    urwid.curses_display.curses.A_BLINK)
 
63
version = "1.6.9"
67
64
 
68
65
def isoformat_to_datetime(iso):
69
66
    "Parse an ISO 8601 date string to a datetime.datetime()"
86
83
    properties and calls a hook function when any of them are
87
84
    changed.
88
85
    """
89
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
86
    def __init__(self, proxy_object=None, properties=None, **kwargs):
90
87
        self.proxy = proxy_object # Mandos Client proxy object
91
 
        
92
 
        self.properties = dict()
 
88
        self.properties = dict() if properties is None else properties
93
89
        self.property_changed_match = (
94
 
            self.proxy.connect_to_signal("PropertyChanged",
95
 
                                         self.property_changed,
96
 
                                         client_interface,
 
90
            self.proxy.connect_to_signal("PropertiesChanged",
 
91
                                         self.properties_changed,
 
92
                                         dbus.PROPERTIES_IFACE,
97
93
                                         byte_arrays=True))
98
94
        
99
 
        self.properties.update(
100
 
            self.proxy.GetAll(client_interface,
101
 
                              dbus_interface = dbus.PROPERTIES_IFACE))
102
 
 
103
 
        #XXX This breaks good super behaviour
104
 
#        super(MandosClientPropertyCache, self).__init__(
105
 
#            *args, **kwargs)
 
95
        if properties is None:
 
96
            self.properties.update(
 
97
                self.proxy.GetAll(client_interface,
 
98
                                  dbus_interface
 
99
                                  = dbus.PROPERTIES_IFACE))
 
100
        
 
101
        super(MandosClientPropertyCache, self).__init__(**kwargs)
106
102
    
107
 
    def property_changed(self, property=None, value=None):
108
 
        """This is called whenever we get a PropertyChanged signal
109
 
        It updates the changed property in the "properties" dict.
 
103
    def properties_changed(self, interface, properties, invalidated):
 
104
        """This is called whenever we get a PropertiesChanged signal
 
105
        It updates the changed properties in the "properties" dict.
110
106
        """
111
107
        # Update properties dict with new value
112
 
        self.properties[property] = value
 
108
        self.properties.update(properties)
113
109
    
114
 
    def delete(self, *args, **kwargs):
 
110
    def delete(self):
115
111
        self.property_changed_match.remove()
116
 
        super(MandosClientPropertyCache, self).__init__(
117
 
            *args, **kwargs)
118
112
 
119
113
 
120
114
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
122
116
    """
123
117
    
124
118
    def __init__(self, server_proxy_object=None, update_hook=None,
125
 
                 delete_hook=None, logger=None, *args, **kwargs):
 
119
                 delete_hook=None, logger=None, **kwargs):
126
120
        # Called on update
127
121
        self.update_hook = update_hook
128
122
        # Called on delete
133
127
        self.logger = logger
134
128
        
135
129
        self._update_timer_callback_tag = None
136
 
        self._update_timer_callback_lock = 0
137
130
        
138
131
        # The widget shown normally
139
132
        self._text_widget = urwid.Text("")
140
133
        # The widget shown when we have focus
141
134
        self._focus_text_widget = urwid.Text("")
142
 
        super(MandosClientWidget, self).__init__(
143
 
            update_hook=update_hook, delete_hook=delete_hook,
144
 
            *args, **kwargs)
 
135
        super(MandosClientWidget, self).__init__(**kwargs)
145
136
        self.update()
146
137
        self.opened = False
147
138
        
148
 
        last_checked_ok = isoformat_to_datetime(self.properties
149
 
                                                ["LastCheckedOK"])
150
 
        
151
 
        if self.properties ["LastCheckerStatus"] != 0:
152
 
            self.using_timer(True)
153
 
        
154
 
        if self.need_approval:
155
 
            self.using_timer(True)
156
 
        
157
139
        self.match_objects = (
158
140
            self.proxy.connect_to_signal("CheckerCompleted",
159
141
                                         self.checker_completed,
175
157
                                         self.rejected,
176
158
                                         client_interface,
177
159
                                         byte_arrays=True))
178
 
        #self.logger('Created client {0}'
179
 
        #            .format(self.properties["Name"]))
180
 
    
181
 
    def property_changed(self, property=None, value=None):
182
 
        super(self, MandosClientWidget).property_changed(property,
183
 
                                                         value)
184
 
        if property == "ApprovalPending":
185
 
            using_timer(bool(value))
186
 
        if property == "LastCheckerStatus":
187
 
            using_timer(value != 0)
188
 
            #self.logger('Checker for client {0} (command "{1}") was '
189
 
            #            ' successful'.format(self.properties["Name"],
190
 
            #                                 command))
 
160
        self.logger('Created client {}'
 
161
                    .format(self.properties["Name"]), level=0)
191
162
    
192
163
    def using_timer(self, flag):
193
164
        """Call this method with True or False when timer should be
194
165
        activated or deactivated.
195
166
        """
196
 
        old = self._update_timer_callback_lock
197
 
        if flag:
198
 
            self._update_timer_callback_lock += 1
199
 
        else:
200
 
            self._update_timer_callback_lock -= 1
201
 
        if old == 0 and self._update_timer_callback_lock:
 
167
        if flag and self._update_timer_callback_tag is None:
202
168
            # Will update the shown timer value every second
203
169
            self._update_timer_callback_tag = (gobject.timeout_add
204
170
                                               (1000,
205
171
                                                self.update_timer))
206
 
        elif old and self._update_timer_callback_lock == 0:
 
172
        elif not (flag or self._update_timer_callback_tag is None):
207
173
            gobject.source_remove(self._update_timer_callback_tag)
208
174
            self._update_timer_callback_tag = None
209
175
    
210
176
    def checker_completed(self, exitstatus, condition, command):
211
177
        if exitstatus == 0:
 
178
            self.logger('Checker for client {} (command "{}")'
 
179
                        ' succeeded'.format(self.properties["Name"],
 
180
                                            command), level=0)
212
181
            self.update()
213
182
            return
214
183
        # Checker failed
215
184
        if os.WIFEXITED(condition):
216
 
            self.logger('Checker for client {0} (command "{1}")'
217
 
                        ' failed with exit code {2}'
 
185
            self.logger('Checker for client {} (command "{}") failed'
 
186
                        ' with exit code {}'
218
187
                        .format(self.properties["Name"], command,
219
188
                                os.WEXITSTATUS(condition)))
220
189
        elif os.WIFSIGNALED(condition):
221
 
            self.logger('Checker for client {0} (command "{1}") was'
222
 
                        ' killed by signal {2}'
 
190
            self.logger('Checker for client {} (command "{}") was'
 
191
                        ' killed by signal {}'
223
192
                        .format(self.properties["Name"], command,
224
193
                                os.WTERMSIG(condition)))
225
194
        elif os.WCOREDUMP(condition):
226
 
            self.logger('Checker for client {0} (command "{1}")'
227
 
                        ' dumped core'
228
 
                        .format(self.properties["Name"], command))
 
195
            self.logger('Checker for client {} (command "{}") dumped'
 
196
                        ' core'.format(self.properties["Name"],
 
197
                                       command))
229
198
        else:
230
 
            self.logger('Checker for client {0} completed'
 
199
            self.logger('Checker for client {} completed'
231
200
                        ' mysteriously'
232
201
                        .format(self.properties["Name"]))
233
202
        self.update()
234
203
    
235
204
    def checker_started(self, command):
236
 
        """Server signals that a checker started. This could be useful
237
 
           to log in the future. """
238
 
        #self.logger('Client {0} started checker "{1}"'
239
 
        #            .format(self.properties["Name"],
240
 
        #                    unicode(command)))
241
 
        pass
 
205
        """Server signals that a checker started."""
 
206
        self.logger('Client {} started checker "{}"'
 
207
                    .format(self.properties["Name"],
 
208
                            command), level=0)
242
209
    
243
210
    def got_secret(self):
244
 
        self.logger('Client {0} received its secret'
 
211
        self.logger('Client {} received its secret'
245
212
                    .format(self.properties["Name"]))
246
213
    
247
214
    def need_approval(self, timeout, default):
248
215
        if not default:
249
 
            message = 'Client {0} needs approval within {1} seconds'
 
216
            message = 'Client {} needs approval within {} seconds'
250
217
        else:
251
 
            message = 'Client {0} will get its secret in {1} seconds'
 
218
            message = 'Client {} will get its secret in {} seconds'
252
219
        self.logger(message.format(self.properties["Name"],
253
220
                                   timeout/1000))
254
 
        self.using_timer(True)
255
221
    
256
222
    def rejected(self, reason):
257
 
        self.logger('Client {0} was rejected; reason: {1}'
 
223
        self.logger('Client {} was rejected; reason: {}'
258
224
                    .format(self.properties["Name"], reason))
259
225
    
260
226
    def selectable(self):
283
249
                          "bold-underline-blink":
284
250
                              "bold-underline-blink-standout",
285
251
                          }
286
 
 
 
252
        
287
253
        # Rebuild focus and non-focus widgets using current properties
288
 
 
 
254
        
289
255
        # Base part of a client. Name!
290
256
        base = '{name}: '.format(name=self.properties["Name"])
291
257
        if not self.properties["Enabled"]:
292
258
            message = "DISABLED"
 
259
            self.using_timer(False)
293
260
        elif self.properties["ApprovalPending"]:
294
261
            timeout = datetime.timedelta(milliseconds
295
262
                                         = self.properties
297
264
            last_approval_request = isoformat_to_datetime(
298
265
                self.properties["LastApprovalRequest"])
299
266
            if last_approval_request is not None:
300
 
                timer = timeout - (datetime.datetime.utcnow()
301
 
                                   - last_approval_request)
 
267
                timer = max(timeout - (datetime.datetime.utcnow()
 
268
                                       - last_approval_request),
 
269
                            datetime.timedelta())
302
270
            else:
303
271
                timer = datetime.timedelta()
304
272
            if self.properties["ApprovedByDefault"]:
305
 
                message = "Approval in {0}. (d)eny?"
 
273
                message = "Approval in {}. (d)eny?"
306
274
            else:
307
 
                message = "Denial in {0}. (a)pprove?"
308
 
            message = message.format(unicode(timer).rsplit(".", 1)[0])
 
275
                message = "Denial in {}. (a)pprove?"
 
276
            message = message.format(str(timer).rsplit(".", 1)[0])
 
277
            self.using_timer(True)
309
278
        elif self.properties["LastCheckerStatus"] != 0:
310
279
            # When checker has failed, show timer until client expires
311
280
            expires = self.properties["Expires"]
314
283
            else:
315
284
                expires = (datetime.datetime.strptime
316
285
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
317
 
                timer = expires - datetime.datetime.utcnow()
 
286
                timer = max(expires - datetime.datetime.utcnow(),
 
287
                            datetime.timedelta())
318
288
            message = ('A checker has failed! Time until client'
319
 
                       ' gets disabled: {0}'
320
 
                       .format(unicode(timer).rsplit(".", 1)[0]))
 
289
                       ' gets disabled: {}'
 
290
                       .format(str(timer).rsplit(".", 1)[0]))
 
291
            self.using_timer(True)
321
292
        else:
322
293
            message = "enabled"
323
 
        self._text = "{0}{1}".format(base, message)
324
 
            
 
294
            self.using_timer(False)
 
295
        self._text = "{}{}".format(base, message)
 
296
        
325
297
        if not urwid.supports_unicode():
326
298
            self._text = self._text.encode("ascii", "replace")
327
299
        textlist = [("normal", self._text)]
344
316
        self.update()
345
317
        return True             # Keep calling this
346
318
    
347
 
    def delete(self, *args, **kwargs):
 
319
    def delete(self, **kwargs):
348
320
        if self._update_timer_callback_tag is not None:
349
321
            gobject.source_remove(self._update_timer_callback_tag)
350
322
            self._update_timer_callback_tag = None
353
325
        self.match_objects = ()
354
326
        if self.delete_hook is not None:
355
327
            self.delete_hook(self)
356
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
 
328
        return super(MandosClientWidget, self).delete(**kwargs)
357
329
    
358
330
    def render(self, maxcolrow, focus=False):
359
331
        """Render differently if we have focus.
401
373
        else:
402
374
            return key
403
375
    
404
 
    def property_changed(self, property=None, value=None,
405
 
                         *args, **kwargs):
406
 
        """Call self.update() if old value is not new value.
 
376
    def properties_changed(self, interface, properties, invalidated):
 
377
        """Call self.update() if any properties changed.
407
378
        This overrides the method from MandosClientPropertyCache"""
408
 
        property_name = unicode(property)
409
 
        old_value = self.properties.get(property_name)
410
 
        super(MandosClientWidget, self).property_changed(
411
 
            property=property, value=value, *args, **kwargs)
412
 
        if self.properties.get(property_name) != old_value:
 
379
        old_values = { key: self.properties.get(key)
 
380
                       for key in properties.keys() }
 
381
        super(MandosClientWidget, self).properties_changed(
 
382
            interface, properties, invalidated)
 
383
        if any(old_values[key] != self.properties.get(key)
 
384
               for key in old_values):
413
385
            self.update()
414
386
 
415
387
 
418
390
    "down" key presses, thus not allowing any containing widgets to
419
391
    use them as an excuse to shift focus away from this widget.
420
392
    """
421
 
    def keypress(self, maxcolrow, key):
422
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
393
    def keypress(self, *args, **kwargs):
 
394
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
423
395
        if ret in ("up", "down"):
424
396
            return
425
397
        return ret
429
401
    """This is the entire user interface - the whole screen
430
402
    with boxes, lists of client widgets, etc.
431
403
    """
432
 
    def __init__(self, max_log_length=1000):
 
404
    def __init__(self, max_log_length=1000, log_level=1):
433
405
        DBusGMainLoop(set_as_default=True)
434
406
        
435
407
        self.screen = urwid.curses_display.Screen()
438
410
                ("normal",
439
411
                 "default", "default", None),
440
412
                ("bold",
441
 
                 "default", "default", "bold"),
 
413
                 "bold", "default", "bold"),
442
414
                ("underline-blink",
443
 
                 "default", "default", "underline"),
 
415
                 "underline,blink", "default", "underline,blink"),
444
416
                ("standout",
445
 
                 "default", "default", "standout"),
 
417
                 "standout", "default", "standout"),
446
418
                ("bold-underline-blink",
447
 
                 "default", "default", ("bold", "underline")),
 
419
                 "bold,underline,blink", "default", "bold,underline,blink"),
448
420
                ("bold-standout",
449
 
                 "default", "default", ("bold", "standout")),
 
421
                 "bold,standout", "default", "bold,standout"),
450
422
                ("underline-blink-standout",
451
 
                 "default", "default", ("underline", "standout")),
 
423
                 "underline,blink,standout", "default",
 
424
                 "underline,blink,standout"),
452
425
                ("bold-underline-blink-standout",
453
 
                 "default", "default", ("bold", "underline",
454
 
                                          "standout")),
 
426
                 "bold,underline,blink,standout", "default",
 
427
                 "bold,underline,blink,standout"),
455
428
                ))
456
429
        
457
430
        if urwid.supports_unicode():
472
445
        self.log = []
473
446
        self.max_log_length = max_log_length
474
447
        
 
448
        self.log_level = log_level
 
449
        
475
450
        # We keep a reference to the log widget so we can remove it
476
451
        # from the ListWalker without it getting destroyed
477
452
        self.logbox = ConstrainedListBox(self.log)
491
466
        self.main_loop = gobject.MainLoop()
492
467
    
493
468
    def client_not_found(self, fingerprint, address):
494
 
        self.log_message("Client with address {0} and fingerprint"
495
 
                         " {1} could not be found"
 
469
        self.log_message("Client with address {} and fingerprint {}"
 
470
                         " could not be found"
496
471
                         .format(address, fingerprint))
497
472
    
498
473
    def rebuild(self):
511
486
            self.uilist.append(self.logbox)
512
487
        self.topwidget = urwid.Pile(self.uilist)
513
488
    
514
 
    def log_message(self, message):
 
489
    def log_message(self, message, level=1):
 
490
        """Log message formatted with timestamp"""
 
491
        if level < self.log_level:
 
492
            return
515
493
        timestamp = datetime.datetime.now().isoformat()
516
 
        self.log_message_raw(timestamp + ": " + message)
 
494
        self.log_message_raw("{}: {}".format(timestamp, message),
 
495
                             level=level)
517
496
    
518
 
    def log_message_raw(self, markup):
 
497
    def log_message_raw(self, markup, level=1):
519
498
        """Add a log message to the log buffer."""
 
499
        if level < self.log_level:
 
500
            return
520
501
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
521
502
        if (self.max_log_length
522
503
            and len(self.log) > self.max_log_length):
529
510
        """Toggle visibility of the log buffer."""
530
511
        self.log_visible = not self.log_visible
531
512
        self.rebuild()
532
 
        #self.log_message("Log visibility changed to: "
533
 
        #                 + unicode(self.log_visible))
 
513
        self.log_message("Log visibility changed to: {}"
 
514
                         .format(self.log_visible), level=0)
534
515
    
535
516
    def change_log_display(self):
536
517
        """Change type of log display.
541
522
            self.log_wrap = "clip"
542
523
        for textwidget in self.log:
543
524
            textwidget.set_wrap_mode(self.log_wrap)
544
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
525
        self.log_message("Wrap mode: {}".format(self.log_wrap),
 
526
                         level=0)
545
527
    
546
528
    def find_and_remove_client(self, path, name):
547
529
        """Find a client by its object path and remove it.
552
534
            client = self.clients_dict[path]
553
535
        except KeyError:
554
536
            # not found?
555
 
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
537
            self.log_message("Unknown client {!r} ({!r}) removed"
556
538
                             .format(name, path))
557
539
            return
558
540
        client.delete()
576
558
        if path is None:
577
559
            path = client.proxy.object_path
578
560
        self.clients_dict[path] = client
579
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
561
        self.clients.sort(key=lambda c: c.properties["Name"])
580
562
        self.refresh()
581
563
    
582
564
    def remove_client(self, client, path=None):
584
566
        if path is None:
585
567
            path = client.proxy.object_path
586
568
        del self.clients_dict[path]
587
 
        if not self.clients_dict:
588
 
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
589
 
            # is completely emptied, we need to recreate it.
590
 
            self.clients = urwid.SimpleListWalker([])
591
 
            self.rebuild()
592
569
        self.refresh()
593
570
    
594
571
    def refresh(self):
607
584
        try:
608
585
            mandos_clients = (self.mandos_serv
609
586
                              .GetAllClientsWithProperties())
 
587
            if not mandos_clients:
 
588
                self.log_message_raw(("bold", "Note: Server has no clients."))
610
589
        except dbus.exceptions.DBusException:
 
590
            self.log_message_raw(("bold", "Note: No Mandos server running."))
611
591
            mandos_clients = dbus.Dictionary()
612
592
        
613
593
        (self.mandos_serv
625
605
                            self.client_not_found,
626
606
                            dbus_interface=server_interface,
627
607
                            byte_arrays=True))
628
 
        for path, client in mandos_clients.iteritems():
 
608
        for path, client in mandos_clients.items():
629
609
            client_proxy_object = self.bus.get_object(self.busname,
630
610
                                                      path)
631
611
            self.add_client(MandosClientWidget(server_proxy_object
640
620
                                               logger
641
621
                                               =self.log_message),
642
622
                            path=path)
643
 
 
 
623
        
644
624
        self.refresh()
645
625
        self._input_callback_tag = (gobject.io_add_watch
646
626
                                    (sys.stdin.fileno(),
678
658
            elif key == "window resize":
679
659
                self.size = self.screen.get_cols_rows()
680
660
                self.refresh()
681
 
            elif key == "\f":  # Ctrl-L
 
661
            elif key == "ctrl l":
 
662
                self.screen.clear()
682
663
                self.refresh()
683
664
            elif key == "l" or key == "D":
684
665
                self.toggle_log_display()
696
677
                                            "?: Help",
697
678
                                            "l: Log window toggle",
698
679
                                            "TAB: Switch window",
699
 
                                            "w: Wrap (log)"))))
 
680
                                            "w: Wrap (log lines)",
 
681
                                            "v: Toggle verbose log",
 
682
                                            ))))
700
683
                self.log_message_raw(("bold",
701
684
                                      "  "
702
685
                                      .join(("Clients:",
715
698
                else:
716
699
                    self.topwidget.set_focus(self.logbox)
717
700
                self.refresh()
 
701
            elif key == "v":
 
702
                if self.log_level == 0:
 
703
                    self.log_level = 1
 
704
                    self.log_message("Verbose mode: Off")
 
705
                else:
 
706
                    self.log_level = 0
 
707
                    self.log_message("Verbose mode: On")
718
708
            #elif (key == "end" or key == "meta >" or key == "G"
719
709
            #      or key == ">"):
720
710
            #    pass            # xxx end-of-buffer
743
733
    ui.run()
744
734
except KeyboardInterrupt:
745
735
    ui.screen.stop()
746
 
except Exception, e:
747
 
    ui.log_message(unicode(e))
 
736
except Exception as e:
 
737
    ui.log_message(str(e))
748
738
    ui.screen.stop()
749
739
    raise