/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2013-10-28 08:38:47 UTC
  • Revision ID: teddy@recompile.se-20131028083847-cper3srg5o29r2ge
Use architecture libdir.

Instead of always using /usr/lib/mandos, use whatever the architecture
specifies, like /usr/lib/x86_64-linux-gnu/mandos or /usr/lib64/mandos.
Still use /usr/lib/mandos as a fallback.

* Makefile (LIBDIR): New.
 (install-client-nokey, uninstall-client): Use LIBDIR instead of
                                           $(PREFIX)/lib.
* initramfs-tools-hook: Detect correct libdir and copy from there.

Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>

Show diffs side-by-side

added added

removed removed

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