/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-2016 Teddy Hogeborn
7
 
# Copyright © 2009-2016 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
25
25
 
26
26
from __future__ import (division, absolute_import, print_function,
27
27
                        unicode_literals)
28
 
try:
29
 
    from future_builtins import *
30
 
except ImportError:
31
 
    pass
 
28
 
 
29
from future_builtins import *
32
30
 
33
31
import sys
34
32
import os
 
33
import signal
35
34
 
36
35
import datetime
37
36
 
39
38
import urwid
40
39
 
41
40
from dbus.mainloop.glib import DBusGMainLoop
42
 
from gi.repository import GLib
 
41
import gobject
43
42
 
44
43
import dbus
45
44
 
 
45
import UserList
 
46
 
46
47
import locale
47
48
 
48
 
if sys.version_info.major == 2:
49
 
    str = unicode
50
 
 
51
49
locale.setlocale(locale.LC_ALL, '')
52
50
 
53
51
import logging
57
55
domain = 'se.recompile'
58
56
server_interface = domain + '.Mandos'
59
57
client_interface = domain + '.Mandos.Client'
60
 
version = "1.7.10"
61
 
 
62
 
try:
63
 
    dbus.OBJECT_MANAGER_IFACE
64
 
except AttributeError:
65
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
58
version = "1.5.3"
 
59
 
 
60
# Always run in monochrome mode
 
61
urwid.curses_display.curses.has_colors = lambda : False
 
62
 
 
63
# Urwid doesn't support blinking, but we want it.  Since we have no
 
64
# use for underline on its own, we make underline also always blink.
 
65
urwid.curses_display.curses.A_UNDERLINE |= (
 
66
    urwid.curses_display.curses.A_BLINK)
66
67
 
67
68
def isoformat_to_datetime(iso):
68
69
    "Parse an ISO 8601 date string to a datetime.datetime()"
89
90
        self.proxy = proxy_object # Mandos Client proxy object
90
91
        self.properties = dict() if properties is None else properties
91
92
        self.property_changed_match = (
92
 
            self.proxy.connect_to_signal("PropertiesChanged",
93
 
                                         self.properties_changed,
94
 
                                         dbus.PROPERTIES_IFACE,
 
93
            self.proxy.connect_to_signal("PropertyChanged",
 
94
                                         self._property_changed,
 
95
                                         client_interface,
95
96
                                         byte_arrays=True))
96
97
        
97
98
        if properties is None:
102
103
        
103
104
        super(MandosClientPropertyCache, self).__init__(**kwargs)
104
105
    
105
 
    def properties_changed(self, interface, properties, invalidated):
106
 
        """This is called whenever we get a PropertiesChanged signal
107
 
        It updates the changed properties in the "properties" dict.
 
106
    def _property_changed(self, property, value):
 
107
        """Helper which takes positional arguments"""
 
108
        return self.property_changed(property=property, value=value)
 
109
    
 
110
    def property_changed(self, property=None, value=None):
 
111
        """This is called whenever we get a PropertyChanged signal
 
112
        It updates the changed property in the "properties" dict.
108
113
        """
109
114
        # Update properties dict with new value
110
 
        if interface == client_interface:
111
 
            self.properties.update(properties)
 
115
        self.properties[property] = value
112
116
    
113
117
    def delete(self):
114
118
        self.property_changed_match.remove()
130
134
        self.logger = logger
131
135
        
132
136
        self._update_timer_callback_tag = None
 
137
        self._update_timer_callback_lock = 0
133
138
        
134
139
        # The widget shown normally
135
140
        self._text_widget = urwid.Text("")
139
144
        self.update()
140
145
        self.opened = False
141
146
        
 
147
        last_checked_ok = isoformat_to_datetime(self.properties
 
148
                                                ["LastCheckedOK"])
 
149
        
 
150
        if self.properties ["LastCheckerStatus"] != 0:
 
151
            self.using_timer(True)
 
152
        
 
153
        if self.need_approval:
 
154
            self.using_timer(True)
 
155
        
142
156
        self.match_objects = (
143
157
            self.proxy.connect_to_signal("CheckerCompleted",
144
158
                                         self.checker_completed,
160
174
                                         self.rejected,
161
175
                                         client_interface,
162
176
                                         byte_arrays=True))
163
 
        self.logger('Created client {}'
164
 
                    .format(self.properties["Name"]), level=0)
 
177
        #self.logger('Created client {0}'
 
178
        #            .format(self.properties["Name"]))
 
179
    
 
180
    def property_changed(self, property=None, value=None):
 
181
        super(self, MandosClientWidget).property_changed(property,
 
182
                                                         value)
 
183
        if property == "ApprovalPending":
 
184
            using_timer(bool(value))
 
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))
165
190
    
166
191
    def using_timer(self, flag):
167
192
        """Call this method with True or False when timer should be
168
193
        activated or deactivated.
169
194
        """
170
 
        if flag and self._update_timer_callback_tag is None:
 
195
        old = self._update_timer_callback_lock
 
196
        if flag:
 
197
            self._update_timer_callback_lock += 1
 
198
        else:
 
199
            self._update_timer_callback_lock -= 1
 
200
        if old == 0 and self._update_timer_callback_lock:
171
201
            # Will update the shown timer value every second
172
 
            self._update_timer_callback_tag = (GLib.timeout_add
 
202
            self._update_timer_callback_tag = (gobject.timeout_add
173
203
                                               (1000,
174
204
                                                self.update_timer))
175
 
        elif not (flag or self._update_timer_callback_tag is None):
176
 
            GLib.source_remove(self._update_timer_callback_tag)
 
205
        elif old and self._update_timer_callback_lock == 0:
 
206
            gobject.source_remove(self._update_timer_callback_tag)
177
207
            self._update_timer_callback_tag = None
178
208
    
179
209
    def checker_completed(self, exitstatus, condition, command):
180
210
        if exitstatus == 0:
181
 
            self.logger('Checker for client {} (command "{}")'
182
 
                        ' succeeded'.format(self.properties["Name"],
183
 
                                            command), level=0)
184
211
            self.update()
185
212
            return
186
213
        # Checker failed
187
214
        if os.WIFEXITED(condition):
188
 
            self.logger('Checker for client {} (command "{}") failed'
189
 
                        ' with exit code {}'
 
215
            self.logger('Checker for client {0} (command "{1}")'
 
216
                        ' failed with exit code {2}'
190
217
                        .format(self.properties["Name"], command,
191
218
                                os.WEXITSTATUS(condition)))
192
219
        elif os.WIFSIGNALED(condition):
193
 
            self.logger('Checker for client {} (command "{}") was'
194
 
                        ' killed by signal {}'
 
220
            self.logger('Checker for client {0} (command "{1}") was'
 
221
                        ' killed by signal {2}'
195
222
                        .format(self.properties["Name"], command,
196
223
                                os.WTERMSIG(condition)))
 
224
        elif os.WCOREDUMP(condition):
 
225
            self.logger('Checker for client {0} (command "{1}")'
 
226
                        ' dumped core'
 
227
                        .format(self.properties["Name"], command))
 
228
        else:
 
229
            self.logger('Checker for client {0} completed'
 
230
                        ' mysteriously'
 
231
                        .format(self.properties["Name"]))
197
232
        self.update()
198
233
    
199
234
    def checker_started(self, command):
200
 
        """Server signals that a checker started."""
201
 
        self.logger('Client {} started checker "{}"'
202
 
                    .format(self.properties["Name"],
203
 
                            command), level=0)
 
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)))
 
240
        pass
204
241
    
205
242
    def got_secret(self):
206
 
        self.logger('Client {} received its secret'
 
243
        self.logger('Client {0} received its secret'
207
244
                    .format(self.properties["Name"]))
208
245
    
209
246
    def need_approval(self, timeout, default):
210
247
        if not default:
211
 
            message = 'Client {} needs approval within {} seconds'
 
248
            message = 'Client {0} needs approval within {1} seconds'
212
249
        else:
213
 
            message = 'Client {} will get its secret in {} seconds'
 
250
            message = 'Client {0} will get its secret in {1} seconds'
214
251
        self.logger(message.format(self.properties["Name"],
215
252
                                   timeout/1000))
 
253
        self.using_timer(True)
216
254
    
217
255
    def rejected(self, reason):
218
 
        self.logger('Client {} was rejected; reason: {}'
 
256
        self.logger('Client {0} was rejected; reason: {1}'
219
257
                    .format(self.properties["Name"], reason))
220
258
    
221
259
    def selectable(self):
244
282
                          "bold-underline-blink":
245
283
                              "bold-underline-blink-standout",
246
284
                          }
247
 
        
 
285
 
248
286
        # Rebuild focus and non-focus widgets using current properties
249
 
        
 
287
 
250
288
        # Base part of a client. Name!
251
289
        base = '{name}: '.format(name=self.properties["Name"])
252
290
        if not self.properties["Enabled"]:
253
291
            message = "DISABLED"
254
 
            self.using_timer(False)
255
292
        elif self.properties["ApprovalPending"]:
256
293
            timeout = datetime.timedelta(milliseconds
257
294
                                         = self.properties
259
296
            last_approval_request = isoformat_to_datetime(
260
297
                self.properties["LastApprovalRequest"])
261
298
            if last_approval_request is not None:
262
 
                timer = max(timeout - (datetime.datetime.utcnow()
263
 
                                       - last_approval_request),
264
 
                            datetime.timedelta())
 
299
                timer = timeout - (datetime.datetime.utcnow()
 
300
                                   - last_approval_request)
265
301
            else:
266
302
                timer = datetime.timedelta()
267
303
            if self.properties["ApprovedByDefault"]:
268
 
                message = "Approval in {}. (d)eny?"
 
304
                message = "Approval in {0}. (d)eny?"
269
305
            else:
270
 
                message = "Denial in {}. (a)pprove?"
271
 
            message = message.format(str(timer).rsplit(".", 1)[0])
272
 
            self.using_timer(True)
 
306
                message = "Denial in {0}. (a)pprove?"
 
307
            message = message.format(unicode(timer).rsplit(".", 1)[0])
273
308
        elif self.properties["LastCheckerStatus"] != 0:
274
309
            # When checker has failed, show timer until client expires
275
310
            expires = self.properties["Expires"]
278
313
            else:
279
314
                expires = (datetime.datetime.strptime
280
315
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
281
 
                timer = max(expires - datetime.datetime.utcnow(),
282
 
                            datetime.timedelta())
 
316
                timer = expires - datetime.datetime.utcnow()
283
317
            message = ('A checker has failed! Time until client'
284
 
                       ' gets disabled: {}'
285
 
                       .format(str(timer).rsplit(".", 1)[0]))
286
 
            self.using_timer(True)
 
318
                       ' gets disabled: {0}'
 
319
                       .format(unicode(timer).rsplit(".", 1)[0]))
287
320
        else:
288
321
            message = "enabled"
289
 
            self.using_timer(False)
290
 
        self._text = "{}{}".format(base, message)
291
 
        
 
322
        self._text = "{0}{1}".format(base, message)
 
323
            
292
324
        if not urwid.supports_unicode():
293
325
            self._text = self._text.encode("ascii", "replace")
294
326
        textlist = [("normal", self._text)]
306
338
            self.update_hook()
307
339
    
308
340
    def update_timer(self):
309
 
        """called by GLib. Will indefinitely loop until
310
 
        GLib.source_remove() on tag is called
311
 
        """
 
341
        """called by gobject. Will indefinitely loop until
 
342
        gobject.source_remove() on tag is called"""
312
343
        self.update()
313
344
        return True             # Keep calling this
314
345
    
315
346
    def delete(self, **kwargs):
316
347
        if self._update_timer_callback_tag is not None:
317
 
            GLib.source_remove(self._update_timer_callback_tag)
 
348
            gobject.source_remove(self._update_timer_callback_tag)
318
349
            self._update_timer_callback_tag = None
319
350
        for match in self.match_objects:
320
351
            match.remove()
333
364
        """Handle keys.
334
365
        This overrides the method from urwid.FlowWidget"""
335
366
        if key == "+":
336
 
            self.proxy.Set(client_interface, "Enabled",
337
 
                           dbus.Boolean(True), ignore_reply = True,
338
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
367
            self.proxy.Enable(dbus_interface = client_interface,
 
368
                              ignore_reply=True)
339
369
        elif key == "-":
340
 
            self.proxy.Set(client_interface, "Enabled", False,
341
 
                           ignore_reply = True,
342
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
370
            self.proxy.Disable(dbus_interface = client_interface,
 
371
                               ignore_reply=True)
343
372
        elif key == "a":
344
373
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
345
374
                               dbus_interface = client_interface,
353
382
                                                  .object_path,
354
383
                                                  ignore_reply=True)
355
384
        elif key == "s":
356
 
            self.proxy.Set(client_interface, "CheckerRunning",
357
 
                           dbus.Boolean(True), ignore_reply = True,
358
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
385
            self.proxy.StartChecker(dbus_interface = client_interface,
 
386
                                    ignore_reply=True)
359
387
        elif key == "S":
360
 
            self.proxy.Set(client_interface, "CheckerRunning",
361
 
                           dbus.Boolean(False), ignore_reply = True,
362
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
388
            self.proxy.StopChecker(dbus_interface = client_interface,
 
389
                                   ignore_reply=True)
363
390
        elif key == "C":
364
391
            self.proxy.CheckedOK(dbus_interface = client_interface,
365
392
                                 ignore_reply=True)
373
400
        else:
374
401
            return key
375
402
    
376
 
    def properties_changed(self, interface, properties, invalidated):
377
 
        """Call self.update() if any properties changed.
 
403
    def property_changed(self, property=None, **kwargs):
 
404
        """Call self.update() if old value is not new value.
378
405
        This overrides the method from MandosClientPropertyCache"""
379
 
        old_values = { key: self.properties.get(key)
380
 
                       for key in properties.keys() }
381
 
        super(MandosClientWidget, self).properties_changed(
382
 
            interface, properties, invalidated)
383
 
        if any(old_values[key] != self.properties.get(key)
384
 
               for key in old_values):
 
406
        property_name = unicode(property)
 
407
        old_value = self.properties.get(property_name)
 
408
        super(MandosClientWidget, self).property_changed(
 
409
            property=property, **kwargs)
 
410
        if self.properties.get(property_name) != old_value:
385
411
            self.update()
386
412
 
387
413
 
401
427
    """This is the entire user interface - the whole screen
402
428
    with boxes, lists of client widgets, etc.
403
429
    """
404
 
    def __init__(self, max_log_length=1000, log_level=1):
 
430
    def __init__(self, max_log_length=1000):
405
431
        DBusGMainLoop(set_as_default=True)
406
432
        
407
433
        self.screen = urwid.curses_display.Screen()
410
436
                ("normal",
411
437
                 "default", "default", None),
412
438
                ("bold",
413
 
                 "bold", "default", "bold"),
 
439
                 "default", "default", "bold"),
414
440
                ("underline-blink",
415
 
                 "underline,blink", "default", "underline,blink"),
 
441
                 "default", "default", "underline"),
416
442
                ("standout",
417
 
                 "standout", "default", "standout"),
 
443
                 "default", "default", "standout"),
418
444
                ("bold-underline-blink",
419
 
                 "bold,underline,blink", "default", "bold,underline,blink"),
 
445
                 "default", "default", ("bold", "underline")),
420
446
                ("bold-standout",
421
 
                 "bold,standout", "default", "bold,standout"),
 
447
                 "default", "default", ("bold", "standout")),
422
448
                ("underline-blink-standout",
423
 
                 "underline,blink,standout", "default",
424
 
                 "underline,blink,standout"),
 
449
                 "default", "default", ("underline", "standout")),
425
450
                ("bold-underline-blink-standout",
426
 
                 "bold,underline,blink,standout", "default",
427
 
                 "bold,underline,blink,standout"),
 
451
                 "default", "default", ("bold", "underline",
 
452
                                          "standout")),
428
453
                ))
429
454
        
430
455
        if urwid.supports_unicode():
445
470
        self.log = []
446
471
        self.max_log_length = max_log_length
447
472
        
448
 
        self.log_level = log_level
449
 
        
450
473
        # We keep a reference to the log widget so we can remove it
451
474
        # from the ListWalker without it getting destroyed
452
475
        self.logbox = ConstrainedListBox(self.log)
463
486
                              "q: Quit  ?: Help"))
464
487
        
465
488
        self.busname = domain + '.Mandos'
466
 
        self.main_loop = GLib.MainLoop()
 
489
        self.main_loop = gobject.MainLoop()
467
490
    
468
491
    def client_not_found(self, fingerprint, address):
469
 
        self.log_message("Client with address {} and fingerprint {}"
470
 
                         " could not be found"
 
492
        self.log_message("Client with address {0} and fingerprint"
 
493
                         " {1} could not be found"
471
494
                         .format(address, fingerprint))
472
495
    
473
496
    def rebuild(self):
486
509
            self.uilist.append(self.logbox)
487
510
        self.topwidget = urwid.Pile(self.uilist)
488
511
    
489
 
    def log_message(self, message, level=1):
490
 
        """Log message formatted with timestamp"""
491
 
        if level < self.log_level:
492
 
            return
 
512
    def log_message(self, message):
493
513
        timestamp = datetime.datetime.now().isoformat()
494
 
        self.log_message_raw("{}: {}".format(timestamp, message),
495
 
                             level=level)
 
514
        self.log_message_raw(timestamp + ": " + message)
496
515
    
497
 
    def log_message_raw(self, markup, level=1):
 
516
    def log_message_raw(self, markup):
498
517
        """Add a log message to the log buffer."""
499
 
        if level < self.log_level:
500
 
            return
501
518
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
502
519
        if (self.max_log_length
503
520
            and len(self.log) > self.max_log_length):
510
527
        """Toggle visibility of the log buffer."""
511
528
        self.log_visible = not self.log_visible
512
529
        self.rebuild()
513
 
        self.log_message("Log visibility changed to: {}"
514
 
                         .format(self.log_visible), level=0)
 
530
        #self.log_message("Log visibility changed to: "
 
531
        #                 + unicode(self.log_visible))
515
532
    
516
533
    def change_log_display(self):
517
534
        """Change type of log display.
522
539
            self.log_wrap = "clip"
523
540
        for textwidget in self.log:
524
541
            textwidget.set_wrap_mode(self.log_wrap)
525
 
        self.log_message("Wrap mode: {}".format(self.log_wrap),
526
 
                         level=0)
 
542
        #self.log_message("Wrap mode: " + self.log_wrap)
527
543
    
528
 
    def find_and_remove_client(self, path, interfaces):
 
544
    def find_and_remove_client(self, path, name):
529
545
        """Find a client by its object path and remove it.
530
546
        
531
 
        This is connected to the InterfacesRemoved signal from the
 
547
        This is connected to the ClientRemoved signal from the
532
548
        Mandos server object."""
533
 
        if client_interface not in interfaces:
534
 
            # Not a Mandos client object; ignore
535
 
            return
536
549
        try:
537
550
            client = self.clients_dict[path]
538
551
        except KeyError:
539
552
            # not found?
540
 
            self.log_message("Unknown client {!r} removed"
541
 
                             .format(path))
 
553
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
554
                             .format(name, path))
542
555
            return
543
556
        client.delete()
544
557
    
545
 
    def add_new_client(self, path, ifs_and_props):
546
 
        """Find a client by its object path and remove it.
547
 
        
548
 
        This is connected to the InterfacesAdded signal from the
549
 
        Mandos server object.
550
 
        """
551
 
        if client_interface not in ifs_and_props:
552
 
            # Not a Mandos client object; ignore
553
 
            return
 
558
    def add_new_client(self, path):
554
559
        client_proxy_object = self.bus.get_object(self.busname, path)
555
560
        self.add_client(MandosClientWidget(server_proxy_object
556
561
                                           =self.mandos_serv,
561
566
                                           delete_hook
562
567
                                           =self.remove_client,
563
568
                                           logger
564
 
                                           =self.log_message,
565
 
                                           properties
566
 
                                           = dict(ifs_and_props[
567
 
                                               client_interface])),
 
569
                                           =self.log_message),
568
570
                        path=path)
569
571
    
570
572
    def add_client(self, client, path=None):
572
574
        if path is None:
573
575
            path = client.proxy.object_path
574
576
        self.clients_dict[path] = client
575
 
        self.clients.sort(key=lambda c: c.properties["Name"])
 
577
        self.clients.sort(None, lambda c: c.properties["Name"])
576
578
        self.refresh()
577
579
    
578
580
    def remove_client(self, client, path=None):
580
582
        if path is None:
581
583
            path = client.proxy.object_path
582
584
        del self.clients_dict[path]
 
585
        if not self.clients_dict:
 
586
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
 
587
            # is completely emptied, we need to recreate it.
 
588
            self.clients = urwid.SimpleListWalker([])
 
589
            self.rebuild()
583
590
        self.refresh()
584
591
    
585
592
    def refresh(self):
598
605
        try:
599
606
            mandos_clients = (self.mandos_serv
600
607
                              .GetAllClientsWithProperties())
601
 
            if not mandos_clients:
602
 
                self.log_message_raw(("bold", "Note: Server has no clients."))
603
608
        except dbus.exceptions.DBusException:
604
 
            self.log_message_raw(("bold", "Note: No Mandos server running."))
605
609
            mandos_clients = dbus.Dictionary()
606
610
        
607
611
        (self.mandos_serv
608
 
         .connect_to_signal("InterfacesRemoved",
 
612
         .connect_to_signal("ClientRemoved",
609
613
                            self.find_and_remove_client,
610
 
                            dbus_interface
611
 
                            = dbus.OBJECT_MANAGER_IFACE,
 
614
                            dbus_interface=server_interface,
612
615
                            byte_arrays=True))
613
616
        (self.mandos_serv
614
 
         .connect_to_signal("InterfacesAdded",
 
617
         .connect_to_signal("ClientAdded",
615
618
                            self.add_new_client,
616
 
                            dbus_interface
617
 
                            = dbus.OBJECT_MANAGER_IFACE,
 
619
                            dbus_interface=server_interface,
618
620
                            byte_arrays=True))
619
621
        (self.mandos_serv
620
622
         .connect_to_signal("ClientNotFound",
621
623
                            self.client_not_found,
622
624
                            dbus_interface=server_interface,
623
625
                            byte_arrays=True))
624
 
        for path, client in mandos_clients.items():
 
626
        for path, client in mandos_clients.iteritems():
625
627
            client_proxy_object = self.bus.get_object(self.busname,
626
628
                                                      path)
627
629
            self.add_client(MandosClientWidget(server_proxy_object
638
640
                            path=path)
639
641
        
640
642
        self.refresh()
641
 
        self._input_callback_tag = (GLib.io_add_watch
 
643
        self._input_callback_tag = (gobject.io_add_watch
642
644
                                    (sys.stdin.fileno(),
643
 
                                     GLib.IO_IN,
 
645
                                     gobject.IO_IN,
644
646
                                     self.process_input))
645
647
        self.main_loop.run()
646
648
        # Main loop has finished, we should close everything now
647
 
        GLib.source_remove(self._input_callback_tag)
 
649
        gobject.source_remove(self._input_callback_tag)
648
650
        self.screen.stop()
649
651
    
650
652
    def stop(self):
674
676
            elif key == "window resize":
675
677
                self.size = self.screen.get_cols_rows()
676
678
                self.refresh()
677
 
            elif key == "ctrl l":
678
 
                self.screen.clear()
 
679
            elif key == "\f":  # Ctrl-L
679
680
                self.refresh()
680
681
            elif key == "l" or key == "D":
681
682
                self.toggle_log_display()
693
694
                                            "?: Help",
694
695
                                            "l: Log window toggle",
695
696
                                            "TAB: Switch window",
696
 
                                            "w: Wrap (log lines)",
697
 
                                            "v: Toggle verbose log",
698
 
                                            ))))
 
697
                                            "w: Wrap (log)"))))
699
698
                self.log_message_raw(("bold",
700
699
                                      "  "
701
700
                                      .join(("Clients:",
714
713
                else:
715
714
                    self.topwidget.set_focus(self.logbox)
716
715
                self.refresh()
717
 
            elif key == "v":
718
 
                if self.log_level == 0:
719
 
                    self.log_level = 1
720
 
                    self.log_message("Verbose mode: Off")
721
 
                else:
722
 
                    self.log_level = 0
723
 
                    self.log_message("Verbose mode: On")
724
716
            #elif (key == "end" or key == "meta >" or key == "G"
725
717
            #      or key == ">"):
726
718
            #    pass            # xxx end-of-buffer
749
741
    ui.run()
750
742
except KeyboardInterrupt:
751
743
    ui.screen.stop()
752
 
except Exception as e:
753
 
    ui.log_message(str(e))
 
744
except Exception, e:
 
745
    ui.log_message(unicode(e))
754
746
    ui.screen.stop()
755
747
    raise