/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: 2011-07-16 00:29:19 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110716002919-r77yikuiulj42o40
* initramfs-tools-script: Abort if plugin-runner is missing.  Removed
                          workaround for Debian bug #633582; the
                          workaround required getopt, which can not be
                          guaranteed.
* plugin-runner.c (main): Work around Debian bug #633582.
* plugins.d/mandos-client.c (main): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
 
3
# 
 
4
# Mandos Monitor - Control and monitor the Mandos server
 
5
# 
 
6
# Copyright © 2009-2011 Teddy Hogeborn
 
7
# Copyright © 2009-2011 Björn Påhlsson
 
8
# 
 
9
# This program is free software: you can redistribute it and/or modify
 
10
# it under the terms of the GNU General Public License as published by
 
11
# the Free Software Foundation, either version 3 of the License, or
 
12
# (at your option) any later version.
 
13
#
 
14
#     This program is distributed in the hope that it will be useful,
 
15
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
16
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
17
#     GNU General Public License for more details.
 
18
# 
 
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
# 
3
24
 
4
 
from __future__ import division, absolute_import, with_statement
 
25
from __future__ import division, absolute_import, print_function, unicode_literals
5
26
 
6
27
import sys
7
28
import os
21
42
 
22
43
import locale
23
44
 
24
 
locale.setlocale(locale.LC_ALL, u'')
 
45
locale.setlocale(locale.LC_ALL, '')
25
46
 
26
47
import logging
27
48
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
30
51
domain = 'se.bsnet.fukt'
31
52
server_interface = domain + '.Mandos'
32
53
client_interface = domain + '.Mandos.Client'
33
 
version = "1.0.15"
 
54
version = "1.3.0"
34
55
 
35
56
# Always run in monochrome mode
36
57
urwid.curses_display.curses.has_colors = lambda : False
44
65
    "Parse an ISO 8601 date string to a datetime.datetime()"
45
66
    if not iso:
46
67
        return None
47
 
    d, t = iso.split(u"T", 1)
48
 
    year, month, day = d.split(u"-", 2)
49
 
    hour, minute, second = t.split(u":", 2)
 
68
    d, t = iso.split("T", 1)
 
69
    year, month, day = d.split("-", 2)
 
70
    hour, minute, second = t.split(":", 2)
50
71
    second, fraction = divmod(float(second), 1)
51
72
    return datetime.datetime(int(year),
52
73
                             int(month),
65
86
        self.proxy = proxy_object # Mandos Client proxy object
66
87
        
67
88
        self.properties = dict()
68
 
        self.proxy.connect_to_signal(u"PropertyChanged",
 
89
        self.proxy.connect_to_signal("PropertyChanged",
69
90
                                     self.property_changed,
70
91
                                     client_interface,
71
92
                                     byte_arrays=True)
102
123
        self.logger = logger
103
124
        
104
125
        self._update_timer_callback_tag = None
 
126
        self._update_timer_callback_lock = 0
105
127
        self.last_checker_failed = False
106
128
        
107
129
        # The widget shown normally
108
 
        self._text_widget = urwid.Text(u"")
 
130
        self._text_widget = urwid.Text("")
109
131
        # The widget shown when we have focus
110
 
        self._focus_text_widget = urwid.Text(u"")
 
132
        self._focus_text_widget = urwid.Text("")
111
133
        super(MandosClientWidget, self).__init__(
112
134
            update_hook=update_hook, delete_hook=delete_hook,
113
135
            *args, **kwargs)
114
136
        self.update()
115
137
        self.opened = False
116
 
        self.proxy.connect_to_signal(u"CheckerCompleted",
117
 
                                     self.checker_completed,
118
 
                                     client_interface,
119
 
                                     byte_arrays=True)
120
 
        self.proxy.connect_to_signal(u"CheckerStarted",
121
 
                                     self.checker_started,
122
 
                                     client_interface,
123
 
                                     byte_arrays=True)
124
 
        self.proxy.connect_to_signal(u"GotSecret",
125
 
                                     self.got_secret,
126
 
                                     client_interface,
127
 
                                     byte_arrays=True)
128
 
        self.proxy.connect_to_signal(u"NeedApproval",
129
 
                                     self.need_approval,
130
 
                                     client_interface,
131
 
                                     byte_arrays=True)
132
 
        self.proxy.connect_to_signal(u"Rejected",
133
 
                                     self.rejected,
134
 
                                     client_interface,
135
 
                                     byte_arrays=True)
 
138
        
136
139
        last_checked_ok = isoformat_to_datetime(self.properties
137
 
                                                [u"LastCheckedOK"])
 
140
                                                ["LastCheckedOK"])
138
141
        if last_checked_ok is None:
139
142
            self.last_checker_failed = True
140
143
        else:
143
146
                                        > datetime.timedelta
144
147
                                        (milliseconds=
145
148
                                         self.properties
146
 
                                         [u"Interval"]))
 
149
                                         ["Interval"]))
 
150
        
147
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)
 
177
    
 
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
    def using_timer(self, flag):
 
185
        """Call this method with True or False when timer should be
 
186
        activated or deactivated.
 
187
        """
 
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:
148
194
            self._update_timer_callback_tag = (gobject.timeout_add
149
195
                                               (1000,
150
196
                                                self.update_timer))
 
197
        elif old and self._update_timer_callback_lock == 0:
 
198
            gobject.source_remove(self._update_timer_callback_tag)
 
199
            self._update_timer_callback_tag = None
151
200
    
152
201
    def checker_completed(self, exitstatus, condition, command):
153
202
        if exitstatus == 0:
154
203
            if self.last_checker_failed:
155
204
                self.last_checker_failed = False
156
 
                gobject.source_remove(self._update_timer_callback_tag)
157
 
                self._update_timer_callback_tag = None
158
 
            #self.logger(u'Checker for client %s (command "%s")'
159
 
            #            u' was successful'
160
 
            #            % (self.properties[u"Name"], command))
 
205
                self.using_timer(False)
 
206
            #self.logger('Checker for client %s (command "%s")'
 
207
            #            ' was successful'
 
208
            #            % (self.properties["Name"], command))
161
209
            self.update()
162
210
            return
163
211
        # Checker failed
164
212
        if not self.last_checker_failed:
165
213
            self.last_checker_failed = True
166
 
            self._update_timer_callback_tag = (gobject.timeout_add
167
 
                                               (1000,
168
 
                                                self.update_timer))
 
214
            self.using_timer(True)
169
215
        if os.WIFEXITED(condition):
170
 
            self.logger(u'Checker for client %s (command "%s")'
171
 
                        u' failed with exit code %s'
172
 
                        % (self.properties[u"Name"], command,
 
216
            self.logger('Checker for client %s (command "%s")'
 
217
                        ' failed with exit code %s'
 
218
                        % (self.properties["Name"], command,
173
219
                           os.WEXITSTATUS(condition)))
174
220
        elif os.WIFSIGNALED(condition):
175
 
            self.logger(u'Checker for client %s (command "%s")'
176
 
                        u' was killed by signal %s'
177
 
                        % (self.properties[u"Name"], command,
 
221
            self.logger('Checker for client %s (command "%s")'
 
222
                        ' was killed by signal %s'
 
223
                        % (self.properties["Name"], command,
178
224
                           os.WTERMSIG(condition)))
179
225
        elif os.WCOREDUMP(condition):
180
 
            self.logger(u'Checker for client %s (command "%s")'
181
 
                        u' dumped core'
182
 
                        % (self.properties[u"Name"], command))
 
226
            self.logger('Checker for client %s (command "%s")'
 
227
                        ' dumped core'
 
228
                        % (self.properties["Name"], command))
183
229
        else:
184
 
            self.logger(u'Checker for client %s completed'
185
 
                        u' mysteriously')
 
230
            self.logger('Checker for client %s completed'
 
231
                        ' mysteriously')
186
232
        self.update()
187
233
    
188
234
    def checker_started(self, command):
189
 
        #self.logger(u'Client %s started checker "%s"'
190
 
        #            % (self.properties[u"Name"], unicode(command)))
 
235
        #self.logger('Client %s started checker "%s"'
 
236
        #            % (self.properties["Name"], unicode(command)))
191
237
        pass
192
238
    
193
239
    def got_secret(self):
194
240
        self.last_checker_failed = False
195
 
        self.logger(u'Client %s received its secret'
196
 
                    % self.properties[u"Name"])
 
241
        self.logger('Client %s received its secret'
 
242
                    % self.properties["Name"])
197
243
    
198
244
    def need_approval(self, timeout, default):
199
245
        if not default:
200
 
            message = u'Client %s needs approval within %s seconds'
 
246
            message = 'Client %s needs approval within %s seconds'
201
247
        else:
202
 
            message = u'Client %s will get its secret in %s seconds'
 
248
            message = 'Client %s will get its secret in %s seconds'
203
249
        self.logger(message
204
 
                    % (self.properties[u"Name"], timeout/1000))
 
250
                    % (self.properties["Name"], timeout/1000))
 
251
        self.using_timer(True)
205
252
    
206
253
    def rejected(self, reason):
207
 
        self.logger(u'Client %s was rejected; reason: %s'
208
 
                    % (self.properties[u"Name"], reason))
 
254
        self.logger('Client %s was rejected; reason: %s'
 
255
                    % (self.properties["Name"], reason))
209
256
    
210
257
    def selectable(self):
211
258
        """Make this a "selectable" widget.
212
259
        This overrides the method from urwid.FlowWidget."""
213
260
        return True
214
261
    
215
 
    def rows(self, (maxcol,), focus=False):
 
262
    def rows(self, maxcolrow, focus=False):
216
263
        """How many rows this widget will occupy might depend on
217
264
        whether we have focus or not.
218
265
        This overrides the method from urwid.FlowWidget"""
219
 
        return self.current_widget(focus).rows((maxcol,), focus=focus)
 
266
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
220
267
    
221
268
    def current_widget(self, focus=False):
222
269
        if focus or self.opened:
226
273
    def update(self):
227
274
        "Called when what is visible on the screen should be updated."
228
275
        # How to add standout mode to a style
229
 
        with_standout = { u"normal": u"standout",
230
 
                          u"bold": u"bold-standout",
231
 
                          u"underline-blink":
232
 
                              u"underline-blink-standout",
233
 
                          u"bold-underline-blink":
234
 
                              u"bold-underline-blink-standout",
 
276
        with_standout = { "normal": "standout",
 
277
                          "bold": "bold-standout",
 
278
                          "underline-blink":
 
279
                              "underline-blink-standout",
 
280
                          "bold-underline-blink":
 
281
                              "bold-underline-blink-standout",
235
282
                          }
236
283
 
237
284
        # Rebuild focus and non-focus widgets using current properties
238
285
 
239
286
        # Base part of a client. Name!
240
 
        base = (u'%(name)s: '
241
 
                      % {u"name": self.properties[u"Name"]})
242
 
        if not self.properties[u"Enabled"]:
243
 
            message = u"DISABLED"
244
 
        elif self.properties[u"ApprovalPending"]:
245
 
            if self.properties[u"ApprovedByDefault"]:
246
 
                message = u"Connection established to client. (d)eny?"
247
 
            else:
248
 
                message = u"Seeks approval to send secret. (a)pprove?"
 
287
        base = ('%(name)s: '
 
288
                      % {"name": self.properties["Name"]})
 
289
        if not self.properties["Enabled"]:
 
290
            message = "DISABLED"
 
291
        elif self.properties["ApprovalPending"]:
 
292
            timeout = datetime.timedelta(milliseconds
 
293
                                         = self.properties
 
294
                                         ["ApprovalDelay"])
 
295
            last_approval_request = isoformat_to_datetime(
 
296
                self.properties["LastApprovalRequest"])
 
297
            if last_approval_request is not None:
 
298
                timer = timeout - (datetime.datetime.utcnow()
 
299
                                   - last_approval_request)
 
300
            else:
 
301
                timer = datetime.timedelta()
 
302
            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]
249
307
        elif self.last_checker_failed:
250
308
            timeout = datetime.timedelta(milliseconds
251
309
                                         = self.properties
252
 
                                         [u"Timeout"])
 
310
                                         ["Timeout"])
253
311
            last_ok = isoformat_to_datetime(
254
 
                max((self.properties[u"LastCheckedOK"]
255
 
                     or self.properties[u"Created"]),
256
 
                    self.properties[u"LastEnabled"]))
 
312
                max((self.properties["LastCheckedOK"]
 
313
                     or self.properties["Created"]),
 
314
                    self.properties["LastEnabled"]))
257
315
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
258
 
            message = (u'A checker has failed! Time until client'
259
 
                       u' gets diabled: %s'
 
316
            message = ('A checker has failed! Time until client'
 
317
                       ' gets disabled: %s'
260
318
                           % unicode(timer).rsplit(".", 1)[0])
261
319
        else:
262
 
            message = u"enabled"
 
320
            message = "enabled"
263
321
        self._text = "%s%s" % (base, message)
264
322
            
265
323
        if not urwid.supports_unicode():
266
324
            self._text = self._text.encode("ascii", "replace")
267
 
        textlist = [(u"normal", self._text)]
 
325
        textlist = [("normal", self._text)]
268
326
        self._text_widget.set_text(textlist)
269
327
        self._focus_text_widget.set_text([(with_standout[text[0]],
270
328
                                           text[1])
290
348
        if self.delete_hook is not None:
291
349
            self.delete_hook(self)
292
350
    
293
 
    def render(self, (maxcol,), focus=False):
 
351
    def render(self, maxcolrow, focus=False):
294
352
        """Render differently if we have focus.
295
353
        This overrides the method from urwid.FlowWidget"""
296
 
        return self.current_widget(focus).render((maxcol,),
 
354
        return self.current_widget(focus).render(maxcolrow,
297
355
                                                 focus=focus)
298
356
    
299
 
    def keypress(self, (maxcol,), key):
 
357
    def keypress(self, maxcolrow, key):
300
358
        """Handle keys.
301
359
        This overrides the method from urwid.FlowWidget"""
302
 
        if key == u"+":
303
 
            self.proxy.Enable(dbus_interface = client_interface)
304
 
        elif key == u"-":
305
 
            self.proxy.Disable(dbus_interface = client_interface)
306
 
        elif key == u"a":
 
360
        if key == "+":
 
361
            self.proxy.Enable(dbus_interface = client_interface,
 
362
                              ignore_reply=True)
 
363
        elif key == "-":
 
364
            self.proxy.Disable(dbus_interface = client_interface,
 
365
                               ignore_reply=True)
 
366
        elif key == "a":
307
367
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
308
 
                               dbus_interface = client_interface)
309
 
        elif key == u"d":
 
368
                               dbus_interface = client_interface,
 
369
                               ignore_reply=True)
 
370
        elif key == "d":
310
371
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
311
 
                                  dbus_interface = client_interface)
312
 
        elif key == u"r" or key == u"_" or key == u"ctrl k":
 
372
                                  dbus_interface = client_interface,
 
373
                               ignore_reply=True)
 
374
        elif key == "R" or key == "_" or key == "ctrl k":
313
375
            self.server_proxy_object.RemoveClient(self.proxy
314
 
                                                  .object_path)
315
 
        elif key == u"s":
316
 
            self.proxy.StartChecker(dbus_interface = client_interface)
317
 
        elif key == u"S":
318
 
            self.proxy.StopChecker(dbus_interface = client_interface)
319
 
        elif key == u"C":
320
 
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
376
                                                  .object_path,
 
377
                                                  ignore_reply=True)
 
378
        elif key == "s":
 
379
            self.proxy.StartChecker(dbus_interface = client_interface,
 
380
                                    ignore_reply=True)
 
381
        elif key == "S":
 
382
            self.proxy.StopChecker(dbus_interface = client_interface,
 
383
                                   ignore_reply=True)
 
384
        elif key == "C":
 
385
            self.proxy.CheckedOK(dbus_interface = client_interface,
 
386
                                 ignore_reply=True)
321
387
        # xxx
322
 
#         elif key == u"p" or key == "=":
 
388
#         elif key == "p" or key == "=":
323
389
#             self.proxy.pause()
324
 
#         elif key == u"u" or key == ":":
 
390
#         elif key == "u" or key == ":":
325
391
#             self.proxy.unpause()
326
 
#         elif key == u"RET":
 
392
#         elif key == "RET":
327
393
#             self.open()
328
394
        else:
329
395
            return key
345
411
    "down" key presses, thus not allowing any containing widgets to
346
412
    use them as an excuse to shift focus away from this widget.
347
413
    """
348
 
    def keypress(self, (maxcol, maxrow), key):
349
 
        ret = super(ConstrainedListBox, self).keypress((maxcol,
350
 
                                                        maxrow), key)
351
 
        if ret in (u"up", u"down"):
 
414
    def keypress(self, maxcolrow, key):
 
415
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
416
        if ret in ("up", "down"):
352
417
            return
353
418
        return ret
354
419
 
363
428
        self.screen = urwid.curses_display.Screen()
364
429
        
365
430
        self.screen.register_palette((
366
 
                (u"normal",
367
 
                 u"default", u"default", None),
368
 
                (u"bold",
369
 
                 u"default", u"default", u"bold"),
370
 
                (u"underline-blink",
371
 
                 u"default", u"default", u"underline"),
372
 
                (u"standout",
373
 
                 u"default", u"default", u"standout"),
374
 
                (u"bold-underline-blink",
375
 
                 u"default", u"default", (u"bold", u"underline")),
376
 
                (u"bold-standout",
377
 
                 u"default", u"default", (u"bold", u"standout")),
378
 
                (u"underline-blink-standout",
379
 
                 u"default", u"default", (u"underline", u"standout")),
380
 
                (u"bold-underline-blink-standout",
381
 
                 u"default", u"default", (u"bold", u"underline",
382
 
                                          u"standout")),
 
431
                ("normal",
 
432
                 "default", "default", None),
 
433
                ("bold",
 
434
                 "default", "default", "bold"),
 
435
                ("underline-blink",
 
436
                 "default", "default", "underline"),
 
437
                ("standout",
 
438
                 "default", "default", "standout"),
 
439
                ("bold-underline-blink",
 
440
                 "default", "default", ("bold", "underline")),
 
441
                ("bold-standout",
 
442
                 "default", "default", ("bold", "standout")),
 
443
                ("underline-blink-standout",
 
444
                 "default", "default", ("underline", "standout")),
 
445
                ("bold-underline-blink-standout",
 
446
                 "default", "default", ("bold", "underline",
 
447
                                          "standout")),
383
448
                ))
384
449
        
385
450
        if urwid.supports_unicode():
386
 
            self.divider = u"─" # \u2500
387
 
            #self.divider = u"━" # \u2501
 
451
            self.divider = "─" # \u2500
 
452
            #self.divider = "━" # \u2501
388
453
        else:
389
 
            #self.divider = u"-" # \u002d
390
 
            self.divider = u"_" # \u005f
 
454
            #self.divider = "-" # \u002d
 
455
            self.divider = "_" # \u005f
391
456
        
392
457
        self.screen.start()
393
458
        
407
472
        # This keeps track of whether self.uilist currently has
408
473
        # self.logbox in it or not
409
474
        self.log_visible = True
410
 
        self.log_wrap = u"any"
 
475
        self.log_wrap = "any"
411
476
        
412
477
        self.rebuild()
413
 
        self.log_message_raw((u"bold",
414
 
                              u"Mandos Monitor version " + version))
415
 
        self.log_message_raw((u"bold",
416
 
                              u"q: Quit  ?: Help"))
 
478
        self.log_message_raw(("bold",
 
479
                              "Mandos Monitor version " + version))
 
480
        self.log_message_raw(("bold",
 
481
                              "q: Quit  ?: Help"))
417
482
        
418
483
        self.busname = domain + '.Mandos'
419
484
        self.main_loop = gobject.MainLoop()
420
485
        self.bus = dbus.SystemBus()
421
486
        mandos_dbus_objc = self.bus.get_object(
422
 
            self.busname, u"/", follow_name_owner_changes=True)
 
487
            self.busname, "/", follow_name_owner_changes=True)
423
488
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
424
489
                                          dbus_interface
425
490
                                          = server_interface)
430
495
            mandos_clients = dbus.Dictionary()
431
496
        
432
497
        (self.mandos_serv
433
 
         .connect_to_signal(u"ClientRemoved",
 
498
         .connect_to_signal("ClientRemoved",
434
499
                            self.find_and_remove_client,
435
500
                            dbus_interface=server_interface,
436
501
                            byte_arrays=True))
437
502
        (self.mandos_serv
438
 
         .connect_to_signal(u"ClientAdded",
 
503
         .connect_to_signal("ClientAdded",
439
504
                            self.add_new_client,
440
505
                            dbus_interface=server_interface,
441
506
                            byte_arrays=True))
442
507
        (self.mandos_serv
443
 
         .connect_to_signal(u"ClientNotFound",
 
508
         .connect_to_signal("ClientNotFound",
444
509
                            self.client_not_found,
445
510
                            dbus_interface=server_interface,
446
511
                            byte_arrays=True))
461
526
                            path=path)
462
527
    
463
528
    def client_not_found(self, fingerprint, address):
464
 
        self.log_message((u"Client with address %s and fingerprint %s"
465
 
                          u" could not be found" % (address,
 
529
        self.log_message(("Client with address %s and fingerprint %s"
 
530
                          " could not be found" % (address,
466
531
                                                    fingerprint)))
467
532
    
468
533
    def rebuild(self):
484
549
    
485
550
    def log_message(self, message):
486
551
        timestamp = datetime.datetime.now().isoformat()
487
 
        self.log_message_raw(timestamp + u": " + message)
 
552
        self.log_message_raw(timestamp + ": " + message)
488
553
    
489
554
    def log_message_raw(self, markup):
490
555
        """Add a log message to the log buffer."""
493
558
            and len(self.log) > self.max_log_length):
494
559
            del self.log[0:len(self.log)-self.max_log_length-1]
495
560
        self.logbox.set_focus(len(self.logbox.body.contents),
496
 
                              coming_from=u"above")
 
561
                              coming_from="above")
497
562
        self.refresh()
498
563
    
499
564
    def toggle_log_display(self):
500
565
        """Toggle visibility of the log buffer."""
501
566
        self.log_visible = not self.log_visible
502
567
        self.rebuild()
503
 
        #self.log_message(u"Log visibility changed to: "
 
568
        #self.log_message("Log visibility changed to: "
504
569
        #                 + unicode(self.log_visible))
505
570
    
506
571
    def change_log_display(self):
507
572
        """Change type of log display.
508
573
        Currently, this toggles wrapping of text lines."""
509
 
        if self.log_wrap == u"clip":
510
 
            self.log_wrap = u"any"
 
574
        if self.log_wrap == "clip":
 
575
            self.log_wrap = "any"
511
576
        else:
512
 
            self.log_wrap = u"clip"
 
577
            self.log_wrap = "clip"
513
578
        for textwidget in self.log:
514
579
            textwidget.set_wrap_mode(self.log_wrap)
515
 
        #self.log_message(u"Wrap mode: " + self.log_wrap)
 
580
        #self.log_message("Wrap mode: " + self.log_wrap)
516
581
    
517
582
    def find_and_remove_client(self, path, name):
518
583
        """Find an client from its object path and remove it.
545
610
        if path is None:
546
611
            path = client.proxy.object_path
547
612
        self.clients_dict[path] = client
548
 
        self.clients.sort(None, lambda c: c.properties[u"Name"])
 
613
        self.clients.sort(None, lambda c: c.properties["Name"])
549
614
        self.refresh()
550
615
    
551
616
    def remove_client(self, client, path=None):
582
647
    
583
648
    def process_input(self, source, condition):
584
649
        keys = self.screen.get_input()
585
 
        translations = { u"ctrl n": u"down",      # Emacs
586
 
                         u"ctrl p": u"up",        # Emacs
587
 
                         u"ctrl v": u"page down", # Emacs
588
 
                         u"meta v": u"page up",   # Emacs
589
 
                         u" ": u"page down",      # less
590
 
                         u"f": u"page down",      # less
591
 
                         u"b": u"page up",        # less
592
 
                         u"j": u"down",           # vi
593
 
                         u"k": u"up",             # vi
 
650
        translations = { "ctrl n": "down",      # Emacs
 
651
                         "ctrl p": "up",        # Emacs
 
652
                         "ctrl v": "page down", # Emacs
 
653
                         "meta v": "page up",   # Emacs
 
654
                         " ": "page down",      # less
 
655
                         "f": "page down",      # less
 
656
                         "b": "page up",        # less
 
657
                         "j": "down",           # vi
 
658
                         "k": "up",             # vi
594
659
                         }
595
660
        for key in keys:
596
661
            try:
598
663
            except KeyError:    # :-)
599
664
                pass
600
665
            
601
 
            if key == u"q" or key == u"Q":
 
666
            if key == "q" or key == "Q":
602
667
                self.stop()
603
668
                break
604
 
            elif key == u"window resize":
 
669
            elif key == "window resize":
605
670
                self.size = self.screen.get_cols_rows()
606
671
                self.refresh()
607
 
            elif key == u"\f":  # Ctrl-L
 
672
            elif key == "\f":  # Ctrl-L
608
673
                self.refresh()
609
 
            elif key == u"l" or key == u"D":
 
674
            elif key == "l" or key == "D":
610
675
                self.toggle_log_display()
611
676
                self.refresh()
612
 
            elif key == u"w" or key == u"i":
 
677
            elif key == "w" or key == "i":
613
678
                self.change_log_display()
614
679
                self.refresh()
615
 
            elif key == u"?" or key == u"f1" or key == u"esc":
 
680
            elif key == "?" or key == "f1" or key == "esc":
616
681
                if not self.log_visible:
617
682
                    self.log_visible = True
618
683
                    self.rebuild()
619
 
                self.log_message_raw((u"bold",
620
 
                                      u"  ".
621
 
                                      join((u"q: Quit",
622
 
                                            u"?: Help",
623
 
                                            u"l: Log window toggle",
624
 
                                            u"TAB: Switch window",
625
 
                                            u"w: Wrap (log)"))))
626
 
                self.log_message_raw((u"bold",
627
 
                                      u"  "
628
 
                                      .join((u"Clients:",
629
 
                                             u"+: Enable",
630
 
                                             u"-: Disable",
631
 
                                             u"r: Remove",
632
 
                                             u"s: Start new checker",
633
 
                                             u"S: Stop checker",
634
 
                                             u"C: Checker OK",
635
 
                                             u"a: Approve",
636
 
                                             u"d: Deny"))))
 
684
                self.log_message_raw(("bold",
 
685
                                      "  ".
 
686
                                      join(("q: Quit",
 
687
                                            "?: Help",
 
688
                                            "l: Log window toggle",
 
689
                                            "TAB: Switch window",
 
690
                                            "w: Wrap (log)"))))
 
691
                self.log_message_raw(("bold",
 
692
                                      "  "
 
693
                                      .join(("Clients:",
 
694
                                             "+: Enable",
 
695
                                             "-: Disable",
 
696
                                             "R: Remove",
 
697
                                             "s: Start new checker",
 
698
                                             "S: Stop checker",
 
699
                                             "C: Checker OK",
 
700
                                             "a: Approve",
 
701
                                             "d: Deny"))))
637
702
                self.refresh()
638
 
            elif key == u"tab":
 
703
            elif key == "tab":
639
704
                if self.topwidget.get_focus() is self.logbox:
640
705
                    self.topwidget.set_focus(0)
641
706
                else:
642
707
                    self.topwidget.set_focus(self.logbox)
643
708
                self.refresh()
644
 
            #elif (key == u"end" or key == u"meta >" or key == u"G"
645
 
            #      or key == u">"):
 
709
            #elif (key == "end" or key == "meta >" or key == "G"
 
710
            #      or key == ">"):
646
711
            #    pass            # xxx end-of-buffer
647
 
            #elif (key == u"home" or key == u"meta <" or key == u"g"
648
 
            #      or key == u"<"):
 
712
            #elif (key == "home" or key == "meta <" or key == "g"
 
713
            #      or key == "<"):
649
714
            #    pass            # xxx beginning-of-buffer
650
 
            #elif key == u"ctrl e" or key == u"$":
 
715
            #elif key == "ctrl e" or key == "$":
651
716
            #    pass            # xxx move-end-of-line
652
 
            #elif key == u"ctrl a" or key == u"^":
 
717
            #elif key == "ctrl a" or key == "^":
653
718
            #    pass            # xxx move-beginning-of-line
654
 
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
 
719
            #elif key == "ctrl b" or key == "meta (" or key == "h":
655
720
            #    pass            # xxx left
656
 
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
 
721
            #elif key == "ctrl f" or key == "meta )" or key == "l":
657
722
            #    pass            # xxx right
658
 
            #elif key == u"a":
 
723
            #elif key == "a":
659
724
            #    pass            # scroll up log
660
 
            #elif key == u"z":
 
725
            #elif key == "z":
661
726
            #    pass            # scroll down log
662
727
            elif self.topwidget.selectable():
663
728
                self.topwidget.keypress(self.size, key)