/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2011-03-08 19:09:03 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110308190903-j499ebtb9bpk31ar
* INSTALL: Updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
 
3
# 
 
4
# Mandos Monitor - Control and monitor the Mandos server
 
5
# 
 
6
# Copyright © 2009-2011 Teddy Hogeborn
 
7
# Copyright © 2009-2011 Björn Påhlsson
 
8
# 
 
9
# This program is free software: you can redistribute it and/or modify
 
10
# it under the terms of the GNU General Public License as published by
 
11
# the Free Software Foundation, either version 3 of the License, or
 
12
# (at your option) any later version.
 
13
#
 
14
#     This program is distributed in the hope that it will be useful,
 
15
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
16
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
17
#     GNU General Public License for more details.
 
18
# 
 
19
# You should have received a copy of the GNU General Public License
 
20
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
21
# 
 
22
# Contact the authors at <mandos@fukt.bsnet.se>.
 
23
# 
3
24
 
4
 
from __future__ import division, absolute_import, with_statement
 
25
from __future__ import division, absolute_import, print_function, unicode_literals
5
26
 
6
27
import sys
7
28
import os
21
42
 
22
43
import locale
23
44
 
24
 
locale.setlocale(locale.LC_ALL, u'')
 
45
locale.setlocale(locale.LC_ALL, '')
25
46
 
26
47
import logging
27
48
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
30
51
domain = 'se.bsnet.fukt'
31
52
server_interface = domain + '.Mandos'
32
53
client_interface = domain + '.Mandos.Client'
33
 
version = "1.0.15"
 
54
version = "1.2.3"
34
55
 
35
56
# Always run in monochrome mode
36
57
urwid.curses_display.curses.has_colors = lambda : False
40
61
urwid.curses_display.curses.A_UNDERLINE |= (
41
62
    urwid.curses_display.curses.A_BLINK)
42
63
 
 
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
 
43
80
class MandosClientPropertyCache(object):
44
81
    """This wraps a Mandos Client D-Bus proxy object, caches the
45
82
    properties and calls a hook function when any of them are
49
86
        self.proxy = proxy_object # Mandos Client proxy object
50
87
        
51
88
        self.properties = dict()
52
 
        self.proxy.connect_to_signal(u"PropertyChanged",
 
89
        self.proxy.connect_to_signal("PropertyChanged",
53
90
                                     self.property_changed,
54
91
                                     client_interface,
55
92
                                     byte_arrays=True)
57
94
        self.properties.update(
58
95
            self.proxy.GetAll(client_interface,
59
96
                              dbus_interface = dbus.PROPERTIES_IFACE))
60
 
        super(MandosClientPropertyCache, self).__init__(
61
 
            proxy_object=proxy_object, *args, **kwargs)
 
97
 
 
98
        #XXX This break good super behaviour!
 
99
#        super(MandosClientPropertyCache, self).__init__(
 
100
#            *args, **kwargs)
62
101
    
63
102
    def property_changed(self, property=None, value=None):
64
103
        """This is called whenever we get a PropertyChanged signal
83
122
        # Logger
84
123
        self.logger = logger
85
124
        
 
125
        self._update_timer_callback_tag = None
 
126
        self._update_timer_callback_lock = 0
 
127
        self.last_checker_failed = False
 
128
        
86
129
        # The widget shown normally
87
 
        self._text_widget = urwid.Text(u"")
 
130
        self._text_widget = urwid.Text("")
88
131
        # The widget shown when we have focus
89
 
        self._focus_text_widget = urwid.Text(u"")
 
132
        self._focus_text_widget = urwid.Text("")
90
133
        super(MandosClientWidget, self).__init__(
91
134
            update_hook=update_hook, delete_hook=delete_hook,
92
135
            *args, **kwargs)
93
136
        self.update()
94
137
        self.opened = False
95
 
        self.proxy.connect_to_signal(u"CheckerCompleted",
 
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",
96
158
                                     self.checker_completed,
97
159
                                     client_interface,
98
160
                                     byte_arrays=True)
99
 
        self.proxy.connect_to_signal(u"CheckerStarted",
 
161
        self.proxy.connect_to_signal("CheckerStarted",
100
162
                                     self.checker_started,
101
163
                                     client_interface,
102
164
                                     byte_arrays=True)
103
 
        self.proxy.connect_to_signal(u"GotSecret",
 
165
        self.proxy.connect_to_signal("GotSecret",
104
166
                                     self.got_secret,
105
167
                                     client_interface,
106
168
                                     byte_arrays=True)
107
 
        self.proxy.connect_to_signal(u"NeedApproval",
 
169
        self.proxy.connect_to_signal("NeedApproval",
108
170
                                     self.need_approval,
109
171
                                     client_interface,
110
172
                                     byte_arrays=True)
111
 
        self.proxy.connect_to_signal(u"Rejected",
 
173
        self.proxy.connect_to_signal("Rejected",
112
174
                                     self.rejected,
113
175
                                     client_interface,
114
176
                                     byte_arrays=True)
115
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
            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
    
116
201
    def checker_completed(self, exitstatus, condition, command):
117
202
        if exitstatus == 0:
118
 
            #self.logger(u'Checker for client %s (command "%s")'
119
 
            #            u' was successful'
120
 
            #            % (self.properties[u"name"], command))
 
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()
121
210
            return
 
211
        # Checker failed
 
212
        if not self.last_checker_failed:
 
213
            self.last_checker_failed = True
 
214
            self.using_timer(True)
122
215
        if os.WIFEXITED(condition):
123
 
            self.logger(u'Checker for client %s (command "%s")'
124
 
                        u' failed with exit code %s'
125
 
                        % (self.properties[u"name"], command,
 
216
            self.logger('Checker for client %s (command "%s")'
 
217
                        ' failed with exit code %s'
 
218
                        % (self.properties["Name"], command,
126
219
                           os.WEXITSTATUS(condition)))
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,
 
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,
132
224
                           os.WTERMSIG(condition)))
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')
 
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()
139
233
    
140
234
    def checker_started(self, command):
141
 
        #self.logger(u'Client %s started checker "%s"'
142
 
        #            % (self.properties[u"name"], unicode(command)))
 
235
        #self.logger('Client %s started checker "%s"'
 
236
        #            % (self.properties["Name"], unicode(command)))
143
237
        pass
144
238
    
145
239
    def got_secret(self):
146
 
        self.logger(u'Client %s received its secret'
147
 
                    % self.properties[u"name"])
 
240
        self.last_checker_failed = False
 
241
        self.logger('Client %s received its secret'
 
242
                    % self.properties["Name"])
148
243
    
149
244
    def need_approval(self, timeout, default):
150
245
        if not default:
151
 
            message = u'Client %s needs approval within %s seconds'
 
246
            message = 'Client %s needs approval within %s seconds'
152
247
        else:
153
 
            message = u'Client %s will get its secret in %s seconds'
 
248
            message = 'Client %s will get its secret in %s seconds'
154
249
        self.logger(message
155
 
                    % (self.properties[u"name"], timeout/1000))
 
250
                    % (self.properties["Name"], timeout/1000))
 
251
        self.using_timer(True)
156
252
    
157
253
    def rejected(self, reason):
158
 
        self.logger(u'Client %s was rejected; reason: %s'
159
 
                    % (self.properties[u"name"], reason))
 
254
        self.logger('Client %s was rejected; reason: %s'
 
255
                    % (self.properties["Name"], reason))
160
256
    
161
257
    def selectable(self):
162
258
        """Make this a "selectable" widget.
163
259
        This overrides the method from urwid.FlowWidget."""
164
260
        return True
165
261
    
166
 
    def rows(self, (maxcol,), focus=False):
 
262
    def rows(self, maxcolrow, focus=False):
167
263
        """How many rows this widget will occupy might depend on
168
264
        whether we have focus or not.
169
265
        This overrides the method from urwid.FlowWidget"""
170
 
        return self.current_widget(focus).rows((maxcol,), focus=focus)
 
266
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
171
267
    
172
268
    def current_widget(self, focus=False):
173
269
        if focus or self.opened:
177
273
    def update(self):
178
274
        "Called when what is visible on the screen should be updated."
179
275
        # How to add standout mode to a style
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",
 
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",
186
282
                          }
187
 
        
 
283
 
188
284
        # Rebuild focus and non-focus widgets using current properties
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")})
 
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
            
195
323
        if not urwid.supports_unicode():
196
324
            self._text = self._text.encode("ascii", "replace")
197
 
        textlist = [(u"normal", self._text)]
 
325
        textlist = [("normal", self._text)]
198
326
        self._text_widget.set_text(textlist)
199
327
        self._focus_text_widget.set_text([(with_standout[text[0]],
200
328
                                           text[1])
208
336
        if self.update_hook is not None:
209
337
            self.update_hook()
210
338
    
 
339
    def update_timer(self):
 
340
        "called by gobject"
 
341
        self.update()
 
342
        return True             # Keep calling this
 
343
    
211
344
    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
212
348
        if self.delete_hook is not None:
213
349
            self.delete_hook(self)
214
350
    
215
 
    def render(self, (maxcol,), focus=False):
 
351
    def render(self, maxcolrow, focus=False):
216
352
        """Render differently if we have focus.
217
353
        This overrides the method from urwid.FlowWidget"""
218
 
        return self.current_widget(focus).render((maxcol,),
 
354
        return self.current_widget(focus).render(maxcolrow,
219
355
                                                 focus=focus)
220
356
    
221
 
    def keypress(self, (maxcol,), key):
 
357
    def keypress(self, maxcolrow, key):
222
358
        """Handle keys.
223
359
        This overrides the method from urwid.FlowWidget"""
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":
 
360
        if key == "+":
 
361
            self.proxy.Enable(dbus_interface = client_interface)
 
362
        elif key == "-":
 
363
            self.proxy.Disable(dbus_interface = client_interface)
 
364
        elif key == "a":
 
365
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
 
366
                               dbus_interface = client_interface)
 
367
        elif key == "d":
 
368
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
 
369
                                  dbus_interface = client_interface)
 
370
        elif key == "R" or key == "_" or key == "ctrl k":
229
371
            self.server_proxy_object.RemoveClient(self.proxy
230
372
                                                  .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()
 
373
        elif key == "s":
 
374
            self.proxy.StartChecker(dbus_interface = client_interface)
 
375
        elif key == "S":
 
376
            self.proxy.StopChecker(dbus_interface = client_interface)
 
377
        elif key == "C":
 
378
            self.proxy.CheckedOK(dbus_interface = client_interface)
237
379
        # xxx
238
 
#         elif key == u"p" or key == "=":
 
380
#         elif key == "p" or key == "=":
239
381
#             self.proxy.pause()
240
 
#         elif key == u"u" or key == ":":
 
382
#         elif key == "u" or key == ":":
241
383
#             self.proxy.unpause()
242
 
#         elif key == u"RET":
 
384
#         elif key == "RET":
243
385
#             self.open()
244
 
        elif key == u"+":
245
 
            self.proxy.Approve(True)
246
 
        elif key == u"-":
247
 
            self.proxy.Approve(False)
248
386
        else:
249
387
            return key
250
388
    
265
403
    "down" key presses, thus not allowing any containing widgets to
266
404
    use them as an excuse to shift focus away from this widget.
267
405
    """
268
 
    def keypress(self, (maxcol, maxrow), key):
269
 
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
270
 
        if ret in (u"up", u"down"):
 
406
    def keypress(self, maxcolrow, key):
 
407
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
408
        if ret in ("up", "down"):
271
409
            return
272
410
        return ret
273
411
 
282
420
        self.screen = urwid.curses_display.Screen()
283
421
        
284
422
        self.screen.register_palette((
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")),
 
423
                ("normal",
 
424
                 "default", "default", None),
 
425
                ("bold",
 
426
                 "default", "default", "bold"),
 
427
                ("underline-blink",
 
428
                 "default", "default", "underline"),
 
429
                ("standout",
 
430
                 "default", "default", "standout"),
 
431
                ("bold-underline-blink",
 
432
                 "default", "default", ("bold", "underline")),
 
433
                ("bold-standout",
 
434
                 "default", "default", ("bold", "standout")),
 
435
                ("underline-blink-standout",
 
436
                 "default", "default", ("underline", "standout")),
 
437
                ("bold-underline-blink-standout",
 
438
                 "default", "default", ("bold", "underline",
 
439
                                          "standout")),
302
440
                ))
303
441
        
304
442
        if urwid.supports_unicode():
305
 
            self.divider = u"─" # \u2500
306
 
            #self.divider = u"━" # \u2501
 
443
            self.divider = "─" # \u2500
 
444
            #self.divider = "━" # \u2501
307
445
        else:
308
 
            #self.divider = u"-" # \u002d
309
 
            self.divider = u"_" # \u005f
 
446
            #self.divider = "-" # \u002d
 
447
            self.divider = "_" # \u005f
310
448
        
311
449
        self.screen.start()
312
450
        
326
464
        # This keeps track of whether self.uilist currently has
327
465
        # self.logbox in it or not
328
466
        self.log_visible = True
329
 
        self.log_wrap = u"any"
 
467
        self.log_wrap = "any"
330
468
        
331
469
        self.rebuild()
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"))
 
470
        self.log_message_raw(("bold",
 
471
                              "Mandos Monitor version " + version))
 
472
        self.log_message_raw(("bold",
 
473
                              "q: Quit  ?: Help"))
336
474
        
337
475
        self.busname = domain + '.Mandos'
338
476
        self.main_loop = gobject.MainLoop()
339
477
        self.bus = dbus.SystemBus()
340
478
        mandos_dbus_objc = self.bus.get_object(
341
 
            self.busname, u"/", follow_name_owner_changes=True)
 
479
            self.busname, "/", follow_name_owner_changes=True)
342
480
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
343
481
                                          dbus_interface
344
482
                                          = server_interface)
349
487
            mandos_clients = dbus.Dictionary()
350
488
        
351
489
        (self.mandos_serv
352
 
         .connect_to_signal(u"ClientRemoved",
 
490
         .connect_to_signal("ClientRemoved",
353
491
                            self.find_and_remove_client,
354
492
                            dbus_interface=server_interface,
355
493
                            byte_arrays=True))
356
494
        (self.mandos_serv
357
 
         .connect_to_signal(u"ClientAdded",
 
495
         .connect_to_signal("ClientAdded",
358
496
                            self.add_new_client,
359
497
                            dbus_interface=server_interface,
360
498
                            byte_arrays=True))
361
499
        (self.mandos_serv
362
 
         .connect_to_signal(u"ClientNotFound",
 
500
         .connect_to_signal("ClientNotFound",
363
501
                            self.client_not_found,
364
502
                            dbus_interface=server_interface,
365
503
                            byte_arrays=True))
380
518
                            path=path)
381
519
    
382
520
    def client_not_found(self, fingerprint, address):
383
 
        self.log_message((u"Client with address %s and fingerprint %s"
384
 
                          u" could not be found" % (address,
 
521
        self.log_message(("Client with address %s and fingerprint %s"
 
522
                          " could not be found" % (address,
385
523
                                                    fingerprint)))
386
524
    
387
525
    def rebuild(self):
389
527
        Call this when the widget layout needs to change"""
390
528
        self.uilist = []
391
529
        #self.uilist.append(urwid.ListBox(self.clients))
392
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
 
530
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
531
                                                          clients),
393
532
                                       #header=urwid.Divider(),
394
533
                                       header=None,
395
 
                                       footer=urwid.Divider(div_char=self.divider)))
 
534
                                       footer=
 
535
                                       urwid.Divider(div_char=
 
536
                                                     self.divider)))
396
537
        if self.log_visible:
397
538
            self.uilist.append(self.logbox)
398
539
            pass
400
541
    
401
542
    def log_message(self, message):
402
543
        timestamp = datetime.datetime.now().isoformat()
403
 
        self.log_message_raw(timestamp + u": " + message)
 
544
        self.log_message_raw(timestamp + ": " + message)
404
545
    
405
546
    def log_message_raw(self, markup):
406
547
        """Add a log message to the log buffer."""
409
550
            and len(self.log) > self.max_log_length):
410
551
            del self.log[0:len(self.log)-self.max_log_length-1]
411
552
        self.logbox.set_focus(len(self.logbox.body.contents),
412
 
                              coming_from=u"above")
 
553
                              coming_from="above")
413
554
        self.refresh()
414
555
    
415
556
    def toggle_log_display(self):
416
557
        """Toggle visibility of the log buffer."""
417
558
        self.log_visible = not self.log_visible
418
559
        self.rebuild()
419
 
        self.log_message(u"Log visibility changed to: "
420
 
                         + unicode(self.log_visible))
 
560
        #self.log_message("Log visibility changed to: "
 
561
        #                 + unicode(self.log_visible))
421
562
    
422
563
    def change_log_display(self):
423
564
        """Change type of log display.
424
565
        Currently, this toggles wrapping of text lines."""
425
 
        if self.log_wrap == u"clip":
426
 
            self.log_wrap = u"any"
 
566
        if self.log_wrap == "clip":
 
567
            self.log_wrap = "any"
427
568
        else:
428
 
            self.log_wrap = u"clip"
 
569
            self.log_wrap = "clip"
429
570
        for textwidget in self.log:
430
571
            textwidget.set_wrap_mode(self.log_wrap)
431
 
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
572
        #self.log_message("Wrap mode: " + self.log_wrap)
432
573
    
433
574
    def find_and_remove_client(self, path, name):
434
575
        """Find an client from its object path and remove it.
461
602
        if path is None:
462
603
            path = client.proxy.object_path
463
604
        self.clients_dict[path] = client
464
 
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
605
        self.clients.sort(None, lambda c: c.properties["Name"])
465
606
        self.refresh()
466
607
    
467
608
    def remove_client(self, client, path=None):
498
639
    
499
640
    def process_input(self, source, condition):
500
641
        keys = self.screen.get_input()
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
 
642
        translations = { "ctrl n": "down",      # Emacs
 
643
                         "ctrl p": "up",        # Emacs
 
644
                         "ctrl v": "page down", # Emacs
 
645
                         "meta v": "page up",   # Emacs
 
646
                         " ": "page down",      # less
 
647
                         "f": "page down",      # less
 
648
                         "b": "page up",        # less
 
649
                         "j": "down",           # vi
 
650
                         "k": "up",             # vi
510
651
                         }
511
652
        for key in keys:
512
653
            try:
514
655
            except KeyError:    # :-)
515
656
                pass
516
657
            
517
 
            if key == u"q" or key == u"Q":
 
658
            if key == "q" or key == "Q":
518
659
                self.stop()
519
660
                break
520
 
            elif key == u"window resize":
 
661
            elif key == "window resize":
521
662
                self.size = self.screen.get_cols_rows()
522
663
                self.refresh()
523
 
            elif key == u"\f":  # Ctrl-L
 
664
            elif key == "\f":  # Ctrl-L
524
665
                self.refresh()
525
 
            elif key == u"l" or key == u"D":
 
666
            elif key == "l" or key == "D":
526
667
                self.toggle_log_display()
527
668
                self.refresh()
528
 
            elif key == u"w" or key == u"i":
 
669
            elif key == "w" or key == "i":
529
670
                self.change_log_display()
530
671
                self.refresh()
531
 
            elif key == u"?" or key == u"f1" or key == u"esc":
 
672
            elif key == "?" or key == "f1" or key == "esc":
532
673
                if not self.log_visible:
533
674
                    self.log_visible = True
534
675
                    self.rebuild()
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"))))
 
676
                self.log_message_raw(("bold",
 
677
                                      "  ".
 
678
                                      join(("q: Quit",
 
679
                                            "?: Help",
 
680
                                            "l: Log window toggle",
 
681
                                            "TAB: Switch window",
 
682
                                            "w: Wrap (log)"))))
 
683
                self.log_message_raw(("bold",
 
684
                                      "  "
 
685
                                      .join(("Clients:",
 
686
                                             "+: Enable",
 
687
                                             "-: Disable",
 
688
                                             "R: Remove",
 
689
                                             "s: Start new checker",
 
690
                                             "S: Stop checker",
 
691
                                             "C: Checker OK",
 
692
                                             "a: Approve",
 
693
                                             "d: Deny"))))
551
694
                self.refresh()
552
 
            elif key == u"tab":
 
695
            elif key == "tab":
553
696
                if self.topwidget.get_focus() is self.logbox:
554
697
                    self.topwidget.set_focus(0)
555
698
                else:
556
699
                    self.topwidget.set_focus(self.logbox)
557
700
                self.refresh()
558
 
            #elif (key == u"end" or key == u"meta >" or key == u"G"
559
 
            #      or key == u">"):
 
701
            #elif (key == "end" or key == "meta >" or key == "G"
 
702
            #      or key == ">"):
560
703
            #    pass            # xxx end-of-buffer
561
 
            #elif (key == u"home" or key == u"meta <" or key == u"g"
562
 
            #      or key == u"<"):
 
704
            #elif (key == "home" or key == "meta <" or key == "g"
 
705
            #      or key == "<"):
563
706
            #    pass            # xxx beginning-of-buffer
564
 
            #elif key == u"ctrl e" or key == u"$":
 
707
            #elif key == "ctrl e" or key == "$":
565
708
            #    pass            # xxx move-end-of-line
566
 
            #elif key == u"ctrl a" or key == u"^":
 
709
            #elif key == "ctrl a" or key == "^":
567
710
            #    pass            # xxx move-beginning-of-line
568
 
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
 
711
            #elif key == "ctrl b" or key == "meta (" or key == "h":
569
712
            #    pass            # xxx left
570
 
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
 
713
            #elif key == "ctrl f" or key == "meta )" or key == "l":
571
714
            #    pass            # xxx right
572
 
            #elif key == u"a":
 
715
            #elif key == "a":
573
716
            #    pass            # scroll up log
574
 
            #elif key == u"z":
 
717
            #elif key == "z":
575
718
            #    pass            # scroll down log
576
719
            elif self.topwidget.selectable():
577
720
                self.topwidget.keypress(self.size, key)
581
724
ui = UserInterface()
582
725
try:
583
726
    ui.run()
 
727
except KeyboardInterrupt:
 
728
    ui.screen.stop()
584
729
except Exception, e:
585
730
    ui.log_message(unicode(e))
586
731
    ui.screen.stop()