/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

* initramfs-tools-script: Bug fix: Add missing "--options" argument to
                          getopt.

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