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