/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

  • Committer: teddy at bsnet
  • Date: 2010-08-24 18:18:01 UTC
  • mto: (24.1.154 mandos)
  • mto: This revision was merged to the branch mainline in revision 270.
  • Revision ID: teddy@fukt.bsnet.se-20100824181801-n798wxs117trv8iu
* mandos: Use logging.getLogger() as in the documentation.
* mandos-monitor: Suppress logging from dbus.proxies.

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