/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2011-12-21 17:17:32 UTC
  • mto: (237.7.75 trunk)
  • mto: This revision was merged to the branch mainline in revision 290.
  • Revision ID: teddy@recompile.se-20111221171732-j1yfbekvztjk205a
* mandos-ctl (main): Correct "except:" syntax.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
 
3
 
4
# Mandos Monitor - Control and monitor the Mandos server
 
5
 
6
# Copyright © 2009-2011 Teddy Hogeborn
 
7
# Copyright © 2009-2011 Björn Påhlsson
 
8
 
9
# This program is free software: you can redistribute it and/or modify
 
10
# it under the terms of the GNU General Public License as published by
 
11
# the Free Software Foundation, either version 3 of the License, or
 
12
# (at your option) any later version.
 
13
#
 
14
#     This program is distributed in the hope that it will be useful,
 
15
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
16
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
17
#     GNU General Public License for more details.
 
18
 
19
# You should have received a copy of the GNU General Public License
 
20
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
21
 
22
# Contact the authors at <mandos@recompile.se>.
 
23
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)
28
50
 
29
51
# Some useful constants
30
 
domain = 'se.bsnet.fukt'
 
52
domain = 'se.recompile'
31
53
server_interface = domain + '.Mandos'
32
54
client_interface = domain + '.Mandos.Client'
33
 
version = "1.0.15"
 
55
version = "1.4.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
 
            proxy_object=proxy_object, *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"Rejected",
108
 
                                     self.rejected,
109
 
                                     client_interface,
110
 
                                     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
            # Will update the shown timer value every second
 
204
            self._update_timer_callback_tag = (gobject.timeout_add
 
205
                                               (1000,
 
206
                                                self.update_timer))
 
207
        elif old and self._update_timer_callback_lock == 0:
 
208
            gobject.source_remove(self._update_timer_callback_tag)
 
209
            self._update_timer_callback_tag = None
111
210
    
112
211
    def checker_completed(self, exitstatus, condition, command):
113
212
        if exitstatus == 0:
114
 
            self.logger(u'Checker for client %s (command "%s")'
115
 
                        u' was successful'
116
 
                        % (self.properties[u"name"], command))
 
213
            if self.last_checker_failed:
 
214
                self.last_checker_failed = False
 
215
                self.using_timer(False)
 
216
            #self.logger('Checker for client %s (command "%s")'
 
217
            #            ' was successful'
 
218
            #            % (self.properties["Name"], command))
 
219
            self.update()
117
220
            return
 
221
        # Checker failed
 
222
        if not self.last_checker_failed:
 
223
            self.last_checker_failed = True
 
224
            self.using_timer(True)
118
225
        if os.WIFEXITED(condition):
119
 
            self.logger(u'Checker for client %s (command "%s")'
120
 
                        u' failed with exit code %s'
121
 
                        % (self.properties[u"name"], command,
 
226
            self.logger('Checker for client %s (command "%s")'
 
227
                        ' failed with exit code %s'
 
228
                        % (self.properties["Name"], command,
122
229
                           os.WEXITSTATUS(condition)))
123
 
            return
124
 
        if os.WIFSIGNALED(condition):
125
 
            self.logger(u'Checker for client %s (command "%s")'
126
 
                        u' was killed by signal %s'
127
 
                        % (self.properties[u"name"], command,
 
230
        elif os.WIFSIGNALED(condition):
 
231
            self.logger('Checker for client %s (command "%s")'
 
232
                        ' was killed by signal %s'
 
233
                        % (self.properties["Name"], command,
128
234
                           os.WTERMSIG(condition)))
129
 
            return
130
 
        if os.WCOREDUMP(condition):
131
 
            self.logger(u'Checker for client %s (command "%s")'
132
 
                        u' dumped core'
133
 
                        % (self.properties[u"name"], command))
134
 
        self.logger(u'Checker for client %s completed mysteriously')
 
235
        elif os.WCOREDUMP(condition):
 
236
            self.logger('Checker for client %s (command "%s")'
 
237
                        ' dumped core'
 
238
                        % (self.properties["Name"], command))
 
239
        else:
 
240
            self.logger('Checker for client %s completed'
 
241
                        ' mysteriously')
 
242
        self.update()
135
243
    
136
244
    def checker_started(self, command):
137
 
        self.logger(u'Client %s started checker "%s"'
138
 
                    % (self.properties[u"name"], unicode(command)))
 
245
        #self.logger('Client %s started checker "%s"'
 
246
        #            % (self.properties["Name"], unicode(command)))
 
247
        pass
139
248
    
140
249
    def got_secret(self):
141
 
        self.logger(u'Client %s received its secret'
142
 
                    % self.properties[u"name"])
143
 
    
144
 
    def rejected(self):
145
 
        self.logger(u'Client %s was rejected'
146
 
                    % self.properties[u"name"])
 
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))
147
266
    
148
267
    def selectable(self):
149
268
        """Make this a "selectable" widget.
150
269
        This overrides the method from urwid.FlowWidget."""
151
270
        return True
152
271
    
153
 
    def rows(self, (maxcol,), focus=False):
 
272
    def rows(self, maxcolrow, focus=False):
154
273
        """How many rows this widget will occupy might depend on
155
274
        whether we have focus or not.
156
275
        This overrides the method from urwid.FlowWidget"""
157
 
        return self.current_widget(focus).rows((maxcol,), focus=focus)
 
276
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
158
277
    
159
278
    def current_widget(self, focus=False):
160
279
        if focus or self.opened:
164
283
    def update(self):
165
284
        "Called when what is visible on the screen should be updated."
166
285
        # How to add standout mode to a style
167
 
        with_standout = { u"normal": u"standout",
168
 
                          u"bold": u"bold-standout",
169
 
                          u"underline-blink":
170
 
                              u"underline-blink-standout",
171
 
                          u"bold-underline-blink":
172
 
                              u"bold-underline-blink-standout",
 
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",
173
292
                          }
174
 
        
 
293
 
175
294
        # Rebuild focus and non-focus widgets using current properties
176
 
        self._text = (u'%(name)s: %(enabled)s'
177
 
                      % { u"name": self.properties[u"name"],
178
 
                          u"enabled":
179
 
                              (u"enabled"
180
 
                               if self.properties[u"enabled"]
181
 
                               else u"DISABLED")})
 
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
            
182
333
        if not urwid.supports_unicode():
183
334
            self._text = self._text.encode("ascii", "replace")
184
 
        textlist = [(u"normal", self._text)]
 
335
        textlist = [("normal", self._text)]
185
336
        self._text_widget.set_text(textlist)
186
337
        self._focus_text_widget.set_text([(with_standout[text[0]],
187
338
                                           text[1])
195
346
        if self.update_hook is not None:
196
347
            self.update_hook()
197
348
    
198
 
    def delete(self):
 
349
    def update_timer(self):
 
350
        """called by gobject. Will indefinitely loop until
 
351
        gobject.source_remove() on tag is called"""
 
352
        self.update()
 
353
        return True             # Keep calling this
 
354
    
 
355
    def delete(self, *args, **kwargs):
 
356
        if self._update_timer_callback_tag is not None:
 
357
            gobject.source_remove(self._update_timer_callback_tag)
 
358
            self._update_timer_callback_tag = None
 
359
        for match in self.match_objects:
 
360
            match.remove()
 
361
        self.match_objects = ()
199
362
        if self.delete_hook is not None:
200
363
            self.delete_hook(self)
 
364
        return super(MandosClientWidget, self).delete(*args, **kwargs)
201
365
    
202
 
    def render(self, (maxcol,), focus=False):
 
366
    def render(self, maxcolrow, focus=False):
203
367
        """Render differently if we have focus.
204
368
        This overrides the method from urwid.FlowWidget"""
205
 
        return self.current_widget(focus).render((maxcol,),
 
369
        return self.current_widget(focus).render(maxcolrow,
206
370
                                                 focus=focus)
207
371
    
208
 
    def keypress(self, (maxcol,), key):
 
372
    def keypress(self, maxcolrow, key):
209
373
        """Handle keys.
210
374
        This overrides the method from urwid.FlowWidget"""
211
 
        if key == u"e" or key == u"+":
212
 
            self.proxy.Enable()
213
 
        elif key == u"d" or key == u"-":
214
 
            self.proxy.Disable()
215
 
        elif key == u"r" or key == u"_" or key == u"ctrl k":
 
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":
216
390
            self.server_proxy_object.RemoveClient(self.proxy
217
 
                                                  .object_path)
218
 
        elif key == u"s":
219
 
            self.proxy.StartChecker()
220
 
        elif key == u"S":
221
 
            self.proxy.StopChecker()
222
 
        elif key == u"C":
223
 
            self.proxy.CheckedOK()
 
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)
224
402
        # xxx
225
 
#         elif key == u"p" or key == "=":
 
403
#         elif key == "p" or key == "=":
226
404
#             self.proxy.pause()
227
 
#         elif key == u"u" or key == ":":
 
405
#         elif key == "u" or key == ":":
228
406
#             self.proxy.unpause()
229
 
#         elif key == u"RET":
 
407
#         elif key == "RET":
230
408
#             self.open()
231
409
        else:
232
410
            return key
248
426
    "down" key presses, thus not allowing any containing widgets to
249
427
    use them as an excuse to shift focus away from this widget.
250
428
    """
251
 
    def keypress(self, (maxcol, maxrow), key):
252
 
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
253
 
        if ret in (u"up", u"down"):
 
429
    def keypress(self, maxcolrow, key):
 
430
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
431
        if ret in ("up", "down"):
254
432
            return
255
433
        return ret
256
434
 
265
443
        self.screen = urwid.curses_display.Screen()
266
444
        
267
445
        self.screen.register_palette((
268
 
                (u"normal",
269
 
                 u"default", u"default", None),
270
 
                (u"bold",
271
 
                 u"default", u"default", u"bold"),
272
 
                (u"underline-blink",
273
 
                 u"default", u"default", u"underline"),
274
 
                (u"standout",
275
 
                 u"default", u"default", u"standout"),
276
 
                (u"bold-underline-blink",
277
 
                 u"default", u"default", (u"bold", u"underline")),
278
 
                (u"bold-standout",
279
 
                 u"default", u"default", (u"bold", u"standout")),
280
 
                (u"underline-blink-standout",
281
 
                 u"default", u"default", (u"underline", u"standout")),
282
 
                (u"bold-underline-blink-standout",
283
 
                 u"default", u"default", (u"bold", u"underline",
284
 
                                          u"standout")),
 
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")),
285
463
                ))
286
464
        
287
465
        if urwid.supports_unicode():
288
 
            self.divider = u"─" # \u2500
289
 
            #self.divider = u"━" # \u2501
 
466
            self.divider = "─" # \u2500
 
467
            #self.divider = "━" # \u2501
290
468
        else:
291
 
            #self.divider = u"-" # \u002d
292
 
            self.divider = u"_" # \u005f
 
469
            #self.divider = "-" # \u002d
 
470
            self.divider = "_" # \u005f
293
471
        
294
472
        self.screen.start()
295
473
        
309
487
        # This keeps track of whether self.uilist currently has
310
488
        # self.logbox in it or not
311
489
        self.log_visible = True
312
 
        self.log_wrap = u"any"
 
490
        self.log_wrap = "any"
313
491
        
314
492
        self.rebuild()
315
 
        self.log_message_raw((u"bold",
316
 
                              u"Mandos Monitor version " + version))
317
 
        self.log_message_raw((u"bold",
318
 
                              u"q: Quit  ?: Help"))
 
493
        self.log_message_raw(("bold",
 
494
                              "Mandos Monitor version " + version))
 
495
        self.log_message_raw(("bold",
 
496
                              "q: Quit  ?: Help"))
319
497
        
320
498
        self.busname = domain + '.Mandos'
321
499
        self.main_loop = gobject.MainLoop()
322
500
        self.bus = dbus.SystemBus()
323
501
        mandos_dbus_objc = self.bus.get_object(
324
 
            self.busname, u"/", follow_name_owner_changes=True)
 
502
            self.busname, "/", follow_name_owner_changes=True)
325
503
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
326
504
                                          dbus_interface
327
505
                                          = server_interface)
332
510
            mandos_clients = dbus.Dictionary()
333
511
        
334
512
        (self.mandos_serv
335
 
         .connect_to_signal(u"ClientRemoved",
 
513
         .connect_to_signal("ClientRemoved",
336
514
                            self.find_and_remove_client,
337
515
                            dbus_interface=server_interface,
338
516
                            byte_arrays=True))
339
517
        (self.mandos_serv
340
 
         .connect_to_signal(u"ClientAdded",
 
518
         .connect_to_signal("ClientAdded",
341
519
                            self.add_new_client,
342
520
                            dbus_interface=server_interface,
343
521
                            byte_arrays=True))
344
522
        (self.mandos_serv
345
 
         .connect_to_signal(u"ClientNotFound",
 
523
         .connect_to_signal("ClientNotFound",
346
524
                            self.client_not_found,
347
525
                            dbus_interface=server_interface,
348
526
                            byte_arrays=True))
363
541
                            path=path)
364
542
    
365
543
    def client_not_found(self, fingerprint, address):
366
 
        self.log_message((u"Client with address %s and fingerprint %s"
367
 
                          u" could not be found" % (address,
 
544
        self.log_message(("Client with address %s and fingerprint %s"
 
545
                          " could not be found" % (address,
368
546
                                                    fingerprint)))
369
547
    
370
548
    def rebuild(self):
372
550
        Call this when the widget layout needs to change"""
373
551
        self.uilist = []
374
552
        #self.uilist.append(urwid.ListBox(self.clients))
375
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
 
553
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
554
                                                          clients),
376
555
                                       #header=urwid.Divider(),
377
556
                                       header=None,
378
 
                                       footer=urwid.Divider(div_char=self.divider)))
 
557
                                       footer=
 
558
                                       urwid.Divider(div_char=
 
559
                                                     self.divider)))
379
560
        if self.log_visible:
380
561
            self.uilist.append(self.logbox)
381
562
            pass
383
564
    
384
565
    def log_message(self, message):
385
566
        timestamp = datetime.datetime.now().isoformat()
386
 
        self.log_message_raw(timestamp + u": " + message)
 
567
        self.log_message_raw(timestamp + ": " + message)
387
568
    
388
569
    def log_message_raw(self, markup):
389
570
        """Add a log message to the log buffer."""
392
573
            and len(self.log) > self.max_log_length):
393
574
            del self.log[0:len(self.log)-self.max_log_length-1]
394
575
        self.logbox.set_focus(len(self.logbox.body.contents),
395
 
                              coming_from=u"above")
 
576
                              coming_from="above")
396
577
        self.refresh()
397
578
    
398
579
    def toggle_log_display(self):
399
580
        """Toggle visibility of the log buffer."""
400
581
        self.log_visible = not self.log_visible
401
582
        self.rebuild()
402
 
        self.log_message(u"Log visibility changed to: "
403
 
                         + unicode(self.log_visible))
 
583
        #self.log_message("Log visibility changed to: "
 
584
        #                 + unicode(self.log_visible))
404
585
    
405
586
    def change_log_display(self):
406
587
        """Change type of log display.
407
588
        Currently, this toggles wrapping of text lines."""
408
 
        if self.log_wrap == u"clip":
409
 
            self.log_wrap = u"any"
 
589
        if self.log_wrap == "clip":
 
590
            self.log_wrap = "any"
410
591
        else:
411
 
            self.log_wrap = u"clip"
 
592
            self.log_wrap = "clip"
412
593
        for textwidget in self.log:
413
594
            textwidget.set_wrap_mode(self.log_wrap)
414
 
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
595
        #self.log_message("Wrap mode: " + self.log_wrap)
415
596
    
416
597
    def find_and_remove_client(self, path, name):
417
 
        """Find an client from its object path and remove it.
 
598
        """Find a client by its object path and remove it.
418
599
        
419
600
        This is connected to the ClientRemoved signal from the
420
601
        Mandos server object."""
422
603
            client = self.clients_dict[path]
423
604
        except KeyError:
424
605
            # not found?
 
606
            self.log_message("Unknown client %r (%r) removed", name,
 
607
                             path)
425
608
            return
426
 
        self.remove_client(client, path)
 
609
        client.delete()
427
610
    
428
611
    def add_new_client(self, path):
429
612
        client_proxy_object = self.bus.get_object(self.busname, path)
444
627
        if path is None:
445
628
            path = client.proxy.object_path
446
629
        self.clients_dict[path] = client
447
 
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
630
        self.clients.sort(None, lambda c: c.properties["Name"])
448
631
        self.refresh()
449
632
    
450
633
    def remove_client(self, client, path=None):
481
664
    
482
665
    def process_input(self, source, condition):
483
666
        keys = self.screen.get_input()
484
 
        translations = { u"ctrl n": u"down",      # Emacs
485
 
                         u"ctrl p": u"up",        # Emacs
486
 
                         u"ctrl v": u"page down", # Emacs
487
 
                         u"meta v": u"page up",   # Emacs
488
 
                         u" ": u"page down",      # less
489
 
                         u"f": u"page down",      # less
490
 
                         u"b": u"page up",        # less
491
 
                         u"j": u"down",           # vi
492
 
                         u"k": u"up",             # vi
 
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
493
676
                         }
494
677
        for key in keys:
495
678
            try:
497
680
            except KeyError:    # :-)
498
681
                pass
499
682
            
500
 
            if key == u"q" or key == u"Q":
 
683
            if key == "q" or key == "Q":
501
684
                self.stop()
502
685
                break
503
 
            elif key == u"window resize":
 
686
            elif key == "window resize":
504
687
                self.size = self.screen.get_cols_rows()
505
688
                self.refresh()
506
 
            elif key == u"\f":  # Ctrl-L
 
689
            elif key == "\f":  # Ctrl-L
507
690
                self.refresh()
508
 
            elif key == u"l" or key == u"D":
 
691
            elif key == "l" or key == "D":
509
692
                self.toggle_log_display()
510
693
                self.refresh()
511
 
            elif key == u"w" or key == u"i":
 
694
            elif key == "w" or key == "i":
512
695
                self.change_log_display()
513
696
                self.refresh()
514
 
            elif key == u"?" or key == u"f1" or key == u"esc":
 
697
            elif key == "?" or key == "f1" or key == "esc":
515
698
                if not self.log_visible:
516
699
                    self.log_visible = True
517
700
                    self.rebuild()
518
 
                self.log_message_raw((u"bold",
519
 
                                      u"  ".
520
 
                                      join((u"q: Quit",
521
 
                                            u"?: Help",
522
 
                                            u"l: Log window toggle",
523
 
                                            u"TAB: Switch window",
524
 
                                            u"w: Wrap (log)"))))
525
 
                self.log_message_raw((u"bold",
526
 
                                      u"  "
527
 
                                      .join((u"Clients:",
528
 
                                             u"e: Enable",
529
 
                                             u"d: Disable",
530
 
                                             u"r: Remove",
531
 
                                             u"s: Start new checker",
532
 
                                             u"S: Stop checker",
533
 
                                             u"C: Checker OK"))))
 
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"))))
534
719
                self.refresh()
535
 
            elif key == u"tab":
 
720
            elif key == "tab":
536
721
                if self.topwidget.get_focus() is self.logbox:
537
722
                    self.topwidget.set_focus(0)
538
723
                else:
539
724
                    self.topwidget.set_focus(self.logbox)
540
725
                self.refresh()
541
 
            #elif (key == u"end" or key == u"meta >" or key == u"G"
542
 
            #      or key == u">"):
 
726
            #elif (key == "end" or key == "meta >" or key == "G"
 
727
            #      or key == ">"):
543
728
            #    pass            # xxx end-of-buffer
544
 
            #elif (key == u"home" or key == u"meta <" or key == u"g"
545
 
            #      or key == u"<"):
 
729
            #elif (key == "home" or key == "meta <" or key == "g"
 
730
            #      or key == "<"):
546
731
            #    pass            # xxx beginning-of-buffer
547
 
            #elif key == u"ctrl e" or key == u"$":
 
732
            #elif key == "ctrl e" or key == "$":
548
733
            #    pass            # xxx move-end-of-line
549
 
            #elif key == u"ctrl a" or key == u"^":
 
734
            #elif key == "ctrl a" or key == "^":
550
735
            #    pass            # xxx move-beginning-of-line
551
 
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
 
736
            #elif key == "ctrl b" or key == "meta (" or key == "h":
552
737
            #    pass            # xxx left
553
 
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
 
738
            #elif key == "ctrl f" or key == "meta )" or key == "l":
554
739
            #    pass            # xxx right
555
 
            #elif key == u"a":
 
740
            #elif key == "a":
556
741
            #    pass            # scroll up log
557
 
            #elif key == u"z":
 
742
            #elif key == "z":
558
743
            #    pass            # scroll down log
559
744
            elif self.topwidget.selectable():
560
745
                self.topwidget.keypress(self.size, key)
564
749
ui = UserInterface()
565
750
try:
566
751
    ui.run()
 
752
except KeyboardInterrupt:
 
753
    ui.screen.stop()
567
754
except Exception, e:
568
755
    ui.log_message(unicode(e))
569
756
    ui.screen.stop()