/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

Rename all D-Bus properties to conform to D-Bus naming conventions;
all programs changed.

Also rename client setting "approved_delay" to "approval_delay", and
"approved_duration" to "approval_duration"; all programs changed.

* mandos (ClientDBus.NeedApproval): Bug fix: send an UInt64, not a
                                    float.
  (ClientDBus.ApprovedByDefault_dbus_property,
  ClientDBus.ApprovalDelay_dbus_property,
  ClientDBus.ApprovalDuration_dbus_property): Bug fix: send
                                              PropertyChanged signal.

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
 
# 
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.3.0"
 
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)
123
102
        self.logger = logger
124
103
        
125
104
        self._update_timer_callback_tag = None
126
 
        self._update_timer_callback_lock = 0
127
105
        self.last_checker_failed = False
128
106
        
129
107
        # The widget shown normally
130
 
        self._text_widget = urwid.Text("")
 
108
        self._text_widget = urwid.Text(u"")
131
109
        # The widget shown when we have focus
132
 
        self._focus_text_widget = urwid.Text("")
 
110
        self._focus_text_widget = urwid.Text(u"")
133
111
        super(MandosClientWidget, self).__init__(
134
112
            update_hook=update_hook, delete_hook=delete_hook,
135
113
            *args, **kwargs)
136
114
        self.update()
137
115
        self.opened = False
138
 
        
 
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)
139
136
        last_checked_ok = isoformat_to_datetime(self.properties
140
 
                                                ["LastCheckedOK"])
 
137
                                                [u"LastCheckedOK"])
141
138
        if last_checked_ok is None:
142
139
            self.last_checker_failed = True
143
140
        else:
146
143
                                        > datetime.timedelta
147
144
                                        (milliseconds=
148
145
                                         self.properties
149
 
                                         ["Interval"]))
150
 
        
 
146
                                         [u"Interval"]))
151
147
        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:
194
148
            self._update_timer_callback_tag = (gobject.timeout_add
195
149
                                               (1000,
196
150
                                                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
200
151
    
201
152
    def checker_completed(self, exitstatus, condition, command):
202
153
        if exitstatus == 0:
203
154
            if self.last_checker_failed:
204
155
                self.last_checker_failed = False
205
 
                self.using_timer(False)
206
 
            #self.logger('Checker for client %s (command "%s")'
207
 
            #            ' was successful'
208
 
            #            % (self.properties["Name"], command))
 
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))
209
161
            self.update()
210
162
            return
211
163
        # Checker failed
212
164
        if not self.last_checker_failed:
213
165
            self.last_checker_failed = True
214
 
            self.using_timer(True)
 
166
            self._update_timer_callback_tag = (gobject.timeout_add
 
167
                                               (1000,
 
168
                                                self.update_timer))
215
169
        if os.WIFEXITED(condition):
216
 
            self.logger('Checker for client %s (command "%s")'
217
 
                        ' failed with exit code %s'
218
 
                        % (self.properties["Name"], command,
 
170
            self.logger(u'Checker for client %s (command "%s")'
 
171
                        u' failed with exit code %s'
 
172
                        % (self.properties[u"Name"], command,
219
173
                           os.WEXITSTATUS(condition)))
220
174
        elif os.WIFSIGNALED(condition):
221
 
            self.logger('Checker for client %s (command "%s")'
222
 
                        ' was killed by signal %s'
223
 
                        % (self.properties["Name"], command,
 
175
            self.logger(u'Checker for client %s (command "%s")'
 
176
                        u' was killed by signal %s'
 
177
                        % (self.properties[u"Name"], command,
224
178
                           os.WTERMSIG(condition)))
225
179
        elif os.WCOREDUMP(condition):
226
 
            self.logger('Checker for client %s (command "%s")'
227
 
                        ' dumped core'
228
 
                        % (self.properties["Name"], command))
 
180
            self.logger(u'Checker for client %s (command "%s")'
 
181
                        u' dumped core'
 
182
                        % (self.properties[u"Name"], command))
229
183
        else:
230
 
            self.logger('Checker for client %s completed'
231
 
                        ' mysteriously')
 
184
            self.logger(u'Checker for client %s completed'
 
185
                        u' mysteriously')
232
186
        self.update()
233
187
    
234
188
    def checker_started(self, command):
235
 
        #self.logger('Client %s started checker "%s"'
236
 
        #            % (self.properties["Name"], unicode(command)))
 
189
        #self.logger(u'Client %s started checker "%s"'
 
190
        #            % (self.properties[u"Name"], unicode(command)))
237
191
        pass
238
192
    
239
193
    def got_secret(self):
240
194
        self.last_checker_failed = False
241
 
        self.logger('Client %s received its secret'
242
 
                    % self.properties["Name"])
 
195
        self.logger(u'Client %s received its secret'
 
196
                    % self.properties[u"Name"])
243
197
    
244
198
    def need_approval(self, timeout, default):
245
199
        if not default:
246
 
            message = 'Client %s needs approval within %s seconds'
 
200
            message = u'Client %s needs approval within %s seconds'
247
201
        else:
248
 
            message = 'Client %s will get its secret in %s seconds'
 
202
            message = u'Client %s will get its secret in %s seconds'
249
203
        self.logger(message
250
 
                    % (self.properties["Name"], timeout/1000))
251
 
        self.using_timer(True)
 
204
                    % (self.properties[u"Name"], timeout/1000))
252
205
    
253
206
    def rejected(self, reason):
254
 
        self.logger('Client %s was rejected; reason: %s'
255
 
                    % (self.properties["Name"], reason))
 
207
        self.logger(u'Client %s was rejected; reason: %s'
 
208
                    % (self.properties[u"Name"], reason))
256
209
    
257
210
    def selectable(self):
258
211
        """Make this a "selectable" widget.
259
212
        This overrides the method from urwid.FlowWidget."""
260
213
        return True
261
214
    
262
 
    def rows(self, maxcolrow, focus=False):
 
215
    def rows(self, (maxcol,), focus=False):
263
216
        """How many rows this widget will occupy might depend on
264
217
        whether we have focus or not.
265
218
        This overrides the method from urwid.FlowWidget"""
266
 
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
 
219
        return self.current_widget(focus).rows((maxcol,), focus=focus)
267
220
    
268
221
    def current_widget(self, focus=False):
269
222
        if focus or self.opened:
273
226
    def update(self):
274
227
        "Called when what is visible on the screen should be updated."
275
228
        # 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",
 
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",
282
235
                          }
283
236
 
284
237
        # Rebuild focus and non-focus widgets using current properties
285
238
 
286
239
        # 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"]:
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]
 
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?"
307
249
        elif self.last_checker_failed:
308
250
            timeout = datetime.timedelta(milliseconds
309
251
                                         = self.properties
310
 
                                         ["Timeout"])
 
252
                                         [u"Timeout"])
311
253
            last_ok = isoformat_to_datetime(
312
 
                max((self.properties["LastCheckedOK"]
313
 
                     or self.properties["Created"]),
314
 
                    self.properties["LastEnabled"]))
 
254
                max((self.properties[u"LastCheckedOK"]
 
255
                     or self.properties[u"Created"]),
 
256
                    self.properties[u"LastEnabled"]))
315
257
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
316
 
            message = ('A checker has failed! Time until client'
317
 
                       ' gets disabled: %s'
 
258
            message = (u'A checker has failed! Time until client'
 
259
                       u' gets diabled: %s'
318
260
                           % unicode(timer).rsplit(".", 1)[0])
319
261
        else:
320
 
            message = "enabled"
 
262
            message = u"enabled"
321
263
        self._text = "%s%s" % (base, message)
322
264
            
323
265
        if not urwid.supports_unicode():
324
266
            self._text = self._text.encode("ascii", "replace")
325
 
        textlist = [("normal", self._text)]
 
267
        textlist = [(u"normal", self._text)]
326
268
        self._text_widget.set_text(textlist)
327
269
        self._focus_text_widget.set_text([(with_standout[text[0]],
328
270
                                           text[1])
348
290
        if self.delete_hook is not None:
349
291
            self.delete_hook(self)
350
292
    
351
 
    def render(self, maxcolrow, focus=False):
 
293
    def render(self, (maxcol,), focus=False):
352
294
        """Render differently if we have focus.
353
295
        This overrides the method from urwid.FlowWidget"""
354
 
        return self.current_widget(focus).render(maxcolrow,
 
296
        return self.current_widget(focus).render((maxcol,),
355
297
                                                 focus=focus)
356
298
    
357
 
    def keypress(self, maxcolrow, key):
 
299
    def keypress(self, (maxcol,), key):
358
300
        """Handle keys.
359
301
        This overrides the method from urwid.FlowWidget"""
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":
 
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":
367
307
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
368
 
                               dbus_interface = client_interface,
369
 
                               ignore_reply=True)
370
 
        elif key == "d":
 
308
                               dbus_interface = client_interface)
 
309
        elif key == u"d":
371
310
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
372
 
                                  dbus_interface = client_interface,
373
 
                               ignore_reply=True)
374
 
        elif key == "R" or key == "_" or key == "ctrl k":
 
311
                                  dbus_interface = client_interface)
 
312
        elif key == u"r" or key == u"_" or key == u"ctrl k":
375
313
            self.server_proxy_object.RemoveClient(self.proxy
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)
 
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)
387
321
        # xxx
388
 
#         elif key == "p" or key == "=":
 
322
#         elif key == u"p" or key == "=":
389
323
#             self.proxy.pause()
390
 
#         elif key == "u" or key == ":":
 
324
#         elif key == u"u" or key == ":":
391
325
#             self.proxy.unpause()
392
 
#         elif key == "RET":
 
326
#         elif key == u"RET":
393
327
#             self.open()
 
328
#        elif key == u"+":
 
329
#            self.proxy.Approve(True)
 
330
#        elif key == u"-":
 
331
#            self.proxy.Approve(False)
394
332
        else:
395
333
            return key
396
334
    
411
349
    "down" key presses, thus not allowing any containing widgets to
412
350
    use them as an excuse to shift focus away from this widget.
413
351
    """
414
 
    def keypress(self, maxcolrow, key):
415
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
416
 
        if ret in ("up", "down"):
 
352
    def keypress(self, (maxcol, maxrow), key):
 
353
        ret = super(ConstrainedListBox, self).keypress((maxcol,
 
354
                                                        maxrow), key)
 
355
        if ret in (u"up", u"down"):
417
356
            return
418
357
        return ret
419
358
 
428
367
        self.screen = urwid.curses_display.Screen()
429
368
        
430
369
        self.screen.register_palette((
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")),
 
370
                (u"normal",
 
371
                 u"default", u"default", None),
 
372
                (u"bold",
 
373
                 u"default", u"default", u"bold"),
 
374
                (u"underline-blink",
 
375
                 u"default", u"default", u"underline"),
 
376
                (u"standout",
 
377
                 u"default", u"default", u"standout"),
 
378
                (u"bold-underline-blink",
 
379
                 u"default", u"default", (u"bold", u"underline")),
 
380
                (u"bold-standout",
 
381
                 u"default", u"default", (u"bold", u"standout")),
 
382
                (u"underline-blink-standout",
 
383
                 u"default", u"default", (u"underline", u"standout")),
 
384
                (u"bold-underline-blink-standout",
 
385
                 u"default", u"default", (u"bold", u"underline",
 
386
                                          u"standout")),
448
387
                ))
449
388
        
450
389
        if urwid.supports_unicode():
451
 
            self.divider = "─" # \u2500
452
 
            #self.divider = "━" # \u2501
 
390
            self.divider = u"─" # \u2500
 
391
            #self.divider = u"━" # \u2501
453
392
        else:
454
 
            #self.divider = "-" # \u002d
455
 
            self.divider = "_" # \u005f
 
393
            #self.divider = u"-" # \u002d
 
394
            self.divider = u"_" # \u005f
456
395
        
457
396
        self.screen.start()
458
397
        
472
411
        # This keeps track of whether self.uilist currently has
473
412
        # self.logbox in it or not
474
413
        self.log_visible = True
475
 
        self.log_wrap = "any"
 
414
        self.log_wrap = u"any"
476
415
        
477
416
        self.rebuild()
478
 
        self.log_message_raw(("bold",
479
 
                              "Mandos Monitor version " + version))
480
 
        self.log_message_raw(("bold",
481
 
                              "q: Quit  ?: Help"))
 
417
        self.log_message_raw((u"bold",
 
418
                              u"Mandos Monitor version " + version))
 
419
        self.log_message_raw((u"bold",
 
420
                              u"q: Quit  ?: Help"))
482
421
        
483
422
        self.busname = domain + '.Mandos'
484
423
        self.main_loop = gobject.MainLoop()
485
424
        self.bus = dbus.SystemBus()
486
425
        mandos_dbus_objc = self.bus.get_object(
487
 
            self.busname, "/", follow_name_owner_changes=True)
 
426
            self.busname, u"/", follow_name_owner_changes=True)
488
427
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
489
428
                                          dbus_interface
490
429
                                          = server_interface)
495
434
            mandos_clients = dbus.Dictionary()
496
435
        
497
436
        (self.mandos_serv
498
 
         .connect_to_signal("ClientRemoved",
 
437
         .connect_to_signal(u"ClientRemoved",
499
438
                            self.find_and_remove_client,
500
439
                            dbus_interface=server_interface,
501
440
                            byte_arrays=True))
502
441
        (self.mandos_serv
503
 
         .connect_to_signal("ClientAdded",
 
442
         .connect_to_signal(u"ClientAdded",
504
443
                            self.add_new_client,
505
444
                            dbus_interface=server_interface,
506
445
                            byte_arrays=True))
507
446
        (self.mandos_serv
508
 
         .connect_to_signal("ClientNotFound",
 
447
         .connect_to_signal(u"ClientNotFound",
509
448
                            self.client_not_found,
510
449
                            dbus_interface=server_interface,
511
450
                            byte_arrays=True))
526
465
                            path=path)
527
466
    
528
467
    def client_not_found(self, fingerprint, address):
529
 
        self.log_message(("Client with address %s and fingerprint %s"
530
 
                          " could not be found" % (address,
 
468
        self.log_message((u"Client with address %s and fingerprint %s"
 
469
                          u" could not be found" % (address,
531
470
                                                    fingerprint)))
532
471
    
533
472
    def rebuild(self):
549
488
    
550
489
    def log_message(self, message):
551
490
        timestamp = datetime.datetime.now().isoformat()
552
 
        self.log_message_raw(timestamp + ": " + message)
 
491
        self.log_message_raw(timestamp + u": " + message)
553
492
    
554
493
    def log_message_raw(self, markup):
555
494
        """Add a log message to the log buffer."""
558
497
            and len(self.log) > self.max_log_length):
559
498
            del self.log[0:len(self.log)-self.max_log_length-1]
560
499
        self.logbox.set_focus(len(self.logbox.body.contents),
561
 
                              coming_from="above")
 
500
                              coming_from=u"above")
562
501
        self.refresh()
563
502
    
564
503
    def toggle_log_display(self):
565
504
        """Toggle visibility of the log buffer."""
566
505
        self.log_visible = not self.log_visible
567
506
        self.rebuild()
568
 
        #self.log_message("Log visibility changed to: "
569
 
        #                 + unicode(self.log_visible))
 
507
        self.log_message(u"Log visibility changed to: "
 
508
                         + unicode(self.log_visible))
570
509
    
571
510
    def change_log_display(self):
572
511
        """Change type of log display.
573
512
        Currently, this toggles wrapping of text lines."""
574
 
        if self.log_wrap == "clip":
575
 
            self.log_wrap = "any"
 
513
        if self.log_wrap == u"clip":
 
514
            self.log_wrap = u"any"
576
515
        else:
577
 
            self.log_wrap = "clip"
 
516
            self.log_wrap = u"clip"
578
517
        for textwidget in self.log:
579
518
            textwidget.set_wrap_mode(self.log_wrap)
580
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
519
        self.log_message(u"Wrap mode: " + self.log_wrap)
581
520
    
582
521
    def find_and_remove_client(self, path, name):
583
522
        """Find an client from its object path and remove it.
610
549
        if path is None:
611
550
            path = client.proxy.object_path
612
551
        self.clients_dict[path] = client
613
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
552
        self.clients.sort(None, lambda c: c.properties[u"Name"])
614
553
        self.refresh()
615
554
    
616
555
    def remove_client(self, client, path=None):
647
586
    
648
587
    def process_input(self, source, condition):
649
588
        keys = self.screen.get_input()
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
 
589
        translations = { u"ctrl n": u"down",      # Emacs
 
590
                         u"ctrl p": u"up",        # Emacs
 
591
                         u"ctrl v": u"page down", # Emacs
 
592
                         u"meta v": u"page up",   # Emacs
 
593
                         u" ": u"page down",      # less
 
594
                         u"f": u"page down",      # less
 
595
                         u"b": u"page up",        # less
 
596
                         u"j": u"down",           # vi
 
597
                         u"k": u"up",             # vi
659
598
                         }
660
599
        for key in keys:
661
600
            try:
663
602
            except KeyError:    # :-)
664
603
                pass
665
604
            
666
 
            if key == "q" or key == "Q":
 
605
            if key == u"q" or key == u"Q":
667
606
                self.stop()
668
607
                break
669
 
            elif key == "window resize":
 
608
            elif key == u"window resize":
670
609
                self.size = self.screen.get_cols_rows()
671
610
                self.refresh()
672
 
            elif key == "\f":  # Ctrl-L
 
611
            elif key == u"\f":  # Ctrl-L
673
612
                self.refresh()
674
 
            elif key == "l" or key == "D":
 
613
            elif key == u"l" or key == u"D":
675
614
                self.toggle_log_display()
676
615
                self.refresh()
677
 
            elif key == "w" or key == "i":
 
616
            elif key == u"w" or key == u"i":
678
617
                self.change_log_display()
679
618
                self.refresh()
680
 
            elif key == "?" or key == "f1" or key == "esc":
 
619
            elif key == u"?" or key == u"f1" or key == u"esc":
681
620
                if not self.log_visible:
682
621
                    self.log_visible = True
683
622
                    self.rebuild()
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"))))
 
623
                self.log_message_raw((u"bold",
 
624
                                      u"  ".
 
625
                                      join((u"q: Quit",
 
626
                                            u"?: Help",
 
627
                                            u"l: Log window toggle",
 
628
                                            u"TAB: Switch window",
 
629
                                            u"w: Wrap (log)"))))
 
630
                self.log_message_raw((u"bold",
 
631
                                      u"  "
 
632
                                      .join((u"Clients:",
 
633
                                             u"+: Enable",
 
634
                                             u"-: Disable",
 
635
                                             u"r: Remove",
 
636
                                             u"s: Start new checker",
 
637
                                             u"S: Stop checker",
 
638
                                             u"C: Checker OK",
 
639
                                             u"a: Approve",
 
640
                                             u"d: Deny"))))
702
641
                self.refresh()
703
 
            elif key == "tab":
 
642
            elif key == u"tab":
704
643
                if self.topwidget.get_focus() is self.logbox:
705
644
                    self.topwidget.set_focus(0)
706
645
                else:
707
646
                    self.topwidget.set_focus(self.logbox)
708
647
                self.refresh()
709
 
            #elif (key == "end" or key == "meta >" or key == "G"
710
 
            #      or key == ">"):
 
648
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
649
            #      or key == u">"):
711
650
            #    pass            # xxx end-of-buffer
712
 
            #elif (key == "home" or key == "meta <" or key == "g"
713
 
            #      or key == "<"):
 
651
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
652
            #      or key == u"<"):
714
653
            #    pass            # xxx beginning-of-buffer
715
 
            #elif key == "ctrl e" or key == "$":
 
654
            #elif key == u"ctrl e" or key == u"$":
716
655
            #    pass            # xxx move-end-of-line
717
 
            #elif key == "ctrl a" or key == "^":
 
656
            #elif key == u"ctrl a" or key == u"^":
718
657
            #    pass            # xxx move-beginning-of-line
719
 
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
658
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
720
659
            #    pass            # xxx left
721
 
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
660
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
722
661
            #    pass            # xxx right
723
 
            #elif key == "a":
 
662
            #elif key == u"a":
724
663
            #    pass            # scroll up log
725
 
            #elif key == "z":
 
664
            #elif key == u"z":
726
665
            #    pass            # scroll down log
727
666
            elif self.topwidget.selectable():
728
667
                self.topwidget.keypress(self.size, key)