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 |
#
|
|
659
by Teddy Hogeborn
* debian/copyright: Change year to "2014". |
6 |
# Copyright © 2009-2014 Teddy Hogeborn
|
7 |
# Copyright © 2009-2014 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 |
|
409
by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message. |
36 |
import datetime |
37 |
||
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
38 |
import urwid.curses_display |
39 |
import urwid |
|
40 |
||
41 |
from dbus.mainloop.glib import DBusGMainLoop |
|
617
by Teddy Hogeborn
* mandos: Bug fix: Don't print output from checkers when running in |
42 |
try: |
43 |
import gobject |
|
44 |
except ImportError: |
|
45 |
from gi.repository import GObject as gobject |
|
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
46 |
|
47 |
import dbus |
|
48 |
||
411
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
49 |
import locale |
50 |
||
617
by Teddy Hogeborn
* mandos: Bug fix: Don't print output from checkers when running in |
51 |
if sys.version_info[0] == 2: |
52 |
str = unicode |
|
53 |
||
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
54 |
locale.setlocale(locale.LC_ALL, '') |
411
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
55 |
|
24.1.153
by Björn Påhlsson
early commit to ease todays coding |
56 |
import logging |
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
57 |
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL) |
24.1.153
by Björn Påhlsson
early commit to ease todays coding |
58 |
|
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
59 |
# Some useful constants
|
24.1.186
by Björn Påhlsson
transitional stuff actually working |
60 |
domain = 'se.recompile' |
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
61 |
server_interface = domain + '.Mandos' |
62 |
client_interface = domain + '.Mandos.Client' |
|
237.4.51
by Teddy Hogeborn
* Makefile (version): Changed to "1.6.7". |
63 |
version = "1.6.7" |
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
64 |
|
417
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 |
|
463.1.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) |
|
417
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 |
||
404
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 |
"""
|
|
580
by Teddy Hogeborn
* mandos-monitor: Speedup: Use properties from D-Bus |
86 |
def __init__(self, proxy_object=None, properties=None, **kwargs): |
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
87 |
self.proxy = proxy_object # Mandos Client proxy object |
580
by Teddy Hogeborn
* mandos-monitor: Speedup: Use properties from D-Bus |
88 |
self.properties = dict() if properties is None else properties |
488
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Save match tag for |
89 |
self.property_changed_match = ( |
90 |
self.proxy.connect_to_signal("PropertyChanged", |
|
580
by Teddy Hogeborn
* mandos-monitor: Speedup: Use properties from D-Bus |
91 |
self._property_changed, |
488
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Save match tag for |
92 |
client_interface, |
93 |
byte_arrays=True)) |
|
24.1.153
by Björn Påhlsson
early commit to ease todays coding |
94 |
|
580
by Teddy Hogeborn
* mandos-monitor: Speedup: Use properties from D-Bus |
95 |
if properties is None: |
96 |
self.properties.update( |
|
97 |
self.proxy.GetAll(client_interface, |
|
98 |
dbus_interface
|
|
99 |
= dbus.PROPERTIES_IFACE)) |
|
100 |
||
101 |
super(MandosClientPropertyCache, self).__init__(**kwargs) |
|
102 |
||
103 |
def _property_changed(self, property, value): |
|
104 |
"""Helper which takes positional arguments""" |
|
105 |
return self.property_changed(property=property, value=value) |
|
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
106 |
|
107 |
def property_changed(self, property=None, value=None): |
|
108 |
"""This is called whenever we get a PropertyChanged signal |
|
109 |
It updates the changed property in the "properties" dict.
|
|
110 |
"""
|
|
111 |
# Update properties dict with new value
|
|
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
112 |
self.properties[property] = value |
488
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Save match tag for |
113 |
|
580
by Teddy Hogeborn
* mandos-monitor: Speedup: Use properties from D-Bus |
114 |
def delete(self): |
488
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Save match tag for |
115 |
self.property_changed_match.remove() |
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
116 |
|
117 |
||
118 |
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache): |
|
119 |
"""A Mandos Client which is visible on the screen. |
|
120 |
"""
|
|
121 |
||
122 |
def __init__(self, server_proxy_object=None, update_hook=None, |
|
580
by Teddy Hogeborn
* mandos-monitor: Speedup: Use properties from D-Bus |
123 |
delete_hook=None, logger=None, **kwargs): |
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
124 |
# Called on update
|
125 |
self.update_hook = update_hook |
|
126 |
# Called on delete
|
|
127 |
self.delete_hook = delete_hook |
|
128 |
# Mandos Server proxy object
|
|
129 |
self.server_proxy_object = server_proxy_object |
|
409
by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message. |
130 |
# Logger
|
131 |
self.logger = logger |
|
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
132 |
|
417
by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log |
133 |
self._update_timer_callback_tag = None |
134 |
||
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
135 |
# The widget shown normally
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
136 |
self._text_widget = urwid.Text("") |
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
137 |
# The widget shown when we have focus
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
138 |
self._focus_text_widget = urwid.Text("") |
580
by Teddy Hogeborn
* mandos-monitor: Speedup: Use properties from D-Bus |
139 |
super(MandosClientWidget, self).__init__(**kwargs) |
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
140 |
self.update() |
141 |
self.opened = False |
|
442
by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property. |
142 |
|
488
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Save match tag for |
143 |
self.match_objects = ( |
144 |
self.proxy.connect_to_signal("CheckerCompleted", |
|
145 |
self.checker_completed, |
|
146 |
client_interface, |
|
147 |
byte_arrays=True), |
|
148 |
self.proxy.connect_to_signal("CheckerStarted", |
|
149 |
self.checker_started, |
|
150 |
client_interface, |
|
151 |
byte_arrays=True), |
|
152 |
self.proxy.connect_to_signal("GotSecret", |
|
153 |
self.got_secret, |
|
154 |
client_interface, |
|
155 |
byte_arrays=True), |
|
156 |
self.proxy.connect_to_signal("NeedApproval", |
|
157 |
self.need_approval, |
|
158 |
client_interface, |
|
159 |
byte_arrays=True), |
|
160 |
self.proxy.connect_to_signal("Rejected", |
|
161 |
self.rejected, |
|
162 |
client_interface, |
|
163 |
byte_arrays=True)) |
|
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
164 |
self.logger('Created client {}' |
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
165 |
.format(self.properties["Name"]), level=0) |
442
by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property. |
166 |
|
167 |
def using_timer(self, flag): |
|
168 |
"""Call this method with True or False when timer should be |
|
169 |
activated or deactivated.
|
|
170 |
"""
|
|
581
by Teddy Hogeborn
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call |
171 |
if flag and self._update_timer_callback_tag is None: |
24.1.179
by Björn Påhlsson
New feature: |
172 |
# Will update the shown timer value every second
|
417
by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log |
173 |
self._update_timer_callback_tag = (gobject.timeout_add |
174 |
(1000, |
|
175 |
self.update_timer)) |
|
581
by Teddy Hogeborn
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call |
176 |
elif not (flag or self._update_timer_callback_tag is None): |
442
by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property. |
177 |
gobject.source_remove(self._update_timer_callback_tag) |
178 |
self._update_timer_callback_tag = None |
|
409
by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message. |
179 |
|
180 |
def checker_completed(self, exitstatus, condition, command): |
|
181 |
if exitstatus == 0: |
|
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
182 |
self.logger('Checker for client {} (command "{}")' |
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
183 |
' succeeded'.format(self.properties["Name"], |
184 |
command), level=0) |
|
417
by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log |
185 |
self.update() |
409
by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message. |
186 |
return
|
417
by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log |
187 |
# Checker failed
|
409
by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message. |
188 |
if os.WIFEXITED(condition): |
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
189 |
self.logger('Checker for client {} (command "{}") failed' |
190 |
' with exit code {}' |
|
567
by Teddy Hogeborn
* mandos-monitor: Use new string format method. |
191 |
.format(self.properties["Name"], command, |
192 |
os.WEXITSTATUS(condition))) |
|
417
by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log |
193 |
elif os.WIFSIGNALED(condition): |
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
194 |
self.logger('Checker for client {} (command "{}") was' |
195 |
' killed by signal {}' |
|
567
by Teddy Hogeborn
* mandos-monitor: Use new string format method. |
196 |
.format(self.properties["Name"], command, |
197 |
os.WTERMSIG(condition))) |
|
417
by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log |
198 |
elif os.WCOREDUMP(condition): |
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
199 |
self.logger('Checker for client {} (command "{}") dumped' |
200 |
' core'.format(self.properties["Name"], |
|
201 |
command)) |
|
417
by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log |
202 |
else: |
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
203 |
self.logger('Checker for client {} completed' |
567
by Teddy Hogeborn
* mandos-monitor: Use new string format method. |
204 |
' mysteriously'
|
205 |
.format(self.properties["Name"])) |
|
417
by Teddy Hogeborn
* mandos (AvahiService.entry_group_state_changed): Better debug log |
206 |
self.update() |
409
by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message. |
207 |
|
208 |
def checker_started(self, command): |
|
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
209 |
"""Server signals that a checker started.""" |
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
210 |
self.logger('Client {} started checker "{}"' |
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
211 |
.format(self.properties["Name"], |
212 |
command), level=0) |
|
409
by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message. |
213 |
|
214 |
def got_secret(self): |
|
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
215 |
self.logger('Client {} received its secret' |
567
by Teddy Hogeborn
* mandos-monitor: Use new string format method. |
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: |
|
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
220 |
message = 'Client {} needs approval within {} seconds' |
24.1.153
by Björn Påhlsson
early commit to ease todays coding |
221 |
else: |
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
222 |
message = 'Client {} will get its secret in {} seconds' |
567
by Teddy Hogeborn
* mandos-monitor: Use new string format method. |
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): |
|
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
227 |
self.logger('Client {} was rejected; reason: {}' |
567
by Teddy Hogeborn
* mandos-monitor: Use new string format method. |
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"]: |
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
277 |
message = "Approval in {}. (d)eny?" |
24.1.159
by Björn Påhlsson
added approval to mandos-ctl |
278 |
else: |
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
279 |
message = "Denial in {}. (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' |
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
293 |
' gets disabled: {}' |
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) |
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
299 |
self._text = "{}{}".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 |
"""
|
|
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
407 |
def __init__(self, max_log_length=1000, log_level=1): |
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
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 |
||
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
451 |
self.log_level = log_level |
452 |
||
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
453 |
# We keep a reference to the log widget so we can remove it
|
454 |
# from the ListWalker without it getting destroyed
|
|
455 |
self.logbox = ConstrainedListBox(self.log) |
|
456 |
||
457 |
# This keeps track of whether self.uilist currently has
|
|
458 |
# self.logbox in it or not
|
|
459 |
self.log_visible = True |
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
460 |
self.log_wrap = "any" |
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
461 |
|
462 |
self.rebuild() |
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
463 |
self.log_message_raw(("bold", |
464 |
"Mandos Monitor version " + version)) |
|
465 |
self.log_message_raw(("bold", |
|
466 |
"q: Quit ?: Help")) |
|
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
467 |
|
468 |
self.busname = domain + '.Mandos' |
|
469 |
self.main_loop = gobject.MainLoop() |
|
470 |
||
409
by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message. |
471 |
def client_not_found(self, fingerprint, address): |
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
472 |
self.log_message("Client with address {} and fingerprint {}" |
473 |
" could not be found"
|
|
567
by Teddy Hogeborn
* mandos-monitor: Use new string format method. |
474 |
.format(address, fingerprint)) |
409
by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message. |
475 |
|
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
476 |
def rebuild(self): |
477 |
"""This rebuilds the User Interface. |
|
478 |
Call this when the widget layout needs to change"""
|
|
479 |
self.uilist = [] |
|
480 |
#self.uilist.append(urwid.ListBox(self.clients))
|
|
422
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
481 |
self.uilist.append(urwid.Frame(ConstrainedListBox(self. |
482 |
clients), |
|
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
483 |
#header=urwid.Divider(),
|
484 |
header=None, |
|
422
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
485 |
footer= |
486 |
urwid.Divider(div_char= |
|
487 |
self.divider))) |
|
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
488 |
if self.log_visible: |
489 |
self.uilist.append(self.logbox) |
|
490 |
self.topwidget = urwid.Pile(self.uilist) |
|
491 |
||
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
492 |
def log_message(self, message, level=1): |
612
by Björn Påhlsson
added note messages when mandos-monitor starts without running server, |
493 |
"""Log message formatted with timestamp""" |
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
494 |
if level < self.log_level: |
495 |
return
|
|
409
by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message. |
496 |
timestamp = datetime.datetime.now().isoformat() |
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
497 |
self.log_message_raw("{}: {}".format(timestamp, message), |
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
498 |
level=level) |
409
by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message. |
499 |
|
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
500 |
def log_message_raw(self, markup, level=1): |
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
501 |
"""Add a log message to the log buffer.""" |
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
502 |
if level < self.log_level: |
503 |
return
|
|
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
504 |
self.log.append(urwid.Text(markup, wrap=self.log_wrap)) |
505 |
if (self.max_log_length |
|
506 |
and len(self.log) > self.max_log_length): |
|
507 |
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 |
508 |
self.logbox.set_focus(len(self.logbox.body.contents), |
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
509 |
coming_from="above") |
409
by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message. |
510 |
self.refresh() |
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
511 |
|
512 |
def toggle_log_display(self): |
|
513 |
"""Toggle visibility of the log buffer.""" |
|
514 |
self.log_visible = not self.log_visible |
|
515 |
self.rebuild() |
|
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
516 |
self.log_message("Log visibility changed to: {}" |
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
517 |
.format(self.log_visible), level=0) |
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
518 |
|
519 |
def change_log_display(self): |
|
520 |
"""Change type of log display. |
|
521 |
Currently, this toggles wrapping of text lines."""
|
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
522 |
if self.log_wrap == "clip": |
523 |
self.log_wrap = "any" |
|
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
524 |
else: |
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
525 |
self.log_wrap = "clip" |
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
526 |
for textwidget in self.log: |
527 |
textwidget.set_wrap_mode(self.log_wrap) |
|
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
528 |
self.log_message("Wrap mode: {}".format(self.log_wrap), |
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
529 |
level=0) |
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
530 |
|
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
531 |
def find_and_remove_client(self, path, name): |
488
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Save match tag for |
532 |
"""Find a client by its object path and remove it. |
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
533 |
|
534 |
This is connected to the ClientRemoved signal from the
|
|
535 |
Mandos server object."""
|
|
536 |
try: |
|
537 |
client = self.clients_dict[path] |
|
538 |
except KeyError: |
|
539 |
# not found?
|
|
723.1.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
540 |
self.log_message("Unknown client {!r} ({!r}) removed" |
567
by Teddy Hogeborn
* mandos-monitor: Use new string format method. |
541 |
.format(name, path)) |
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
542 |
return
|
488
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Save match tag for |
543 |
client.delete() |
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
544 |
|
411
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
545 |
def add_new_client(self, path): |
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
546 |
client_proxy_object = self.bus.get_object(self.busname, path) |
547 |
self.add_client(MandosClientWidget(server_proxy_object |
|
548 |
=self.mandos_serv, |
|
549 |
proxy_object
|
|
550 |
=client_proxy_object, |
|
551 |
update_hook
|
|
552 |
=self.refresh, |
|
553 |
delete_hook
|
|
411
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
554 |
=self.remove_client, |
555 |
logger
|
|
556 |
=self.log_message), |
|
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
557 |
path=path) |
558 |
||
559 |
def add_client(self, client, path=None): |
|
560 |
self.clients.append(client) |
|
561 |
if path is None: |
|
562 |
path = client.proxy.object_path |
|
563 |
self.clients_dict[path] = client |
|
617
by Teddy Hogeborn
* mandos: Bug fix: Don't print output from checkers when running in |
564 |
self.clients.sort(key=lambda c: c.properties["Name"]) |
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
565 |
self.refresh() |
566 |
||
567 |
def remove_client(self, client, path=None): |
|
568 |
self.clients.remove(client) |
|
569 |
if path is None: |
|
570 |
path = client.proxy.object_path |
|
571 |
del self.clients_dict[path] |
|
572 |
self.refresh() |
|
573 |
||
574 |
def refresh(self): |
|
575 |
"""Redraw the screen""" |
|
576 |
canvas = self.topwidget.render(self.size, focus=True) |
|
577 |
self.screen.draw_screen(self.size, canvas) |
|
578 |
||
579 |
def run(self): |
|
580 |
"""Start the main loop and exit when it's done.""" |
|
537
by Björn Påhlsson
nicer stacktrace when mandos-monitor fail during startup |
581 |
self.bus = dbus.SystemBus() |
582 |
mandos_dbus_objc = self.bus.get_object( |
|
583 |
self.busname, "/", follow_name_owner_changes=True) |
|
584 |
self.mandos_serv = dbus.Interface(mandos_dbus_objc, |
|
585 |
dbus_interface
|
|
586 |
= server_interface) |
|
587 |
try: |
|
588 |
mandos_clients = (self.mandos_serv |
|
589 |
.GetAllClientsWithProperties()) |
|
612
by Björn Påhlsson
added note messages when mandos-monitor starts without running server, |
590 |
if not mandos_clients: |
591 |
self.log_message_raw(("bold", "Note: Server has no clients.")) |
|
537
by Björn Påhlsson
nicer stacktrace when mandos-monitor fail during startup |
592 |
except dbus.exceptions.DBusException: |
616
by Teddy Hogeborn
* mandos-ctl (string_to_delta): Try to parse RFC 3339 duration before |
593 |
self.log_message_raw(("bold", "Note: No Mandos server running.")) |
537
by Björn Påhlsson
nicer stacktrace when mandos-monitor fail during startup |
594 |
mandos_clients = dbus.Dictionary() |
595 |
||
596 |
(self.mandos_serv |
|
597 |
.connect_to_signal("ClientRemoved", |
|
598 |
self.find_and_remove_client, |
|
599 |
dbus_interface=server_interface, |
|
600 |
byte_arrays=True)) |
|
601 |
(self.mandos_serv |
|
602 |
.connect_to_signal("ClientAdded", |
|
603 |
self.add_new_client, |
|
604 |
dbus_interface=server_interface, |
|
605 |
byte_arrays=True)) |
|
606 |
(self.mandos_serv |
|
607 |
.connect_to_signal("ClientNotFound", |
|
608 |
self.client_not_found, |
|
609 |
dbus_interface=server_interface, |
|
610 |
byte_arrays=True)) |
|
617
by Teddy Hogeborn
* mandos: Bug fix: Don't print output from checkers when running in |
611 |
for path, client in mandos_clients.items(): |
537
by Björn Påhlsson
nicer stacktrace when mandos-monitor fail during startup |
612 |
client_proxy_object = self.bus.get_object(self.busname, |
613 |
path) |
|
614 |
self.add_client(MandosClientWidget(server_proxy_object |
|
615 |
=self.mandos_serv, |
|
616 |
proxy_object
|
|
617 |
=client_proxy_object, |
|
618 |
properties=client, |
|
619 |
update_hook
|
|
620 |
=self.refresh, |
|
621 |
delete_hook
|
|
622 |
=self.remove_client, |
|
623 |
logger
|
|
624 |
=self.log_message), |
|
625 |
path=path) |
|
580
by Teddy Hogeborn
* mandos-monitor: Speedup: Use properties from D-Bus |
626 |
|
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
627 |
self.refresh() |
628 |
self._input_callback_tag = (gobject.io_add_watch |
|
629 |
(sys.stdin.fileno(), |
|
630 |
gobject.IO_IN, |
|
631 |
self.process_input)) |
|
632 |
self.main_loop.run() |
|
633 |
# Main loop has finished, we should close everything now
|
|
634 |
gobject.source_remove(self._input_callback_tag) |
|
635 |
self.screen.stop() |
|
636 |
||
637 |
def stop(self): |
|
638 |
self.main_loop.quit() |
|
639 |
||
640 |
def process_input(self, source, condition): |
|
641 |
keys = self.screen.get_input() |
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
642 |
translations = { "ctrl n": "down", # Emacs |
643 |
"ctrl p": "up", # Emacs |
|
644 |
"ctrl v": "page down", # Emacs |
|
645 |
"meta v": "page up", # Emacs |
|
646 |
" ": "page down", # less |
|
647 |
"f": "page down", # less |
|
648 |
"b": "page up", # less |
|
649 |
"j": "down", # vi |
|
650 |
"k": "up", # vi |
|
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
651 |
}
|
652 |
for key in keys: |
|
653 |
try: |
|
654 |
key = translations[key] |
|
655 |
except KeyError: # :-) |
|
656 |
pass
|
|
657 |
||
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
658 |
if key == "q" or key == "Q": |
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
659 |
self.stop() |
660 |
break
|
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
661 |
elif key == "window resize": |
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
662 |
self.size = self.screen.get_cols_rows() |
663 |
self.refresh() |
|
722
by Teddy Hogeborn
mandos-monitor: Bug fix: Make Ctrl-L actually redraw the screen. |
664 |
elif key == "ctrl l": |
665 |
self.screen.clear() |
|
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
666 |
self.refresh() |
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
667 |
elif key == "l" or key == "D": |
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
668 |
self.toggle_log_display() |
669 |
self.refresh() |
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
670 |
elif key == "w" or key == "i": |
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
671 |
self.change_log_display() |
672 |
self.refresh() |
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
673 |
elif key == "?" or key == "f1" or key == "esc": |
407
by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S" |
674 |
if not self.log_visible: |
675 |
self.log_visible = True |
|
676 |
self.rebuild() |
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
677 |
self.log_message_raw(("bold", |
678 |
" ". |
|
679 |
join(("q: Quit", |
|
680 |
"?: Help", |
|
681 |
"l: Log window toggle", |
|
682 |
"TAB: Switch window", |
|
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
683 |
"w: Wrap (log lines)", |
684 |
"v: Toggle verbose log", |
|
685 |
))))
|
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
686 |
self.log_message_raw(("bold", |
687 |
" "
|
|
688 |
.join(("Clients:", |
|
689 |
"+: Enable", |
|
690 |
"-: Disable", |
|
691 |
"R: Remove", |
|
692 |
"s: Start new checker", |
|
693 |
"S: Stop checker", |
|
694 |
"C: Checker OK", |
|
695 |
"a: Approve", |
|
696 |
"d: Deny")))) |
|
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
697 |
self.refresh() |
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
698 |
elif key == "tab": |
405
by Teddy Hogeborn
* mandos-monitor (MandosClientPropertyCache): Remove conversion of |
699 |
if self.topwidget.get_focus() is self.logbox: |
700 |
self.topwidget.set_focus(0) |
|
701 |
else: |
|
702 |
self.topwidget.set_focus(self.logbox) |
|
703 |
self.refresh() |
|
713
by Teddy Hogeborn
mandos-monitor: New "verbose" mode to see less important log messages. |
704 |
elif key == "v": |
705 |
if self.log_level == 0: |
|
706 |
self.log_level = 1 |
|
707 |
self.log_message("Verbose mode: Off") |
|
708 |
else: |
|
709 |
self.log_level = 0 |
|
710 |
self.log_message("Verbose mode: On") |
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
711 |
#elif (key == "end" or key == "meta >" or key == "G"
|
712 |
# or key == ">"):
|
|
407
by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S" |
713 |
# pass # xxx end-of-buffer
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
714 |
#elif (key == "home" or key == "meta <" or key == "g"
|
715 |
# or key == "<"):
|
|
407
by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S" |
716 |
# pass # xxx beginning-of-buffer
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
717 |
#elif key == "ctrl e" or key == "$":
|
407
by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S" |
718 |
# pass # xxx move-end-of-line
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
719 |
#elif key == "ctrl a" or key == "^":
|
407
by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S" |
720 |
# pass # xxx move-beginning-of-line
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
721 |
#elif key == "ctrl b" or key == "meta (" or key == "h":
|
407
by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S" |
722 |
# pass # xxx left
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
723 |
#elif key == "ctrl f" or key == "meta )" or key == "l":
|
407
by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S" |
724 |
# pass # xxx right
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
725 |
#elif key == "a":
|
407
by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S" |
726 |
# pass # scroll up log
|
463.1.2
by teddy at bsnet
* mandos-monitor: Use unicode string literals. Update __future__ |
727 |
#elif key == "z":
|
407
by Teddy Hogeborn
* mandos-monitor (MandosClientWidget): Change "StopChecker" key to "S" |
728 |
# pass # scroll down log
|
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
729 |
elif self.topwidget.selectable(): |
730 |
self.topwidget.keypress(self.size, key) |
|
731 |
self.refresh() |
|
732 |
return True |
|
733 |
||
734 |
ui = UserInterface() |
|
735 |
try: |
|
736 |
ui.run() |
|
24.1.159
by Björn Påhlsson
added approval to mandos-ctl |
737 |
except KeyboardInterrupt: |
738 |
ui.screen.stop() |
|
617
by Teddy Hogeborn
* mandos: Bug fix: Don't print output from checkers when running in |
739 |
except Exception as e: |
740 |
ui.log_message(str(e)) |
|
404
by Teddy Hogeborn
* mandos-monitor: New prototype version of interactive server |
741 |
ui.screen.stop() |
742 |
raise
|