/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-05 09:27:47 UTC
  • Revision ID: teddy@recompile.se-20120505092747-d8s061chuhlt961h
* mandos-ctl (print_clients): Bug fix: Don't show "Extended Timeout"
                              as milliseconds.

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