/mandos/trunk

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