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