/mandos/trunk

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