/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 at bsnet
  • Date: 2011-03-21 19:34:39 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110321193439-lkj3kwvhmujd8lwv
* plugins.d/mandos-client.c (good_interface): Reject non-ARP
                                              interfaces.

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