/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 (AvahiService.entry_group_state_changed): Better debug log
                                                   message.
  (AvahiService.server_state_changed): Added debug log message.

* mandos-monitor (isoformat_to_datetime): New function.
  (MandosClientWidget): Show a countdown to disabling if last checker
                        failed.

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@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, '')
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
 
domain = 'se.recompile'
 
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
66
41
    "Parse an ISO 8601 date string to a datetime.datetime()"
67
42
    if not iso:
68
43
        return None
69
 
    d, t = iso.split("T", 1)
70
 
    year, month, day = d.split("-", 2)
71
 
    hour, minute, second = t.split(":", 2)
 
44
    d, t = iso.split(u"T", 1)
 
45
    year, month, day = d.split(u"-", 2)
 
46
    hour, minute, second = t.split(u":", 2)
72
47
    second, fraction = divmod(float(second), 1)
73
48
    return datetime.datetime(int(year),
74
49
                             int(month),
87
62
        self.proxy = proxy_object # Mandos Client proxy object
88
63
        
89
64
        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))
 
65
        self.proxy.connect_to_signal(u"PropertyChanged",
 
66
                                     self.property_changed,
 
67
                                     client_interface,
 
68
                                     byte_arrays=True)
95
69
        
96
70
        self.properties.update(
97
71
            self.proxy.GetAll(client_interface,
98
72
                              dbus_interface = dbus.PROPERTIES_IFACE))
99
 
 
100
 
        #XXX This breaks good super behaviour
101
 
#        super(MandosClientPropertyCache, self).__init__(
102
 
#            *args, **kwargs)
 
73
        super(MandosClientPropertyCache, self).__init__(
 
74
            proxy_object=proxy_object, *args, **kwargs)
103
75
    
104
76
    def property_changed(self, property=None, value=None):
105
77
        """This is called whenever we get a PropertyChanged signal
107
79
        """
108
80
        # Update properties dict with new value
109
81
        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
82
 
116
83
 
117
84
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
130
97
        self.logger = logger
131
98
        
132
99
        self._update_timer_callback_tag = None
133
 
        self._update_timer_callback_lock = 0
134
100
        self.last_checker_failed = False
135
101
        
136
102
        # The widget shown normally
137
 
        self._text_widget = urwid.Text("")
 
103
        self._text_widget = urwid.Text(u"")
138
104
        # The widget shown when we have focus
139
 
        self._focus_text_widget = urwid.Text("")
 
105
        self._focus_text_widget = urwid.Text(u"")
140
106
        super(MandosClientWidget, self).__init__(
141
107
            update_hook=update_hook, delete_hook=delete_hook,
142
108
            *args, **kwargs)
143
109
        self.update()
144
110
        self.opened = False
145
 
        
 
111
        self.proxy.connect_to_signal(u"CheckerCompleted",
 
112
                                     self.checker_completed,
 
113
                                     client_interface,
 
114
                                     byte_arrays=True)
 
115
        self.proxy.connect_to_signal(u"CheckerStarted",
 
116
                                     self.checker_started,
 
117
                                     client_interface,
 
118
                                     byte_arrays=True)
 
119
        self.proxy.connect_to_signal(u"GotSecret",
 
120
                                     self.got_secret,
 
121
                                     client_interface,
 
122
                                     byte_arrays=True)
 
123
        self.proxy.connect_to_signal(u"Rejected",
 
124
                                     self.rejected,
 
125
                                     client_interface,
 
126
                                     byte_arrays=True)
146
127
        last_checked_ok = isoformat_to_datetime(self.properties
147
 
                                                ["LastCheckedOK"])
 
128
                                                ["last_checked_ok"])
148
129
        if last_checked_ok is None:
149
130
            self.last_checker_failed = True
150
131
        else:
152
133
                                         - last_checked_ok)
153
134
                                        > datetime.timedelta
154
135
                                        (milliseconds=
155
 
                                         self.properties
156
 
                                         ["Interval"]))
157
 
        
 
136
                                         self.properties["interval"]))
158
137
        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
138
            self._update_timer_callback_tag = (gobject.timeout_add
205
139
                                               (1000,
206
140
                                                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
210
141
    
211
142
    def checker_completed(self, exitstatus, condition, command):
212
143
        if exitstatus == 0:
213
144
            if self.last_checker_failed:
214
145
                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))
 
146
                gobject.source_remove(self._update_timer_callback_tag)
 
147
                self._update_timer_callback_tag = None
 
148
            self.logger(u'Checker for client %s (command "%s")'
 
149
                        u' was successful'
 
150
                        % (self.properties[u"name"], command))
219
151
            self.update()
220
152
            return
221
153
        # Checker failed
222
154
        if not self.last_checker_failed:
223
155
            self.last_checker_failed = True
224
 
            self.using_timer(True)
 
156
            self._update_timer_callback_tag = (gobject.timeout_add
 
157
                                               (1000,
 
158
                                                self.update_timer))
225
159
        if os.WIFEXITED(condition):
226
 
            self.logger('Checker for client %s (command "%s")'
227
 
                        ' failed with exit code %s'
228
 
                        % (self.properties["Name"], command,
 
160
            self.logger(u'Checker for client %s (command "%s")'
 
161
                        u' failed with exit code %s'
 
162
                        % (self.properties[u"name"], command,
229
163
                           os.WEXITSTATUS(condition)))
230
164
        elif os.WIFSIGNALED(condition):
231
 
            self.logger('Checker for client %s (command "%s")'
232
 
                        ' was killed by signal %s'
233
 
                        % (self.properties["Name"], command,
 
165
            self.logger(u'Checker for client %s (command "%s")'
 
166
                        u' was killed by signal %s'
 
167
                        % (self.properties[u"name"], command,
234
168
                           os.WTERMSIG(condition)))
235
169
        elif os.WCOREDUMP(condition):
236
 
            self.logger('Checker for client %s (command "%s")'
237
 
                        ' dumped core'
238
 
                        % (self.properties["Name"], command))
 
170
            self.logger(u'Checker for client %s (command "%s")'
 
171
                        u' dumped core'
 
172
                        % (self.properties[u"name"], command))
239
173
        else:
240
 
            self.logger('Checker for client %s completed'
241
 
                        ' mysteriously')
 
174
            self.logger(u'Checker for client %s completed mysteriously')
242
175
        self.update()
243
176
    
244
177
    def checker_started(self, command):
245
 
        #self.logger('Client %s started checker "%s"'
246
 
        #            % (self.properties["Name"], unicode(command)))
247
 
        pass
 
178
        self.logger(u'Client %s started checker "%s"'
 
179
                    % (self.properties[u"name"], unicode(command)))
248
180
    
249
181
    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))
 
182
        self.logger(u'Client %s received its secret'
 
183
                    % self.properties[u"name"])
 
184
    
 
185
    def rejected(self):
 
186
        self.logger(u'Client %s was rejected'
 
187
                    % self.properties[u"name"])
266
188
    
267
189
    def selectable(self):
268
190
        """Make this a "selectable" widget.
269
191
        This overrides the method from urwid.FlowWidget."""
270
192
        return True
271
193
    
272
 
    def rows(self, maxcolrow, focus=False):
 
194
    def rows(self, (maxcol,), focus=False):
273
195
        """How many rows this widget will occupy might depend on
274
196
        whether we have focus or not.
275
197
        This overrides the method from urwid.FlowWidget"""
276
 
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
 
198
        return self.current_widget(focus).rows((maxcol,), focus=focus)
277
199
    
278
200
    def current_widget(self, focus=False):
279
201
        if focus or self.opened:
283
205
    def update(self):
284
206
        "Called when what is visible on the screen should be updated."
285
207
        # 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",
 
208
        with_standout = { u"normal": u"standout",
 
209
                          u"bold": u"bold-standout",
 
210
                          u"underline-blink":
 
211
                              u"underline-blink-standout",
 
212
                          u"bold-underline-blink":
 
213
                              u"bold-underline-blink-standout",
292
214
                          }
293
 
 
 
215
        
294
216
        # 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
 
            
 
217
        self._text = (u'%(name)s: %(enabled)s%(timer)s'
 
218
                      % { u"name": self.properties[u"name"],
 
219
                          u"enabled":
 
220
                              (u"enabled"
 
221
                               if self.properties[u"enabled"]
 
222
                               else u"DISABLED"),
 
223
                          u"timer": (unicode(datetime.timedelta
 
224
                                             (milliseconds =
 
225
                                              self.properties
 
226
                                              [u"timeout"])
 
227
                                             - (datetime.datetime
 
228
                                                .utcnow()
 
229
                                                - isoformat_to_datetime
 
230
                                                (max((self.properties
 
231
                                                 ["last_checked_ok"]
 
232
                                                 or
 
233
                                                 self.properties
 
234
                                                 ["created"]),
 
235
                                                    self.properties[u"last_enabled"]))))
 
236
                                     if (self.last_checker_failed
 
237
                                         and self.properties
 
238
                                         [u"enabled"])
 
239
                                     else u"")})
333
240
        if not urwid.supports_unicode():
334
241
            self._text = self._text.encode("ascii", "replace")
335
 
        textlist = [("normal", self._text)]
 
242
        textlist = [(u"normal", self._text)]
336
243
        self._text_widget.set_text(textlist)
337
244
        self._focus_text_widget.set_text([(with_standout[text[0]],
338
245
                                           text[1])
347
254
            self.update_hook()
348
255
    
349
256
    def update_timer(self):
350
 
        """called by gobject. Will indefinitely loop until
351
 
        gobject.source_remove() on tag is called"""
 
257
        "called by gobject"
352
258
        self.update()
353
259
        return True             # Keep calling this
354
260
    
355
 
    def delete(self, *args, **kwargs):
 
261
    def delete(self):
356
262
        if self._update_timer_callback_tag is not None:
357
263
            gobject.source_remove(self._update_timer_callback_tag)
358
264
            self._update_timer_callback_tag = None
359
 
        for match in self.match_objects:
360
 
            match.remove()
361
 
        self.match_objects = ()
362
265
        if self.delete_hook is not None:
363
266
            self.delete_hook(self)
364
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
365
267
    
366
 
    def render(self, maxcolrow, focus=False):
 
268
    def render(self, (maxcol,), focus=False):
367
269
        """Render differently if we have focus.
368
270
        This overrides the method from urwid.FlowWidget"""
369
 
        return self.current_widget(focus).render(maxcolrow,
 
271
        return self.current_widget(focus).render((maxcol,),
370
272
                                                 focus=focus)
371
273
    
372
 
    def keypress(self, maxcolrow, key):
 
274
    def keypress(self, (maxcol,), key):
373
275
        """Handle keys.
374
276
        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":
 
277
        if key == u"e" or key == u"+":
 
278
            self.proxy.Enable()
 
279
        elif key == u"d" or key == u"-":
 
280
            self.proxy.Disable()
 
281
        elif key == u"r" or key == u"_" or key == u"ctrl k":
390
282
            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)
 
283
                                                  .object_path)
 
284
        elif key == u"s":
 
285
            self.proxy.StartChecker()
 
286
        elif key == u"S":
 
287
            self.proxy.StopChecker()
 
288
        elif key == u"C":
 
289
            self.proxy.CheckedOK()
402
290
        # xxx
403
 
#         elif key == "p" or key == "=":
 
291
#         elif key == u"p" or key == "=":
404
292
#             self.proxy.pause()
405
 
#         elif key == "u" or key == ":":
 
293
#         elif key == u"u" or key == ":":
406
294
#             self.proxy.unpause()
407
 
#         elif key == "RET":
 
295
#         elif key == u"RET":
408
296
#             self.open()
409
297
        else:
410
298
            return key
426
314
    "down" key presses, thus not allowing any containing widgets to
427
315
    use them as an excuse to shift focus away from this widget.
428
316
    """
429
 
    def keypress(self, maxcolrow, key):
430
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
431
 
        if ret in ("up", "down"):
 
317
    def keypress(self, (maxcol, maxrow), key):
 
318
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
 
319
        if ret in (u"up", u"down"):
432
320
            return
433
321
        return ret
434
322
 
443
331
        self.screen = urwid.curses_display.Screen()
444
332
        
445
333
        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")),
 
334
                (u"normal",
 
335
                 u"default", u"default", None),
 
336
                (u"bold",
 
337
                 u"default", u"default", u"bold"),
 
338
                (u"underline-blink",
 
339
                 u"default", u"default", u"underline"),
 
340
                (u"standout",
 
341
                 u"default", u"default", u"standout"),
 
342
                (u"bold-underline-blink",
 
343
                 u"default", u"default", (u"bold", u"underline")),
 
344
                (u"bold-standout",
 
345
                 u"default", u"default", (u"bold", u"standout")),
 
346
                (u"underline-blink-standout",
 
347
                 u"default", u"default", (u"underline", u"standout")),
 
348
                (u"bold-underline-blink-standout",
 
349
                 u"default", u"default", (u"bold", u"underline",
 
350
                                          u"standout")),
463
351
                ))
464
352
        
465
353
        if urwid.supports_unicode():
466
 
            self.divider = "─" # \u2500
467
 
            #self.divider = "━" # \u2501
 
354
            self.divider = u"─" # \u2500
 
355
            #self.divider = u"━" # \u2501
468
356
        else:
469
 
            #self.divider = "-" # \u002d
470
 
            self.divider = "_" # \u005f
 
357
            #self.divider = u"-" # \u002d
 
358
            self.divider = u"_" # \u005f
471
359
        
472
360
        self.screen.start()
473
361
        
487
375
        # This keeps track of whether self.uilist currently has
488
376
        # self.logbox in it or not
489
377
        self.log_visible = True
490
 
        self.log_wrap = "any"
 
378
        self.log_wrap = u"any"
491
379
        
492
380
        self.rebuild()
493
 
        self.log_message_raw(("bold",
494
 
                              "Mandos Monitor version " + version))
495
 
        self.log_message_raw(("bold",
496
 
                              "q: Quit  ?: Help"))
 
381
        self.log_message_raw((u"bold",
 
382
                              u"Mandos Monitor version " + version))
 
383
        self.log_message_raw((u"bold",
 
384
                              u"q: Quit  ?: Help"))
497
385
        
498
386
        self.busname = domain + '.Mandos'
499
387
        self.main_loop = gobject.MainLoop()
500
388
        self.bus = dbus.SystemBus()
501
389
        mandos_dbus_objc = self.bus.get_object(
502
 
            self.busname, "/", follow_name_owner_changes=True)
 
390
            self.busname, u"/", follow_name_owner_changes=True)
503
391
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
504
392
                                          dbus_interface
505
393
                                          = server_interface)
510
398
            mandos_clients = dbus.Dictionary()
511
399
        
512
400
        (self.mandos_serv
513
 
         .connect_to_signal("ClientRemoved",
 
401
         .connect_to_signal(u"ClientRemoved",
514
402
                            self.find_and_remove_client,
515
403
                            dbus_interface=server_interface,
516
404
                            byte_arrays=True))
517
405
        (self.mandos_serv
518
 
         .connect_to_signal("ClientAdded",
 
406
         .connect_to_signal(u"ClientAdded",
519
407
                            self.add_new_client,
520
408
                            dbus_interface=server_interface,
521
409
                            byte_arrays=True))
522
410
        (self.mandos_serv
523
 
         .connect_to_signal("ClientNotFound",
 
411
         .connect_to_signal(u"ClientNotFound",
524
412
                            self.client_not_found,
525
413
                            dbus_interface=server_interface,
526
414
                            byte_arrays=True))
541
429
                            path=path)
542
430
    
543
431
    def client_not_found(self, fingerprint, address):
544
 
        self.log_message(("Client with address %s and fingerprint %s"
545
 
                          " could not be found" % (address,
 
432
        self.log_message((u"Client with address %s and fingerprint %s"
 
433
                          u" could not be found" % (address,
546
434
                                                    fingerprint)))
547
435
    
548
436
    def rebuild(self):
550
438
        Call this when the widget layout needs to change"""
551
439
        self.uilist = []
552
440
        #self.uilist.append(urwid.ListBox(self.clients))
553
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
554
 
                                                          clients),
 
441
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
555
442
                                       #header=urwid.Divider(),
556
443
                                       header=None,
557
 
                                       footer=
558
 
                                       urwid.Divider(div_char=
559
 
                                                     self.divider)))
 
444
                                       footer=urwid.Divider(div_char=self.divider)))
560
445
        if self.log_visible:
561
446
            self.uilist.append(self.logbox)
562
447
            pass
564
449
    
565
450
    def log_message(self, message):
566
451
        timestamp = datetime.datetime.now().isoformat()
567
 
        self.log_message_raw(timestamp + ": " + message)
 
452
        self.log_message_raw(timestamp + u": " + message)
568
453
    
569
454
    def log_message_raw(self, markup):
570
455
        """Add a log message to the log buffer."""
573
458
            and len(self.log) > self.max_log_length):
574
459
            del self.log[0:len(self.log)-self.max_log_length-1]
575
460
        self.logbox.set_focus(len(self.logbox.body.contents),
576
 
                              coming_from="above")
 
461
                              coming_from=u"above")
577
462
        self.refresh()
578
463
    
579
464
    def toggle_log_display(self):
580
465
        """Toggle visibility of the log buffer."""
581
466
        self.log_visible = not self.log_visible
582
467
        self.rebuild()
583
 
        #self.log_message("Log visibility changed to: "
584
 
        #                 + unicode(self.log_visible))
 
468
        self.log_message(u"Log visibility changed to: "
 
469
                         + unicode(self.log_visible))
585
470
    
586
471
    def change_log_display(self):
587
472
        """Change type of log display.
588
473
        Currently, this toggles wrapping of text lines."""
589
 
        if self.log_wrap == "clip":
590
 
            self.log_wrap = "any"
 
474
        if self.log_wrap == u"clip":
 
475
            self.log_wrap = u"any"
591
476
        else:
592
 
            self.log_wrap = "clip"
 
477
            self.log_wrap = u"clip"
593
478
        for textwidget in self.log:
594
479
            textwidget.set_wrap_mode(self.log_wrap)
595
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
480
        self.log_message(u"Wrap mode: " + self.log_wrap)
596
481
    
597
482
    def find_and_remove_client(self, path, name):
598
 
        """Find a client by its object path and remove it.
 
483
        """Find an client from its object path and remove it.
599
484
        
600
485
        This is connected to the ClientRemoved signal from the
601
486
        Mandos server object."""
603
488
            client = self.clients_dict[path]
604
489
        except KeyError:
605
490
            # not found?
606
 
            self.log_message("Unknown client %r (%r) removed", name,
607
 
                             path)
608
491
            return
609
 
        client.delete()
 
492
        self.remove_client(client, path)
610
493
    
611
494
    def add_new_client(self, path):
612
495
        client_proxy_object = self.bus.get_object(self.busname, path)
627
510
        if path is None:
628
511
            path = client.proxy.object_path
629
512
        self.clients_dict[path] = client
630
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
513
        self.clients.sort(None, lambda c: c.properties[u"name"])
631
514
        self.refresh()
632
515
    
633
516
    def remove_client(self, client, path=None):
664
547
    
665
548
    def process_input(self, source, condition):
666
549
        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
 
550
        translations = { u"ctrl n": u"down",      # Emacs
 
551
                         u"ctrl p": u"up",        # Emacs
 
552
                         u"ctrl v": u"page down", # Emacs
 
553
                         u"meta v": u"page up",   # Emacs
 
554
                         u" ": u"page down",      # less
 
555
                         u"f": u"page down",      # less
 
556
                         u"b": u"page up",        # less
 
557
                         u"j": u"down",           # vi
 
558
                         u"k": u"up",             # vi
676
559
                         }
677
560
        for key in keys:
678
561
            try:
680
563
            except KeyError:    # :-)
681
564
                pass
682
565
            
683
 
            if key == "q" or key == "Q":
 
566
            if key == u"q" or key == u"Q":
684
567
                self.stop()
685
568
                break
686
 
            elif key == "window resize":
 
569
            elif key == u"window resize":
687
570
                self.size = self.screen.get_cols_rows()
688
571
                self.refresh()
689
 
            elif key == "\f":  # Ctrl-L
 
572
            elif key == u"\f":  # Ctrl-L
690
573
                self.refresh()
691
 
            elif key == "l" or key == "D":
 
574
            elif key == u"l" or key == u"D":
692
575
                self.toggle_log_display()
693
576
                self.refresh()
694
 
            elif key == "w" or key == "i":
 
577
            elif key == u"w" or key == u"i":
695
578
                self.change_log_display()
696
579
                self.refresh()
697
 
            elif key == "?" or key == "f1" or key == "esc":
 
580
            elif key == u"?" or key == u"f1" or key == u"esc":
698
581
                if not self.log_visible:
699
582
                    self.log_visible = True
700
583
                    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"))))
 
584
                self.log_message_raw((u"bold",
 
585
                                      u"  ".
 
586
                                      join((u"q: Quit",
 
587
                                            u"?: Help",
 
588
                                            u"l: Log window toggle",
 
589
                                            u"TAB: Switch window",
 
590
                                            u"w: Wrap (log)"))))
 
591
                self.log_message_raw((u"bold",
 
592
                                      u"  "
 
593
                                      .join((u"Clients:",
 
594
                                             u"e: Enable",
 
595
                                             u"d: Disable",
 
596
                                             u"r: Remove",
 
597
                                             u"s: Start new checker",
 
598
                                             u"S: Stop checker",
 
599
                                             u"C: Checker OK"))))
719
600
                self.refresh()
720
 
            elif key == "tab":
 
601
            elif key == u"tab":
721
602
                if self.topwidget.get_focus() is self.logbox:
722
603
                    self.topwidget.set_focus(0)
723
604
                else:
724
605
                    self.topwidget.set_focus(self.logbox)
725
606
                self.refresh()
726
 
            #elif (key == "end" or key == "meta >" or key == "G"
727
 
            #      or key == ">"):
 
607
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
608
            #      or key == u">"):
728
609
            #    pass            # xxx end-of-buffer
729
 
            #elif (key == "home" or key == "meta <" or key == "g"
730
 
            #      or key == "<"):
 
610
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
611
            #      or key == u"<"):
731
612
            #    pass            # xxx beginning-of-buffer
732
 
            #elif key == "ctrl e" or key == "$":
 
613
            #elif key == u"ctrl e" or key == u"$":
733
614
            #    pass            # xxx move-end-of-line
734
 
            #elif key == "ctrl a" or key == "^":
 
615
            #elif key == u"ctrl a" or key == u"^":
735
616
            #    pass            # xxx move-beginning-of-line
736
 
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
617
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
737
618
            #    pass            # xxx left
738
 
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
619
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
739
620
            #    pass            # xxx right
740
 
            #elif key == "a":
 
621
            #elif key == u"a":
741
622
            #    pass            # scroll up log
742
 
            #elif key == "z":
 
623
            #elif key == u"z":
743
624
            #    pass            # scroll down log
744
625
            elif self.topwidget.selectable():
745
626
                self.topwidget.keypress(self.size, key)
749
630
ui = UserInterface()
750
631
try:
751
632
    ui.run()
752
 
except KeyboardInterrupt:
753
 
    ui.screen.stop()
754
633
except Exception, e:
755
634
    ui.log_message(unicode(e))
756
635
    ui.screen.stop()