/mandos/release

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