/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

* Makefile (LDFLAGS): Added "-Xlinker --as-needed".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
 
3
# 
 
4
# Mandos Monitor - Control and monitor the Mandos server
 
5
# 
 
6
# Copyright © 2009-2011 Teddy Hogeborn
 
7
# Copyright © 2009-2011 Björn Påhlsson
 
8
# 
 
9
# This program is free software: you can redistribute it and/or modify
 
10
# it under the terms of the GNU General Public License as published by
 
11
# the Free Software Foundation, either version 3 of the License, or
 
12
# (at your option) any later version.
 
13
#
 
14
#     This program is distributed in the hope that it will be useful,
 
15
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
16
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
17
#     GNU General Public License for more details.
 
18
# 
 
19
# You should have received a copy of the GNU General Public License
 
20
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
21
# 
 
22
# Contact the authors at <mandos@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
 
29
import os
7
30
import signal
8
31
 
 
32
import datetime
 
33
 
9
34
import urwid.curses_display
10
35
import urwid
11
36
 
16
41
 
17
42
import UserList
18
43
 
 
44
import locale
 
45
 
 
46
locale.setlocale(locale.LC_ALL, '')
 
47
 
 
48
import logging
 
49
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
 
50
 
19
51
# Some useful constants
20
52
domain = 'se.bsnet.fukt'
21
53
server_interface = domain + '.Mandos'
22
54
client_interface = domain + '.Mandos.Client'
23
 
version = "1.0.14"
 
55
version = "1.3.1"
24
56
 
25
57
# Always run in monochrome mode
26
58
urwid.curses_display.curses.has_colors = lambda : False
30
62
urwid.curses_display.curses.A_UNDERLINE |= (
31
63
    urwid.curses_display.curses.A_BLINK)
32
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
 
33
81
class MandosClientPropertyCache(object):
34
82
    """This wraps a Mandos Client D-Bus proxy object, caches the
35
83
    properties and calls a hook function when any of them are
36
84
    changed.
37
85
    """
38
 
    def __init__(self, proxy_object=None, properties=None, *args,
39
 
                 **kwargs):
 
86
    def __init__(self, proxy_object=None, *args, **kwargs):
40
87
        self.proxy = proxy_object # Mandos Client proxy object
41
88
        
42
 
        if properties is None:
43
 
            self.properties = dict()
44
 
        else:
45
 
            self.properties = properties
46
 
        self.proxy.connect_to_signal("PropertyChanged",
47
 
                                     self.property_changed,
48
 
                                     client_interface,
49
 
                                     byte_arrays=True)
 
89
        self.properties = dict()
 
90
        self.property_changed_match = (
 
91
            self.proxy.connect_to_signal("PropertyChanged",
 
92
                                         self.property_changed,
 
93
                                         client_interface,
 
94
                                         byte_arrays=True))
50
95
        
51
 
        if properties is None:
52
 
            self.properties.update(self.proxy.GetAll(client_interface,
53
 
                                                     dbus_interface =
54
 
                                                     dbus.PROPERTIES_IFACE))
55
 
        super(MandosClientPropertyCache, self).__init__(
56
 
            proxy_object=proxy_object,
57
 
            properties=properties, *args, **kwargs)
 
96
        self.properties.update(
 
97
            self.proxy.GetAll(client_interface,
 
98
                              dbus_interface = dbus.PROPERTIES_IFACE))
 
99
 
 
100
        #XXX This breaks good super behaviour
 
101
#        super(MandosClientPropertyCache, self).__init__(
 
102
#            *args, **kwargs)
58
103
    
59
104
    def property_changed(self, property=None, value=None):
60
105
        """This is called whenever we get a PropertyChanged signal
62
107
        """
63
108
        # Update properties dict with new value
64
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)
65
115
 
66
116
 
67
117
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
69
119
    """
70
120
    
71
121
    def __init__(self, server_proxy_object=None, update_hook=None,
72
 
                 delete_hook=None, *args, **kwargs):
 
122
                 delete_hook=None, logger=None, *args, **kwargs):
73
123
        # Called on update
74
124
        self.update_hook = update_hook
75
125
        # Called on delete
76
126
        self.delete_hook = delete_hook
77
127
        # Mandos Server proxy object
78
128
        self.server_proxy_object = server_proxy_object
 
129
        # Logger
 
130
        self.logger = logger
 
131
        
 
132
        self._update_timer_callback_tag = None
 
133
        self._update_timer_callback_lock = 0
 
134
        self.last_checker_failed = False
79
135
        
80
136
        # The widget shown normally
81
137
        self._text_widget = urwid.Text("")
86
142
            *args, **kwargs)
87
143
        self.update()
88
144
        self.opened = False
 
145
        
 
146
        last_checked_ok = isoformat_to_datetime(self.properties
 
147
                                                ["LastCheckedOK"])
 
148
        if last_checked_ok is None:
 
149
            self.last_checker_failed = True
 
150
        else:
 
151
            self.last_checker_failed = ((datetime.datetime.utcnow()
 
152
                                         - last_checked_ok)
 
153
                                        > datetime.timedelta
 
154
                                        (milliseconds=
 
155
                                         self.properties
 
156
                                         ["Interval"]))
 
157
        
 
158
        if self.last_checker_failed:
 
159
            self.using_timer(True)
 
160
        
 
161
        if self.need_approval:
 
162
            self.using_timer(True)
 
163
        
 
164
        self.match_objects = (
 
165
            self.proxy.connect_to_signal("CheckerCompleted",
 
166
                                         self.checker_completed,
 
167
                                         client_interface,
 
168
                                         byte_arrays=True),
 
169
            self.proxy.connect_to_signal("CheckerStarted",
 
170
                                         self.checker_started,
 
171
                                         client_interface,
 
172
                                         byte_arrays=True),
 
173
            self.proxy.connect_to_signal("GotSecret",
 
174
                                         self.got_secret,
 
175
                                         client_interface,
 
176
                                         byte_arrays=True),
 
177
            self.proxy.connect_to_signal("NeedApproval",
 
178
                                         self.need_approval,
 
179
                                         client_interface,
 
180
                                         byte_arrays=True),
 
181
            self.proxy.connect_to_signal("Rejected",
 
182
                                         self.rejected,
 
183
                                         client_interface,
 
184
                                         byte_arrays=True))
 
185
        #self.logger('Created client %s' % (self.properties["Name"]))
 
186
    
 
187
    def property_changed(self, property=None, value=None):
 
188
        super(self, MandosClientWidget).property_changed(property,
 
189
                                                         value)
 
190
        if property == "ApprovalPending":
 
191
            using_timer(bool(value))
 
192
        
 
193
    def using_timer(self, flag):
 
194
        """Call this method with True or False when timer should be
 
195
        activated or deactivated.
 
196
        """
 
197
        old = self._update_timer_callback_lock
 
198
        if flag:
 
199
            self._update_timer_callback_lock += 1
 
200
        else:
 
201
            self._update_timer_callback_lock -= 1
 
202
        if old == 0 and self._update_timer_callback_lock:
 
203
            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
 
209
    
 
210
    def checker_completed(self, exitstatus, condition, command):
 
211
        if exitstatus == 0:
 
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()
 
219
            return
 
220
        # Checker failed
 
221
        if not self.last_checker_failed:
 
222
            self.last_checker_failed = True
 
223
            self.using_timer(True)
 
224
        if os.WIFEXITED(condition):
 
225
            self.logger('Checker for client %s (command "%s")'
 
226
                        ' failed with exit code %s'
 
227
                        % (self.properties["Name"], command,
 
228
                           os.WEXITSTATUS(condition)))
 
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,
 
233
                           os.WTERMSIG(condition)))
 
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()
 
242
    
 
243
    def checker_started(self, command):
 
244
        #self.logger('Client %s started checker "%s"'
 
245
        #            % (self.properties["Name"], unicode(command)))
 
246
        pass
 
247
    
 
248
    def got_secret(self):
 
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))
89
265
    
90
266
    def selectable(self):
91
267
        """Make this a "selectable" widget.
92
268
        This overrides the method from urwid.FlowWidget."""
93
269
        return True
94
270
    
95
 
    def rows(self, (maxcol,), focus=False):
 
271
    def rows(self, maxcolrow, focus=False):
96
272
        """How many rows this widget will occupy might depend on
97
273
        whether we have focus or not.
98
274
        This overrides the method from urwid.FlowWidget"""
99
 
        return self.current_widget(focus).rows((maxcol,), focus=focus)
 
275
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
100
276
    
101
277
    def current_widget(self, focus=False):
102
278
        if focus or self.opened:
106
282
    def update(self):
107
283
        "Called when what is visible on the screen should be updated."
108
284
        # How to add standout mode to a style
109
 
        with_standout = { u"normal": u"standout",
110
 
                          u"bold": u"bold-standout",
111
 
                          u"underline-blink":
112
 
                              u"underline-blink-standout",
113
 
                          u"bold-underline-blink":
114
 
                              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",
115
291
                          }
116
 
        
 
292
 
117
293
        # Rebuild focus and non-focus widgets using current properties
118
 
        self._text = (u'name="%(name)s", enabled=%(enabled)s'
119
 
                      % self.properties)
 
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
            
120
332
        if not urwid.supports_unicode():
121
333
            self._text = self._text.encode("ascii", "replace")
122
 
        textlist = [(u"normal", u"BLARGH: "), (u"bold", self._text)]
 
334
        textlist = [("normal", self._text)]
123
335
        self._text_widget.set_text(textlist)
124
336
        self._focus_text_widget.set_text([(with_standout[text[0]],
125
337
                                           text[1])
133
345
        if self.update_hook is not None:
134
346
            self.update_hook()
135
347
    
136
 
    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 = ()
137
360
        if self.delete_hook is not None:
138
361
            self.delete_hook(self)
 
362
        return super(MandosClientWidget, self).delete(*args, **kwargs)
139
363
    
140
 
    def render(self, (maxcol,), focus=False):
 
364
    def render(self, maxcolrow, focus=False):
141
365
        """Render differently if we have focus.
142
366
        This overrides the method from urwid.FlowWidget"""
143
 
        return self.current_widget(focus).render((maxcol,),
 
367
        return self.current_widget(focus).render(maxcolrow,
144
368
                                                 focus=focus)
145
369
    
146
 
    def keypress(self, (maxcol,), key):
 
370
    def keypress(self, maxcolrow, key):
147
371
        """Handle keys.
148
372
        This overrides the method from urwid.FlowWidget"""
149
 
        if key == u"e" or key == u"+":
150
 
            self.proxy.Enable()
151
 
        elif key == u"d" or key == u"-":
152
 
            self.proxy.Disable()
153
 
        elif key == u"r" or key == u"_":
 
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":
154
388
            self.server_proxy_object.RemoveClient(self.proxy
155
 
                                                  .object_path)
156
 
        elif key == u"s":
157
 
            self.proxy.StartChecker()
158
 
        elif key == u"S":
159
 
            self.proxy.StopChecker()
160
 
        elif key == u"C":
161
 
            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)
162
400
        # xxx
163
 
#         elif key == u"p" or key == "=":
 
401
#         elif key == "p" or key == "=":
164
402
#             self.proxy.pause()
165
 
#         elif key == u"u" or key == ":":
 
403
#         elif key == "u" or key == ":":
166
404
#             self.proxy.unpause()
167
 
#         elif key == u"RET":
 
405
#         elif key == "RET":
168
406
#             self.open()
169
407
        else:
170
408
            return key
186
424
    "down" key presses, thus not allowing any containing widgets to
187
425
    use them as an excuse to shift focus away from this widget.
188
426
    """
189
 
    def keypress(self, (maxcol, maxrow), key):
190
 
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
191
 
        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"):
192
430
            return
193
431
        return ret
194
432
 
203
441
        self.screen = urwid.curses_display.Screen()
204
442
        
205
443
        self.screen.register_palette((
206
 
                (u"normal",
207
 
                 u"default", u"default", None),
208
 
                (u"bold",
209
 
                 u"default", u"default", u"bold"),
210
 
                (u"underline-blink",
211
 
                 u"default", u"default", u"underline"),
212
 
                (u"standout",
213
 
                 u"default", u"default", u"standout"),
214
 
                (u"bold-underline-blink",
215
 
                 u"default", u"default", (u"bold", u"underline")),
216
 
                (u"bold-standout",
217
 
                 u"default", u"default", (u"bold", u"standout")),
218
 
                (u"underline-blink-standout",
219
 
                 u"default", u"default", (u"underline", u"standout")),
220
 
                (u"bold-underline-blink-standout",
221
 
                 u"default", u"default", (u"bold", u"underline",
222
 
                                          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")),
223
461
                ))
224
462
        
225
463
        if urwid.supports_unicode():
226
 
            #self.divider = u"─" # \u2500
227
 
            self.divider = u"━" # \u2501
 
464
            self.divider = "─" # \u2500
 
465
            #self.divider = "━" # \u2501
228
466
        else:
229
 
            #self.divider = u"-" # \u002d
230
 
            self.divider = u"_" # \u005f
 
467
            #self.divider = "-" # \u002d
 
468
            self.divider = "_" # \u005f
231
469
        
232
470
        self.screen.start()
233
471
        
247
485
        # This keeps track of whether self.uilist currently has
248
486
        # self.logbox in it or not
249
487
        self.log_visible = True
250
 
        self.log_wrap = u"any"
 
488
        self.log_wrap = "any"
251
489
        
252
490
        self.rebuild()
253
 
        self.log_message((u"bold",
254
 
                          u"Mandos Monitor version " + version))
255
 
        self.log_message((u"bold",
256
 
                          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"))
257
495
        
258
496
        self.busname = domain + '.Mandos'
259
497
        self.main_loop = gobject.MainLoop()
260
498
        self.bus = dbus.SystemBus()
261
499
        mandos_dbus_objc = self.bus.get_object(
262
 
            self.busname, u"/", follow_name_owner_changes=True)
 
500
            self.busname, "/", follow_name_owner_changes=True)
263
501
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
264
502
                                          dbus_interface
265
503
                                          = server_interface)
279
517
                            self.add_new_client,
280
518
                            dbus_interface=server_interface,
281
519
                            byte_arrays=True))
 
520
        (self.mandos_serv
 
521
         .connect_to_signal("ClientNotFound",
 
522
                            self.client_not_found,
 
523
                            dbus_interface=server_interface,
 
524
                            byte_arrays=True))
282
525
        for path, client in mandos_clients.iteritems():
283
526
            client_proxy_object = self.bus.get_object(self.busname,
284
527
                                                      path)
290
533
                                               update_hook
291
534
                                               =self.refresh,
292
535
                                               delete_hook
293
 
                                               =self.remove_client),
 
536
                                               =self.remove_client,
 
537
                                               logger
 
538
                                               =self.log_message),
294
539
                            path=path)
295
540
    
 
541
    def client_not_found(self, fingerprint, address):
 
542
        self.log_message(("Client with address %s and fingerprint %s"
 
543
                          " could not be found" % (address,
 
544
                                                    fingerprint)))
 
545
    
296
546
    def rebuild(self):
297
547
        """This rebuilds the User Interface.
298
548
        Call this when the widget layout needs to change"""
299
549
        self.uilist = []
300
550
        #self.uilist.append(urwid.ListBox(self.clients))
301
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
 
551
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
552
                                                          clients),
302
553
                                       #header=urwid.Divider(),
303
554
                                       header=None,
304
 
                                       footer=urwid.Divider(div_char=self.divider)))
 
555
                                       footer=
 
556
                                       urwid.Divider(div_char=
 
557
                                                     self.divider)))
305
558
        if self.log_visible:
306
559
            self.uilist.append(self.logbox)
307
560
            pass
308
561
        self.topwidget = urwid.Pile(self.uilist)
309
562
    
310
 
    def log_message(self, markup):
 
563
    def log_message(self, message):
 
564
        timestamp = datetime.datetime.now().isoformat()
 
565
        self.log_message_raw(timestamp + ": " + message)
 
566
    
 
567
    def log_message_raw(self, markup):
311
568
        """Add a log message to the log buffer."""
312
569
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
313
570
        if (self.max_log_length
314
571
            and len(self.log) > self.max_log_length):
315
572
            del self.log[0:len(self.log)-self.max_log_length-1]
 
573
        self.logbox.set_focus(len(self.logbox.body.contents),
 
574
                              coming_from="above")
 
575
        self.refresh()
316
576
    
317
577
    def toggle_log_display(self):
318
578
        """Toggle visibility of the log buffer."""
319
579
        self.log_visible = not self.log_visible
320
580
        self.rebuild()
321
 
        self.log_message(u"Log visibility changed to: "
322
 
                         + unicode(self.log_visible))
 
581
        #self.log_message("Log visibility changed to: "
 
582
        #                 + unicode(self.log_visible))
323
583
    
324
584
    def change_log_display(self):
325
585
        """Change type of log display.
326
586
        Currently, this toggles wrapping of text lines."""
327
 
        if self.log_wrap == u"clip":
328
 
            self.log_wrap = u"any"
 
587
        if self.log_wrap == "clip":
 
588
            self.log_wrap = "any"
329
589
        else:
330
 
            self.log_wrap = u"clip"
 
590
            self.log_wrap = "clip"
331
591
        for textwidget in self.log:
332
592
            textwidget.set_wrap_mode(self.log_wrap)
333
 
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
593
        #self.log_message("Wrap mode: " + self.log_wrap)
334
594
    
335
595
    def find_and_remove_client(self, path, name):
336
 
        """Find an client from its object path and remove it.
 
596
        """Find a client by its object path and remove it.
337
597
        
338
598
        This is connected to the ClientRemoved signal from the
339
599
        Mandos server object."""
341
601
            client = self.clients_dict[path]
342
602
        except KeyError:
343
603
            # not found?
 
604
            self.log_message("Unknown client %r (%r) removed", name,
 
605
                             path)
344
606
            return
345
 
        self.remove_client(client, path)
 
607
        client.delete()
346
608
    
347
 
    def add_new_client(self, path, properties):
 
609
    def add_new_client(self, path):
348
610
        client_proxy_object = self.bus.get_object(self.busname, path)
349
611
        self.add_client(MandosClientWidget(server_proxy_object
350
612
                                           =self.mandos_serv,
351
613
                                           proxy_object
352
614
                                           =client_proxy_object,
353
 
                                           properties=properties,
354
615
                                           update_hook
355
616
                                           =self.refresh,
356
617
                                           delete_hook
357
 
                                           =self.remove_client),
 
618
                                           =self.remove_client,
 
619
                                           logger
 
620
                                           =self.log_message),
358
621
                        path=path)
359
622
    
360
623
    def add_client(self, client, path=None):
362
625
        if path is None:
363
626
            path = client.proxy.object_path
364
627
        self.clients_dict[path] = client
365
 
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
628
        self.clients.sort(None, lambda c: c.properties["Name"])
366
629
        self.refresh()
367
630
    
368
631
    def remove_client(self, client, path=None):
399
662
    
400
663
    def process_input(self, source, condition):
401
664
        keys = self.screen.get_input()
402
 
        translations = { u"ctrl n": u"down",      # Emacs
403
 
                         u"ctrl p": u"up",        # Emacs
404
 
                         u"ctrl v": u"page down", # Emacs
405
 
                         u"meta v": u"page up",   # Emacs
406
 
                         u" ": u"page down",      # less
407
 
                         u"f": u"page down",      # less
408
 
                         u"b": u"page up",        # less
409
 
                         u"j": u"down",           # vi
410
 
                         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
411
674
                         }
412
675
        for key in keys:
413
676
            try:
415
678
            except KeyError:    # :-)
416
679
                pass
417
680
            
418
 
            if key == u"q" or key == u"Q":
 
681
            if key == "q" or key == "Q":
419
682
                self.stop()
420
683
                break
421
 
            elif key == u"window resize":
 
684
            elif key == "window resize":
422
685
                self.size = self.screen.get_cols_rows()
423
686
                self.refresh()
424
 
            elif key == u"\f":  # Ctrl-L
 
687
            elif key == "\f":  # Ctrl-L
425
688
                self.refresh()
426
 
            elif key == u"l" or key == u"D":
 
689
            elif key == "l" or key == "D":
427
690
                self.toggle_log_display()
428
691
                self.refresh()
429
 
            elif key == u"w" or key == u"i":
 
692
            elif key == "w" or key == "i":
430
693
                self.change_log_display()
431
694
                self.refresh()
432
 
            elif key == u"?" or key == u"f1":
 
695
            elif key == "?" or key == "f1" or key == "esc":
433
696
                if not self.log_visible:
434
697
                    self.log_visible = True
435
698
                    self.rebuild()
436
 
                self.log_message((u"bold",
437
 
                                  u"  ".join((u"q: Quit",
438
 
                                              u"?: Help",
439
 
                                              u"l: Log window toggle",
440
 
                                              u"TAB: Switch window",
441
 
                                              u"w: Wrap (log)"))))
442
 
                self.log_message((u"bold",
443
 
                                  u"  ".join((u"Clients:",
444
 
                                              u"e: Enable",
445
 
                                              u"d: Disable",
446
 
                                              u"r: Remove",
447
 
                                              u"s: Start new checker",
448
 
                                              u"S: Stop checker",
449
 
                                              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"))))
450
717
                self.refresh()
451
 
            elif key == u"tab":
 
718
            elif key == "tab":
452
719
                if self.topwidget.get_focus() is self.logbox:
453
720
                    self.topwidget.set_focus(0)
454
721
                else:
455
722
                    self.topwidget.set_focus(self.logbox)
456
723
                self.refresh()
457
 
            #elif (key == u"end" or key == u"meta >" or key == u"G"
458
 
            #      or key == u">"):
 
724
            #elif (key == "end" or key == "meta >" or key == "G"
 
725
            #      or key == ">"):
459
726
            #    pass            # xxx end-of-buffer
460
 
            #elif (key == u"home" or key == u"meta <" or key == u"g"
461
 
            #      or key == u"<"):
 
727
            #elif (key == "home" or key == "meta <" or key == "g"
 
728
            #      or key == "<"):
462
729
            #    pass            # xxx beginning-of-buffer
463
 
            #elif key == u"ctrl e" or key == u"$":
 
730
            #elif key == "ctrl e" or key == "$":
464
731
            #    pass            # xxx move-end-of-line
465
 
            #elif key == u"ctrl a" or key == u"^":
 
732
            #elif key == "ctrl a" or key == "^":
466
733
            #    pass            # xxx move-beginning-of-line
467
 
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
 
734
            #elif key == "ctrl b" or key == "meta (" or key == "h":
468
735
            #    pass            # xxx left
469
 
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
 
736
            #elif key == "ctrl f" or key == "meta )" or key == "l":
470
737
            #    pass            # xxx right
471
 
            #elif key == u"a":
 
738
            #elif key == "a":
472
739
            #    pass            # scroll up log
473
 
            #elif key == u"z":
 
740
            #elif key == "z":
474
741
            #    pass            # scroll down log
475
742
            elif self.topwidget.selectable():
476
743
                self.topwidget.keypress(self.size, key)
480
747
ui = UserInterface()
481
748
try:
482
749
    ui.run()
483
 
except:
 
750
except KeyboardInterrupt:
 
751
    ui.screen.stop()
 
752
except Exception, e:
 
753
    ui.log_message(unicode(e))
484
754
    ui.screen.stop()
485
755
    raise