/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: 2013-08-27 21:47:35 UTC
  • Revision ID: teddy@recompile.se-20130827214735-8r7bsaqjvkx2h97c
* plugin-runner.c (main): Bug fix; do not ignore return value of
                          setgid().
* plugins.d/mandos-client.c (main): Bug fix: sleep() takes an unsigned
                                    int, not an int.
* plugins.d/plymouth.c (exec_and_wait, getargv, main/plymouthd_argv):
                       Add more const-ness to the argv pointer.

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-2011 Teddy Hogeborn
7
 
# Copyright © 2009-2011 Björn Påhlsson
 
6
# Copyright © 2009-2012 Teddy Hogeborn
 
7
# Copyright © 2009-2012 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
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
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
35
40
import urwid
36
41
 
37
42
from dbus.mainloop.glib import DBusGMainLoop
38
 
import gobject
 
43
try:
 
44
    import gobject
 
45
except ImportError:
 
46
    from gi.repository import GObject as gobject
39
47
 
40
48
import dbus
41
49
 
42
 
import UserList
43
 
 
44
50
import locale
45
51
 
 
52
if sys.version_info[0] == 2:
 
53
    str = unicode
 
54
 
46
55
locale.setlocale(locale.LC_ALL, '')
47
56
 
48
57
import logging
49
58
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
50
59
 
51
60
# Some useful constants
52
 
domain = 'se.bsnet.fukt'
 
61
domain = 'se.recompile'
53
62
server_interface = domain + '.Mandos'
54
63
client_interface = domain + '.Mandos.Client'
55
 
version = "1.3.1"
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)
 
64
version = "1.6.0"
64
65
 
65
66
def isoformat_to_datetime(iso):
66
67
    "Parse an ISO 8601 date string to a datetime.datetime()"
83
84
    properties and calls a hook function when any of them are
84
85
    changed.
85
86
    """
86
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
87
    def __init__(self, proxy_object=None, properties=None, **kwargs):
87
88
        self.proxy = proxy_object # Mandos Client proxy object
88
 
        
89
 
        self.properties = dict()
 
89
        self.properties = dict() if properties is None else properties
90
90
        self.property_changed_match = (
91
91
            self.proxy.connect_to_signal("PropertyChanged",
92
 
                                         self.property_changed,
 
92
                                         self._property_changed,
93
93
                                         client_interface,
94
94
                                         byte_arrays=True))
95
95
        
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)
 
96
        if properties is None:
 
97
            self.properties.update(
 
98
                self.proxy.GetAll(client_interface,
 
99
                                  dbus_interface
 
100
                                  = dbus.PROPERTIES_IFACE))
 
101
        
 
102
        super(MandosClientPropertyCache, self).__init__(**kwargs)
 
103
    
 
104
    def _property_changed(self, property, value):
 
105
        """Helper which takes positional arguments"""
 
106
        return self.property_changed(property=property, value=value)
103
107
    
104
108
    def property_changed(self, property=None, value=None):
105
109
        """This is called whenever we get a PropertyChanged signal
108
112
        # Update properties dict with new value
109
113
        self.properties[property] = value
110
114
    
111
 
    def delete(self, *args, **kwargs):
 
115
    def delete(self):
112
116
        self.property_changed_match.remove()
113
 
        super(MandosClientPropertyCache, self).__init__(
114
 
            *args, **kwargs)
115
117
 
116
118
 
117
119
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
119
121
    """
120
122
    
121
123
    def __init__(self, server_proxy_object=None, update_hook=None,
122
 
                 delete_hook=None, logger=None, *args, **kwargs):
 
124
                 delete_hook=None, logger=None, **kwargs):
123
125
        # Called on update
124
126
        self.update_hook = update_hook
125
127
        # Called on delete
130
132
        self.logger = logger
131
133
        
132
134
        self._update_timer_callback_tag = None
133
 
        self._update_timer_callback_lock = 0
134
 
        self.last_checker_failed = False
135
135
        
136
136
        # The widget shown normally
137
137
        self._text_widget = urwid.Text("")
138
138
        # The widget shown when we have focus
139
139
        self._focus_text_widget = urwid.Text("")
140
 
        super(MandosClientWidget, self).__init__(
141
 
            update_hook=update_hook, delete_hook=delete_hook,
142
 
            *args, **kwargs)
 
140
        super(MandosClientWidget, self).__init__(**kwargs)
143
141
        self.update()
144
142
        self.opened = False
145
143
        
146
 
        last_checked_ok = isoformat_to_datetime(self.properties
147
 
                                                ["LastCheckedOK"])
148
 
        if last_checked_ok is None:
149
 
            self.last_checker_failed = True
150
 
        else:
151
 
            self.last_checker_failed = ((datetime.datetime.utcnow()
152
 
                                         - last_checked_ok)
153
 
                                        > datetime.timedelta
154
 
                                        (milliseconds=
155
 
                                         self.properties
156
 
                                         ["Interval"]))
157
 
        
158
 
        if self.last_checker_failed:
159
 
            self.using_timer(True)
160
 
        
161
 
        if self.need_approval:
162
 
            self.using_timer(True)
163
 
        
164
144
        self.match_objects = (
165
145
            self.proxy.connect_to_signal("CheckerCompleted",
166
146
                                         self.checker_completed,
182
162
                                         self.rejected,
183
163
                                         client_interface,
184
164
                                         byte_arrays=True))
185
 
        #self.logger('Created client %s' % (self.properties["Name"]))
 
165
        #self.logger('Created client {0}'
 
166
        #            .format(self.properties["Name"]))
186
167
    
187
 
    def property_changed(self, property=None, value=None):
188
 
        super(self, MandosClientWidget).property_changed(property,
189
 
                                                         value)
190
 
        if property == "ApprovalPending":
191
 
            using_timer(bool(value))
192
 
        
193
168
    def using_timer(self, flag):
194
169
        """Call this method with True or False when timer should be
195
170
        activated or deactivated.
196
171
        """
197
 
        old = self._update_timer_callback_lock
198
 
        if flag:
199
 
            self._update_timer_callback_lock += 1
200
 
        else:
201
 
            self._update_timer_callback_lock -= 1
202
 
        if old == 0 and self._update_timer_callback_lock:
 
172
        if flag and self._update_timer_callback_tag is None:
 
173
            # Will update the shown timer value every second
203
174
            self._update_timer_callback_tag = (gobject.timeout_add
204
175
                                               (1000,
205
176
                                                self.update_timer))
206
 
        elif old and self._update_timer_callback_lock == 0:
 
177
        elif not (flag or self._update_timer_callback_tag is None):
207
178
            gobject.source_remove(self._update_timer_callback_tag)
208
179
            self._update_timer_callback_tag = None
209
180
    
210
181
    def checker_completed(self, exitstatus, condition, command):
211
182
        if exitstatus == 0:
212
 
            if self.last_checker_failed:
213
 
                self.last_checker_failed = False
214
 
                self.using_timer(False)
215
 
            #self.logger('Checker for client %s (command "%s")'
216
 
            #            ' was successful'
217
 
            #            % (self.properties["Name"], command))
218
183
            self.update()
219
184
            return
220
185
        # Checker failed
221
 
        if not self.last_checker_failed:
222
 
            self.last_checker_failed = True
223
 
            self.using_timer(True)
224
186
        if os.WIFEXITED(condition):
225
 
            self.logger('Checker for client %s (command "%s")'
226
 
                        ' failed with exit code %s'
227
 
                        % (self.properties["Name"], command,
228
 
                           os.WEXITSTATUS(condition)))
 
187
            self.logger('Checker for client {0} (command "{1}")'
 
188
                        ' failed with exit code {2}'
 
189
                        .format(self.properties["Name"], command,
 
190
                                os.WEXITSTATUS(condition)))
229
191
        elif os.WIFSIGNALED(condition):
230
 
            self.logger('Checker for client %s (command "%s")'
231
 
                        ' was killed by signal %s'
232
 
                        % (self.properties["Name"], command,
233
 
                           os.WTERMSIG(condition)))
 
192
            self.logger('Checker for client {0} (command "{1}") was'
 
193
                        ' killed by signal {2}'
 
194
                        .format(self.properties["Name"], command,
 
195
                                os.WTERMSIG(condition)))
234
196
        elif os.WCOREDUMP(condition):
235
 
            self.logger('Checker for client %s (command "%s")'
 
197
            self.logger('Checker for client {0} (command "{1}")'
236
198
                        ' dumped core'
237
 
                        % (self.properties["Name"], command))
 
199
                        .format(self.properties["Name"], command))
238
200
        else:
239
 
            self.logger('Checker for client %s completed'
240
 
                        ' mysteriously')
 
201
            self.logger('Checker for client {0} completed'
 
202
                        ' mysteriously'
 
203
                        .format(self.properties["Name"]))
241
204
        self.update()
242
205
    
243
206
    def checker_started(self, command):
244
 
        #self.logger('Client %s started checker "%s"'
245
 
        #            % (self.properties["Name"], unicode(command)))
 
207
        """Server signals that a checker started. This could be useful
 
208
           to log in the future. """
 
209
        #self.logger('Client {0} started checker "{1}"'
 
210
        #            .format(self.properties["Name"],
 
211
        #                    str(command)))
246
212
        pass
247
213
    
248
214
    def got_secret(self):
249
 
        self.last_checker_failed = False
250
 
        self.logger('Client %s received its secret'
251
 
                    % self.properties["Name"])
 
215
        self.logger('Client {0} received its secret'
 
216
                    .format(self.properties["Name"]))
252
217
    
253
218
    def need_approval(self, timeout, default):
254
219
        if not default:
255
 
            message = 'Client %s needs approval within %s seconds'
 
220
            message = 'Client {0} needs approval within {1} seconds'
256
221
        else:
257
 
            message = 'Client %s will get its secret in %s seconds'
258
 
        self.logger(message
259
 
                    % (self.properties["Name"], timeout/1000))
260
 
        self.using_timer(True)
 
222
            message = 'Client {0} will get its secret in {1} seconds'
 
223
        self.logger(message.format(self.properties["Name"],
 
224
                                   timeout/1000))
261
225
    
262
226
    def rejected(self, reason):
263
 
        self.logger('Client %s was rejected; reason: %s'
264
 
                    % (self.properties["Name"], reason))
 
227
        self.logger('Client {0} was rejected; reason: {1}'
 
228
                    .format(self.properties["Name"], reason))
265
229
    
266
230
    def selectable(self):
267
231
        """Make this a "selectable" widget.
289
253
                          "bold-underline-blink":
290
254
                              "bold-underline-blink-standout",
291
255
                          }
292
 
 
 
256
        
293
257
        # Rebuild focus and non-focus widgets using current properties
294
 
 
 
258
        
295
259
        # Base part of a client. Name!
296
 
        base = ('%(name)s: '
297
 
                      % {"name": self.properties["Name"]})
 
260
        base = '{name}: '.format(name=self.properties["Name"])
298
261
        if not self.properties["Enabled"]:
299
262
            message = "DISABLED"
 
263
            self.using_timer(False)
300
264
        elif self.properties["ApprovalPending"]:
301
265
            timeout = datetime.timedelta(milliseconds
302
266
                                         = self.properties
304
268
            last_approval_request = isoformat_to_datetime(
305
269
                self.properties["LastApprovalRequest"])
306
270
            if last_approval_request is not None:
307
 
                timer = timeout - (datetime.datetime.utcnow()
308
 
                                   - last_approval_request)
 
271
                timer = max(timeout - (datetime.datetime.utcnow()
 
272
                                       - last_approval_request),
 
273
                            datetime.timedelta())
309
274
            else:
310
275
                timer = datetime.timedelta()
311
276
            if self.properties["ApprovedByDefault"]:
312
 
                message = "Approval in %s. (d)eny?"
313
 
            else:
314
 
                message = "Denial in %s. (a)pprove?"
315
 
            message = message % unicode(timer).rsplit(".", 1)[0]
316
 
        elif self.last_checker_failed:
317
 
            timeout = datetime.timedelta(milliseconds
318
 
                                         = self.properties
319
 
                                         ["Timeout"])
320
 
            last_ok = isoformat_to_datetime(
321
 
                max((self.properties["LastCheckedOK"]
322
 
                     or self.properties["Created"]),
323
 
                    self.properties["LastEnabled"]))
324
 
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
 
277
                message = "Approval in {0}. (d)eny?"
 
278
            else:
 
279
                message = "Denial in {0}. (a)pprove?"
 
280
            message = message.format(str(timer).rsplit(".", 1)[0])
 
281
            self.using_timer(True)
 
282
        elif self.properties["LastCheckerStatus"] != 0:
 
283
            # When checker has failed, show timer until client expires
 
284
            expires = self.properties["Expires"]
 
285
            if expires == "":
 
286
                timer = datetime.timedelta(0)
 
287
            else:
 
288
                expires = (datetime.datetime.strptime
 
289
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
 
290
                timer = max(expires - datetime.datetime.utcnow(),
 
291
                            datetime.timedelta())
325
292
            message = ('A checker has failed! Time until client'
326
 
                       ' gets disabled: %s'
327
 
                           % unicode(timer).rsplit(".", 1)[0])
 
293
                       ' gets disabled: {0}'
 
294
                       .format(str(timer).rsplit(".", 1)[0]))
 
295
            self.using_timer(True)
328
296
        else:
329
297
            message = "enabled"
330
 
        self._text = "%s%s" % (base, message)
331
 
            
 
298
            self.using_timer(False)
 
299
        self._text = "{0}{1}".format(base, message)
 
300
        
332
301
        if not urwid.supports_unicode():
333
302
            self._text = self._text.encode("ascii", "replace")
334
303
        textlist = [("normal", self._text)]
346
315
            self.update_hook()
347
316
    
348
317
    def update_timer(self):
349
 
        "called by gobject"
 
318
        """called by gobject. Will indefinitely loop until
 
319
        gobject.source_remove() on tag is called"""
350
320
        self.update()
351
321
        return True             # Keep calling this
352
322
    
353
 
    def delete(self, *args, **kwargs):
 
323
    def delete(self, **kwargs):
354
324
        if self._update_timer_callback_tag is not None:
355
325
            gobject.source_remove(self._update_timer_callback_tag)
356
326
            self._update_timer_callback_tag = None
359
329
        self.match_objects = ()
360
330
        if self.delete_hook is not None:
361
331
            self.delete_hook(self)
362
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
 
332
        return super(MandosClientWidget, self).delete(**kwargs)
363
333
    
364
334
    def render(self, maxcolrow, focus=False):
365
335
        """Render differently if we have focus.
407
377
        else:
408
378
            return key
409
379
    
410
 
    def property_changed(self, property=None, value=None,
411
 
                         *args, **kwargs):
 
380
    def property_changed(self, property=None, **kwargs):
412
381
        """Call self.update() if old value is not new value.
413
382
        This overrides the method from MandosClientPropertyCache"""
414
 
        property_name = unicode(property)
 
383
        property_name = str(property)
415
384
        old_value = self.properties.get(property_name)
416
385
        super(MandosClientWidget, self).property_changed(
417
 
            property=property, value=value, *args, **kwargs)
 
386
            property=property, **kwargs)
418
387
        if self.properties.get(property_name) != old_value:
419
388
            self.update()
420
389
 
424
393
    "down" key presses, thus not allowing any containing widgets to
425
394
    use them as an excuse to shift focus away from this widget.
426
395
    """
427
 
    def keypress(self, maxcolrow, key):
428
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
396
    def keypress(self, *args, **kwargs):
 
397
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
429
398
        if ret in ("up", "down"):
430
399
            return
431
400
        return ret
444
413
                ("normal",
445
414
                 "default", "default", None),
446
415
                ("bold",
447
 
                 "default", "default", "bold"),
 
416
                 "bold", "default", "bold"),
448
417
                ("underline-blink",
449
 
                 "default", "default", "underline"),
 
418
                 "underline,blink", "default", "underline,blink"),
450
419
                ("standout",
451
 
                 "default", "default", "standout"),
 
420
                 "standout", "default", "standout"),
452
421
                ("bold-underline-blink",
453
 
                 "default", "default", ("bold", "underline")),
 
422
                 "bold,underline,blink", "default", "bold,underline,blink"),
454
423
                ("bold-standout",
455
 
                 "default", "default", ("bold", "standout")),
 
424
                 "bold,standout", "default", "bold,standout"),
456
425
                ("underline-blink-standout",
457
 
                 "default", "default", ("underline", "standout")),
 
426
                 "underline,blink,standout", "default",
 
427
                 "underline,blink,standout"),
458
428
                ("bold-underline-blink-standout",
459
 
                 "default", "default", ("bold", "underline",
460
 
                                          "standout")),
 
429
                 "bold,underline,blink,standout", "default",
 
430
                 "bold,underline,blink,standout"),
461
431
                ))
462
432
        
463
433
        if urwid.supports_unicode():
495
465
        
496
466
        self.busname = domain + '.Mandos'
497
467
        self.main_loop = gobject.MainLoop()
498
 
        self.bus = dbus.SystemBus()
499
 
        mandos_dbus_objc = self.bus.get_object(
500
 
            self.busname, "/", follow_name_owner_changes=True)
501
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
502
 
                                          dbus_interface
503
 
                                          = server_interface)
504
 
        try:
505
 
            mandos_clients = (self.mandos_serv
506
 
                              .GetAllClientsWithProperties())
507
 
        except dbus.exceptions.DBusException:
508
 
            mandos_clients = dbus.Dictionary()
509
 
        
510
 
        (self.mandos_serv
511
 
         .connect_to_signal("ClientRemoved",
512
 
                            self.find_and_remove_client,
513
 
                            dbus_interface=server_interface,
514
 
                            byte_arrays=True))
515
 
        (self.mandos_serv
516
 
         .connect_to_signal("ClientAdded",
517
 
                            self.add_new_client,
518
 
                            dbus_interface=server_interface,
519
 
                            byte_arrays=True))
520
 
        (self.mandos_serv
521
 
         .connect_to_signal("ClientNotFound",
522
 
                            self.client_not_found,
523
 
                            dbus_interface=server_interface,
524
 
                            byte_arrays=True))
525
 
        for path, client in mandos_clients.iteritems():
526
 
            client_proxy_object = self.bus.get_object(self.busname,
527
 
                                                      path)
528
 
            self.add_client(MandosClientWidget(server_proxy_object
529
 
                                               =self.mandos_serv,
530
 
                                               proxy_object
531
 
                                               =client_proxy_object,
532
 
                                               properties=client,
533
 
                                               update_hook
534
 
                                               =self.refresh,
535
 
                                               delete_hook
536
 
                                               =self.remove_client,
537
 
                                               logger
538
 
                                               =self.log_message),
539
 
                            path=path)
540
468
    
541
469
    def client_not_found(self, fingerprint, address):
542
 
        self.log_message(("Client with address %s and fingerprint %s"
543
 
                          " could not be found" % (address,
544
 
                                                    fingerprint)))
 
470
        self.log_message("Client with address {0} and fingerprint"
 
471
                         " {1} could not be found"
 
472
                         .format(address, fingerprint))
545
473
    
546
474
    def rebuild(self):
547
475
        """This rebuilds the User Interface.
557
485
                                                     self.divider)))
558
486
        if self.log_visible:
559
487
            self.uilist.append(self.logbox)
560
 
            pass
561
488
        self.topwidget = urwid.Pile(self.uilist)
562
489
    
563
490
    def log_message(self, message):
 
491
        """Log message formatted with timestamp"""
564
492
        timestamp = datetime.datetime.now().isoformat()
565
493
        self.log_message_raw(timestamp + ": " + message)
566
494
    
579
507
        self.log_visible = not self.log_visible
580
508
        self.rebuild()
581
509
        #self.log_message("Log visibility changed to: "
582
 
        #                 + unicode(self.log_visible))
 
510
        #                 + str(self.log_visible))
583
511
    
584
512
    def change_log_display(self):
585
513
        """Change type of log display.
601
529
            client = self.clients_dict[path]
602
530
        except KeyError:
603
531
            # not found?
604
 
            self.log_message("Unknown client %r (%r) removed", name,
605
 
                             path)
 
532
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
533
                             .format(name, path))
606
534
            return
607
535
        client.delete()
608
536
    
625
553
        if path is None:
626
554
            path = client.proxy.object_path
627
555
        self.clients_dict[path] = client
628
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
556
        self.clients.sort(key=lambda c: c.properties["Name"])
629
557
        self.refresh()
630
558
    
631
559
    def remove_client(self, client, path=None):
633
561
        if path is None:
634
562
            path = client.proxy.object_path
635
563
        del self.clients_dict[path]
636
 
        if not self.clients_dict:
637
 
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
638
 
            # is completely emptied, we need to recreate it.
639
 
            self.clients = urwid.SimpleListWalker([])
640
 
            self.rebuild()
641
564
        self.refresh()
642
565
    
643
566
    def refresh(self):
647
570
    
648
571
    def run(self):
649
572
        """Start the main loop and exit when it's done."""
 
573
        self.bus = dbus.SystemBus()
 
574
        mandos_dbus_objc = self.bus.get_object(
 
575
            self.busname, "/", follow_name_owner_changes=True)
 
576
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
577
                                          dbus_interface
 
578
                                          = server_interface)
 
579
        try:
 
580
            mandos_clients = (self.mandos_serv
 
581
                              .GetAllClientsWithProperties())
 
582
            if not mandos_clients:
 
583
                self.log_message_raw(("bold", "Note: Server has no clients."))
 
584
        except dbus.exceptions.DBusException:
 
585
            self.log_message_raw(("bold", "Note: No Mandos server running."))
 
586
            mandos_clients = dbus.Dictionary()
 
587
        
 
588
        (self.mandos_serv
 
589
         .connect_to_signal("ClientRemoved",
 
590
                            self.find_and_remove_client,
 
591
                            dbus_interface=server_interface,
 
592
                            byte_arrays=True))
 
593
        (self.mandos_serv
 
594
         .connect_to_signal("ClientAdded",
 
595
                            self.add_new_client,
 
596
                            dbus_interface=server_interface,
 
597
                            byte_arrays=True))
 
598
        (self.mandos_serv
 
599
         .connect_to_signal("ClientNotFound",
 
600
                            self.client_not_found,
 
601
                            dbus_interface=server_interface,
 
602
                            byte_arrays=True))
 
603
        for path, client in mandos_clients.items():
 
604
            client_proxy_object = self.bus.get_object(self.busname,
 
605
                                                      path)
 
606
            self.add_client(MandosClientWidget(server_proxy_object
 
607
                                               =self.mandos_serv,
 
608
                                               proxy_object
 
609
                                               =client_proxy_object,
 
610
                                               properties=client,
 
611
                                               update_hook
 
612
                                               =self.refresh,
 
613
                                               delete_hook
 
614
                                               =self.remove_client,
 
615
                                               logger
 
616
                                               =self.log_message),
 
617
                            path=path)
 
618
        
650
619
        self.refresh()
651
620
        self._input_callback_tag = (gobject.io_add_watch
652
621
                                    (sys.stdin.fileno(),
749
718
    ui.run()
750
719
except KeyboardInterrupt:
751
720
    ui.screen.stop()
752
 
except Exception, e:
753
 
    ui.log_message(unicode(e))
 
721
except Exception as e:
 
722
    ui.log_message(str(e))
754
723
    ui.screen.stop()
755
724
    raise