/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: 2012-05-07 19:13:15 UTC
  • Revision ID: teddy@recompile.se-20120507191315-tbe55n4u1uq3l7ft
* mandos: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

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