/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: Björn Påhlsson
  • Date: 2010-09-07 16:48:58 UTC
  • mto: (237.4.3 mandos-release)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: belorn@fukt.bsnet.se-20100907164858-tcg8hkxdj41zizac
mandos server: Added debuglevel that adjust at what level information
               should be reported.
plugin-runner, askpass-fifo, password-prompt, splasy, usplash:
               Using error instead of perror

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
61
40
urwid.curses_display.curses.A_UNDERLINE |= (
62
41
    urwid.curses_display.curses.A_BLINK)
63
42
 
64
 
def isoformat_to_datetime(iso):
65
 
    "Parse an ISO 8601 date string to a datetime.datetime()"
66
 
    if not iso:
67
 
        return None
68
 
    d, t = iso.split("T", 1)
69
 
    year, month, day = d.split("-", 2)
70
 
    hour, minute, second = t.split(":", 2)
71
 
    second, fraction = divmod(float(second), 1)
72
 
    return datetime.datetime(int(year),
73
 
                             int(month),
74
 
                             int(day),
75
 
                             int(hour),
76
 
                             int(minute),
77
 
                             int(second),           # Whole seconds
78
 
                             int(fraction*1000000)) # Microseconds
79
 
 
80
43
class MandosClientPropertyCache(object):
81
44
    """This wraps a Mandos Client D-Bus proxy object, caches the
82
45
    properties and calls a hook function when any of them are
86
49
        self.proxy = proxy_object # Mandos Client proxy object
87
50
        
88
51
        self.properties = dict()
89
 
        self.proxy.connect_to_signal("PropertyChanged",
 
52
        self.proxy.connect_to_signal(u"PropertyChanged",
90
53
                                     self.property_changed,
91
54
                                     client_interface,
92
55
                                     byte_arrays=True)
122
85
        # Logger
123
86
        self.logger = logger
124
87
        
125
 
        self._update_timer_callback_tag = None
126
 
        self._update_timer_callback_lock = 0
127
 
        self.last_checker_failed = False
128
 
        
129
88
        # The widget shown normally
130
 
        self._text_widget = urwid.Text("")
 
89
        self._text_widget = urwid.Text(u"")
131
90
        # The widget shown when we have focus
132
 
        self._focus_text_widget = urwid.Text("")
 
91
        self._focus_text_widget = urwid.Text(u"")
133
92
        super(MandosClientWidget, self).__init__(
134
93
            update_hook=update_hook, delete_hook=delete_hook,
135
94
            *args, **kwargs)
136
95
        self.update()
137
96
        self.opened = False
138
 
        
139
 
        last_checked_ok = isoformat_to_datetime(self.properties
140
 
                                                ["LastCheckedOK"])
141
 
        if last_checked_ok is None:
142
 
            self.last_checker_failed = True
143
 
        else:
144
 
            self.last_checker_failed = ((datetime.datetime.utcnow()
145
 
                                         - last_checked_ok)
146
 
                                        > datetime.timedelta
147
 
                                        (milliseconds=
148
 
                                         self.properties
149
 
                                         ["Interval"]))
150
 
        
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",
 
97
        self.proxy.connect_to_signal(u"CheckerCompleted",
158
98
                                     self.checker_completed,
159
99
                                     client_interface,
160
100
                                     byte_arrays=True)
161
 
        self.proxy.connect_to_signal("CheckerStarted",
 
101
        self.proxy.connect_to_signal(u"CheckerStarted",
162
102
                                     self.checker_started,
163
103
                                     client_interface,
164
104
                                     byte_arrays=True)
165
 
        self.proxy.connect_to_signal("GotSecret",
 
105
        self.proxy.connect_to_signal(u"GotSecret",
166
106
                                     self.got_secret,
167
107
                                     client_interface,
168
108
                                     byte_arrays=True)
169
 
        self.proxy.connect_to_signal("NeedApproval",
 
109
        self.proxy.connect_to_signal(u"NeedApproval",
170
110
                                     self.need_approval,
171
111
                                     client_interface,
172
112
                                     byte_arrays=True)
173
 
        self.proxy.connect_to_signal("Rejected",
 
113
        self.proxy.connect_to_signal(u"Rejected",
174
114
                                     self.rejected,
175
115
                                     client_interface,
176
116
                                     byte_arrays=True)
177
117
    
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
 
            self._update_timer_callback_tag = (gobject.timeout_add
195
 
                                               (1000,
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
200
 
    
201
118
    def checker_completed(self, exitstatus, condition, command):
202
119
        if exitstatus == 0:
203
 
            if self.last_checker_failed:
204
 
                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))
209
 
            self.update()
 
120
            #self.logger(u'Checker for client %s (command "%s")'
 
121
            #            u' was successful'
 
122
            #            % (self.properties[u"name"], command))
210
123
            return
211
 
        # Checker failed
212
 
        if not self.last_checker_failed:
213
 
            self.last_checker_failed = True
214
 
            self.using_timer(True)
215
124
        if os.WIFEXITED(condition):
216
 
            self.logger('Checker for client %s (command "%s")'
217
 
                        ' failed with exit code %s'
218
 
                        % (self.properties["Name"], command,
 
125
            self.logger(u'Checker for client %s (command "%s")'
 
126
                        u' failed with exit code %s'
 
127
                        % (self.properties[u"name"], command,
219
128
                           os.WEXITSTATUS(condition)))
220
 
        elif os.WIFSIGNALED(condition):
221
 
            self.logger('Checker for client %s (command "%s")'
222
 
                        ' was killed by signal %s'
223
 
                        % (self.properties["Name"], command,
 
129
            return
 
130
        if os.WIFSIGNALED(condition):
 
131
            self.logger(u'Checker for client %s (command "%s")'
 
132
                        u' was killed by signal %s'
 
133
                        % (self.properties[u"name"], command,
224
134
                           os.WTERMSIG(condition)))
225
 
        elif os.WCOREDUMP(condition):
226
 
            self.logger('Checker for client %s (command "%s")'
227
 
                        ' dumped core'
228
 
                        % (self.properties["Name"], command))
229
 
        else:
230
 
            self.logger('Checker for client %s completed'
231
 
                        ' mysteriously')
232
 
        self.update()
 
135
            return
 
136
        if os.WCOREDUMP(condition):
 
137
            self.logger(u'Checker for client %s (command "%s")'
 
138
                        u' dumped core'
 
139
                        % (self.properties[u"name"], command))
 
140
        self.logger(u'Checker for client %s completed mysteriously')
233
141
    
234
142
    def checker_started(self, command):
235
 
        #self.logger('Client %s started checker "%s"'
236
 
        #            % (self.properties["Name"], unicode(command)))
 
143
        #self.logger(u'Client %s started checker "%s"'
 
144
        #            % (self.properties[u"name"], unicode(command)))
237
145
        pass
238
146
    
239
147
    def got_secret(self):
240
 
        self.last_checker_failed = False
241
 
        self.logger('Client %s received its secret'
242
 
                    % self.properties["Name"])
 
148
        self.logger(u'Client %s received its secret'
 
149
                    % self.properties[u"name"])
243
150
    
244
151
    def need_approval(self, timeout, default):
245
152
        if not default:
246
 
            message = 'Client %s needs approval within %s seconds'
 
153
            message = u'Client %s needs approval within %s seconds'
247
154
        else:
248
 
            message = 'Client %s will get its secret in %s seconds'
 
155
            message = u'Client %s will get its secret in %s seconds'
249
156
        self.logger(message
250
 
                    % (self.properties["Name"], timeout/1000))
251
 
        self.using_timer(True)
 
157
                    % (self.properties[u"name"], timeout/1000))
252
158
    
253
159
    def rejected(self, reason):
254
 
        self.logger('Client %s was rejected; reason: %s'
255
 
                    % (self.properties["Name"], reason))
 
160
        self.logger(u'Client %s was rejected; reason: %s'
 
161
                    % (self.properties[u"name"], reason))
256
162
    
257
163
    def selectable(self):
258
164
        """Make this a "selectable" widget.
259
165
        This overrides the method from urwid.FlowWidget."""
260
166
        return True
261
167
    
262
 
    def rows(self, maxcolrow, focus=False):
 
168
    def rows(self, (maxcol,), focus=False):
263
169
        """How many rows this widget will occupy might depend on
264
170
        whether we have focus or not.
265
171
        This overrides the method from urwid.FlowWidget"""
266
 
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
 
172
        return self.current_widget(focus).rows((maxcol,), focus=focus)
267
173
    
268
174
    def current_widget(self, focus=False):
269
175
        if focus or self.opened:
273
179
    def update(self):
274
180
        "Called when what is visible on the screen should be updated."
275
181
        # 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",
 
182
        with_standout = { u"normal": u"standout",
 
183
                          u"bold": u"bold-standout",
 
184
                          u"underline-blink":
 
185
                              u"underline-blink-standout",
 
186
                          u"bold-underline-blink":
 
187
                              u"bold-underline-blink-standout",
282
188
                          }
283
189
 
284
190
        # Rebuild focus and non-focus widgets using current properties
285
191
 
286
192
        # 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]
307
 
        elif self.last_checker_failed:
308
 
            timeout = datetime.timedelta(milliseconds
309
 
                                         = self.properties
310
 
                                         ["Timeout"])
311
 
            last_ok = isoformat_to_datetime(
312
 
                max((self.properties["LastCheckedOK"]
313
 
                     or self.properties["Created"]),
314
 
                    self.properties["LastEnabled"]))
315
 
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
316
 
            message = ('A checker has failed! Time until client'
317
 
                       ' gets disabled: %s'
318
 
                           % unicode(timer).rsplit(".", 1)[0])
 
193
        self._text = (u'%(name)s: '
 
194
                      % {u"name": self.properties[u"name"]})
 
195
 
 
196
        if self.properties[u"approved_pending"]:
 
197
            if self.properties[u"approved_by_default"]:
 
198
                self._text += u"Connection established to client. (d)eny?"
 
199
            else:
 
200
                self._text += u"Seeks approval to send secret. (a)pprove?"
319
201
        else:
320
 
            message = "enabled"
321
 
        self._text = "%s%s" % (base, message)
322
 
            
 
202
            self._text += (u'%(enabled)s'
 
203
                           % {u"enabled":
 
204
                               (u"enabled"
 
205
                                if self.properties[u"enabled"]
 
206
                                else u"DISABLED")})
323
207
        if not urwid.supports_unicode():
324
208
            self._text = self._text.encode("ascii", "replace")
325
 
        textlist = [("normal", self._text)]
 
209
        textlist = [(u"normal", self._text)]
326
210
        self._text_widget.set_text(textlist)
327
211
        self._focus_text_widget.set_text([(with_standout[text[0]],
328
212
                                           text[1])
336
220
        if self.update_hook is not None:
337
221
            self.update_hook()
338
222
    
339
 
    def update_timer(self):
340
 
        "called by gobject"
341
 
        self.update()
342
 
        return True             # Keep calling this
343
 
    
344
223
    def delete(self):
345
 
        if self._update_timer_callback_tag is not None:
346
 
            gobject.source_remove(self._update_timer_callback_tag)
347
 
            self._update_timer_callback_tag = None
348
224
        if self.delete_hook is not None:
349
225
            self.delete_hook(self)
350
226
    
351
 
    def render(self, maxcolrow, focus=False):
 
227
    def render(self, (maxcol,), focus=False):
352
228
        """Render differently if we have focus.
353
229
        This overrides the method from urwid.FlowWidget"""
354
 
        return self.current_widget(focus).render(maxcolrow,
 
230
        return self.current_widget(focus).render((maxcol,),
355
231
                                                 focus=focus)
356
232
    
357
 
    def keypress(self, maxcolrow, key):
 
233
    def keypress(self, (maxcol,), key):
358
234
        """Handle keys.
359
235
        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":
 
236
        if key == u"+":
 
237
            self.proxy.Enable(dbus_interface = client_interface)
 
238
        elif key == u"-":
 
239
            self.proxy.Disable(dbus_interface = client_interface)
 
240
        elif key == u"a":
367
241
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
368
 
                               dbus_interface = client_interface,
369
 
                               ignore_reply=True)
370
 
        elif key == "d":
 
242
                               dbus_interface = client_interface)
 
243
        elif key == u"d":
371
244
            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":
 
245
                                  dbus_interface = client_interface)
 
246
        elif key == u"r" or key == u"_" or key == u"ctrl k":
375
247
            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)
 
248
                                                  .object_path)
 
249
        elif key == u"s":
 
250
            self.proxy.StartChecker(dbus_interface = client_interface)
 
251
        elif key == u"S":
 
252
            self.proxy.StopChecker(dbus_interface = client_interface)
 
253
        elif key == u"C":
 
254
            self.proxy.CheckedOK(dbus_interface = client_interface)
387
255
        # xxx
388
 
#         elif key == "p" or key == "=":
 
256
#         elif key == u"p" or key == "=":
389
257
#             self.proxy.pause()
390
 
#         elif key == "u" or key == ":":
 
258
#         elif key == u"u" or key == ":":
391
259
#             self.proxy.unpause()
392
 
#         elif key == "RET":
 
260
#         elif key == u"RET":
393
261
#             self.open()
 
262
#        elif key == u"+":
 
263
#            self.proxy.Approve(True)
 
264
#        elif key == u"-":
 
265
#            self.proxy.Approve(False)
394
266
        else:
395
267
            return key
396
268
    
411
283
    "down" key presses, thus not allowing any containing widgets to
412
284
    use them as an excuse to shift focus away from this widget.
413
285
    """
414
 
    def keypress(self, maxcolrow, key):
415
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
416
 
        if ret in ("up", "down"):
 
286
    def keypress(self, (maxcol, maxrow), key):
 
287
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
 
288
        if ret in (u"up", u"down"):
417
289
            return
418
290
        return ret
419
291
 
428
300
        self.screen = urwid.curses_display.Screen()
429
301
        
430
302
        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")),
 
303
                (u"normal",
 
304
                 u"default", u"default", None),
 
305
                (u"bold",
 
306
                 u"default", u"default", u"bold"),
 
307
                (u"underline-blink",
 
308
                 u"default", u"default", u"underline"),
 
309
                (u"standout",
 
310
                 u"default", u"default", u"standout"),
 
311
                (u"bold-underline-blink",
 
312
                 u"default", u"default", (u"bold", u"underline")),
 
313
                (u"bold-standout",
 
314
                 u"default", u"default", (u"bold", u"standout")),
 
315
                (u"underline-blink-standout",
 
316
                 u"default", u"default", (u"underline", u"standout")),
 
317
                (u"bold-underline-blink-standout",
 
318
                 u"default", u"default", (u"bold", u"underline",
 
319
                                          u"standout")),
448
320
                ))
449
321
        
450
322
        if urwid.supports_unicode():
451
 
            self.divider = "─" # \u2500
452
 
            #self.divider = "━" # \u2501
 
323
            self.divider = u"─" # \u2500
 
324
            #self.divider = u"━" # \u2501
453
325
        else:
454
 
            #self.divider = "-" # \u002d
455
 
            self.divider = "_" # \u005f
 
326
            #self.divider = u"-" # \u002d
 
327
            self.divider = u"_" # \u005f
456
328
        
457
329
        self.screen.start()
458
330
        
472
344
        # This keeps track of whether self.uilist currently has
473
345
        # self.logbox in it or not
474
346
        self.log_visible = True
475
 
        self.log_wrap = "any"
 
347
        self.log_wrap = u"any"
476
348
        
477
349
        self.rebuild()
478
 
        self.log_message_raw(("bold",
479
 
                              "Mandos Monitor version " + version))
480
 
        self.log_message_raw(("bold",
481
 
                              "q: Quit  ?: Help"))
 
350
        self.log_message_raw((u"bold",
 
351
                              u"Mandos Monitor version " + version))
 
352
        self.log_message_raw((u"bold",
 
353
                              u"q: Quit  ?: Help"))
482
354
        
483
355
        self.busname = domain + '.Mandos'
484
356
        self.main_loop = gobject.MainLoop()
485
357
        self.bus = dbus.SystemBus()
486
358
        mandos_dbus_objc = self.bus.get_object(
487
 
            self.busname, "/", follow_name_owner_changes=True)
 
359
            self.busname, u"/", follow_name_owner_changes=True)
488
360
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
489
361
                                          dbus_interface
490
362
                                          = server_interface)
495
367
            mandos_clients = dbus.Dictionary()
496
368
        
497
369
        (self.mandos_serv
498
 
         .connect_to_signal("ClientRemoved",
 
370
         .connect_to_signal(u"ClientRemoved",
499
371
                            self.find_and_remove_client,
500
372
                            dbus_interface=server_interface,
501
373
                            byte_arrays=True))
502
374
        (self.mandos_serv
503
 
         .connect_to_signal("ClientAdded",
 
375
         .connect_to_signal(u"ClientAdded",
504
376
                            self.add_new_client,
505
377
                            dbus_interface=server_interface,
506
378
                            byte_arrays=True))
507
379
        (self.mandos_serv
508
 
         .connect_to_signal("ClientNotFound",
 
380
         .connect_to_signal(u"ClientNotFound",
509
381
                            self.client_not_found,
510
382
                            dbus_interface=server_interface,
511
383
                            byte_arrays=True))
526
398
                            path=path)
527
399
    
528
400
    def client_not_found(self, fingerprint, address):
529
 
        self.log_message(("Client with address %s and fingerprint %s"
530
 
                          " could not be found" % (address,
 
401
        self.log_message((u"Client with address %s and fingerprint %s"
 
402
                          u" could not be found" % (address,
531
403
                                                    fingerprint)))
532
404
    
533
405
    def rebuild(self):
535
407
        Call this when the widget layout needs to change"""
536
408
        self.uilist = []
537
409
        #self.uilist.append(urwid.ListBox(self.clients))
538
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
539
 
                                                          clients),
 
410
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
540
411
                                       #header=urwid.Divider(),
541
412
                                       header=None,
542
 
                                       footer=
543
 
                                       urwid.Divider(div_char=
544
 
                                                     self.divider)))
 
413
                                       footer=urwid.Divider(div_char=self.divider)))
545
414
        if self.log_visible:
546
415
            self.uilist.append(self.logbox)
547
416
            pass
549
418
    
550
419
    def log_message(self, message):
551
420
        timestamp = datetime.datetime.now().isoformat()
552
 
        self.log_message_raw(timestamp + ": " + message)
 
421
        self.log_message_raw(timestamp + u": " + message)
553
422
    
554
423
    def log_message_raw(self, markup):
555
424
        """Add a log message to the log buffer."""
558
427
            and len(self.log) > self.max_log_length):
559
428
            del self.log[0:len(self.log)-self.max_log_length-1]
560
429
        self.logbox.set_focus(len(self.logbox.body.contents),
561
 
                              coming_from="above")
 
430
                              coming_from=u"above")
562
431
        self.refresh()
563
432
    
564
433
    def toggle_log_display(self):
565
434
        """Toggle visibility of the log buffer."""
566
435
        self.log_visible = not self.log_visible
567
436
        self.rebuild()
568
 
        #self.log_message("Log visibility changed to: "
569
 
        #                 + unicode(self.log_visible))
 
437
        self.log_message(u"Log visibility changed to: "
 
438
                         + unicode(self.log_visible))
570
439
    
571
440
    def change_log_display(self):
572
441
        """Change type of log display.
573
442
        Currently, this toggles wrapping of text lines."""
574
 
        if self.log_wrap == "clip":
575
 
            self.log_wrap = "any"
 
443
        if self.log_wrap == u"clip":
 
444
            self.log_wrap = u"any"
576
445
        else:
577
 
            self.log_wrap = "clip"
 
446
            self.log_wrap = u"clip"
578
447
        for textwidget in self.log:
579
448
            textwidget.set_wrap_mode(self.log_wrap)
580
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
449
        self.log_message(u"Wrap mode: " + self.log_wrap)
581
450
    
582
451
    def find_and_remove_client(self, path, name):
583
452
        """Find an client from its object path and remove it.
610
479
        if path is None:
611
480
            path = client.proxy.object_path
612
481
        self.clients_dict[path] = client
613
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
482
        self.clients.sort(None, lambda c: c.properties[u"name"])
614
483
        self.refresh()
615
484
    
616
485
    def remove_client(self, client, path=None):
647
516
    
648
517
    def process_input(self, source, condition):
649
518
        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
 
519
        translations = { u"ctrl n": u"down",      # Emacs
 
520
                         u"ctrl p": u"up",        # Emacs
 
521
                         u"ctrl v": u"page down", # Emacs
 
522
                         u"meta v": u"page up",   # Emacs
 
523
                         u" ": u"page down",      # less
 
524
                         u"f": u"page down",      # less
 
525
                         u"b": u"page up",        # less
 
526
                         u"j": u"down",           # vi
 
527
                         u"k": u"up",             # vi
659
528
                         }
660
529
        for key in keys:
661
530
            try:
663
532
            except KeyError:    # :-)
664
533
                pass
665
534
            
666
 
            if key == "q" or key == "Q":
 
535
            if key == u"q" or key == u"Q":
667
536
                self.stop()
668
537
                break
669
 
            elif key == "window resize":
 
538
            elif key == u"window resize":
670
539
                self.size = self.screen.get_cols_rows()
671
540
                self.refresh()
672
 
            elif key == "\f":  # Ctrl-L
 
541
            elif key == u"\f":  # Ctrl-L
673
542
                self.refresh()
674
 
            elif key == "l" or key == "D":
 
543
            elif key == u"l" or key == u"D":
675
544
                self.toggle_log_display()
676
545
                self.refresh()
677
 
            elif key == "w" or key == "i":
 
546
            elif key == u"w" or key == u"i":
678
547
                self.change_log_display()
679
548
                self.refresh()
680
 
            elif key == "?" or key == "f1" or key == "esc":
 
549
            elif key == u"?" or key == u"f1" or key == u"esc":
681
550
                if not self.log_visible:
682
551
                    self.log_visible = True
683
552
                    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"))))
 
553
                self.log_message_raw((u"bold",
 
554
                                      u"  ".
 
555
                                      join((u"q: Quit",
 
556
                                            u"?: Help",
 
557
                                            u"l: Log window toggle",
 
558
                                            u"TAB: Switch window",
 
559
                                            u"w: Wrap (log)"))))
 
560
                self.log_message_raw((u"bold",
 
561
                                      u"  "
 
562
                                      .join((u"Clients:",
 
563
                                             u"+: Enable",
 
564
                                             u"-: Disable",
 
565
                                             u"r: Remove",
 
566
                                             u"s: Start new checker",
 
567
                                             u"S: Stop checker",
 
568
                                             u"C: Checker OK",
 
569
                                             u"a: Approve",
 
570
                                             u"d: Deny"))))
702
571
                self.refresh()
703
 
            elif key == "tab":
 
572
            elif key == u"tab":
704
573
                if self.topwidget.get_focus() is self.logbox:
705
574
                    self.topwidget.set_focus(0)
706
575
                else:
707
576
                    self.topwidget.set_focus(self.logbox)
708
577
                self.refresh()
709
 
            #elif (key == "end" or key == "meta >" or key == "G"
710
 
            #      or key == ">"):
 
578
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
579
            #      or key == u">"):
711
580
            #    pass            # xxx end-of-buffer
712
 
            #elif (key == "home" or key == "meta <" or key == "g"
713
 
            #      or key == "<"):
 
581
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
582
            #      or key == u"<"):
714
583
            #    pass            # xxx beginning-of-buffer
715
 
            #elif key == "ctrl e" or key == "$":
 
584
            #elif key == u"ctrl e" or key == u"$":
716
585
            #    pass            # xxx move-end-of-line
717
 
            #elif key == "ctrl a" or key == "^":
 
586
            #elif key == u"ctrl a" or key == u"^":
718
587
            #    pass            # xxx move-beginning-of-line
719
 
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
588
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
720
589
            #    pass            # xxx left
721
 
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
590
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
722
591
            #    pass            # xxx right
723
 
            #elif key == "a":
 
592
            #elif key == u"a":
724
593
            #    pass            # scroll up log
725
 
            #elif key == "z":
 
594
            #elif key == u"z":
726
595
            #    pass            # scroll down log
727
596
            elif self.topwidget.selectable():
728
597
                self.topwidget.keypress(self.size, key)
732
601
ui = UserInterface()
733
602
try:
734
603
    ui.run()
735
 
except KeyboardInterrupt:
736
 
    ui.screen.stop()
737
604
except Exception, e:
738
605
    ui.log_message(unicode(e))
739
606
    ui.screen.stop()