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