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