/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

* mandos-ctl: Also show "LastApprovalRequest" property.

Show diffs side-by-side

added added

removed removed

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