/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: 2010-10-02 17:41:05 UTC
  • mto: (24.1.169 mandos)
  • mto: This revision was merged to the branch mainline in revision 453.
  • Revision ID: teddy@fukt.bsnet.se-20101002174105-xfqa0j8y1puvedo3
* debian/source/format: New; contains "3.0 (quilt)".

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,2010 Teddy Hogeborn
 
7
# Copyright © 2009,2010 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
25
from __future__ import division, absolute_import, with_statement
5
26
 
6
27
import sys
 
28
import os
7
29
import signal
8
30
 
 
31
import datetime
 
32
 
9
33
import urwid.curses_display
10
34
import urwid
11
35
 
16
40
 
17
41
import UserList
18
42
 
 
43
import locale
 
44
 
 
45
locale.setlocale(locale.LC_ALL, u'')
 
46
 
 
47
import logging
 
48
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
 
49
 
19
50
# Some useful constants
20
51
domain = 'se.bsnet.fukt'
21
52
server_interface = domain + '.Mandos'
22
53
client_interface = domain + '.Mandos.Client'
23
 
version = "1.0.14"
 
54
version = "1.2"
24
55
 
25
56
# Always run in monochrome mode
26
57
urwid.curses_display.curses.has_colors = lambda : False
30
61
urwid.curses_display.curses.A_UNDERLINE |= (
31
62
    urwid.curses_display.curses.A_BLINK)
32
63
 
 
64
def isoformat_to_datetime(iso):
 
65
    "Parse an ISO 8601 date string to a datetime.datetime()"
 
66
    if not iso:
 
67
        return None
 
68
    d, t = iso.split(u"T", 1)
 
69
    year, month, day = d.split(u"-", 2)
 
70
    hour, minute, second = t.split(u":", 2)
 
71
    second, fraction = divmod(float(second), 1)
 
72
    return datetime.datetime(int(year),
 
73
                             int(month),
 
74
                             int(day),
 
75
                             int(hour),
 
76
                             int(minute),
 
77
                             int(second),           # Whole seconds
 
78
                             int(fraction*1000000)) # Microseconds
 
79
 
33
80
class MandosClientPropertyCache(object):
34
81
    """This wraps a Mandos Client D-Bus proxy object, caches the
35
82
    properties and calls a hook function when any of them are
36
83
    changed.
37
84
    """
38
 
    def __init__(self, proxy_object=None, properties=None, *args,
39
 
                 **kwargs):
40
 
        # Type conversion mapping
41
 
        self.type_map = {
42
 
            dbus.ObjectPath: unicode,
43
 
            dbus.ByteArray: str,
44
 
            dbus.Signature: unicode,
45
 
            dbus.Byte: chr,
46
 
            dbus.Int16: int,
47
 
            dbus.UInt16: int,
48
 
            dbus.Int32: int,
49
 
            dbus.UInt32: int,
50
 
            dbus.Int64: int,
51
 
            dbus.UInt64: int,
52
 
            dbus.Dictionary: dict,
53
 
            dbus.Array: list,
54
 
            dbus.String: unicode,
55
 
            dbus.Boolean: bool,
56
 
            dbus.Double: float,
57
 
            dbus.Struct: tuple,
58
 
            }
 
85
    def __init__(self, proxy_object=None, *args, **kwargs):
59
86
        self.proxy = proxy_object # Mandos Client proxy object
60
87
        
61
 
        if properties is None:
62
 
            self.properties = dict()
63
 
        else:
64
 
            self.properties = dict(self.convert_property(prop, val)
65
 
                                   for prop, val in
66
 
                                   properties.iteritems())
67
 
        self.proxy.connect_to_signal("PropertyChanged",
 
88
        self.properties = dict()
 
89
        self.proxy.connect_to_signal(u"PropertyChanged",
68
90
                                     self.property_changed,
69
91
                                     client_interface,
70
92
                                     byte_arrays=True)
71
93
        
72
 
        if properties is None:
73
 
            self.properties.update(
74
 
                self.convert_property(prop, val)
75
 
                for prop, val in
76
 
                self.proxy.GetAll(client_interface,
77
 
                                  dbus_interface =
78
 
                                  dbus.PROPERTIES_IFACE).iteritems())
79
 
        super(MandosClientPropertyCache, self).__init__(
80
 
            proxy_object=proxy_object,
81
 
            properties=properties, *args, **kwargs)
 
94
        self.properties.update(
 
95
            self.proxy.GetAll(client_interface,
 
96
                              dbus_interface = dbus.PROPERTIES_IFACE))
 
97
 
 
98
        #XXX This break good super behaviour!
 
99
#        super(MandosClientPropertyCache, self).__init__(
 
100
#            *args, **kwargs)
82
101
    
83
 
    def convert_property(self, property, value):
84
 
        """This converts the arguments from a D-Bus signal, which are
85
 
        D-Bus types, into normal Python types, using a conversion
86
 
        function from "self.type_map".
87
 
        """
88
 
        property_name = unicode(property) # Always a dbus.String
89
 
        if isinstance(value, dbus.UTF8String):
90
 
            # Should not happen, but prepare for it anyway
91
 
            value = dbus.String(str(value).decode("utf-8"))
92
 
        try:
93
 
            convfunc = self.type_map[type(value)]
94
 
        except KeyError:
95
 
            # Unknown type, return unmodified
96
 
            return property_name, value
97
 
        return property_name, convfunc(value)
98
102
    def property_changed(self, property=None, value=None):
99
103
        """This is called whenever we get a PropertyChanged signal
100
104
        It updates the changed property in the "properties" dict.
101
105
        """
102
 
        # Convert name and value
103
 
        property_name, cvalue = self.convert_property(property, value)
104
106
        # Update properties dict with new value
105
 
        self.properties[property_name] = cvalue
 
107
        self.properties[property] = value
106
108
 
107
109
 
108
110
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
110
112
    """
111
113
    
112
114
    def __init__(self, server_proxy_object=None, update_hook=None,
113
 
                 delete_hook=None, *args, **kwargs):
 
115
                 delete_hook=None, logger=None, *args, **kwargs):
114
116
        # Called on update
115
117
        self.update_hook = update_hook
116
118
        # Called on delete
117
119
        self.delete_hook = delete_hook
118
120
        # Mandos Server proxy object
119
121
        self.server_proxy_object = server_proxy_object
 
122
        # Logger
 
123
        self.logger = logger
 
124
        
 
125
        self._update_timer_callback_tag = None
 
126
        self._update_timer_callback_lock = 0
 
127
        self.last_checker_failed = False
120
128
        
121
129
        # The widget shown normally
122
 
        self._text_widget = urwid.Text("")
 
130
        self._text_widget = urwid.Text(u"")
123
131
        # The widget shown when we have focus
124
 
        self._focus_text_widget = urwid.Text("")
 
132
        self._focus_text_widget = urwid.Text(u"")
125
133
        super(MandosClientWidget, self).__init__(
126
134
            update_hook=update_hook, delete_hook=delete_hook,
127
135
            *args, **kwargs)
128
136
        self.update()
129
137
        self.opened = False
 
138
        
 
139
        last_checked_ok = isoformat_to_datetime(self.properties
 
140
                                                [u"LastCheckedOK"])
 
141
        if last_checked_ok is None:
 
142
            self.last_checker_failed = True
 
143
        else:
 
144
            self.last_checker_failed = ((datetime.datetime.utcnow()
 
145
                                         - last_checked_ok)
 
146
                                        > datetime.timedelta
 
147
                                        (milliseconds=
 
148
                                         self.properties
 
149
                                         [u"Interval"]))
 
150
        
 
151
        if self.last_checker_failed:
 
152
            self.using_timer(True)
 
153
        
 
154
        if self.need_approval:
 
155
            self.using_timer(True)
 
156
        
 
157
        self.proxy.connect_to_signal(u"CheckerCompleted",
 
158
                                     self.checker_completed,
 
159
                                     client_interface,
 
160
                                     byte_arrays=True)
 
161
        self.proxy.connect_to_signal(u"CheckerStarted",
 
162
                                     self.checker_started,
 
163
                                     client_interface,
 
164
                                     byte_arrays=True)
 
165
        self.proxy.connect_to_signal(u"GotSecret",
 
166
                                     self.got_secret,
 
167
                                     client_interface,
 
168
                                     byte_arrays=True)
 
169
        self.proxy.connect_to_signal(u"NeedApproval",
 
170
                                     self.need_approval,
 
171
                                     client_interface,
 
172
                                     byte_arrays=True)
 
173
        self.proxy.connect_to_signal(u"Rejected",
 
174
                                     self.rejected,
 
175
                                     client_interface,
 
176
                                     byte_arrays=True)
 
177
    
 
178
    def property_changed(self, property=None, value=None):
 
179
        super(self, MandosClientWidget).property_changed(property,
 
180
                                                         value)
 
181
        if property == u"ApprovalPending":
 
182
            using_timer(bool(value))
 
183
        
 
184
    def using_timer(self, flag):
 
185
        """Call this method with True or False when timer should be
 
186
        activated or deactivated.
 
187
        """
 
188
        old = self._update_timer_callback_lock
 
189
        if flag:
 
190
            self._update_timer_callback_lock += 1
 
191
        else:
 
192
            self._update_timer_callback_lock -= 1
 
193
        if old == 0 and self._update_timer_callback_lock:
 
194
            self._update_timer_callback_tag = (gobject.timeout_add
 
195
                                               (1000,
 
196
                                                self.update_timer))
 
197
        elif old and self._update_timer_callback_lock == 0:
 
198
            gobject.source_remove(self._update_timer_callback_tag)
 
199
            self._update_timer_callback_tag = None
 
200
    
 
201
    def checker_completed(self, exitstatus, condition, command):
 
202
        if exitstatus == 0:
 
203
            if self.last_checker_failed:
 
204
                self.last_checker_failed = False
 
205
                self.using_timer(False)
 
206
            #self.logger(u'Checker for client %s (command "%s")'
 
207
            #            u' was successful'
 
208
            #            % (self.properties[u"Name"], command))
 
209
            self.update()
 
210
            return
 
211
        # Checker failed
 
212
        if not self.last_checker_failed:
 
213
            self.last_checker_failed = True
 
214
            self.using_timer(True)
 
215
        if os.WIFEXITED(condition):
 
216
            self.logger(u'Checker for client %s (command "%s")'
 
217
                        u' failed with exit code %s'
 
218
                        % (self.properties[u"Name"], command,
 
219
                           os.WEXITSTATUS(condition)))
 
220
        elif os.WIFSIGNALED(condition):
 
221
            self.logger(u'Checker for client %s (command "%s")'
 
222
                        u' was killed by signal %s'
 
223
                        % (self.properties[u"Name"], command,
 
224
                           os.WTERMSIG(condition)))
 
225
        elif os.WCOREDUMP(condition):
 
226
            self.logger(u'Checker for client %s (command "%s")'
 
227
                        u' dumped core'
 
228
                        % (self.properties[u"Name"], command))
 
229
        else:
 
230
            self.logger(u'Checker for client %s completed'
 
231
                        u' mysteriously')
 
232
        self.update()
 
233
    
 
234
    def checker_started(self, command):
 
235
        #self.logger(u'Client %s started checker "%s"'
 
236
        #            % (self.properties[u"Name"], unicode(command)))
 
237
        pass
 
238
    
 
239
    def got_secret(self):
 
240
        self.last_checker_failed = False
 
241
        self.logger(u'Client %s received its secret'
 
242
                    % self.properties[u"Name"])
 
243
    
 
244
    def need_approval(self, timeout, default):
 
245
        if not default:
 
246
            message = u'Client %s needs approval within %s seconds'
 
247
        else:
 
248
            message = u'Client %s will get its secret in %s seconds'
 
249
        self.logger(message
 
250
                    % (self.properties[u"Name"], timeout/1000))
 
251
        self.using_timer(True)
 
252
    
 
253
    def rejected(self, reason):
 
254
        self.logger(u'Client %s was rejected; reason: %s'
 
255
                    % (self.properties[u"Name"], reason))
130
256
    
131
257
    def selectable(self):
132
258
        """Make this a "selectable" widget.
154
280
                          u"bold-underline-blink":
155
281
                              u"bold-underline-blink-standout",
156
282
                          }
157
 
        
 
283
 
158
284
        # Rebuild focus and non-focus widgets using current properties
159
 
        self._text = (u'name="%(name)s", enabled=%(enabled)s'
160
 
                      % self.properties)
 
285
 
 
286
        # Base part of a client. Name!
 
287
        base = (u'%(name)s: '
 
288
                      % {u"name": self.properties[u"Name"]})
 
289
        if not self.properties[u"Enabled"]:
 
290
            message = u"DISABLED"
 
291
        elif self.properties[u"ApprovalPending"]:
 
292
            timeout = datetime.timedelta(milliseconds
 
293
                                         = self.properties
 
294
                                         [u"ApprovalDelay"])
 
295
            last_approval_request = isoformat_to_datetime(
 
296
                self.properties[u"LastApprovalRequest"])
 
297
            if last_approval_request is not None:
 
298
                timer = timeout - (datetime.datetime.utcnow()
 
299
                                   - last_approval_request)
 
300
            else:
 
301
                timer = datetime.timedelta()
 
302
            if self.properties[u"ApprovedByDefault"]:
 
303
                message = u"Approval in %s. (d)eny?"
 
304
            else:
 
305
                message = u"Denial in %s. (a)pprove?"
 
306
            message = message % unicode(timer).rsplit(".", 1)[0]
 
307
        elif self.last_checker_failed:
 
308
            timeout = datetime.timedelta(milliseconds
 
309
                                         = self.properties
 
310
                                         [u"Timeout"])
 
311
            last_ok = isoformat_to_datetime(
 
312
                max((self.properties[u"LastCheckedOK"]
 
313
                     or self.properties[u"Created"]),
 
314
                    self.properties[u"LastEnabled"]))
 
315
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
 
316
            message = (u'A checker has failed! Time until client'
 
317
                       u' gets disabled: %s'
 
318
                           % unicode(timer).rsplit(".", 1)[0])
 
319
        else:
 
320
            message = u"enabled"
 
321
        self._text = "%s%s" % (base, message)
 
322
            
161
323
        if not urwid.supports_unicode():
162
324
            self._text = self._text.encode("ascii", "replace")
163
 
        textlist = [(u"normal", u"BLÄRGH: "), (u"bold", self._text)]
 
325
        textlist = [(u"normal", self._text)]
164
326
        self._text_widget.set_text(textlist)
165
327
        self._focus_text_widget.set_text([(with_standout[text[0]],
166
328
                                           text[1])
174
336
        if self.update_hook is not None:
175
337
            self.update_hook()
176
338
    
 
339
    def update_timer(self):
 
340
        "called by gobject"
 
341
        self.update()
 
342
        return True             # Keep calling this
 
343
    
177
344
    def delete(self):
 
345
        if self._update_timer_callback_tag is not None:
 
346
            gobject.source_remove(self._update_timer_callback_tag)
 
347
            self._update_timer_callback_tag = None
178
348
        if self.delete_hook is not None:
179
349
            self.delete_hook(self)
180
350
    
187
357
    def keypress(self, (maxcol,), key):
188
358
        """Handle keys.
189
359
        This overrides the method from urwid.FlowWidget"""
190
 
        if key == u"e" or key == u"+":
191
 
            self.proxy.Enable()
192
 
        elif key == u"d" or key == u"-":
193
 
            self.proxy.Disable()
194
 
        elif key == u"r" or key == u"_":
 
360
        if key == u"+":
 
361
            self.proxy.Enable(dbus_interface = client_interface)
 
362
        elif key == u"-":
 
363
            self.proxy.Disable(dbus_interface = client_interface)
 
364
        elif key == u"a":
 
365
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
 
366
                               dbus_interface = client_interface)
 
367
        elif key == u"d":
 
368
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
 
369
                                  dbus_interface = client_interface)
 
370
        elif key == u"R" or key == u"_" or key == u"ctrl k":
195
371
            self.server_proxy_object.RemoveClient(self.proxy
196
372
                                                  .object_path)
197
373
        elif key == u"s":
198
 
            self.proxy.StartChecker()
199
 
        elif key == u"c":
200
 
            self.proxy.StopChecker()
 
374
            self.proxy.StartChecker(dbus_interface = client_interface)
201
375
        elif key == u"S":
202
 
            self.proxy.CheckedOK()
 
376
            self.proxy.StopChecker(dbus_interface = client_interface)
 
377
        elif key == u"C":
 
378
            self.proxy.CheckedOK(dbus_interface = client_interface)
203
379
        # xxx
204
380
#         elif key == u"p" or key == "=":
205
381
#             self.proxy.pause()
222
398
            self.update()
223
399
 
224
400
 
 
401
class ConstrainedListBox(urwid.ListBox):
 
402
    """Like a normal urwid.ListBox, but will consume all "up" or
 
403
    "down" key presses, thus not allowing any containing widgets to
 
404
    use them as an excuse to shift focus away from this widget.
 
405
    """
 
406
    def keypress(self, (maxcol, maxrow), key):
 
407
        ret = super(ConstrainedListBox, self).keypress((maxcol,
 
408
                                                        maxrow), key)
 
409
        if ret in (u"up", u"down"):
 
410
            return
 
411
        return ret
 
412
 
 
413
 
225
414
class UserInterface(object):
226
415
    """This is the entire user interface - the whole screen
227
416
    with boxes, lists of client widgets, etc.
228
417
    """
229
 
    def __init__(self):
230
 
        DBusGMainLoop(set_as_default=True )
 
418
    def __init__(self, max_log_length=1000):
 
419
        DBusGMainLoop(set_as_default=True)
231
420
        
232
421
        self.screen = urwid.curses_display.Screen()
233
422
        
251
440
                                          u"standout")),
252
441
                ))
253
442
        
 
443
        if urwid.supports_unicode():
 
444
            self.divider = u"─" # \u2500
 
445
            #self.divider = u"━" # \u2501
 
446
        else:
 
447
            #self.divider = u"-" # \u002d
 
448
            self.divider = u"_" # \u005f
 
449
        
254
450
        self.screen.start()
255
451
        
256
452
        self.size = self.screen.get_cols_rows()
257
453
        
258
454
        self.clients = urwid.SimpleListWalker([])
259
455
        self.clients_dict = {}
260
 
        self.topwidget = urwid.LineBox(urwid.ListBox(self.clients))
261
 
        #self.topwidget = urwid.ListBox(clients)
 
456
        
 
457
        # We will add Text widgets to this list
 
458
        self.log = []
 
459
        self.max_log_length = max_log_length
 
460
        
 
461
        # We keep a reference to the log widget so we can remove it
 
462
        # from the ListWalker without it getting destroyed
 
463
        self.logbox = ConstrainedListBox(self.log)
 
464
        
 
465
        # This keeps track of whether self.uilist currently has
 
466
        # self.logbox in it or not
 
467
        self.log_visible = True
 
468
        self.log_wrap = u"any"
 
469
        
 
470
        self.rebuild()
 
471
        self.log_message_raw((u"bold",
 
472
                              u"Mandos Monitor version " + version))
 
473
        self.log_message_raw((u"bold",
 
474
                              u"q: Quit  ?: Help"))
262
475
        
263
476
        self.busname = domain + '.Mandos'
264
477
        self.main_loop = gobject.MainLoop()
275
488
            mandos_clients = dbus.Dictionary()
276
489
        
277
490
        (self.mandos_serv
278
 
         .connect_to_signal("ClientRemoved",
 
491
         .connect_to_signal(u"ClientRemoved",
279
492
                            self.find_and_remove_client,
280
493
                            dbus_interface=server_interface,
281
494
                            byte_arrays=True))
282
495
        (self.mandos_serv
283
 
         .connect_to_signal("ClientAdded",
 
496
         .connect_to_signal(u"ClientAdded",
284
497
                            self.add_new_client,
285
498
                            dbus_interface=server_interface,
286
499
                            byte_arrays=True))
287
 
        for path, client in (mandos_clients.iteritems()):
 
500
        (self.mandos_serv
 
501
         .connect_to_signal(u"ClientNotFound",
 
502
                            self.client_not_found,
 
503
                            dbus_interface=server_interface,
 
504
                            byte_arrays=True))
 
505
        for path, client in mandos_clients.iteritems():
288
506
            client_proxy_object = self.bus.get_object(self.busname,
289
507
                                                      path)
290
508
            self.add_client(MandosClientWidget(server_proxy_object
295
513
                                               update_hook
296
514
                                               =self.refresh,
297
515
                                               delete_hook
298
 
                                               =self.remove_client),
 
516
                                               =self.remove_client,
 
517
                                               logger
 
518
                                               =self.log_message),
299
519
                            path=path)
300
520
    
 
521
    def client_not_found(self, fingerprint, address):
 
522
        self.log_message((u"Client with address %s and fingerprint %s"
 
523
                          u" could not be found" % (address,
 
524
                                                    fingerprint)))
 
525
    
 
526
    def rebuild(self):
 
527
        """This rebuilds the User Interface.
 
528
        Call this when the widget layout needs to change"""
 
529
        self.uilist = []
 
530
        #self.uilist.append(urwid.ListBox(self.clients))
 
531
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
532
                                                          clients),
 
533
                                       #header=urwid.Divider(),
 
534
                                       header=None,
 
535
                                       footer=
 
536
                                       urwid.Divider(div_char=
 
537
                                                     self.divider)))
 
538
        if self.log_visible:
 
539
            self.uilist.append(self.logbox)
 
540
            pass
 
541
        self.topwidget = urwid.Pile(self.uilist)
 
542
    
 
543
    def log_message(self, message):
 
544
        timestamp = datetime.datetime.now().isoformat()
 
545
        self.log_message_raw(timestamp + u": " + message)
 
546
    
 
547
    def log_message_raw(self, markup):
 
548
        """Add a log message to the log buffer."""
 
549
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
 
550
        if (self.max_log_length
 
551
            and len(self.log) > self.max_log_length):
 
552
            del self.log[0:len(self.log)-self.max_log_length-1]
 
553
        self.logbox.set_focus(len(self.logbox.body.contents),
 
554
                              coming_from=u"above")
 
555
        self.refresh()
 
556
    
 
557
    def toggle_log_display(self):
 
558
        """Toggle visibility of the log buffer."""
 
559
        self.log_visible = not self.log_visible
 
560
        self.rebuild()
 
561
        #self.log_message(u"Log visibility changed to: "
 
562
        #                 + unicode(self.log_visible))
 
563
    
 
564
    def change_log_display(self):
 
565
        """Change type of log display.
 
566
        Currently, this toggles wrapping of text lines."""
 
567
        if self.log_wrap == u"clip":
 
568
            self.log_wrap = u"any"
 
569
        else:
 
570
            self.log_wrap = u"clip"
 
571
        for textwidget in self.log:
 
572
            textwidget.set_wrap_mode(self.log_wrap)
 
573
        #self.log_message(u"Wrap mode: " + self.log_wrap)
 
574
    
301
575
    def find_and_remove_client(self, path, name):
302
576
        """Find an client from its object path and remove it.
303
577
        
310
584
            return
311
585
        self.remove_client(client, path)
312
586
    
313
 
    def add_new_client(self, path, properties):
 
587
    def add_new_client(self, path):
314
588
        client_proxy_object = self.bus.get_object(self.busname, path)
315
589
        self.add_client(MandosClientWidget(server_proxy_object
316
590
                                           =self.mandos_serv,
317
591
                                           proxy_object
318
592
                                           =client_proxy_object,
319
 
                                           properties=properties,
320
593
                                           update_hook
321
594
                                           =self.refresh,
322
595
                                           delete_hook
323
 
                                           =self.remove_client),
 
596
                                           =self.remove_client,
 
597
                                           logger
 
598
                                           =self.log_message),
324
599
                        path=path)
325
600
    
326
601
    def add_client(self, client, path=None):
328
603
        if path is None:
329
604
            path = client.proxy.object_path
330
605
        self.clients_dict[path] = client
331
 
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
606
        self.clients.sort(None, lambda c: c.properties[u"Name"])
332
607
        self.refresh()
333
608
    
334
609
    def remove_client(self, client, path=None):
336
611
        if path is None:
337
612
            path = client.proxy.object_path
338
613
        del self.clients_dict[path]
 
614
        if not self.clients_dict:
 
615
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
 
616
            # is completely emptied, we need to recreate it.
 
617
            self.clients = urwid.SimpleListWalker([])
 
618
            self.rebuild()
339
619
        self.refresh()
340
620
    
341
621
    def refresh(self):
360
640
    
361
641
    def process_input(self, source, condition):
362
642
        keys = self.screen.get_input()
363
 
        translations = { u"j": u"down",
364
 
                         u"k": u"up",
 
643
        translations = { u"ctrl n": u"down",      # Emacs
 
644
                         u"ctrl p": u"up",        # Emacs
 
645
                         u"ctrl v": u"page down", # Emacs
 
646
                         u"meta v": u"page up",   # Emacs
 
647
                         u" ": u"page down",      # less
 
648
                         u"f": u"page down",      # less
 
649
                         u"b": u"page up",        # less
 
650
                         u"j": u"down",           # vi
 
651
                         u"k": u"up",             # vi
365
652
                         }
366
653
        for key in keys:
367
654
            try:
375
662
            elif key == u"window resize":
376
663
                self.size = self.screen.get_cols_rows()
377
664
                self.refresh()
378
 
            elif key == " ":
379
 
                self.refresh()
 
665
            elif key == u"\f":  # Ctrl-L
 
666
                self.refresh()
 
667
            elif key == u"l" or key == u"D":
 
668
                self.toggle_log_display()
 
669
                self.refresh()
 
670
            elif key == u"w" or key == u"i":
 
671
                self.change_log_display()
 
672
                self.refresh()
 
673
            elif key == u"?" or key == u"f1" or key == u"esc":
 
674
                if not self.log_visible:
 
675
                    self.log_visible = True
 
676
                    self.rebuild()
 
677
                self.log_message_raw((u"bold",
 
678
                                      u"  ".
 
679
                                      join((u"q: Quit",
 
680
                                            u"?: Help",
 
681
                                            u"l: Log window toggle",
 
682
                                            u"TAB: Switch window",
 
683
                                            u"w: Wrap (log)"))))
 
684
                self.log_message_raw((u"bold",
 
685
                                      u"  "
 
686
                                      .join((u"Clients:",
 
687
                                             u"+: Enable",
 
688
                                             u"-: Disable",
 
689
                                             u"R: Remove",
 
690
                                             u"s: Start new checker",
 
691
                                             u"S: Stop checker",
 
692
                                             u"C: Checker OK",
 
693
                                             u"a: Approve",
 
694
                                             u"d: Deny"))))
 
695
                self.refresh()
 
696
            elif key == u"tab":
 
697
                if self.topwidget.get_focus() is self.logbox:
 
698
                    self.topwidget.set_focus(0)
 
699
                else:
 
700
                    self.topwidget.set_focus(self.logbox)
 
701
                self.refresh()
 
702
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
703
            #      or key == u">"):
 
704
            #    pass            # xxx end-of-buffer
 
705
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
706
            #      or key == u"<"):
 
707
            #    pass            # xxx beginning-of-buffer
 
708
            #elif key == u"ctrl e" or key == u"$":
 
709
            #    pass            # xxx move-end-of-line
 
710
            #elif key == u"ctrl a" or key == u"^":
 
711
            #    pass            # xxx move-beginning-of-line
 
712
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
 
713
            #    pass            # xxx left
 
714
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
 
715
            #    pass            # xxx right
 
716
            #elif key == u"a":
 
717
            #    pass            # scroll up log
 
718
            #elif key == u"z":
 
719
            #    pass            # scroll down log
380
720
            elif self.topwidget.selectable():
381
721
                self.topwidget.keypress(self.size, key)
382
722
                self.refresh()
385
725
ui = UserInterface()
386
726
try:
387
727
    ui.run()
388
 
except:
 
728
except KeyboardInterrupt:
 
729
    ui.screen.stop()
 
730
except Exception, e:
 
731
    ui.log_message(unicode(e))
389
732
    ui.screen.stop()
390
733
    raise