/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: 2012-05-07 20:46:51 UTC
  • Revision ID: teddy@recompile.se-20120507204651-qx5o5ztwmau54mh4
* mandos-monitor: Speedup: Use properties from D-Bus
                  GetAllClientsWithProperties() call.  Also use
                  super() properly - only use keyword arguments and
                  strip them off as "kwargs" is passed on.
  (MandosClientPropertyCache.__init__): Take new "properties"
                                        argument; use it to skip
                                        calling D-Bus GetAll() method.
                                        Call super().  Bind self._
  (MandosClientPropertyCache._property_changed): New helper function.
  (MandosClientPropertyCache.property_changed): Changed to take
                                                keyword arguments.
  (MandosClientPropertyCache.delete): Bug fix: Don't call
                                      super().__init__().
  (MandosClientWidget.__init__): Don't take *args.  Strip used keyword
                                 arguments before calling super().
  (MandosClientWidget.property_changed): Removed dead code.
  (MandosClientWidget.delete): Don't take *args.
  (MandosClientWidget.property_changed): Don't take "value" argument,
                                         since it is not used.
  (ConstrainedListBox.keypress): Take *args, **kwargs and pass them on
                                 to super().

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/>.
21
 
# 
22
 
# Contact the authors at <mandos@fukt.bsnet.se>.
23
 
# 
24
 
 
25
 
from __future__ import division, absolute_import, print_function, unicode_literals
 
20
# along with this program.  If not, see
 
21
# <http://www.gnu.org/licenses/>.
 
22
# 
 
23
# Contact the authors at <mandos@recompile.se>.
 
24
# 
 
25
 
 
26
from __future__ import (division, absolute_import, print_function,
 
27
                        unicode_literals)
 
28
 
 
29
from future_builtins import *
26
30
 
27
31
import sys
28
32
import os
48
52
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
49
53
 
50
54
# Some useful constants
51
 
domain = 'se.bsnet.fukt'
 
55
domain = 'se.recompile'
52
56
server_interface = domain + '.Mandos'
53
57
client_interface = domain + '.Mandos.Client'
54
 
version = "1.3.0"
 
58
version = "1.5.3"
55
59
 
56
60
# Always run in monochrome mode
57
61
urwid.curses_display.curses.has_colors = lambda : False
82
86
    properties and calls a hook function when any of them are
83
87
    changed.
84
88
    """
85
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
89
    def __init__(self, proxy_object=None, properties=None, **kwargs):
86
90
        self.proxy = proxy_object # Mandos Client proxy object
87
 
        
88
 
        self.properties = dict()
89
 
        self.proxy.connect_to_signal("PropertyChanged",
90
 
                                     self.property_changed,
91
 
                                     client_interface,
92
 
                                     byte_arrays=True)
93
 
        
94
 
        self.properties.update(
95
 
            self.proxy.GetAll(client_interface,
96
 
                              dbus_interface = dbus.PROPERTIES_IFACE))
97
 
 
98
 
        #XXX This break good super behaviour!
99
 
#        super(MandosClientPropertyCache, self).__init__(
100
 
#            *args, **kwargs)
 
91
        self.properties = dict() if properties is None else properties
 
92
        self.property_changed_match = (
 
93
            self.proxy.connect_to_signal("PropertyChanged",
 
94
                                         self._property_changed,
 
95
                                         client_interface,
 
96
                                         byte_arrays=True))
 
97
        
 
98
        if properties is None:
 
99
            self.properties.update(
 
100
                self.proxy.GetAll(client_interface,
 
101
                                  dbus_interface
 
102
                                  = dbus.PROPERTIES_IFACE))
 
103
        
 
104
        super(MandosClientPropertyCache, self).__init__(**kwargs)
 
105
    
 
106
    def _property_changed(self, property, value):
 
107
        """Helper which takes positional arguments"""
 
108
        return self.property_changed(property=property, value=value)
101
109
    
102
110
    def property_changed(self, property=None, value=None):
103
111
        """This is called whenever we get a PropertyChanged signal
105
113
        """
106
114
        # Update properties dict with new value
107
115
        self.properties[property] = value
 
116
    
 
117
    def delete(self):
 
118
        self.property_changed_match.remove()
108
119
 
109
120
 
110
121
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
112
123
    """
113
124
    
114
125
    def __init__(self, server_proxy_object=None, update_hook=None,
115
 
                 delete_hook=None, logger=None, *args, **kwargs):
 
126
                 delete_hook=None, logger=None, **kwargs):
116
127
        # Called on update
117
128
        self.update_hook = update_hook
118
129
        # Called on delete
124
135
        
125
136
        self._update_timer_callback_tag = None
126
137
        self._update_timer_callback_lock = 0
127
 
        self.last_checker_failed = False
128
138
        
129
139
        # The widget shown normally
130
140
        self._text_widget = urwid.Text("")
131
141
        # The widget shown when we have focus
132
142
        self._focus_text_widget = urwid.Text("")
133
 
        super(MandosClientWidget, self).__init__(
134
 
            update_hook=update_hook, delete_hook=delete_hook,
135
 
            *args, **kwargs)
 
143
        super(MandosClientWidget, self).__init__(**kwargs)
136
144
        self.update()
137
145
        self.opened = False
138
146
        
139
147
        last_checked_ok = isoformat_to_datetime(self.properties
140
148
                                                ["LastCheckedOK"])
141
 
        if last_checked_ok is None:
142
 
            self.last_checker_failed = True
143
 
        else:
144
 
            self.last_checker_failed = ((datetime.datetime.utcnow()
145
 
                                         - last_checked_ok)
146
 
                                        > datetime.timedelta
147
 
                                        (milliseconds=
148
 
                                         self.properties
149
 
                                         ["Interval"]))
150
149
        
151
 
        if self.last_checker_failed:
 
150
        if self.properties ["LastCheckerStatus"] != 0:
152
151
            self.using_timer(True)
153
152
        
154
153
        if self.need_approval:
155
154
            self.using_timer(True)
156
155
        
157
 
        self.proxy.connect_to_signal("CheckerCompleted",
158
 
                                     self.checker_completed,
159
 
                                     client_interface,
160
 
                                     byte_arrays=True)
161
 
        self.proxy.connect_to_signal("CheckerStarted",
162
 
                                     self.checker_started,
163
 
                                     client_interface,
164
 
                                     byte_arrays=True)
165
 
        self.proxy.connect_to_signal("GotSecret",
166
 
                                     self.got_secret,
167
 
                                     client_interface,
168
 
                                     byte_arrays=True)
169
 
        self.proxy.connect_to_signal("NeedApproval",
170
 
                                     self.need_approval,
171
 
                                     client_interface,
172
 
                                     byte_arrays=True)
173
 
        self.proxy.connect_to_signal("Rejected",
174
 
                                     self.rejected,
175
 
                                     client_interface,
176
 
                                     byte_arrays=True)
 
156
        self.match_objects = (
 
157
            self.proxy.connect_to_signal("CheckerCompleted",
 
158
                                         self.checker_completed,
 
159
                                         client_interface,
 
160
                                         byte_arrays=True),
 
161
            self.proxy.connect_to_signal("CheckerStarted",
 
162
                                         self.checker_started,
 
163
                                         client_interface,
 
164
                                         byte_arrays=True),
 
165
            self.proxy.connect_to_signal("GotSecret",
 
166
                                         self.got_secret,
 
167
                                         client_interface,
 
168
                                         byte_arrays=True),
 
169
            self.proxy.connect_to_signal("NeedApproval",
 
170
                                         self.need_approval,
 
171
                                         client_interface,
 
172
                                         byte_arrays=True),
 
173
            self.proxy.connect_to_signal("Rejected",
 
174
                                         self.rejected,
 
175
                                         client_interface,
 
176
                                         byte_arrays=True))
 
177
        #self.logger('Created client {0}'
 
178
        #            .format(self.properties["Name"]))
177
179
    
178
180
    def property_changed(self, property=None, value=None):
179
181
        super(self, MandosClientWidget).property_changed(property,
180
182
                                                         value)
181
183
        if property == "ApprovalPending":
182
184
            using_timer(bool(value))
183
 
        
 
185
        if property == "LastCheckerStatus":
 
186
            using_timer(value != 0)
 
187
            #self.logger('Checker for client {0} (command "{1}") was '
 
188
            #            ' successful'.format(self.properties["Name"],
 
189
            #                                 command))
 
190
    
184
191
    def using_timer(self, flag):
185
192
        """Call this method with True or False when timer should be
186
193
        activated or deactivated.
191
198
        else:
192
199
            self._update_timer_callback_lock -= 1
193
200
        if old == 0 and self._update_timer_callback_lock:
 
201
            # Will update the shown timer value every second
194
202
            self._update_timer_callback_tag = (gobject.timeout_add
195
203
                                               (1000,
196
204
                                                self.update_timer))
200
208
    
201
209
    def checker_completed(self, exitstatus, condition, command):
202
210
        if exitstatus == 0:
203
 
            if self.last_checker_failed:
204
 
                self.last_checker_failed = False
205
 
                self.using_timer(False)
206
 
            #self.logger('Checker for client %s (command "%s")'
207
 
            #            ' was successful'
208
 
            #            % (self.properties["Name"], command))
209
211
            self.update()
210
212
            return
211
213
        # Checker failed
212
 
        if not self.last_checker_failed:
213
 
            self.last_checker_failed = True
214
 
            self.using_timer(True)
215
214
        if os.WIFEXITED(condition):
216
 
            self.logger('Checker for client %s (command "%s")'
217
 
                        ' failed with exit code %s'
218
 
                        % (self.properties["Name"], command,
219
 
                           os.WEXITSTATUS(condition)))
 
215
            self.logger('Checker for client {0} (command "{1}")'
 
216
                        ' failed with exit code {2}'
 
217
                        .format(self.properties["Name"], command,
 
218
                                os.WEXITSTATUS(condition)))
220
219
        elif os.WIFSIGNALED(condition):
221
 
            self.logger('Checker for client %s (command "%s")'
222
 
                        ' was killed by signal %s'
223
 
                        % (self.properties["Name"], command,
224
 
                           os.WTERMSIG(condition)))
 
220
            self.logger('Checker for client {0} (command "{1}") was'
 
221
                        ' killed by signal {2}'
 
222
                        .format(self.properties["Name"], command,
 
223
                                os.WTERMSIG(condition)))
225
224
        elif os.WCOREDUMP(condition):
226
 
            self.logger('Checker for client %s (command "%s")'
 
225
            self.logger('Checker for client {0} (command "{1}")'
227
226
                        ' dumped core'
228
 
                        % (self.properties["Name"], command))
 
227
                        .format(self.properties["Name"], command))
229
228
        else:
230
 
            self.logger('Checker for client %s completed'
231
 
                        ' mysteriously')
 
229
            self.logger('Checker for client {0} completed'
 
230
                        ' mysteriously'
 
231
                        .format(self.properties["Name"]))
232
232
        self.update()
233
233
    
234
234
    def checker_started(self, command):
235
 
        #self.logger('Client %s started checker "%s"'
236
 
        #            % (self.properties["Name"], unicode(command)))
 
235
        """Server signals that a checker started. This could be useful
 
236
           to log in the future. """
 
237
        #self.logger('Client {0} started checker "{1}"'
 
238
        #            .format(self.properties["Name"],
 
239
        #                    unicode(command)))
237
240
        pass
238
241
    
239
242
    def got_secret(self):
240
 
        self.last_checker_failed = False
241
 
        self.logger('Client %s received its secret'
242
 
                    % self.properties["Name"])
 
243
        self.logger('Client {0} received its secret'
 
244
                    .format(self.properties["Name"]))
243
245
    
244
246
    def need_approval(self, timeout, default):
245
247
        if not default:
246
 
            message = 'Client %s needs approval within %s seconds'
 
248
            message = 'Client {0} needs approval within {1} seconds'
247
249
        else:
248
 
            message = 'Client %s will get its secret in %s seconds'
249
 
        self.logger(message
250
 
                    % (self.properties["Name"], timeout/1000))
 
250
            message = 'Client {0} will get its secret in {1} seconds'
 
251
        self.logger(message.format(self.properties["Name"],
 
252
                                   timeout/1000))
251
253
        self.using_timer(True)
252
254
    
253
255
    def rejected(self, reason):
254
 
        self.logger('Client %s was rejected; reason: %s'
255
 
                    % (self.properties["Name"], reason))
 
256
        self.logger('Client {0} was rejected; reason: {1}'
 
257
                    .format(self.properties["Name"], reason))
256
258
    
257
259
    def selectable(self):
258
260
        """Make this a "selectable" widget.
284
286
        # Rebuild focus and non-focus widgets using current properties
285
287
 
286
288
        # Base part of a client. Name!
287
 
        base = ('%(name)s: '
288
 
                      % {"name": self.properties["Name"]})
 
289
        base = '{name}: '.format(name=self.properties["Name"])
289
290
        if not self.properties["Enabled"]:
290
291
            message = "DISABLED"
291
292
        elif self.properties["ApprovalPending"]:
300
301
            else:
301
302
                timer = datetime.timedelta()
302
303
            if self.properties["ApprovedByDefault"]:
303
 
                message = "Approval in %s. (d)eny?"
304
 
            else:
305
 
                message = "Denial in %s. (a)pprove?"
306
 
            message = message % unicode(timer).rsplit(".", 1)[0]
307
 
        elif self.last_checker_failed:
308
 
            timeout = datetime.timedelta(milliseconds
309
 
                                         = self.properties
310
 
                                         ["Timeout"])
311
 
            last_ok = isoformat_to_datetime(
312
 
                max((self.properties["LastCheckedOK"]
313
 
                     or self.properties["Created"]),
314
 
                    self.properties["LastEnabled"]))
315
 
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
 
304
                message = "Approval in {0}. (d)eny?"
 
305
            else:
 
306
                message = "Denial in {0}. (a)pprove?"
 
307
            message = message.format(unicode(timer).rsplit(".", 1)[0])
 
308
        elif self.properties["LastCheckerStatus"] != 0:
 
309
            # When checker has failed, show timer until client expires
 
310
            expires = self.properties["Expires"]
 
311
            if expires == "":
 
312
                timer = datetime.timedelta(0)
 
313
            else:
 
314
                expires = (datetime.datetime.strptime
 
315
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
 
316
                timer = expires - datetime.datetime.utcnow()
316
317
            message = ('A checker has failed! Time until client'
317
 
                       ' gets disabled: %s'
318
 
                           % unicode(timer).rsplit(".", 1)[0])
 
318
                       ' gets disabled: {0}'
 
319
                       .format(unicode(timer).rsplit(".", 1)[0]))
319
320
        else:
320
321
            message = "enabled"
321
 
        self._text = "%s%s" % (base, message)
 
322
        self._text = "{0}{1}".format(base, message)
322
323
            
323
324
        if not urwid.supports_unicode():
324
325
            self._text = self._text.encode("ascii", "replace")
337
338
            self.update_hook()
338
339
    
339
340
    def update_timer(self):
340
 
        "called by gobject"
 
341
        """called by gobject. Will indefinitely loop until
 
342
        gobject.source_remove() on tag is called"""
341
343
        self.update()
342
344
        return True             # Keep calling this
343
345
    
344
 
    def delete(self):
 
346
    def delete(self, **kwargs):
345
347
        if self._update_timer_callback_tag is not None:
346
348
            gobject.source_remove(self._update_timer_callback_tag)
347
349
            self._update_timer_callback_tag = None
 
350
        for match in self.match_objects:
 
351
            match.remove()
 
352
        self.match_objects = ()
348
353
        if self.delete_hook is not None:
349
354
            self.delete_hook(self)
 
355
        return super(MandosClientWidget, self).delete(**kwargs)
350
356
    
351
357
    def render(self, maxcolrow, focus=False):
352
358
        """Render differently if we have focus.
358
364
        """Handle keys.
359
365
        This overrides the method from urwid.FlowWidget"""
360
366
        if key == "+":
361
 
            self.proxy.Enable(dbus_interface = client_interface)
 
367
            self.proxy.Enable(dbus_interface = client_interface,
 
368
                              ignore_reply=True)
362
369
        elif key == "-":
363
 
            self.proxy.Disable(dbus_interface = client_interface)
 
370
            self.proxy.Disable(dbus_interface = client_interface,
 
371
                               ignore_reply=True)
364
372
        elif key == "a":
365
373
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
366
 
                               dbus_interface = client_interface)
 
374
                               dbus_interface = client_interface,
 
375
                               ignore_reply=True)
367
376
        elif key == "d":
368
377
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
369
 
                                  dbus_interface = client_interface)
 
378
                                  dbus_interface = client_interface,
 
379
                               ignore_reply=True)
370
380
        elif key == "R" or key == "_" or key == "ctrl k":
371
381
            self.server_proxy_object.RemoveClient(self.proxy
372
 
                                                  .object_path)
 
382
                                                  .object_path,
 
383
                                                  ignore_reply=True)
373
384
        elif key == "s":
374
 
            self.proxy.StartChecker(dbus_interface = client_interface)
 
385
            self.proxy.StartChecker(dbus_interface = client_interface,
 
386
                                    ignore_reply=True)
375
387
        elif key == "S":
376
 
            self.proxy.StopChecker(dbus_interface = client_interface)
 
388
            self.proxy.StopChecker(dbus_interface = client_interface,
 
389
                                   ignore_reply=True)
377
390
        elif key == "C":
378
 
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
391
            self.proxy.CheckedOK(dbus_interface = client_interface,
 
392
                                 ignore_reply=True)
379
393
        # xxx
380
394
#         elif key == "p" or key == "=":
381
395
#             self.proxy.pause()
386
400
        else:
387
401
            return key
388
402
    
389
 
    def property_changed(self, property=None, value=None,
390
 
                         *args, **kwargs):
 
403
    def property_changed(self, property=None, **kwargs):
391
404
        """Call self.update() if old value is not new value.
392
405
        This overrides the method from MandosClientPropertyCache"""
393
406
        property_name = unicode(property)
394
407
        old_value = self.properties.get(property_name)
395
408
        super(MandosClientWidget, self).property_changed(
396
 
            property=property, value=value, *args, **kwargs)
 
409
            property=property, **kwargs)
397
410
        if self.properties.get(property_name) != old_value:
398
411
            self.update()
399
412
 
403
416
    "down" key presses, thus not allowing any containing widgets to
404
417
    use them as an excuse to shift focus away from this widget.
405
418
    """
406
 
    def keypress(self, maxcolrow, key):
407
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
419
    def keypress(self, *args, **kwargs):
 
420
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
408
421
        if ret in ("up", "down"):
409
422
            return
410
423
        return ret
474
487
        
475
488
        self.busname = domain + '.Mandos'
476
489
        self.main_loop = gobject.MainLoop()
477
 
        self.bus = dbus.SystemBus()
478
 
        mandos_dbus_objc = self.bus.get_object(
479
 
            self.busname, "/", follow_name_owner_changes=True)
480
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
481
 
                                          dbus_interface
482
 
                                          = server_interface)
483
 
        try:
484
 
            mandos_clients = (self.mandos_serv
485
 
                              .GetAllClientsWithProperties())
486
 
        except dbus.exceptions.DBusException:
487
 
            mandos_clients = dbus.Dictionary()
488
 
        
489
 
        (self.mandos_serv
490
 
         .connect_to_signal("ClientRemoved",
491
 
                            self.find_and_remove_client,
492
 
                            dbus_interface=server_interface,
493
 
                            byte_arrays=True))
494
 
        (self.mandos_serv
495
 
         .connect_to_signal("ClientAdded",
496
 
                            self.add_new_client,
497
 
                            dbus_interface=server_interface,
498
 
                            byte_arrays=True))
499
 
        (self.mandos_serv
500
 
         .connect_to_signal("ClientNotFound",
501
 
                            self.client_not_found,
502
 
                            dbus_interface=server_interface,
503
 
                            byte_arrays=True))
504
 
        for path, client in mandos_clients.iteritems():
505
 
            client_proxy_object = self.bus.get_object(self.busname,
506
 
                                                      path)
507
 
            self.add_client(MandosClientWidget(server_proxy_object
508
 
                                               =self.mandos_serv,
509
 
                                               proxy_object
510
 
                                               =client_proxy_object,
511
 
                                               properties=client,
512
 
                                               update_hook
513
 
                                               =self.refresh,
514
 
                                               delete_hook
515
 
                                               =self.remove_client,
516
 
                                               logger
517
 
                                               =self.log_message),
518
 
                            path=path)
519
490
    
520
491
    def client_not_found(self, fingerprint, address):
521
 
        self.log_message(("Client with address %s and fingerprint %s"
522
 
                          " could not be found" % (address,
523
 
                                                    fingerprint)))
 
492
        self.log_message("Client with address {0} and fingerprint"
 
493
                         " {1} could not be found"
 
494
                         .format(address, fingerprint))
524
495
    
525
496
    def rebuild(self):
526
497
        """This rebuilds the User Interface.
536
507
                                                     self.divider)))
537
508
        if self.log_visible:
538
509
            self.uilist.append(self.logbox)
539
 
            pass
540
510
        self.topwidget = urwid.Pile(self.uilist)
541
511
    
542
512
    def log_message(self, message):
572
542
        #self.log_message("Wrap mode: " + self.log_wrap)
573
543
    
574
544
    def find_and_remove_client(self, path, name):
575
 
        """Find an client from its object path and remove it.
 
545
        """Find a client by its object path and remove it.
576
546
        
577
547
        This is connected to the ClientRemoved signal from the
578
548
        Mandos server object."""
580
550
            client = self.clients_dict[path]
581
551
        except KeyError:
582
552
            # not found?
 
553
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
554
                             .format(name, path))
583
555
            return
584
 
        self.remove_client(client, path)
 
556
        client.delete()
585
557
    
586
558
    def add_new_client(self, path):
587
559
        client_proxy_object = self.bus.get_object(self.busname, path)
624
596
    
625
597
    def run(self):
626
598
        """Start the main loop and exit when it's done."""
 
599
        self.bus = dbus.SystemBus()
 
600
        mandos_dbus_objc = self.bus.get_object(
 
601
            self.busname, "/", follow_name_owner_changes=True)
 
602
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
603
                                          dbus_interface
 
604
                                          = server_interface)
 
605
        try:
 
606
            mandos_clients = (self.mandos_serv
 
607
                              .GetAllClientsWithProperties())
 
608
        except dbus.exceptions.DBusException:
 
609
            mandos_clients = dbus.Dictionary()
 
610
        
 
611
        (self.mandos_serv
 
612
         .connect_to_signal("ClientRemoved",
 
613
                            self.find_and_remove_client,
 
614
                            dbus_interface=server_interface,
 
615
                            byte_arrays=True))
 
616
        (self.mandos_serv
 
617
         .connect_to_signal("ClientAdded",
 
618
                            self.add_new_client,
 
619
                            dbus_interface=server_interface,
 
620
                            byte_arrays=True))
 
621
        (self.mandos_serv
 
622
         .connect_to_signal("ClientNotFound",
 
623
                            self.client_not_found,
 
624
                            dbus_interface=server_interface,
 
625
                            byte_arrays=True))
 
626
        for path, client in mandos_clients.iteritems():
 
627
            client_proxy_object = self.bus.get_object(self.busname,
 
628
                                                      path)
 
629
            self.add_client(MandosClientWidget(server_proxy_object
 
630
                                               =self.mandos_serv,
 
631
                                               proxy_object
 
632
                                               =client_proxy_object,
 
633
                                               properties=client,
 
634
                                               update_hook
 
635
                                               =self.refresh,
 
636
                                               delete_hook
 
637
                                               =self.remove_client,
 
638
                                               logger
 
639
                                               =self.log_message),
 
640
                            path=path)
 
641
        
627
642
        self.refresh()
628
643
        self._input_callback_tag = (gobject.io_add_watch
629
644
                                    (sys.stdin.fileno(),