/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-12-27 03:35:58 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091227033558-y57wv1u4cls3i8kq
TODO file changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
43
21
 
44
22
import locale
45
23
 
46
 
locale.setlocale(locale.LC_ALL, '')
47
 
 
48
 
import logging
49
 
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
 
24
locale.setlocale(locale.LC_ALL, u'')
50
25
 
51
26
# Some useful constants
52
27
domain = 'se.bsnet.fukt'
53
28
server_interface = domain + '.Mandos'
54
29
client_interface = domain + '.Mandos.Client'
55
 
version = "1.3.1"
 
30
version = "1.0.14"
56
31
 
57
32
# Always run in monochrome mode
58
33
urwid.curses_display.curses.has_colors = lambda : False
62
37
urwid.curses_display.curses.A_UNDERLINE |= (
63
38
    urwid.curses_display.curses.A_BLINK)
64
39
 
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
40
class MandosClientPropertyCache(object):
82
41
    """This wraps a Mandos Client D-Bus proxy object, caches the
83
42
    properties and calls a hook function when any of them are
87
46
        self.proxy = proxy_object # Mandos Client proxy object
88
47
        
89
48
        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))
95
 
        
 
49
        self.proxy.connect_to_signal(u"PropertyChanged",
 
50
                                     self.property_changed,
 
51
                                     client_interface,
 
52
                                     byte_arrays=True)
 
53
 
96
54
        self.properties.update(
97
55
            self.proxy.GetAll(client_interface,
98
56
                              dbus_interface = dbus.PROPERTIES_IFACE))
99
 
 
100
 
        #XXX This breaks good super behaviour
101
 
#        super(MandosClientPropertyCache, self).__init__(
102
 
#            *args, **kwargs)
 
57
        super(MandosClientPropertyCache, self).__init__(
 
58
            proxy_object=proxy_object, *args, **kwargs)
103
59
    
104
60
    def property_changed(self, property=None, value=None):
105
61
        """This is called whenever we get a PropertyChanged signal
107
63
        """
108
64
        # Update properties dict with new value
109
65
        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
66
 
116
67
 
117
68
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
129
80
        # Logger
130
81
        self.logger = logger
131
82
        
132
 
        self._update_timer_callback_tag = None
133
 
        self._update_timer_callback_lock = 0
134
 
        self.last_checker_failed = False
135
 
        
136
83
        # The widget shown normally
137
 
        self._text_widget = urwid.Text("")
 
84
        self._text_widget = urwid.Text(u"")
138
85
        # The widget shown when we have focus
139
 
        self._focus_text_widget = urwid.Text("")
 
86
        self._focus_text_widget = urwid.Text(u"")
140
87
        super(MandosClientWidget, self).__init__(
141
88
            update_hook=update_hook, delete_hook=delete_hook,
142
89
            *args, **kwargs)
143
90
        self.update()
144
91
        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
 
92
        self.proxy.connect_to_signal(u"CheckerCompleted",
 
93
                                     self.checker_completed,
 
94
                                     client_interface,
 
95
                                     byte_arrays=True)
 
96
        self.proxy.connect_to_signal(u"CheckerStarted",
 
97
                                     self.checker_started,
 
98
                                     client_interface,
 
99
                                     byte_arrays=True)
 
100
        self.proxy.connect_to_signal(u"GotSecret",
 
101
                                     self.got_secret,
 
102
                                     client_interface,
 
103
                                     byte_arrays=True)
 
104
        self.proxy.connect_to_signal(u"Rejected",
 
105
                                     self.rejected,
 
106
                                     client_interface,
 
107
                                     byte_arrays=True)
209
108
    
210
109
    def checker_completed(self, exitstatus, condition, command):
211
110
        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()
 
111
            self.logger(u'Checker for client %s (command "%s")'
 
112
                        u' was successful'
 
113
                        % (self.properties[u"name"], command))
219
114
            return
220
 
        # Checker failed
221
 
        if not self.last_checker_failed:
222
 
            self.last_checker_failed = True
223
 
            self.using_timer(True)
224
115
        if os.WIFEXITED(condition):
225
 
            self.logger('Checker for client %s (command "%s")'
226
 
                        ' failed with exit code %s'
227
 
                        % (self.properties["Name"], command,
 
116
            self.logger(u'Checker for client %s (command "%s")'
 
117
                        u' failed with exit code %s'
 
118
                        % (self.properties[u"name"], command,
228
119
                           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,
 
120
            return
 
121
        if os.WIFSIGNALED(condition):
 
122
            self.logger(u'Checker for client %s (command "%s")'
 
123
                        u' was killed by signal %s'
 
124
                        % (self.properties[u"name"], command,
233
125
                           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()
 
126
            return
 
127
        if os.WCOREDUMP(condition):
 
128
            self.logger(u'Checker for client %s (command "%s")'
 
129
                        u' dumped core'
 
130
                        % (self.properties[u"name"], command))
 
131
        self.logger(u'Checker for client %s completed mysteriously')
242
132
    
243
133
    def checker_started(self, command):
244
 
        #self.logger('Client %s started checker "%s"'
245
 
        #            % (self.properties["Name"], unicode(command)))
246
 
        pass
 
134
        self.logger(u'Client %s started checker "%s"'
 
135
                    % (self.properties[u"name"], unicode(command)))
247
136
    
248
137
    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))
 
138
        self.logger(u'Client %s received its secret'
 
139
                    % self.properties[u"name"])
 
140
    
 
141
    def rejected(self):
 
142
        self.logger(u'Client %s was rejected'
 
143
                    % self.properties[u"name"])
265
144
    
266
145
    def selectable(self):
267
146
        """Make this a "selectable" widget.
268
147
        This overrides the method from urwid.FlowWidget."""
269
148
        return True
270
149
    
271
 
    def rows(self, maxcolrow, focus=False):
 
150
    def rows(self, (maxcol,), focus=False):
272
151
        """How many rows this widget will occupy might depend on
273
152
        whether we have focus or not.
274
153
        This overrides the method from urwid.FlowWidget"""
275
 
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
 
154
        return self.current_widget(focus).rows((maxcol,), focus=focus)
276
155
    
277
156
    def current_widget(self, focus=False):
278
157
        if focus or self.opened:
282
161
    def update(self):
283
162
        "Called when what is visible on the screen should be updated."
284
163
        # 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",
 
164
        with_standout = { u"normal": u"standout",
 
165
                          u"bold": u"bold-standout",
 
166
                          u"underline-blink":
 
167
                              u"underline-blink-standout",
 
168
                          u"bold-underline-blink":
 
169
                              u"bold-underline-blink-standout",
291
170
                          }
292
 
 
 
171
        
293
172
        # 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
 
            
 
173
        self._text = (u'%(name)s: %(enabled)s'
 
174
                      % { u"name": self.properties[u"name"],
 
175
                          u"enabled":
 
176
                              (u"enabled"
 
177
                               if self.properties[u"enabled"]
 
178
                               else u"DISABLED")})
332
179
        if not urwid.supports_unicode():
333
180
            self._text = self._text.encode("ascii", "replace")
334
 
        textlist = [("normal", self._text)]
 
181
        textlist = [(u"normal", self._text)]
335
182
        self._text_widget.set_text(textlist)
336
183
        self._focus_text_widget.set_text([(with_standout[text[0]],
337
184
                                           text[1])
345
192
        if self.update_hook is not None:
346
193
            self.update_hook()
347
194
    
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 = ()
 
195
    def delete(self):
360
196
        if self.delete_hook is not None:
361
197
            self.delete_hook(self)
362
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
363
198
    
364
 
    def render(self, maxcolrow, focus=False):
 
199
    def render(self, (maxcol,), focus=False):
365
200
        """Render differently if we have focus.
366
201
        This overrides the method from urwid.FlowWidget"""
367
 
        return self.current_widget(focus).render(maxcolrow,
 
202
        return self.current_widget(focus).render((maxcol,),
368
203
                                                 focus=focus)
369
204
    
370
 
    def keypress(self, maxcolrow, key):
 
205
    def keypress(self, (maxcol,), key):
371
206
        """Handle keys.
372
207
        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":
 
208
        if key == u"e" or key == u"+":
 
209
            self.proxy.Enable()
 
210
        elif key == u"d" or key == u"-":
 
211
            self.proxy.Disable()
 
212
        elif key == u"r" or key == u"_" or key == u"ctrl k":
388
213
            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)
 
214
                                                  .object_path)
 
215
        elif key == u"s":
 
216
            self.proxy.StartChecker()
 
217
        elif key == u"S":
 
218
            self.proxy.StopChecker()
 
219
        elif key == u"C":
 
220
            self.proxy.CheckedOK()
400
221
        # xxx
401
 
#         elif key == "p" or key == "=":
 
222
#         elif key == u"p" or key == "=":
402
223
#             self.proxy.pause()
403
 
#         elif key == "u" or key == ":":
 
224
#         elif key == u"u" or key == ":":
404
225
#             self.proxy.unpause()
405
 
#         elif key == "RET":
 
226
#         elif key == u"RET":
406
227
#             self.open()
407
228
        else:
408
229
            return key
424
245
    "down" key presses, thus not allowing any containing widgets to
425
246
    use them as an excuse to shift focus away from this widget.
426
247
    """
427
 
    def keypress(self, maxcolrow, key):
428
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
429
 
        if ret in ("up", "down"):
 
248
    def keypress(self, (maxcol, maxrow), key):
 
249
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
 
250
        if ret in (u"up", u"down"):
430
251
            return
431
252
        return ret
432
253
 
441
262
        self.screen = urwid.curses_display.Screen()
442
263
        
443
264
        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")),
 
265
                (u"normal",
 
266
                 u"default", u"default", None),
 
267
                (u"bold",
 
268
                 u"default", u"default", u"bold"),
 
269
                (u"underline-blink",
 
270
                 u"default", u"default", u"underline"),
 
271
                (u"standout",
 
272
                 u"default", u"default", u"standout"),
 
273
                (u"bold-underline-blink",
 
274
                 u"default", u"default", (u"bold", u"underline")),
 
275
                (u"bold-standout",
 
276
                 u"default", u"default", (u"bold", u"standout")),
 
277
                (u"underline-blink-standout",
 
278
                 u"default", u"default", (u"underline", u"standout")),
 
279
                (u"bold-underline-blink-standout",
 
280
                 u"default", u"default", (u"bold", u"underline",
 
281
                                          u"standout")),
461
282
                ))
462
283
        
463
284
        if urwid.supports_unicode():
464
 
            self.divider = "─" # \u2500
465
 
            #self.divider = "━" # \u2501
 
285
            self.divider = u"─" # \u2500
 
286
            #self.divider = u"━" # \u2501
466
287
        else:
467
 
            #self.divider = "-" # \u002d
468
 
            self.divider = "_" # \u005f
 
288
            #self.divider = u"-" # \u002d
 
289
            self.divider = u"_" # \u005f
469
290
        
470
291
        self.screen.start()
471
292
        
485
306
        # This keeps track of whether self.uilist currently has
486
307
        # self.logbox in it or not
487
308
        self.log_visible = True
488
 
        self.log_wrap = "any"
 
309
        self.log_wrap = u"any"
489
310
        
490
311
        self.rebuild()
491
 
        self.log_message_raw(("bold",
492
 
                              "Mandos Monitor version " + version))
493
 
        self.log_message_raw(("bold",
494
 
                              "q: Quit  ?: Help"))
 
312
        self.log_message_raw((u"bold",
 
313
                              u"Mandos Monitor version " + version))
 
314
        self.log_message_raw((u"bold",
 
315
                              u"q: Quit  ?: Help"))
495
316
        
496
317
        self.busname = domain + '.Mandos'
497
318
        self.main_loop = gobject.MainLoop()
498
319
        self.bus = dbus.SystemBus()
499
320
        mandos_dbus_objc = self.bus.get_object(
500
 
            self.busname, "/", follow_name_owner_changes=True)
 
321
            self.busname, u"/", follow_name_owner_changes=True)
501
322
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
502
323
                                          dbus_interface
503
324
                                          = server_interface)
508
329
            mandos_clients = dbus.Dictionary()
509
330
        
510
331
        (self.mandos_serv
511
 
         .connect_to_signal("ClientRemoved",
 
332
         .connect_to_signal(u"ClientRemoved",
512
333
                            self.find_and_remove_client,
513
334
                            dbus_interface=server_interface,
514
335
                            byte_arrays=True))
515
336
        (self.mandos_serv
516
 
         .connect_to_signal("ClientAdded",
 
337
         .connect_to_signal(u"ClientAdded",
517
338
                            self.add_new_client,
518
339
                            dbus_interface=server_interface,
519
340
                            byte_arrays=True))
520
341
        (self.mandos_serv
521
 
         .connect_to_signal("ClientNotFound",
 
342
         .connect_to_signal(u"ClientNotFound",
522
343
                            self.client_not_found,
523
344
                            dbus_interface=server_interface,
524
345
                            byte_arrays=True))
539
360
                            path=path)
540
361
    
541
362
    def client_not_found(self, fingerprint, address):
542
 
        self.log_message(("Client with address %s and fingerprint %s"
543
 
                          " could not be found" % (address,
 
363
        self.log_message((u"Client with address %s and fingerprint %s"
 
364
                          u" could not be found" % (address,
544
365
                                                    fingerprint)))
545
366
    
546
367
    def rebuild(self):
548
369
        Call this when the widget layout needs to change"""
549
370
        self.uilist = []
550
371
        #self.uilist.append(urwid.ListBox(self.clients))
551
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
552
 
                                                          clients),
 
372
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
553
373
                                       #header=urwid.Divider(),
554
374
                                       header=None,
555
 
                                       footer=
556
 
                                       urwid.Divider(div_char=
557
 
                                                     self.divider)))
 
375
                                       footer=urwid.Divider(div_char=self.divider)))
558
376
        if self.log_visible:
559
377
            self.uilist.append(self.logbox)
560
378
            pass
562
380
    
563
381
    def log_message(self, message):
564
382
        timestamp = datetime.datetime.now().isoformat()
565
 
        self.log_message_raw(timestamp + ": " + message)
 
383
        self.log_message_raw(timestamp + u": " + message)
566
384
    
567
385
    def log_message_raw(self, markup):
568
386
        """Add a log message to the log buffer."""
571
389
            and len(self.log) > self.max_log_length):
572
390
            del self.log[0:len(self.log)-self.max_log_length-1]
573
391
        self.logbox.set_focus(len(self.logbox.body.contents),
574
 
                              coming_from="above")
 
392
                              coming_from=u"above")
575
393
        self.refresh()
576
394
    
577
395
    def toggle_log_display(self):
578
396
        """Toggle visibility of the log buffer."""
579
397
        self.log_visible = not self.log_visible
580
398
        self.rebuild()
581
 
        #self.log_message("Log visibility changed to: "
582
 
        #                 + unicode(self.log_visible))
 
399
        self.log_message(u"Log visibility changed to: "
 
400
                         + unicode(self.log_visible))
583
401
    
584
402
    def change_log_display(self):
585
403
        """Change type of log display.
586
404
        Currently, this toggles wrapping of text lines."""
587
 
        if self.log_wrap == "clip":
588
 
            self.log_wrap = "any"
 
405
        if self.log_wrap == u"clip":
 
406
            self.log_wrap = u"any"
589
407
        else:
590
 
            self.log_wrap = "clip"
 
408
            self.log_wrap = u"clip"
591
409
        for textwidget in self.log:
592
410
            textwidget.set_wrap_mode(self.log_wrap)
593
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
411
        self.log_message(u"Wrap mode: " + self.log_wrap)
594
412
    
595
413
    def find_and_remove_client(self, path, name):
596
 
        """Find a client by its object path and remove it.
 
414
        """Find an client from its object path and remove it.
597
415
        
598
416
        This is connected to the ClientRemoved signal from the
599
417
        Mandos server object."""
601
419
            client = self.clients_dict[path]
602
420
        except KeyError:
603
421
            # not found?
604
 
            self.log_message("Unknown client %r (%r) removed", name,
605
 
                             path)
606
422
            return
607
 
        client.delete()
 
423
        self.remove_client(client, path)
608
424
    
609
425
    def add_new_client(self, path):
610
426
        client_proxy_object = self.bus.get_object(self.busname, path)
625
441
        if path is None:
626
442
            path = client.proxy.object_path
627
443
        self.clients_dict[path] = client
628
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
444
        self.clients.sort(None, lambda c: c.properties[u"name"])
629
445
        self.refresh()
630
446
    
631
447
    def remove_client(self, client, path=None):
662
478
    
663
479
    def process_input(self, source, condition):
664
480
        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
 
481
        translations = { u"ctrl n": u"down",      # Emacs
 
482
                         u"ctrl p": u"up",        # Emacs
 
483
                         u"ctrl v": u"page down", # Emacs
 
484
                         u"meta v": u"page up",   # Emacs
 
485
                         u" ": u"page down",      # less
 
486
                         u"f": u"page down",      # less
 
487
                         u"b": u"page up",        # less
 
488
                         u"j": u"down",           # vi
 
489
                         u"k": u"up",             # vi
674
490
                         }
675
491
        for key in keys:
676
492
            try:
678
494
            except KeyError:    # :-)
679
495
                pass
680
496
            
681
 
            if key == "q" or key == "Q":
 
497
            if key == u"q" or key == u"Q":
682
498
                self.stop()
683
499
                break
684
 
            elif key == "window resize":
 
500
            elif key == u"window resize":
685
501
                self.size = self.screen.get_cols_rows()
686
502
                self.refresh()
687
 
            elif key == "\f":  # Ctrl-L
 
503
            elif key == u"\f":  # Ctrl-L
688
504
                self.refresh()
689
 
            elif key == "l" or key == "D":
 
505
            elif key == u"l" or key == u"D":
690
506
                self.toggle_log_display()
691
507
                self.refresh()
692
 
            elif key == "w" or key == "i":
 
508
            elif key == u"w" or key == u"i":
693
509
                self.change_log_display()
694
510
                self.refresh()
695
 
            elif key == "?" or key == "f1" or key == "esc":
 
511
            elif key == u"?" or key == u"f1" or key == u"esc":
696
512
                if not self.log_visible:
697
513
                    self.log_visible = True
698
514
                    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"))))
 
515
                self.log_message_raw((u"bold",
 
516
                                      u"  ".
 
517
                                      join((u"q: Quit",
 
518
                                            u"?: Help",
 
519
                                            u"l: Log window toggle",
 
520
                                            u"TAB: Switch window",
 
521
                                            u"w: Wrap (log)"))))
 
522
                self.log_message_raw((u"bold",
 
523
                                      u"  "
 
524
                                      .join((u"Clients:",
 
525
                                             u"e: Enable",
 
526
                                             u"d: Disable",
 
527
                                             u"r: Remove",
 
528
                                             u"s: Start new checker",
 
529
                                             u"S: Stop checker",
 
530
                                             u"C: Checker OK"))))
717
531
                self.refresh()
718
 
            elif key == "tab":
 
532
            elif key == u"tab":
719
533
                if self.topwidget.get_focus() is self.logbox:
720
534
                    self.topwidget.set_focus(0)
721
535
                else:
722
536
                    self.topwidget.set_focus(self.logbox)
723
537
                self.refresh()
724
 
            #elif (key == "end" or key == "meta >" or key == "G"
725
 
            #      or key == ">"):
 
538
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
539
            #      or key == u">"):
726
540
            #    pass            # xxx end-of-buffer
727
 
            #elif (key == "home" or key == "meta <" or key == "g"
728
 
            #      or key == "<"):
 
541
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
542
            #      or key == u"<"):
729
543
            #    pass            # xxx beginning-of-buffer
730
 
            #elif key == "ctrl e" or key == "$":
 
544
            #elif key == u"ctrl e" or key == u"$":
731
545
            #    pass            # xxx move-end-of-line
732
 
            #elif key == "ctrl a" or key == "^":
 
546
            #elif key == u"ctrl a" or key == u"^":
733
547
            #    pass            # xxx move-beginning-of-line
734
 
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
548
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
735
549
            #    pass            # xxx left
736
 
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
550
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
737
551
            #    pass            # xxx right
738
 
            #elif key == "a":
 
552
            #elif key == u"a":
739
553
            #    pass            # scroll up log
740
 
            #elif key == "z":
 
554
            #elif key == u"z":
741
555
            #    pass            # scroll down log
742
556
            elif self.topwidget.selectable():
743
557
                self.topwidget.keypress(self.size, key)
747
561
ui = UserInterface()
748
562
try:
749
563
    ui.run()
750
 
except KeyboardInterrupt:
751
 
    ui.screen.stop()
752
564
except Exception, e:
753
565
    ui.log_message(unicode(e))
754
566
    ui.screen.stop()