/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-27 09:23:56 UTC
  • Revision ID: teddy@recompile.se-20150727092356-65ul6jsiozlkjw4e
Debian bug fix for mandos-client: Remove dhparams.pem on purge.

* debian/mandos-client.postrm (purge): Bug fix: Remove dhparams.pem.

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