/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: 2015-07-01 20:01:26 UTC
  • mto: (237.7.307 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150701200126-qb3f6c3jcas2f4og
mandos-client: Try to start a plugin to add and remove a local route.

* debian/mandos-client.README.Debian: Add setting of environment
                                      variable MANDOSPLUGINHELPERDIR
                                      to command line testing
                                      mandos-client.
* mandos-client.c (raise_privileges): Moved to top of file.
                  (raise_privileges_permanently): - '' -
                  (lower_privileges): - '' -
                  (lower_privileges_permanently): - '' -
  (add_remove_local_route, add_local_route, remove_local_route): New.
  (start_mandos_communication): Set SOCK_CLOEXEC flag on socket.  Run
                                the above functions to add (and
                                remove) local route, if the conditions
                                indicates it could help.
  (run_network_hooks): Use O_DIRECTORY, O_PATH, and O_CLOEXEC flags
                       when opening network hook directory. Do
                       TEMP_FAILURE_RETRY around opening of /dev/null
                       and network hook executables.  Move redirecting
                       of stdout and stderr to as late as possible
                       before fexecve().
  (main): Use O_DIRECTORY and O_PATH when opening temporary directory.
* plugins.d/mandos-client.xml (ENVIRONMENT): Document usage of the
                                             MANDOSPLUGINHELPERDIR
                                             environment variable.

Show diffs side-by-side

added added

removed removed

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