/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-02 18:53:38 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-20100902185338-d1022sv517txn3sb
early commit to ease todays coding

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