/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-monitor

* mandos (MandosServer.handle_ipc): Better log message.
  (main/MandosDBusService.ClientNotFound): Add "address" argument.
                                           All callers changed.
* mandos-monitor (MandosClientWidget.__init__): Add "logger" argument.
  (MandosClientWidget.checker_completed,
  MandosClientWidget.checker_started, MandosClientWidget.got_secret,
  MandosClientWidget.rejected): New methods, connected to signals.
  (MandosClientWidget.update): Improve display.
  (UserInterface.client_not_found): New method, conneced to signal.
  (UserInterface.log_message): New; log with timestamp.
  (UserInterface.log_message_raw): Same as old "log_message".  Bug
                                  fix; always do "refresh()".

Show diffs side-by-side

added added

removed removed

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