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