/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2011-09-18 15:03:26 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110918150326-tj4zz5qv0cv54we3
* debian/control: Fix language for lintian.

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