/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2012-01-15 21:07:44 UTC
  • Revision ID: teddy@recompile.se-20120115210744-xc33sww1zxrk92s9
Tags: version-1.5.3-1
* Makefile (version): Changed to "1.5.3".
* NEWS (Version 1.5.3): New entry.
* debian/changelog (1.5.3-1): - '' -

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