/mandos/trunk

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