/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
1
#!/usr/bin/python
2
# -*- mode: python; coding: utf-8 -*-
444 by Teddy Hogeborn
Update copyright year to "2010" wherever appropriate.
3
# 
4
# Mandos Monitor - Control and monitor the Mandos server
5
# 
466 by Teddy Hogeborn
Update copyright year to "2011" wherever appropriate.
6
# Copyright © 2009-2011 Teddy Hogeborn
7
# Copyright © 2009-2011 Björn Påhlsson
444 by Teddy Hogeborn
Update copyright year to "2010" wherever appropriate.
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
# 
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
24
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
25
from __future__ import division, absolute_import, print_function, unicode_literals
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
26
27
import sys
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
28
import os
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
29
import signal
30
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
31
import datetime
32
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
33
import urwid.curses_display
34
import urwid
35
36
from dbus.mainloop.glib import DBusGMainLoop
37
import gobject
38
39
import dbus
40
41
import UserList
42
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
43
import locale
44
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
45
locale.setlocale(locale.LC_ALL, '')
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
46
24.1.153 by Björn Påhlsson
early commit to ease todays coding
47
import logging
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
48
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
24.1.153 by Björn Påhlsson
early commit to ease todays coding
49
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
50
# Some useful constants
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
51
domain = 'se.bsnet.fukt'
52
server_interface = domain + '.Mandos'
53
client_interface = domain + '.Mandos.Client'
237.4.14 by Teddy Hogeborn
* Makefile (version): Changed to "1.3.0".
54
version = "1.3.0"
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
55
56
# Always run in monochrome mode
57
urwid.curses_display.curses.has_colors = lambda : False
58
59
# Urwid doesn't support blinking, but we want it.  Since we have no
60
# use for underline on its own, we make underline also always blink.
61
urwid.curses_display.curses.A_UNDERLINE |= (
62
    urwid.curses_display.curses.A_BLINK)
63
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
64
def isoformat_to_datetime(iso):
65
    "Parse an ISO 8601 date string to a datetime.datetime()"
66
    if not iso:
67
        return None
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
68
    d, t = iso.split("T", 1)
69
    year, month, day = d.split("-", 2)
70
    hour, minute, second = t.split(":", 2)
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
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
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
80
class MandosClientPropertyCache(object):
81
    """This wraps a Mandos Client D-Bus proxy object, caches the
82
    properties and calls a hook function when any of them are
83
    changed.
84
    """
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
85
    def __init__(self, proxy_object=None, *args, **kwargs):
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
86
        self.proxy = proxy_object # Mandos Client proxy object
87
        
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
88
        self.properties = dict()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
89
        self.proxy.connect_to_signal("PropertyChanged",
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
90
                                     self.property_changed,
91
                                     client_interface,
92
                                     byte_arrays=True)
24.1.153 by Björn Påhlsson
early commit to ease todays coding
93
        
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
94
        self.properties.update(
95
            self.proxy.GetAll(client_interface,
96
                              dbus_interface = dbus.PROPERTIES_IFACE))
24.1.154 by Björn Påhlsson
merge
97
98
        #XXX This break good super behaviour!
99
#        super(MandosClientPropertyCache, self).__init__(
100
#            *args, **kwargs)
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
101
    
102
    def property_changed(self, property=None, value=None):
103
        """This is called whenever we get a PropertyChanged signal
104
        It updates the changed property in the "properties" dict.
105
        """
106
        # Update properties dict with new value
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
107
        self.properties[property] = value
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
108
109
110
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
111
    """A Mandos Client which is visible on the screen.
112
    """
113
    
114
    def __init__(self, server_proxy_object=None, update_hook=None,
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
115
                 delete_hook=None, logger=None, *args, **kwargs):
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
116
        # Called on update
117
        self.update_hook = update_hook
118
        # Called on delete
119
        self.delete_hook = delete_hook
120
        # Mandos Server proxy object
121
        self.server_proxy_object = server_proxy_object
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
122
        # Logger
123
        self.logger = logger
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
124
        
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
125
        self._update_timer_callback_tag = None
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
126
        self._update_timer_callback_lock = 0
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
127
        self.last_checker_failed = False
128
        
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
129
        # The widget shown normally
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
130
        self._text_widget = urwid.Text("")
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
131
        # The widget shown when we have focus
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
132
        self._focus_text_widget = urwid.Text("")
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
133
        super(MandosClientWidget, self).__init__(
134
            update_hook=update_hook, delete_hook=delete_hook,
135
            *args, **kwargs)
136
        self.update()
137
        self.opened = False
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
138
        
139
        last_checked_ok = isoformat_to_datetime(self.properties
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
140
                                                ["LastCheckedOK"])
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
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
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
149
                                         ["Interval"]))
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
150
        
151
        if self.last_checker_failed:
152
            self.using_timer(True)
153
        
154
        if self.need_approval:
155
            self.using_timer(True)
156
        
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
157
        self.proxy.connect_to_signal("CheckerCompleted",
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
158
                                     self.checker_completed,
159
                                     client_interface,
160
                                     byte_arrays=True)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
161
        self.proxy.connect_to_signal("CheckerStarted",
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
162
                                     self.checker_started,
163
                                     client_interface,
164
                                     byte_arrays=True)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
165
        self.proxy.connect_to_signal("GotSecret",
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
166
                                     self.got_secret,
167
                                     client_interface,
168
                                     byte_arrays=True)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
169
        self.proxy.connect_to_signal("NeedApproval",
24.1.153 by Björn Påhlsson
early commit to ease todays coding
170
                                     self.need_approval,
171
                                     client_interface,
172
                                     byte_arrays=True)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
173
        self.proxy.connect_to_signal("Rejected",
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
174
                                     self.rejected,
175
                                     client_interface,
176
                                     byte_arrays=True)
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
177
    
178
    def property_changed(self, property=None, value=None):
179
        super(self, MandosClientWidget).property_changed(property,
180
                                                         value)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
181
        if property == "ApprovalPending":
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
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
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
191
        else:
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
192
            self._update_timer_callback_lock -= 1
193
        if old == 0 and self._update_timer_callback_lock:
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
194
            self._update_timer_callback_tag = (gobject.timeout_add
195
                                               (1000,
196
                                                self.update_timer))
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
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
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
200
    
201
    def checker_completed(self, exitstatus, condition, command):
202
        if exitstatus == 0:
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
203
            if self.last_checker_failed:
204
                self.last_checker_failed = False
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
205
                self.using_timer(False)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
206
            #self.logger('Checker for client %s (command "%s")'
207
            #            ' was successful'
208
            #            % (self.properties["Name"], command))
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
209
            self.update()
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
210
            return
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
211
        # Checker failed
212
        if not self.last_checker_failed:
213
            self.last_checker_failed = True
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
214
            self.using_timer(True)
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
215
        if os.WIFEXITED(condition):
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
216
            self.logger('Checker for client %s (command "%s")'
217
                        ' failed with exit code %s'
218
                        % (self.properties["Name"], command,
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
219
                           os.WEXITSTATUS(condition)))
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
220
        elif os.WIFSIGNALED(condition):
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
221
            self.logger('Checker for client %s (command "%s")'
222
                        ' was killed by signal %s'
223
                        % (self.properties["Name"], command,
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
224
                           os.WTERMSIG(condition)))
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
225
        elif os.WCOREDUMP(condition):
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
226
            self.logger('Checker for client %s (command "%s")'
227
                        ' dumped core'
228
                        % (self.properties["Name"], command))
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
229
        else:
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
230
            self.logger('Checker for client %s completed'
231
                        ' mysteriously')
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
232
        self.update()
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
233
    
234
    def checker_started(self, command):
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
235
        #self.logger('Client %s started checker "%s"'
236
        #            % (self.properties["Name"], unicode(command)))
24.1.153 by Björn Påhlsson
early commit to ease todays coding
237
        pass
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
238
    
239
    def got_secret(self):
24.1.159 by Björn Påhlsson
added approval to mandos-ctl
240
        self.last_checker_failed = False
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
241
        self.logger('Client %s received its secret'
242
                    % self.properties["Name"])
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
243
    
24.1.153 by Björn Påhlsson
early commit to ease todays coding
244
    def need_approval(self, timeout, default):
245
        if not default:
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
246
            message = 'Client %s needs approval within %s seconds'
24.1.153 by Björn Påhlsson
early commit to ease todays coding
247
        else:
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
248
            message = 'Client %s will get its secret in %s seconds'
24.1.153 by Björn Påhlsson
early commit to ease todays coding
249
        self.logger(message
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
250
                    % (self.properties["Name"], timeout/1000))
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
251
        self.using_timer(True)
24.1.153 by Björn Påhlsson
early commit to ease todays coding
252
    
253
    def rejected(self, reason):
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
254
        self.logger('Client %s was rejected; reason: %s'
255
                    % (self.properties["Name"], reason))
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
256
    
257
    def selectable(self):
258
        """Make this a "selectable" widget.
259
        This overrides the method from urwid.FlowWidget."""
260
        return True
261
    
463.1.1 by teddy at bsnet
* mandos-monitor: Use only unicode string literals.
262
    def rows(self, maxcolrow, focus=False):
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
263
        """How many rows this widget will occupy might depend on
264
        whether we have focus or not.
265
        This overrides the method from urwid.FlowWidget"""
463.1.1 by teddy at bsnet
* mandos-monitor: Use only unicode string literals.
266
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
267
    
268
    def current_widget(self, focus=False):
269
        if focus or self.opened:
270
            return self._focus_widget
271
        return self._widget
272
    
273
    def update(self):
274
        "Called when what is visible on the screen should be updated."
275
        # How to add standout mode to a style
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
276
        with_standout = { "normal": "standout",
277
                          "bold": "bold-standout",
278
                          "underline-blink":
279
                              "underline-blink-standout",
280
                          "bold-underline-blink":
281
                              "bold-underline-blink-standout",
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
282
                          }
24.1.154 by Björn Påhlsson
merge
283
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
284
        # Rebuild focus and non-focus widgets using current properties
24.1.154 by Björn Påhlsson
merge
285
286
        # Base part of a client. Name!
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
287
        base = ('%(name)s: '
288
                      % {"name": self.properties["Name"]})
289
        if not self.properties["Enabled"]:
290
            message = "DISABLED"
291
        elif self.properties["ApprovalPending"]:
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
292
            timeout = datetime.timedelta(milliseconds
293
                                         = self.properties
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
294
                                         ["ApprovalDelay"])
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
295
            last_approval_request = isoformat_to_datetime(
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
296
                self.properties["LastApprovalRequest"])
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
297
            if last_approval_request is not None:
298
                timer = timeout - (datetime.datetime.utcnow()
299
                                   - last_approval_request)
300
            else:
301
                timer = datetime.timedelta()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
302
            if self.properties["ApprovedByDefault"]:
303
                message = "Approval in %s. (d)eny?"
24.1.159 by Björn Påhlsson
added approval to mandos-ctl
304
            else:
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
305
                message = "Denial in %s. (a)pprove?"
442 by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property.
306
            message = message % unicode(timer).rsplit(".", 1)[0]
24.1.156 by Björn Påhlsson
merge
307
        elif self.last_checker_failed:
308
            timeout = datetime.timedelta(milliseconds
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
309
                                         = self.properties
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
310
                                         ["Timeout"])
24.1.156 by Björn Påhlsson
merge
311
            last_ok = isoformat_to_datetime(
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
312
                max((self.properties["LastCheckedOK"]
313
                     or self.properties["Created"]),
314
                    self.properties["LastEnabled"]))
24.1.156 by Björn Påhlsson
merge
315
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
316
            message = ('A checker has failed! Time until client'
317
                       ' gets disabled: %s'
24.1.158 by Björn Påhlsson
mandos-monitor: removed milisecondsseconds from countdown.
318
                           % unicode(timer).rsplit(".", 1)[0])
24.1.154 by Björn Påhlsson
merge
319
        else:
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
320
            message = "enabled"
321
        self._text = "%s%s" % (base, message)
24.1.156 by Björn Påhlsson
merge
322
            
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
323
        if not urwid.supports_unicode():
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
324
            self._text = self._text.encode("ascii", "replace")
325
        textlist = [("normal", self._text)]
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
326
        self._text_widget.set_text(textlist)
327
        self._focus_text_widget.set_text([(with_standout[text[0]],
328
                                           text[1])
329
                                          if isinstance(text, tuple)
330
                                          else text
331
                                          for text in textlist])
332
        self._widget = self._text_widget
333
        self._focus_widget = urwid.AttrWrap(self._focus_text_widget,
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
334
                                            "standout")
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
335
        # Run update hook, if any
336
        if self.update_hook is not None:
337
            self.update_hook()
338
    
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
339
    def update_timer(self):
340
        "called by gobject"
341
        self.update()
342
        return True             # Keep calling this
343
    
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
344
    def delete(self):
417 by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log
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
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
348
        if self.delete_hook is not None:
349
            self.delete_hook(self)
350
    
463.1.1 by teddy at bsnet
* mandos-monitor: Use only unicode string literals.
351
    def render(self, maxcolrow, focus=False):
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
352
        """Render differently if we have focus.
353
        This overrides the method from urwid.FlowWidget"""
463.1.1 by teddy at bsnet
* mandos-monitor: Use only unicode string literals.
354
        return self.current_widget(focus).render(maxcolrow,
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
355
                                                 focus=focus)
356
    
463.1.1 by teddy at bsnet
* mandos-monitor: Use only unicode string literals.
357
    def keypress(self, maxcolrow, key):
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
358
        """Handle keys.
359
        This overrides the method from urwid.FlowWidget"""
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
360
        if key == "+":
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
361
            self.proxy.Enable(dbus_interface = client_interface,
362
                              ignore_reply=True)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
363
        elif key == "-":
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
364
            self.proxy.Disable(dbus_interface = client_interface,
365
                               ignore_reply=True)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
366
        elif key == "a":
24.1.154 by Björn Påhlsson
merge
367
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
368
                               dbus_interface = client_interface,
369
                               ignore_reply=True)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
370
        elif key == "d":
24.1.154 by Björn Påhlsson
merge
371
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
372
                                  dbus_interface = client_interface,
373
                               ignore_reply=True)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
374
        elif key == "R" or key == "_" or key == "ctrl k":
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
375
            self.server_proxy_object.RemoveClient(self.proxy
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
376
                                                  .object_path,
377
                                                  ignore_reply=True)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
378
        elif key == "s":
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
379
            self.proxy.StartChecker(dbus_interface = client_interface,
380
                                    ignore_reply=True)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
381
        elif key == "S":
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
382
            self.proxy.StopChecker(dbus_interface = client_interface,
383
                                   ignore_reply=True)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
384
        elif key == "C":
482 by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new
385
            self.proxy.CheckedOK(dbus_interface = client_interface,
386
                                 ignore_reply=True)
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
387
        # xxx
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
388
#         elif key == "p" or key == "=":
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
389
#             self.proxy.pause()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
390
#         elif key == "u" or key == ":":
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
391
#             self.proxy.unpause()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
392
#         elif key == "RET":
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
393
#             self.open()
394
        else:
395
            return key
396
    
397
    def property_changed(self, property=None, value=None,
398
                         *args, **kwargs):
399
        """Call self.update() if old value is not new value.
400
        This overrides the method from MandosClientPropertyCache"""
401
        property_name = unicode(property)
402
        old_value = self.properties.get(property_name)
403
        super(MandosClientWidget, self).property_changed(
404
            property=property, value=value, *args, **kwargs)
405
        if self.properties.get(property_name) != old_value:
406
            self.update()
407
408
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
409
class ConstrainedListBox(urwid.ListBox):
410
    """Like a normal urwid.ListBox, but will consume all "up" or
411
    "down" key presses, thus not allowing any containing widgets to
412
    use them as an excuse to shift focus away from this widget.
413
    """
463.1.1 by teddy at bsnet
* mandos-monitor: Use only unicode string literals.
414
    def keypress(self, maxcolrow, key):
415
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
416
        if ret in ("up", "down"):
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
417
            return
418
        return ret
419
420
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
421
class UserInterface(object):
422
    """This is the entire user interface - the whole screen
423
    with boxes, lists of client widgets, etc.
424
    """
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
425
    def __init__(self, max_log_length=1000):
426
        DBusGMainLoop(set_as_default=True)
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
427
        
428
        self.screen = urwid.curses_display.Screen()
429
        
430
        self.screen.register_palette((
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
431
                ("normal",
432
                 "default", "default", None),
433
                ("bold",
434
                 "default", "default", "bold"),
435
                ("underline-blink",
436
                 "default", "default", "underline"),
437
                ("standout",
438
                 "default", "default", "standout"),
439
                ("bold-underline-blink",
440
                 "default", "default", ("bold", "underline")),
441
                ("bold-standout",
442
                 "default", "default", ("bold", "standout")),
443
                ("underline-blink-standout",
444
                 "default", "default", ("underline", "standout")),
445
                ("bold-underline-blink-standout",
446
                 "default", "default", ("bold", "underline",
447
                                          "standout")),
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
448
                ))
449
        
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
450
        if urwid.supports_unicode():
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
451
            self.divider = "─" # \u2500
452
            #self.divider = "━" # \u2501
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
453
        else:
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
454
            #self.divider = "-" # \u002d
455
            self.divider = "_" # \u005f
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
456
        
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
457
        self.screen.start()
458
        
459
        self.size = self.screen.get_cols_rows()
460
        
461
        self.clients = urwid.SimpleListWalker([])
462
        self.clients_dict = {}
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
463
        
464
        # We will add Text widgets to this list
465
        self.log = []
466
        self.max_log_length = max_log_length
467
        
468
        # We keep a reference to the log widget so we can remove it
469
        # from the ListWalker without it getting destroyed
470
        self.logbox = ConstrainedListBox(self.log)
471
        
472
        # This keeps track of whether self.uilist currently has
473
        # self.logbox in it or not
474
        self.log_visible = True
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
475
        self.log_wrap = "any"
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
476
        
477
        self.rebuild()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
478
        self.log_message_raw(("bold",
479
                              "Mandos Monitor version " + version))
480
        self.log_message_raw(("bold",
481
                              "q: Quit  ?: Help"))
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
482
        
483
        self.busname = domain + '.Mandos'
484
        self.main_loop = gobject.MainLoop()
485
        self.bus = dbus.SystemBus()
486
        mandos_dbus_objc = self.bus.get_object(
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
487
            self.busname, "/", follow_name_owner_changes=True)
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
488
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
489
                                          dbus_interface
490
                                          = server_interface)
491
        try:
492
            mandos_clients = (self.mandos_serv
493
                              .GetAllClientsWithProperties())
494
        except dbus.exceptions.DBusException:
495
            mandos_clients = dbus.Dictionary()
496
        
497
        (self.mandos_serv
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
498
         .connect_to_signal("ClientRemoved",
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
499
                            self.find_and_remove_client,
500
                            dbus_interface=server_interface,
501
                            byte_arrays=True))
502
        (self.mandos_serv
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
503
         .connect_to_signal("ClientAdded",
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
504
                            self.add_new_client,
505
                            dbus_interface=server_interface,
506
                            byte_arrays=True))
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
507
        (self.mandos_serv
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
508
         .connect_to_signal("ClientNotFound",
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
509
                            self.client_not_found,
510
                            dbus_interface=server_interface,
511
                            byte_arrays=True))
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
512
        for path, client in mandos_clients.iteritems():
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
513
            client_proxy_object = self.bus.get_object(self.busname,
514
                                                      path)
515
            self.add_client(MandosClientWidget(server_proxy_object
516
                                               =self.mandos_serv,
517
                                               proxy_object
518
                                               =client_proxy_object,
519
                                               properties=client,
520
                                               update_hook
521
                                               =self.refresh,
522
                                               delete_hook
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
523
                                               =self.remove_client,
524
                                               logger
525
                                               =self.log_message),
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
526
                            path=path)
527
    
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
528
    def client_not_found(self, fingerprint, address):
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
529
        self.log_message(("Client with address %s and fingerprint %s"
530
                          " could not be found" % (address,
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
531
                                                    fingerprint)))
532
    
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
533
    def rebuild(self):
534
        """This rebuilds the User Interface.
535
        Call this when the widget layout needs to change"""
536
        self.uilist = []
537
        #self.uilist.append(urwid.ListBox(self.clients))
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
538
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
539
                                                          clients),
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
540
                                       #header=urwid.Divider(),
541
                                       header=None,
422 by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions;
542
                                       footer=
543
                                       urwid.Divider(div_char=
544
                                                     self.divider)))
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
545
        if self.log_visible:
546
            self.uilist.append(self.logbox)
547
            pass
548
        self.topwidget = urwid.Pile(self.uilist)
549
    
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
550
    def log_message(self, message):
551
        timestamp = datetime.datetime.now().isoformat()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
552
        self.log_message_raw(timestamp + ": " + message)
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
553
    
554
    def log_message_raw(self, markup):
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
555
        """Add a log message to the log buffer."""
556
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
557
        if (self.max_log_length
558
            and len(self.log) > self.max_log_length):
559
            del self.log[0:len(self.log)-self.max_log_length-1]
408 by Teddy Hogeborn
* debian/rules: Only set BROKEN_PIE if binutils is a specific range of
560
        self.logbox.set_focus(len(self.logbox.body.contents),
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
561
                              coming_from="above")
409 by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message.
562
        self.refresh()
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
563
    
564
    def toggle_log_display(self):
565
        """Toggle visibility of the log buffer."""
566
        self.log_visible = not self.log_visible
567
        self.rebuild()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
568
        #self.log_message("Log visibility changed to: "
430 by teddy at bsnet
* mandos-monitor.xml: New.
569
        #                 + unicode(self.log_visible))
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
570
    
571
    def change_log_display(self):
572
        """Change type of log display.
573
        Currently, this toggles wrapping of text lines."""
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
574
        if self.log_wrap == "clip":
575
            self.log_wrap = "any"
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
576
        else:
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
577
            self.log_wrap = "clip"
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
578
        for textwidget in self.log:
579
            textwidget.set_wrap_mode(self.log_wrap)
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
580
        #self.log_message("Wrap mode: " + self.log_wrap)
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
581
    
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
582
    def find_and_remove_client(self, path, name):
583
        """Find an client from its object path and remove it.
584
        
585
        This is connected to the ClientRemoved signal from the
586
        Mandos server object."""
587
        try:
588
            client = self.clients_dict[path]
589
        except KeyError:
590
            # not found?
591
            return
592
        self.remove_client(client, path)
593
    
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
594
    def add_new_client(self, path):
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
595
        client_proxy_object = self.bus.get_object(self.busname, path)
596
        self.add_client(MandosClientWidget(server_proxy_object
597
                                           =self.mandos_serv,
598
                                           proxy_object
599
                                           =client_proxy_object,
600
                                           update_hook
601
                                           =self.refresh,
602
                                           delete_hook
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
603
                                           =self.remove_client,
604
                                           logger
605
                                           =self.log_message),
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
606
                        path=path)
607
    
608
    def add_client(self, client, path=None):
609
        self.clients.append(client)
610
        if path is None:
611
            path = client.proxy.object_path
612
        self.clients_dict[path] = client
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
613
        self.clients.sort(None, lambda c: c.properties["Name"])
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
614
        self.refresh()
615
    
616
    def remove_client(self, client, path=None):
617
        self.clients.remove(client)
618
        if path is None:
619
            path = client.proxy.object_path
620
        del self.clients_dict[path]
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
621
        if not self.clients_dict:
622
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
623
            # is completely emptied, we need to recreate it.
624
            self.clients = urwid.SimpleListWalker([])
625
            self.rebuild()
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
626
        self.refresh()
627
    
628
    def refresh(self):
629
        """Redraw the screen"""
630
        canvas = self.topwidget.render(self.size, focus=True)
631
        self.screen.draw_screen(self.size, canvas)
632
    
633
    def run(self):
634
        """Start the main loop and exit when it's done."""
635
        self.refresh()
636
        self._input_callback_tag = (gobject.io_add_watch
637
                                    (sys.stdin.fileno(),
638
                                     gobject.IO_IN,
639
                                     self.process_input))
640
        self.main_loop.run()
641
        # Main loop has finished, we should close everything now
642
        gobject.source_remove(self._input_callback_tag)
643
        self.screen.stop()
644
    
645
    def stop(self):
646
        self.main_loop.quit()
647
    
648
    def process_input(self, source, condition):
649
        keys = self.screen.get_input()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
650
        translations = { "ctrl n": "down",      # Emacs
651
                         "ctrl p": "up",        # Emacs
652
                         "ctrl v": "page down", # Emacs
653
                         "meta v": "page up",   # Emacs
654
                         " ": "page down",      # less
655
                         "f": "page down",      # less
656
                         "b": "page up",        # less
657
                         "j": "down",           # vi
658
                         "k": "up",             # vi
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
659
                         }
660
        for key in keys:
661
            try:
662
                key = translations[key]
663
            except KeyError:    # :-)
664
                pass
665
            
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
666
            if key == "q" or key == "Q":
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
667
                self.stop()
668
                break
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
669
            elif key == "window resize":
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
670
                self.size = self.screen.get_cols_rows()
671
                self.refresh()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
672
            elif key == "\f":  # Ctrl-L
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
673
                self.refresh()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
674
            elif key == "l" or key == "D":
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
675
                self.toggle_log_display()
676
                self.refresh()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
677
            elif key == "w" or key == "i":
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
678
                self.change_log_display()
679
                self.refresh()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
680
            elif key == "?" or key == "f1" or key == "esc":
407 by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S"
681
                if not self.log_visible:
682
                    self.log_visible = True
683
                    self.rebuild()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
684
                self.log_message_raw(("bold",
685
                                      "  ".
686
                                      join(("q: Quit",
687
                                            "?: Help",
688
                                            "l: Log window toggle",
689
                                            "TAB: Switch window",
690
                                            "w: Wrap (log)"))))
691
                self.log_message_raw(("bold",
692
                                      "  "
693
                                      .join(("Clients:",
694
                                             "+: Enable",
695
                                             "-: Disable",
696
                                             "R: Remove",
697
                                             "s: Start new checker",
698
                                             "S: Stop checker",
699
                                             "C: Checker OK",
700
                                             "a: Approve",
701
                                             "d: Deny"))))
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
702
                self.refresh()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
703
            elif key == "tab":
405 by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of
704
                if self.topwidget.get_focus() is self.logbox:
705
                    self.topwidget.set_focus(0)
706
                else:
707
                    self.topwidget.set_focus(self.logbox)
708
                self.refresh()
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
709
            #elif (key == "end" or key == "meta >" or key == "G"
710
            #      or key == ">"):
407 by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S"
711
            #    pass            # xxx end-of-buffer
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
712
            #elif (key == "home" or key == "meta <" or key == "g"
713
            #      or key == "<"):
407 by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S"
714
            #    pass            # xxx beginning-of-buffer
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
715
            #elif key == "ctrl e" or key == "$":
407 by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S"
716
            #    pass            # xxx move-end-of-line
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
717
            #elif key == "ctrl a" or key == "^":
407 by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S"
718
            #    pass            # xxx move-beginning-of-line
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
719
            #elif key == "ctrl b" or key == "meta (" or key == "h":
407 by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S"
720
            #    pass            # xxx left
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
721
            #elif key == "ctrl f" or key == "meta )" or key == "l":
407 by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S"
722
            #    pass            # xxx right
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
723
            #elif key == "a":
407 by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S"
724
            #    pass            # scroll up log
463.1.2 by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__
725
            #elif key == "z":
407 by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S"
726
            #    pass            # scroll down log
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
727
            elif self.topwidget.selectable():
728
                self.topwidget.keypress(self.size, key)
729
                self.refresh()
730
        return True
731
732
ui = UserInterface()
733
try:
734
    ui.run()
24.1.159 by Björn Påhlsson
added approval to mandos-ctl
735
except KeyboardInterrupt:
736
    ui.screen.stop()
411 by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they
737
except Exception, e:
738
    ui.log_message(unicode(e))
404 by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server
739
    ui.screen.stop()
740
    raise