/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: Björn Påhlsson
  • Date: 2011-08-19 15:18:42 UTC
  • mfrom: (237.7.43 trunk)
  • mto: (237.7.45 trunk)
  • mto: This revision was merged to the branch mainline in revision 286.
  • Revision ID: belorn@fukt.bsnet.se-20110819151842-frluz9oo9v7l9fdz
Merge

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