/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: teddy at bsnet
  • Date: 2010-08-31 18:22:25 UTC
  • mto: (24.1.154 mandos)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: teddy@fukt.bsnet.se-20100831182225-sad2cgilj3jeduab
* mandos-monitor (MandosClientWidget): Accept new signal
                                       "NeedApproval".
  (MandosClientWidget.checker_completed): Don't log successful
                                          checkers.
  (MandosClientWidget.checker_started): Don't log.
  (MandosClientWidget.need_approval): New; just log a message.
  (MandosClientWidget.rejected): Take an additional "reason" argument.
  (MandosClientWidget.keypress): Accept "+" and "-" keys to accept or
                                 reject, respectively.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
 
20
import UserList
 
21
 
46
22
import locale
47
23
 
 
24
locale.setlocale(locale.LC_ALL, u'')
 
25
 
48
26
import logging
49
 
 
50
 
if sys.version_info.major == 2:
51
 
    str = unicode
52
 
 
53
 
locale.setlocale(locale.LC_ALL, '')
54
 
 
55
27
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
56
28
 
57
29
# Some useful constants
58
 
domain = 'se.recompile'
 
30
domain = 'se.bsnet.fukt'
59
31
server_interface = domain + '.Mandos'
60
32
client_interface = domain + '.Mandos.Client'
61
 
version = "1.7.14"
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
 
 
 
33
version = "1.0.15"
 
34
 
 
35
# Always run in monochrome mode
 
36
urwid.curses_display.curses.has_colors = lambda : False
 
37
 
 
38
# Urwid doesn't support blinking, but we want it.  Since we have no
 
39
# use for underline on its own, we make underline also always blink.
 
40
urwid.curses_display.curses.A_UNDERLINE |= (
 
41
    urwid.curses_display.curses.A_BLINK)
85
42
 
86
43
class MandosClientPropertyCache(object):
87
44
    """This wraps a Mandos Client D-Bus proxy object, caches the
88
45
    properties and calls a hook function when any of them are
89
46
    changed.
90
47
    """
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.
 
48
    def __init__(self, proxy_object=None, *args, **kwargs):
 
49
        self.proxy = proxy_object # Mandos Client proxy object
 
50
        
 
51
        self.properties = dict()
 
52
        self.proxy.connect_to_signal(u"PropertyChanged",
 
53
                                     self.property_changed,
 
54
                                     client_interface,
 
55
                                     byte_arrays=True)
 
56
        
 
57
        self.properties.update(
 
58
            self.proxy.GetAll(client_interface,
 
59
                              dbus_interface = dbus.PROPERTIES_IFACE))
 
60
        super(MandosClientPropertyCache, self).__init__(
 
61
            proxy_object=proxy_object, *args, **kwargs)
 
62
    
 
63
    def property_changed(self, property=None, value=None):
 
64
        """This is called whenever we get a PropertyChanged signal
 
65
        It updates the changed property in the "properties" dict.
110
66
        """
111
67
        # 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()
 
68
        self.properties[property] = value
117
69
 
118
70
 
119
71
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
120
72
    """A Mandos Client which is visible on the screen.
121
73
    """
122
 
 
 
74
    
123
75
    def __init__(self, server_proxy_object=None, update_hook=None,
124
 
                 delete_hook=None, logger=None, **kwargs):
 
76
                 delete_hook=None, logger=None, *args, **kwargs):
125
77
        # Called on update
126
78
        self.update_hook = update_hook
127
79
        # Called on delete
130
82
        self.server_proxy_object = server_proxy_object
131
83
        # Logger
132
84
        self.logger = logger
133
 
 
134
 
        self._update_timer_callback_tag = None
135
 
 
 
85
        
136
86
        # The widget shown normally
137
 
        self._text_widget = urwid.Text("")
 
87
        self._text_widget = urwid.Text(u"")
138
88
        # The widget shown when we have focus
139
 
        self._focus_text_widget = urwid.Text("")
140
 
        super(MandosClientWidget, self).__init__(**kwargs)
 
89
        self._focus_text_widget = urwid.Text(u"")
 
90
        super(MandosClientWidget, self).__init__(
 
91
            update_hook=update_hook, delete_hook=delete_hook,
 
92
            *args, **kwargs)
141
93
        self.update()
142
94
        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
 
 
 
95
        self.proxy.connect_to_signal(u"CheckerCompleted",
 
96
                                     self.checker_completed,
 
97
                                     client_interface,
 
98
                                     byte_arrays=True)
 
99
        self.proxy.connect_to_signal(u"CheckerStarted",
 
100
                                     self.checker_started,
 
101
                                     client_interface,
 
102
                                     byte_arrays=True)
 
103
        self.proxy.connect_to_signal(u"GotSecret",
 
104
                                     self.got_secret,
 
105
                                     client_interface,
 
106
                                     byte_arrays=True)
 
107
        self.proxy.connect_to_signal(u"NeedApproval",
 
108
                                     self.need_approval,
 
109
                                     client_interface,
 
110
                                     byte_arrays=True)
 
111
        self.proxy.connect_to_signal(u"Rejected",
 
112
                                     self.rejected,
 
113
                                     client_interface,
 
114
                                     byte_arrays=True)
 
115
    
181
116
    def checker_completed(self, exitstatus, condition, command):
182
117
        if exitstatus == 0:
183
 
            self.logger('Checker for client {} (command "{}")'
184
 
                        ' succeeded'.format(self.properties["Name"],
185
 
                                            command), level=0)
186
 
            self.update()
 
118
            #self.logger(u'Checker for client %s (command "%s")'
 
119
            #            u' was successful'
 
120
            #            % (self.properties[u"name"], command))
187
121
            return
188
 
        # Checker failed
189
122
        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
 
 
 
123
            self.logger(u'Checker for client %s (command "%s")'
 
124
                        u' failed with exit code %s'
 
125
                        % (self.properties[u"name"], command,
 
126
                           os.WEXITSTATUS(condition)))
 
127
            return
 
128
        if os.WIFSIGNALED(condition):
 
129
            self.logger(u'Checker for client %s (command "%s")'
 
130
                        u' was killed by signal %s'
 
131
                        % (self.properties[u"name"], command,
 
132
                           os.WTERMSIG(condition)))
 
133
            return
 
134
        if os.WCOREDUMP(condition):
 
135
            self.logger(u'Checker for client %s (command "%s")'
 
136
                        u' dumped core'
 
137
                        % (self.properties[u"name"], command))
 
138
        self.logger(u'Checker for client %s completed mysteriously')
 
139
    
201
140
    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
 
 
 
141
        #self.logger(u'Client %s started checker "%s"'
 
142
        #            % (self.properties[u"name"], unicode(command)))
 
143
        pass
 
144
    
207
145
    def got_secret(self):
208
 
        self.logger('Client {} received its secret'
209
 
                    .format(self.properties["Name"]))
210
 
 
 
146
        self.logger(u'Client %s received its secret'
 
147
                    % self.properties[u"name"])
 
148
    
211
149
    def need_approval(self, timeout, default):
212
150
        if not default:
213
 
            message = 'Client {} needs approval within {} seconds'
 
151
            message = u'Client %s needs approval within %s seconds'
214
152
        else:
215
 
            message = 'Client {} will get its secret in {} seconds'
216
 
        self.logger(message.format(self.properties["Name"],
217
 
                                   timeout/1000))
218
 
 
 
153
            message = u'Client %s will get its secret in %s seconds'
 
154
        self.logger(message
 
155
                    % (self.properties[u"name"], timeout/1000))
 
156
    
219
157
    def rejected(self, reason):
220
 
        self.logger('Client {} was rejected; reason: {}'
221
 
                    .format(self.properties["Name"], reason))
222
 
 
 
158
        self.logger(u'Client %s was rejected; reason: %s'
 
159
                    % (self.properties[u"name"], reason))
 
160
    
223
161
    def selectable(self):
224
162
        """Make this a "selectable" widget.
225
163
        This overrides the method from urwid.FlowWidget."""
226
164
        return True
227
 
 
228
 
    def rows(self, maxcolrow, focus=False):
 
165
    
 
166
    def rows(self, (maxcol,), focus=False):
229
167
        """How many rows this widget will occupy might depend on
230
168
        whether we have focus or not.
231
169
        This overrides the method from urwid.FlowWidget"""
232
 
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
233
 
 
 
170
        return self.current_widget(focus).rows((maxcol,), focus=focus)
 
171
    
234
172
    def current_widget(self, focus=False):
235
173
        if focus or self.opened:
236
174
            return self._focus_widget
237
175
        return self._widget
238
 
 
 
176
    
239
177
    def update(self):
240
178
        "Called when what is visible on the screen should be updated."
241
179
        # 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
 
 
 
180
        with_standout = { u"normal": u"standout",
 
181
                          u"bold": u"bold-standout",
 
182
                          u"underline-blink":
 
183
                              u"underline-blink-standout",
 
184
                          u"bold-underline-blink":
 
185
                              u"bold-underline-blink-standout",
 
186
                          }
 
187
        
250
188
        # 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
 
 
 
189
        self._text = (u'%(name)s: %(enabled)s'
 
190
                      % { u"name": self.properties[u"name"],
 
191
                          u"enabled":
 
192
                              (u"enabled"
 
193
                               if self.properties[u"enabled"]
 
194
                               else u"DISABLED")})
293
195
        if not urwid.supports_unicode():
294
196
            self._text = self._text.encode("ascii", "replace")
295
 
        textlist = [("normal", self._text)]
 
197
        textlist = [(u"normal", self._text)]
296
198
        self._text_widget.set_text(textlist)
297
199
        self._focus_text_widget.set_text([(with_standout[text[0]],
298
200
                                           text[1])
305
207
        # Run update hook, if any
306
208
        if self.update_hook is not None:
307
209
            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 = ()
 
210
    
 
211
    def delete(self):
323
212
        if self.delete_hook is not None:
324
213
            self.delete_hook(self)
325
 
        return super(MandosClientWidget, self).delete(**kwargs)
326
 
 
327
 
    def render(self, maxcolrow, focus=False):
 
214
    
 
215
    def render(self, (maxcol,), focus=False):
328
216
        """Render differently if we have focus.
329
217
        This overrides the method from urwid.FlowWidget"""
330
 
        return self.current_widget(focus).render(maxcolrow,
 
218
        return self.current_widget(focus).render((maxcol,),
331
219
                                                 focus=focus)
332
 
 
333
 
    def keypress(self, maxcolrow, key):
 
220
    
 
221
    def keypress(self, (maxcol,), key):
334
222
        """Handle keys.
335
223
        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":
 
224
        if key == u"e" or key == u"+":
 
225
            self.proxy.Enable()
 
226
        elif key == u"d" or key == u"-":
 
227
            self.proxy.Disable()
 
228
        elif key == u"r" or key == u"_" or key == u"ctrl k":
353
229
            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)
 
230
                                                  .object_path)
 
231
        elif key == u"s":
 
232
            self.proxy.StartChecker()
 
233
        elif key == u"S":
 
234
            self.proxy.StopChecker()
 
235
        elif key == u"C":
 
236
            self.proxy.CheckedOK()
367
237
        # xxx
368
 
#         elif key == "p" or key == "=":
 
238
#         elif key == u"p" or key == "=":
369
239
#             self.proxy.pause()
370
 
#         elif key == "u" or key == ":":
 
240
#         elif key == u"u" or key == ":":
371
241
#             self.proxy.unpause()
372
 
#         elif key == "RET":
 
242
#         elif key == u"RET":
373
243
#             self.open()
 
244
        elif key == u"+":
 
245
            self.proxy.Approve(True)
 
246
        elif key == u"-":
 
247
            self.proxy.Approve(False)
374
248
        else:
375
249
            return key
376
 
 
377
 
    def properties_changed(self, interface, properties, invalidated):
378
 
        """Call self.update() if any properties changed.
 
250
    
 
251
    def property_changed(self, property=None, value=None,
 
252
                         *args, **kwargs):
 
253
        """Call self.update() if old value is not new value.
379
254
        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):
 
255
        property_name = unicode(property)
 
256
        old_value = self.properties.get(property_name)
 
257
        super(MandosClientWidget, self).property_changed(
 
258
            property=property, value=value, *args, **kwargs)
 
259
        if self.properties.get(property_name) != old_value:
386
260
            self.update()
387
261
 
388
262
 
391
265
    "down" key presses, thus not allowing any containing widgets to
392
266
    use them as an excuse to shift focus away from this widget.
393
267
    """
394
 
    def keypress(self, *args, **kwargs):
395
 
        ret = (super(ConstrainedListBox, self)
396
 
               .keypress(*args, **kwargs))
397
 
        if ret in ("up", "down"):
 
268
    def keypress(self, (maxcol, maxrow), key):
 
269
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
 
270
        if ret in (u"up", u"down"):
398
271
            return
399
272
        return ret
400
273
 
403
276
    """This is the entire user interface - the whole screen
404
277
    with boxes, lists of client widgets, etc.
405
278
    """
406
 
    def __init__(self, max_log_length=1000, log_level=1):
 
279
    def __init__(self, max_log_length=1000):
407
280
        DBusGMainLoop(set_as_default=True)
408
 
 
 
281
        
409
282
        self.screen = urwid.curses_display.Screen()
410
 
 
 
283
        
411
284
        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"),
 
285
                (u"normal",
 
286
                 u"default", u"default", None),
 
287
                (u"bold",
 
288
                 u"default", u"default", u"bold"),
 
289
                (u"underline-blink",
 
290
                 u"default", u"default", u"underline"),
 
291
                (u"standout",
 
292
                 u"default", u"default", u"standout"),
 
293
                (u"bold-underline-blink",
 
294
                 u"default", u"default", (u"bold", u"underline")),
 
295
                (u"bold-standout",
 
296
                 u"default", u"default", (u"bold", u"standout")),
 
297
                (u"underline-blink-standout",
 
298
                 u"default", u"default", (u"underline", u"standout")),
 
299
                (u"bold-underline-blink-standout",
 
300
                 u"default", u"default", (u"bold", u"underline",
 
301
                                          u"standout")),
431
302
                ))
432
 
 
 
303
        
433
304
        if urwid.supports_unicode():
434
 
            self.divider = "─"  # \u2500
 
305
            self.divider = u"─" # \u2500
 
306
            #self.divider = u"━" # \u2501
435
307
        else:
436
 
            self.divider = "_"  # \u005f
437
 
 
 
308
            #self.divider = u"-" # \u002d
 
309
            self.divider = u"_" # \u005f
 
310
        
438
311
        self.screen.start()
439
 
 
 
312
        
440
313
        self.size = self.screen.get_cols_rows()
441
 
 
 
314
        
442
315
        self.clients = urwid.SimpleListWalker([])
443
316
        self.clients_dict = {}
444
 
 
 
317
        
445
318
        # We will add Text widgets to this list
446
319
        self.log = []
447
320
        self.max_log_length = max_log_length
448
 
 
449
 
        self.log_level = log_level
450
 
 
 
321
        
451
322
        # We keep a reference to the log widget so we can remove it
452
323
        # from the ListWalker without it getting destroyed
453
324
        self.logbox = ConstrainedListBox(self.log)
454
 
 
 
325
        
455
326
        # This keeps track of whether self.uilist currently has
456
327
        # self.logbox in it or not
457
328
        self.log_visible = True
458
 
        self.log_wrap = "any"
459
 
 
 
329
        self.log_wrap = u"any"
 
330
        
460
331
        self.rebuild()
461
 
        self.log_message_raw(("bold",
462
 
                              "Mandos Monitor version " + version))
463
 
        self.log_message_raw(("bold",
464
 
                              "q: Quit  ?: Help"))
465
 
 
 
332
        self.log_message_raw((u"bold",
 
333
                              u"Mandos Monitor version " + version))
 
334
        self.log_message_raw((u"bold",
 
335
                              u"q: Quit  ?: Help"))
 
336
        
466
337
        self.busname = domain + '.Mandos'
467
 
        self.main_loop = GLib.MainLoop()
468
 
 
 
338
        self.main_loop = gobject.MainLoop()
 
339
        self.bus = dbus.SystemBus()
 
340
        mandos_dbus_objc = self.bus.get_object(
 
341
            self.busname, u"/", follow_name_owner_changes=True)
 
342
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
343
                                          dbus_interface
 
344
                                          = server_interface)
 
345
        try:
 
346
            mandos_clients = (self.mandos_serv
 
347
                              .GetAllClientsWithProperties())
 
348
        except dbus.exceptions.DBusException:
 
349
            mandos_clients = dbus.Dictionary()
 
350
        
 
351
        (self.mandos_serv
 
352
         .connect_to_signal(u"ClientRemoved",
 
353
                            self.find_and_remove_client,
 
354
                            dbus_interface=server_interface,
 
355
                            byte_arrays=True))
 
356
        (self.mandos_serv
 
357
         .connect_to_signal(u"ClientAdded",
 
358
                            self.add_new_client,
 
359
                            dbus_interface=server_interface,
 
360
                            byte_arrays=True))
 
361
        (self.mandos_serv
 
362
         .connect_to_signal(u"ClientNotFound",
 
363
                            self.client_not_found,
 
364
                            dbus_interface=server_interface,
 
365
                            byte_arrays=True))
 
366
        for path, client in mandos_clients.iteritems():
 
367
            client_proxy_object = self.bus.get_object(self.busname,
 
368
                                                      path)
 
369
            self.add_client(MandosClientWidget(server_proxy_object
 
370
                                               =self.mandos_serv,
 
371
                                               proxy_object
 
372
                                               =client_proxy_object,
 
373
                                               properties=client,
 
374
                                               update_hook
 
375
                                               =self.refresh,
 
376
                                               delete_hook
 
377
                                               =self.remove_client,
 
378
                                               logger
 
379
                                               =self.log_message),
 
380
                            path=path)
 
381
    
469
382
    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
 
 
 
383
        self.log_message((u"Client with address %s and fingerprint %s"
 
384
                          u" could not be found" % (address,
 
385
                                                    fingerprint)))
 
386
    
474
387
    def rebuild(self):
475
388
        """This rebuilds the User Interface.
476
389
        Call this when the widget layout needs to change"""
477
390
        self.uilist = []
478
 
        # self.uilist.append(urwid.ListBox(self.clients))
479
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
480
 
                                                          clients),
481
 
                                       # header=urwid.Divider(),
 
391
        #self.uilist.append(urwid.ListBox(self.clients))
 
392
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
 
393
                                       #header=urwid.Divider(),
482
394
                                       header=None,
483
 
                                       footer=urwid.Divider(
484
 
                                           div_char=self.divider)))
 
395
                                       footer=urwid.Divider(div_char=self.divider)))
485
396
        if self.log_visible:
486
397
            self.uilist.append(self.logbox)
 
398
            pass
487
399
        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
 
400
    
 
401
    def log_message(self, message):
493
402
        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):
 
403
        self.log_message_raw(timestamp + u": " + message)
 
404
    
 
405
    def log_message_raw(self, markup):
498
406
        """Add a log message to the log buffer."""
499
 
        if level < self.log_level:
500
 
            return
501
407
        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]
 
408
        if (self.max_log_length
 
409
            and len(self.log) > self.max_log_length):
 
410
            del self.log[0:len(self.log)-self.max_log_length-1]
505
411
        self.logbox.set_focus(len(self.logbox.body.contents),
506
 
                              coming_from="above")
 
412
                              coming_from=u"above")
507
413
        self.refresh()
508
 
 
 
414
    
509
415
    def toggle_log_display(self):
510
416
        """Toggle visibility of the log buffer."""
511
417
        self.log_visible = not self.log_visible
512
418
        self.rebuild()
513
 
        self.log_message("Log visibility changed to: {}"
514
 
                         .format(self.log_visible), level=0)
515
 
 
 
419
        self.log_message(u"Log visibility changed to: "
 
420
                         + unicode(self.log_visible))
 
421
    
516
422
    def change_log_display(self):
517
423
        """Change type of log display.
518
424
        Currently, this toggles wrapping of text lines."""
519
 
        if self.log_wrap == "clip":
520
 
            self.log_wrap = "any"
 
425
        if self.log_wrap == u"clip":
 
426
            self.log_wrap = u"any"
521
427
        else:
522
 
            self.log_wrap = "clip"
 
428
            self.log_wrap = u"clip"
523
429
        for textwidget in self.log:
524
430
            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
 
431
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
432
    
 
433
    def find_and_remove_client(self, path, name):
 
434
        """Find an client from its object path and remove it.
 
435
        
 
436
        This is connected to the ClientRemoved signal from the
532
437
        Mandos server object."""
533
 
        if client_interface not in interfaces:
534
 
            # Not a Mandos client object; ignore
535
 
            return
536
438
        try:
537
439
            client = self.clients_dict[path]
538
440
        except KeyError:
539
441
            # 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
 
442
            return
 
443
        self.remove_client(client, path)
 
444
    
 
445
    def add_new_client(self, path):
554
446
        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])),
 
447
        self.add_client(MandosClientWidget(server_proxy_object
 
448
                                           =self.mandos_serv,
 
449
                                           proxy_object
 
450
                                           =client_proxy_object,
 
451
                                           update_hook
 
452
                                           =self.refresh,
 
453
                                           delete_hook
 
454
                                           =self.remove_client,
 
455
                                           logger
 
456
                                           =self.log_message),
562
457
                        path=path)
563
 
 
 
458
    
564
459
    def add_client(self, client, path=None):
565
460
        self.clients.append(client)
566
461
        if path is None:
567
462
            path = client.proxy.object_path
568
463
        self.clients_dict[path] = client
569
 
        self.clients.sort(key=lambda c: c.properties["Name"])
 
464
        self.clients.sort(None, lambda c: c.properties[u"name"])
570
465
        self.refresh()
571
 
 
 
466
    
572
467
    def remove_client(self, client, path=None):
573
468
        self.clients.remove(client)
574
469
        if path is None:
575
470
            path = client.proxy.object_path
576
471
        del self.clients_dict[path]
 
472
        if not self.clients_dict:
 
473
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
 
474
            # is completely emptied, we need to recreate it.
 
475
            self.clients = urwid.SimpleListWalker([])
 
476
            self.rebuild()
577
477
        self.refresh()
578
 
 
 
478
    
579
479
    def refresh(self):
580
480
        """Redraw the screen"""
581
481
        canvas = self.topwidget.render(self.size, focus=True)
582
482
        self.screen.draw_screen(self.size, canvas)
583
 
 
 
483
    
584
484
    def run(self):
585
485
        """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
486
        self.refresh()
630
 
        self._input_callback_tag = (GLib.io_add_watch
 
487
        self._input_callback_tag = (gobject.io_add_watch
631
488
                                    (sys.stdin.fileno(),
632
 
                                     GLib.IO_IN,
 
489
                                     gobject.IO_IN,
633
490
                                     self.process_input))
634
491
        self.main_loop.run()
635
492
        # Main loop has finished, we should close everything now
636
 
        GLib.source_remove(self._input_callback_tag)
 
493
        gobject.source_remove(self._input_callback_tag)
637
494
        self.screen.stop()
638
 
 
 
495
    
639
496
    def stop(self):
640
497
        self.main_loop.quit()
641
 
 
 
498
    
642
499
    def process_input(self, source, condition):
643
500
        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
 
                        }
 
501
        translations = { u"ctrl n": u"down",      # Emacs
 
502
                         u"ctrl p": u"up",        # Emacs
 
503
                         u"ctrl v": u"page down", # Emacs
 
504
                         u"meta v": u"page up",   # Emacs
 
505
                         u" ": u"page down",      # less
 
506
                         u"f": u"page down",      # less
 
507
                         u"b": u"page up",        # less
 
508
                         u"j": u"down",           # vi
 
509
                         u"k": u"up",             # vi
 
510
                         }
654
511
        for key in keys:
655
512
            try:
656
513
                key = translations[key]
657
514
            except KeyError:    # :-)
658
515
                pass
659
 
 
660
 
            if key == "q" or key == "Q":
 
516
            
 
517
            if key == u"q" or key == u"Q":
661
518
                self.stop()
662
519
                break
663
 
            elif key == "window resize":
 
520
            elif key == u"window resize":
664
521
                self.size = self.screen.get_cols_rows()
665
522
                self.refresh()
666
 
            elif key == "ctrl l":
667
 
                self.screen.clear()
 
523
            elif key == u"\f":  # Ctrl-L
668
524
                self.refresh()
669
 
            elif key == "l" or key == "D":
 
525
            elif key == u"l" or key == u"D":
670
526
                self.toggle_log_display()
671
527
                self.refresh()
672
 
            elif key == "w" or key == "i":
 
528
            elif key == u"w" or key == u"i":
673
529
                self.change_log_display()
674
530
                self.refresh()
675
 
            elif key == "?" or key == "f1" or key == "esc":
 
531
            elif key == u"?" or key == u"f1" or key == u"esc":
676
532
                if not self.log_visible:
677
533
                    self.log_visible = True
678
534
                    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"))))
 
535
                self.log_message_raw((u"bold",
 
536
                                      u"  ".
 
537
                                      join((u"q: Quit",
 
538
                                            u"?: Help",
 
539
                                            u"l: Log window toggle",
 
540
                                            u"TAB: Switch window",
 
541
                                            u"w: Wrap (log)"))))
 
542
                self.log_message_raw((u"bold",
 
543
                                      u"  "
 
544
                                      .join((u"Clients:",
 
545
                                             u"e: Enable",
 
546
                                             u"d: Disable",
 
547
                                             u"r: Remove",
 
548
                                             u"s: Start new checker",
 
549
                                             u"S: Stop checker",
 
550
                                             u"C: Checker OK"))))
699
551
                self.refresh()
700
 
            elif key == "tab":
 
552
            elif key == u"tab":
701
553
                if self.topwidget.get_focus() is self.logbox:
702
554
                    self.topwidget.set_focus(0)
703
555
                else:
704
556
                    self.topwidget.set_focus(self.logbox)
705
557
                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
 
558
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
559
            #      or key == u">"):
 
560
            #    pass            # xxx end-of-buffer
 
561
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
562
            #      or key == u"<"):
 
563
            #    pass            # xxx beginning-of-buffer
 
564
            #elif key == u"ctrl e" or key == u"$":
 
565
            #    pass            # xxx move-end-of-line
 
566
            #elif key == u"ctrl a" or key == u"^":
 
567
            #    pass            # xxx move-beginning-of-line
 
568
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
 
569
            #    pass            # xxx left
 
570
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
 
571
            #    pass            # xxx right
 
572
            #elif key == u"a":
 
573
            #    pass            # scroll up log
 
574
            #elif key == u"z":
 
575
            #    pass            # scroll down log
731
576
            elif self.topwidget.selectable():
732
577
                self.topwidget.keypress(self.size, key)
733
578
                self.refresh()
734
579
        return True
735
580
 
736
 
 
737
581
ui = UserInterface()
738
582
try:
739
583
    ui.run()
740
 
except KeyboardInterrupt:
741
 
    ui.screen.stop()
742
 
except Exception as e:
743
 
    ui.log_message(str(e))
 
584
except Exception, e:
 
585
    ui.log_message(unicode(e))
744
586
    ui.screen.stop()
745
587
    raise