/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

* 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.3.0"
 
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
 
                              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":
 
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":
375
215
            self.server_proxy_object.RemoveClient(self.proxy
376
 
                                                  .object_path,
377
 
                                                  ignore_reply=True)
378
 
        elif key == "s":
379
 
            self.proxy.StartChecker(dbus_interface = client_interface,
380
 
                                    ignore_reply=True)
381
 
        elif key == "S":
382
 
            self.proxy.StopChecker(dbus_interface = client_interface,
383
 
                                   ignore_reply=True)
384
 
        elif key == "C":
385
 
            self.proxy.CheckedOK(dbus_interface = client_interface,
386
 
                                 ignore_reply=True)
 
216
                                                  .object_path)
 
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()
387
223
        # xxx
388
 
#         elif key == "p" or key == "=":
 
224
#         elif key == u"p" or key == "=":
389
225
#             self.proxy.pause()
390
 
#         elif key == "u" or key == ":":
 
226
#         elif key == u"u" or key == ":":
391
227
#             self.proxy.unpause()
392
 
#         elif key == "RET":
 
228
#         elif key == u"RET":
393
229
#             self.open()
394
230
        else:
395
231
            return key
411
247
    "down" key presses, thus not allowing any containing widgets to
412
248
    use them as an excuse to shift focus away from this widget.
413
249
    """
414
 
    def keypress(self, maxcolrow, key):
415
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
416
 
        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"):
417
253
            return
418
254
        return ret
419
255
 
428
264
        self.screen = urwid.curses_display.Screen()
429
265
        
430
266
        self.screen.register_palette((
431
 
                ("normal",
432
 
                 "default", "default", None),
433
 
                ("bold",
434
 
                 "default", "default", "bold"),
435
 
                ("underline-blink",
436
 
                 "default", "default", "underline"),
437
 
                ("standout",
438
 
                 "default", "default", "standout"),
439
 
                ("bold-underline-blink",
440
 
                 "default", "default", ("bold", "underline")),
441
 
                ("bold-standout",
442
 
                 "default", "default", ("bold", "standout")),
443
 
                ("underline-blink-standout",
444
 
                 "default", "default", ("underline", "standout")),
445
 
                ("bold-underline-blink-standout",
446
 
                 "default", "default", ("bold", "underline",
447
 
                                          "standout")),
 
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")),
448
284
                ))
449
285
        
450
286
        if urwid.supports_unicode():
451
 
            self.divider = "─" # \u2500
452
 
            #self.divider = "━" # \u2501
 
287
            self.divider = u"─" # \u2500
 
288
            #self.divider = u"━" # \u2501
453
289
        else:
454
 
            #self.divider = "-" # \u002d
455
 
            self.divider = "_" # \u005f
 
290
            #self.divider = u"-" # \u002d
 
291
            self.divider = u"_" # \u005f
456
292
        
457
293
        self.screen.start()
458
294
        
472
308
        # This keeps track of whether self.uilist currently has
473
309
        # self.logbox in it or not
474
310
        self.log_visible = True
475
 
        self.log_wrap = "any"
 
311
        self.log_wrap = u"any"
476
312
        
477
313
        self.rebuild()
478
 
        self.log_message_raw(("bold",
479
 
                              "Mandos Monitor version " + version))
480
 
        self.log_message_raw(("bold",
481
 
                              "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"))
482
318
        
483
319
        self.busname = domain + '.Mandos'
484
320
        self.main_loop = gobject.MainLoop()
485
321
        self.bus = dbus.SystemBus()
486
322
        mandos_dbus_objc = self.bus.get_object(
487
 
            self.busname, "/", follow_name_owner_changes=True)
 
323
            self.busname, u"/", follow_name_owner_changes=True)
488
324
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
489
325
                                          dbus_interface
490
326
                                          = server_interface)
495
331
            mandos_clients = dbus.Dictionary()
496
332
        
497
333
        (self.mandos_serv
498
 
         .connect_to_signal("ClientRemoved",
 
334
         .connect_to_signal(u"ClientRemoved",
499
335
                            self.find_and_remove_client,
500
336
                            dbus_interface=server_interface,
501
337
                            byte_arrays=True))
502
338
        (self.mandos_serv
503
 
         .connect_to_signal("ClientAdded",
 
339
         .connect_to_signal(u"ClientAdded",
504
340
                            self.add_new_client,
505
341
                            dbus_interface=server_interface,
506
342
                            byte_arrays=True))
507
343
        (self.mandos_serv
508
 
         .connect_to_signal("ClientNotFound",
 
344
         .connect_to_signal(u"ClientNotFound",
509
345
                            self.client_not_found,
510
346
                            dbus_interface=server_interface,
511
347
                            byte_arrays=True))
526
362
                            path=path)
527
363
    
528
364
    def client_not_found(self, fingerprint, address):
529
 
        self.log_message(("Client with address %s and fingerprint %s"
530
 
                          " could not be found" % (address,
 
365
        self.log_message((u"Client with address %s and fingerprint %s"
 
366
                          u" could not be found" % (address,
531
367
                                                    fingerprint)))
532
368
    
533
369
    def rebuild(self):
535
371
        Call this when the widget layout needs to change"""
536
372
        self.uilist = []
537
373
        #self.uilist.append(urwid.ListBox(self.clients))
538
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
539
 
                                                          clients),
 
374
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
540
375
                                       #header=urwid.Divider(),
541
376
                                       header=None,
542
 
                                       footer=
543
 
                                       urwid.Divider(div_char=
544
 
                                                     self.divider)))
 
377
                                       footer=urwid.Divider(div_char=self.divider)))
545
378
        if self.log_visible:
546
379
            self.uilist.append(self.logbox)
547
380
            pass
549
382
    
550
383
    def log_message(self, message):
551
384
        timestamp = datetime.datetime.now().isoformat()
552
 
        self.log_message_raw(timestamp + ": " + message)
 
385
        self.log_message_raw(timestamp + u": " + message)
553
386
    
554
387
    def log_message_raw(self, markup):
555
388
        """Add a log message to the log buffer."""
558
391
            and len(self.log) > self.max_log_length):
559
392
            del self.log[0:len(self.log)-self.max_log_length-1]
560
393
        self.logbox.set_focus(len(self.logbox.body.contents),
561
 
                              coming_from="above")
 
394
                              coming_from=u"above")
562
395
        self.refresh()
563
396
    
564
397
    def toggle_log_display(self):
565
398
        """Toggle visibility of the log buffer."""
566
399
        self.log_visible = not self.log_visible
567
400
        self.rebuild()
568
 
        #self.log_message("Log visibility changed to: "
569
 
        #                 + unicode(self.log_visible))
 
401
        self.log_message(u"Log visibility changed to: "
 
402
                         + unicode(self.log_visible))
570
403
    
571
404
    def change_log_display(self):
572
405
        """Change type of log display.
573
406
        Currently, this toggles wrapping of text lines."""
574
 
        if self.log_wrap == "clip":
575
 
            self.log_wrap = "any"
 
407
        if self.log_wrap == u"clip":
 
408
            self.log_wrap = u"any"
576
409
        else:
577
 
            self.log_wrap = "clip"
 
410
            self.log_wrap = u"clip"
578
411
        for textwidget in self.log:
579
412
            textwidget.set_wrap_mode(self.log_wrap)
580
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
413
        self.log_message(u"Wrap mode: " + self.log_wrap)
581
414
    
582
415
    def find_and_remove_client(self, path, name):
583
416
        """Find an client from its object path and remove it.
591
424
            return
592
425
        self.remove_client(client, path)
593
426
    
594
 
    def add_new_client(self, path):
 
427
    def add_new_client(self, path, properties):
595
428
        client_proxy_object = self.bus.get_object(self.busname, path)
596
429
        self.add_client(MandosClientWidget(server_proxy_object
597
430
                                           =self.mandos_serv,
598
431
                                           proxy_object
599
432
                                           =client_proxy_object,
 
433
                                           properties=properties,
600
434
                                           update_hook
601
435
                                           =self.refresh,
602
436
                                           delete_hook
603
 
                                           =self.remove_client,
604
 
                                           logger
605
 
                                           =self.log_message),
 
437
                                           =self.remove_client),
606
438
                        path=path)
607
439
    
608
440
    def add_client(self, client, path=None):
610
442
        if path is None:
611
443
            path = client.proxy.object_path
612
444
        self.clients_dict[path] = client
613
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
445
        self.clients.sort(None, lambda c: c.properties[u"name"])
614
446
        self.refresh()
615
447
    
616
448
    def remove_client(self, client, path=None):
647
479
    
648
480
    def process_input(self, source, condition):
649
481
        keys = self.screen.get_input()
650
 
        translations = { "ctrl n": "down",      # Emacs
651
 
                         "ctrl p": "up",        # Emacs
652
 
                         "ctrl v": "page down", # Emacs
653
 
                         "meta v": "page up",   # Emacs
654
 
                         " ": "page down",      # less
655
 
                         "f": "page down",      # less
656
 
                         "b": "page up",        # less
657
 
                         "j": "down",           # vi
658
 
                         "k": "up",             # vi
 
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
659
491
                         }
660
492
        for key in keys:
661
493
            try:
663
495
            except KeyError:    # :-)
664
496
                pass
665
497
            
666
 
            if key == "q" or key == "Q":
 
498
            if key == u"q" or key == u"Q":
667
499
                self.stop()
668
500
                break
669
 
            elif key == "window resize":
 
501
            elif key == u"window resize":
670
502
                self.size = self.screen.get_cols_rows()
671
503
                self.refresh()
672
 
            elif key == "\f":  # Ctrl-L
 
504
            elif key == u"\f":  # Ctrl-L
673
505
                self.refresh()
674
 
            elif key == "l" or key == "D":
 
506
            elif key == u"l" or key == u"D":
675
507
                self.toggle_log_display()
676
508
                self.refresh()
677
 
            elif key == "w" or key == "i":
 
509
            elif key == u"w" or key == u"i":
678
510
                self.change_log_display()
679
511
                self.refresh()
680
 
            elif key == "?" or key == "f1" or key == "esc":
 
512
            elif key == u"?" or key == u"f1" or key == u"esc":
681
513
                if not self.log_visible:
682
514
                    self.log_visible = True
683
515
                    self.rebuild()
684
 
                self.log_message_raw(("bold",
685
 
                                      "  ".
686
 
                                      join(("q: Quit",
687
 
                                            "?: Help",
688
 
                                            "l: Log window toggle",
689
 
                                            "TAB: Switch window",
690
 
                                            "w: Wrap (log)"))))
691
 
                self.log_message_raw(("bold",
692
 
                                      "  "
693
 
                                      .join(("Clients:",
694
 
                                             "+: Enable",
695
 
                                             "-: Disable",
696
 
                                             "R: Remove",
697
 
                                             "s: Start new checker",
698
 
                                             "S: Stop checker",
699
 
                                             "C: Checker OK",
700
 
                                             "a: Approve",
701
 
                                             "d: Deny"))))
 
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"))))
702
532
                self.refresh()
703
 
            elif key == "tab":
 
533
            elif key == u"tab":
704
534
                if self.topwidget.get_focus() is self.logbox:
705
535
                    self.topwidget.set_focus(0)
706
536
                else:
707
537
                    self.topwidget.set_focus(self.logbox)
708
538
                self.refresh()
709
 
            #elif (key == "end" or key == "meta >" or key == "G"
710
 
            #      or key == ">"):
 
539
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
540
            #      or key == u">"):
711
541
            #    pass            # xxx end-of-buffer
712
 
            #elif (key == "home" or key == "meta <" or key == "g"
713
 
            #      or key == "<"):
 
542
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
543
            #      or key == u"<"):
714
544
            #    pass            # xxx beginning-of-buffer
715
 
            #elif key == "ctrl e" or key == "$":
 
545
            #elif key == u"ctrl e" or key == u"$":
716
546
            #    pass            # xxx move-end-of-line
717
 
            #elif key == "ctrl a" or key == "^":
 
547
            #elif key == u"ctrl a" or key == u"^":
718
548
            #    pass            # xxx move-beginning-of-line
719
 
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
549
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
720
550
            #    pass            # xxx left
721
 
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
551
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
722
552
            #    pass            # xxx right
723
 
            #elif key == "a":
 
553
            #elif key == u"a":
724
554
            #    pass            # scroll up log
725
 
            #elif key == "z":
 
555
            #elif key == u"z":
726
556
            #    pass            # scroll down log
727
557
            elif self.topwidget.selectable():
728
558
                self.topwidget.keypress(self.size, key)
732
562
ui = UserInterface()
733
563
try:
734
564
    ui.run()
735
 
except KeyboardInterrupt:
736
 
    ui.screen.stop()
737
 
except Exception, e:
738
 
    ui.log_message(unicode(e))
 
565
except:
739
566
    ui.screen.stop()
740
567
    raise