/mandos/release

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