/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: 2009-11-15 10:12:09 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091115101209-d0zrfwkp6u0l7v7b
* mandos (MandosServer.handle_ipc): Better log message.
  (main/MandosDBusService.ClientNotFound): Add "address" argument.
                                           All callers changed.
* mandos-monitor (MandosClientWidget.__init__): Add "logger" argument.
  (MandosClientWidget.checker_completed,
  MandosClientWidget.checker_started, MandosClientWidget.got_secret,
  MandosClientWidget.rejected): New methods, connected to signals.
  (MandosClientWidget.update): Improve display.
  (UserInterface.client_not_found): New method, conneced to signal.
  (UserInterface.log_message): New; log with timestamp.
  (UserInterface.log_message_raw): Same as old "log_message".  Bug
                                  fix; always do "refresh()".

Show diffs side-by-side

added added

removed removed

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