/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-08-20 14:41:20 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 360.
  • Revision ID: teddy@recompile.se-20170820144120-ee0hsyhvo1geg8ms
Handle multiple lines better in cryptroot file.

* initramfs-tools-script: Avoid running plugin-runner more than once
  if the root file system device is specially marked in the cryptroot
  file.  Also never run plugin-runner for a resume (usually swap)
  device.

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