/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

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