/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2012-11-14 21:03:24 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 303.
  • Revision ID: teddy@recompile.se-20121114210324-n7m7k0ki2ncmje3a
* mandos-ctl (string_to_delta): Try to parse RFC 3339 duration before
                                anything else.  This also minimizes
                                the changes from the last release.
  (PGPEngine): Use straight subprocess.Popen() to call "gpg".
* mandos-monitor (UserInterface.run): Fix grammar.

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.6.0"
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
123
134
        self.logger = logger
124
135
        
125
136
        self._update_timer_callback_tag = None
126
 
        self._update_timer_callback_lock = 0
127
 
        self.last_checker_failed = False
128
137
        
129
138
        # The widget shown normally
130
139
        self._text_widget = urwid.Text("")
131
140
        # The widget shown when we have focus
132
141
        self._focus_text_widget = urwid.Text("")
133
 
        super(MandosClientWidget, self).__init__(
134
 
            update_hook=update_hook, delete_hook=delete_hook,
135
 
            *args, **kwargs)
 
142
        super(MandosClientWidget, self).__init__(**kwargs)
136
143
        self.update()
137
144
        self.opened = False
138
145
        
139
 
        last_checked_ok = isoformat_to_datetime(self.properties
140
 
                                                ["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
 
        
151
 
        if self.last_checker_failed:
152
 
            self.using_timer(True)
153
 
        
154
 
        if self.need_approval:
155
 
            self.using_timer(True)
156
 
        
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)
 
146
        self.match_objects = (
 
147
            self.proxy.connect_to_signal("CheckerCompleted",
 
148
                                         self.checker_completed,
 
149
                                         client_interface,
 
150
                                         byte_arrays=True),
 
151
            self.proxy.connect_to_signal("CheckerStarted",
 
152
                                         self.checker_started,
 
153
                                         client_interface,
 
154
                                         byte_arrays=True),
 
155
            self.proxy.connect_to_signal("GotSecret",
 
156
                                         self.got_secret,
 
157
                                         client_interface,
 
158
                                         byte_arrays=True),
 
159
            self.proxy.connect_to_signal("NeedApproval",
 
160
                                         self.need_approval,
 
161
                                         client_interface,
 
162
                                         byte_arrays=True),
 
163
            self.proxy.connect_to_signal("Rejected",
 
164
                                         self.rejected,
 
165
                                         client_interface,
 
166
                                         byte_arrays=True))
 
167
        #self.logger('Created client {0}'
 
168
        #            .format(self.properties["Name"]))
177
169
    
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
 
        
184
170
    def using_timer(self, flag):
185
171
        """Call this method with True or False when timer should be
186
172
        activated or deactivated.
187
173
        """
188
 
        old = self._update_timer_callback_lock
189
 
        if flag:
190
 
            self._update_timer_callback_lock += 1
191
 
        else:
192
 
            self._update_timer_callback_lock -= 1
193
 
        if old == 0 and self._update_timer_callback_lock:
 
174
        if flag and self._update_timer_callback_tag is None:
 
175
            # Will update the shown timer value every second
194
176
            self._update_timer_callback_tag = (gobject.timeout_add
195
177
                                               (1000,
196
178
                                                self.update_timer))
197
 
        elif old and self._update_timer_callback_lock == 0:
 
179
        elif not (flag or self._update_timer_callback_tag is None):
198
180
            gobject.source_remove(self._update_timer_callback_tag)
199
181
            self._update_timer_callback_tag = None
200
182
    
201
183
    def checker_completed(self, exitstatus, condition, command):
202
184
        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
185
            self.update()
210
186
            return
211
187
        # Checker failed
212
 
        if not self.last_checker_failed:
213
 
            self.last_checker_failed = True
214
 
            self.using_timer(True)
215
188
        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)))
 
189
            self.logger('Checker for client {0} (command "{1}")'
 
190
                        ' failed with exit code {2}'
 
191
                        .format(self.properties["Name"], command,
 
192
                                os.WEXITSTATUS(condition)))
220
193
        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)))
 
194
            self.logger('Checker for client {0} (command "{1}") was'
 
195
                        ' killed by signal {2}'
 
196
                        .format(self.properties["Name"], command,
 
197
                                os.WTERMSIG(condition)))
225
198
        elif os.WCOREDUMP(condition):
226
 
            self.logger('Checker for client %s (command "%s")'
 
199
            self.logger('Checker for client {0} (command "{1}")'
227
200
                        ' dumped core'
228
 
                        % (self.properties["Name"], command))
 
201
                        .format(self.properties["Name"], command))
229
202
        else:
230
 
            self.logger('Checker for client %s completed'
231
 
                        ' mysteriously')
 
203
            self.logger('Checker for client {0} completed'
 
204
                        ' mysteriously'
 
205
                        .format(self.properties["Name"]))
232
206
        self.update()
233
207
    
234
208
    def checker_started(self, command):
235
 
        #self.logger('Client %s started checker "%s"'
236
 
        #            % (self.properties["Name"], unicode(command)))
 
209
        """Server signals that a checker started. This could be useful
 
210
           to log in the future. """
 
211
        #self.logger('Client {0} started checker "{1}"'
 
212
        #            .format(self.properties["Name"],
 
213
        #                    unicode(command)))
237
214
        pass
238
215
    
239
216
    def got_secret(self):
240
 
        self.last_checker_failed = False
241
 
        self.logger('Client %s received its secret'
242
 
                    % self.properties["Name"])
 
217
        self.logger('Client {0} received its secret'
 
218
                    .format(self.properties["Name"]))
243
219
    
244
220
    def need_approval(self, timeout, default):
245
221
        if not default:
246
 
            message = 'Client %s needs approval within %s seconds'
 
222
            message = 'Client {0} needs approval within {1} seconds'
247
223
        else:
248
 
            message = 'Client %s will get its secret in %s seconds'
249
 
        self.logger(message
250
 
                    % (self.properties["Name"], timeout/1000))
251
 
        self.using_timer(True)
 
224
            message = 'Client {0} will get its secret in {1} seconds'
 
225
        self.logger(message.format(self.properties["Name"],
 
226
                                   timeout/1000))
252
227
    
253
228
    def rejected(self, reason):
254
 
        self.logger('Client %s was rejected; reason: %s'
255
 
                    % (self.properties["Name"], reason))
 
229
        self.logger('Client {0} was rejected; reason: {1}'
 
230
                    .format(self.properties["Name"], reason))
256
231
    
257
232
    def selectable(self):
258
233
        """Make this a "selectable" widget.
280
255
                          "bold-underline-blink":
281
256
                              "bold-underline-blink-standout",
282
257
                          }
283
 
 
 
258
        
284
259
        # Rebuild focus and non-focus widgets using current properties
285
 
 
 
260
        
286
261
        # Base part of a client. Name!
287
 
        base = ('%(name)s: '
288
 
                      % {"name": self.properties["Name"]})
 
262
        base = '{name}: '.format(name=self.properties["Name"])
289
263
        if not self.properties["Enabled"]:
290
264
            message = "DISABLED"
 
265
            self.using_timer(False)
291
266
        elif self.properties["ApprovalPending"]:
292
267
            timeout = datetime.timedelta(milliseconds
293
268
                                         = self.properties
295
270
            last_approval_request = isoformat_to_datetime(
296
271
                self.properties["LastApprovalRequest"])
297
272
            if last_approval_request is not None:
298
 
                timer = timeout - (datetime.datetime.utcnow()
299
 
                                   - last_approval_request)
 
273
                timer = max(timeout - (datetime.datetime.utcnow()
 
274
                                       - last_approval_request),
 
275
                            datetime.timedelta())
300
276
            else:
301
277
                timer = datetime.timedelta()
302
278
            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)
 
279
                message = "Approval in {0}. (d)eny?"
 
280
            else:
 
281
                message = "Denial in {0}. (a)pprove?"
 
282
            message = message.format(unicode(timer).rsplit(".", 1)[0])
 
283
            self.using_timer(True)
 
284
        elif self.properties["LastCheckerStatus"] != 0:
 
285
            # When checker has failed, show timer until client expires
 
286
            expires = self.properties["Expires"]
 
287
            if expires == "":
 
288
                timer = datetime.timedelta(0)
 
289
            else:
 
290
                expires = (datetime.datetime.strptime
 
291
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
 
292
                timer = max(expires - datetime.datetime.utcnow(),
 
293
                            datetime.timedelta())
316
294
            message = ('A checker has failed! Time until client'
317
 
                       ' gets disabled: %s'
318
 
                           % unicode(timer).rsplit(".", 1)[0])
 
295
                       ' gets disabled: {0}'
 
296
                       .format(unicode(timer).rsplit(".", 1)[0]))
 
297
            self.using_timer(True)
319
298
        else:
320
299
            message = "enabled"
321
 
        self._text = "%s%s" % (base, message)
322
 
            
 
300
            self.using_timer(False)
 
301
        self._text = "{0}{1}".format(base, message)
 
302
        
323
303
        if not urwid.supports_unicode():
324
304
            self._text = self._text.encode("ascii", "replace")
325
305
        textlist = [("normal", self._text)]
337
317
            self.update_hook()
338
318
    
339
319
    def update_timer(self):
340
 
        "called by gobject"
 
320
        """called by gobject. Will indefinitely loop until
 
321
        gobject.source_remove() on tag is called"""
341
322
        self.update()
342
323
        return True             # Keep calling this
343
324
    
344
 
    def delete(self):
 
325
    def delete(self, **kwargs):
345
326
        if self._update_timer_callback_tag is not None:
346
327
            gobject.source_remove(self._update_timer_callback_tag)
347
328
            self._update_timer_callback_tag = None
 
329
        for match in self.match_objects:
 
330
            match.remove()
 
331
        self.match_objects = ()
348
332
        if self.delete_hook is not None:
349
333
            self.delete_hook(self)
 
334
        return super(MandosClientWidget, self).delete(**kwargs)
350
335
    
351
336
    def render(self, maxcolrow, focus=False):
352
337
        """Render differently if we have focus.
358
343
        """Handle keys.
359
344
        This overrides the method from urwid.FlowWidget"""
360
345
        if key == "+":
361
 
            self.proxy.Enable(dbus_interface = client_interface)
 
346
            self.proxy.Enable(dbus_interface = client_interface,
 
347
                              ignore_reply=True)
362
348
        elif key == "-":
363
 
            self.proxy.Disable(dbus_interface = client_interface)
 
349
            self.proxy.Disable(dbus_interface = client_interface,
 
350
                               ignore_reply=True)
364
351
        elif key == "a":
365
352
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
366
 
                               dbus_interface = client_interface)
 
353
                               dbus_interface = client_interface,
 
354
                               ignore_reply=True)
367
355
        elif key == "d":
368
356
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
369
 
                                  dbus_interface = client_interface)
 
357
                                  dbus_interface = client_interface,
 
358
                               ignore_reply=True)
370
359
        elif key == "R" or key == "_" or key == "ctrl k":
371
360
            self.server_proxy_object.RemoveClient(self.proxy
372
 
                                                  .object_path)
 
361
                                                  .object_path,
 
362
                                                  ignore_reply=True)
373
363
        elif key == "s":
374
 
            self.proxy.StartChecker(dbus_interface = client_interface)
 
364
            self.proxy.StartChecker(dbus_interface = client_interface,
 
365
                                    ignore_reply=True)
375
366
        elif key == "S":
376
 
            self.proxy.StopChecker(dbus_interface = client_interface)
 
367
            self.proxy.StopChecker(dbus_interface = client_interface,
 
368
                                   ignore_reply=True)
377
369
        elif key == "C":
378
 
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
370
            self.proxy.CheckedOK(dbus_interface = client_interface,
 
371
                                 ignore_reply=True)
379
372
        # xxx
380
373
#         elif key == "p" or key == "=":
381
374
#             self.proxy.pause()
386
379
        else:
387
380
            return key
388
381
    
389
 
    def property_changed(self, property=None, value=None,
390
 
                         *args, **kwargs):
 
382
    def property_changed(self, property=None, **kwargs):
391
383
        """Call self.update() if old value is not new value.
392
384
        This overrides the method from MandosClientPropertyCache"""
393
385
        property_name = unicode(property)
394
386
        old_value = self.properties.get(property_name)
395
387
        super(MandosClientWidget, self).property_changed(
396
 
            property=property, value=value, *args, **kwargs)
 
388
            property=property, **kwargs)
397
389
        if self.properties.get(property_name) != old_value:
398
390
            self.update()
399
391
 
403
395
    "down" key presses, thus not allowing any containing widgets to
404
396
    use them as an excuse to shift focus away from this widget.
405
397
    """
406
 
    def keypress(self, maxcolrow, key):
407
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
398
    def keypress(self, *args, **kwargs):
 
399
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
408
400
        if ret in ("up", "down"):
409
401
            return
410
402
        return ret
474
466
        
475
467
        self.busname = domain + '.Mandos'
476
468
        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
469
    
520
470
    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)))
 
471
        self.log_message("Client with address {0} and fingerprint"
 
472
                         " {1} could not be found"
 
473
                         .format(address, fingerprint))
524
474
    
525
475
    def rebuild(self):
526
476
        """This rebuilds the User Interface.
536
486
                                                     self.divider)))
537
487
        if self.log_visible:
538
488
            self.uilist.append(self.logbox)
539
 
            pass
540
489
        self.topwidget = urwid.Pile(self.uilist)
541
490
    
542
491
    def log_message(self, message):
 
492
        """Log message formatted with timestamp"""
543
493
        timestamp = datetime.datetime.now().isoformat()
544
494
        self.log_message_raw(timestamp + ": " + message)
545
495
    
572
522
        #self.log_message("Wrap mode: " + self.log_wrap)
573
523
    
574
524
    def find_and_remove_client(self, path, name):
575
 
        """Find an client from its object path and remove it.
 
525
        """Find a client by its object path and remove it.
576
526
        
577
527
        This is connected to the ClientRemoved signal from the
578
528
        Mandos server object."""
580
530
            client = self.clients_dict[path]
581
531
        except KeyError:
582
532
            # not found?
 
533
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
534
                             .format(name, path))
583
535
            return
584
 
        self.remove_client(client, path)
 
536
        client.delete()
585
537
    
586
538
    def add_new_client(self, path):
587
539
        client_proxy_object = self.bus.get_object(self.busname, path)
624
576
    
625
577
    def run(self):
626
578
        """Start the main loop and exit when it's done."""
 
579
        self.bus = dbus.SystemBus()
 
580
        mandos_dbus_objc = self.bus.get_object(
 
581
            self.busname, "/", follow_name_owner_changes=True)
 
582
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
583
                                          dbus_interface
 
584
                                          = server_interface)
 
585
        try:
 
586
            mandos_clients = (self.mandos_serv
 
587
                              .GetAllClientsWithProperties())
 
588
            if not mandos_clients:
 
589
                self.log_message_raw(("bold", "Note: Server has no clients."))
 
590
        except dbus.exceptions.DBusException:
 
591
            self.log_message_raw(("bold", "Note: No Mandos server running."))
 
592
            mandos_clients = dbus.Dictionary()
 
593
        
 
594
        (self.mandos_serv
 
595
         .connect_to_signal("ClientRemoved",
 
596
                            self.find_and_remove_client,
 
597
                            dbus_interface=server_interface,
 
598
                            byte_arrays=True))
 
599
        (self.mandos_serv
 
600
         .connect_to_signal("ClientAdded",
 
601
                            self.add_new_client,
 
602
                            dbus_interface=server_interface,
 
603
                            byte_arrays=True))
 
604
        (self.mandos_serv
 
605
         .connect_to_signal("ClientNotFound",
 
606
                            self.client_not_found,
 
607
                            dbus_interface=server_interface,
 
608
                            byte_arrays=True))
 
609
        for path, client in mandos_clients.iteritems():
 
610
            client_proxy_object = self.bus.get_object(self.busname,
 
611
                                                      path)
 
612
            self.add_client(MandosClientWidget(server_proxy_object
 
613
                                               =self.mandos_serv,
 
614
                                               proxy_object
 
615
                                               =client_proxy_object,
 
616
                                               properties=client,
 
617
                                               update_hook
 
618
                                               =self.refresh,
 
619
                                               delete_hook
 
620
                                               =self.remove_client,
 
621
                                               logger
 
622
                                               =self.log_message),
 
623
                            path=path)
 
624
        
627
625
        self.refresh()
628
626
        self._input_callback_tag = (gobject.io_add_watch
629
627
                                    (sys.stdin.fileno(),