/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2017-02-21 18:23:54 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 358.
  • Revision ID: teddy@recompile.se-20170221182354-qjl75f74t02bbm5n
Suppress lintian warning about lsb-base dependency

This warning is erroneous since we do depend on lsb-base, we just also
depend on systemd-sysv as an alternative, since if that is installed,
the /etc/init.d/mandos script (which is the thing which actually
requires lsb-base) is never run anyway.  Suppress this warning.

* debian/mandos.lintian-overrides (mandos): Add new line
  "init.d-script-needs-depends-on-lsb-base etc/init.d/mandos (line
  49)"

Show diffs side-by-side

added added

removed removed

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