/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: 2019-11-03 19:09:41 UTC
  • Revision ID: teddy@recompile.se-20191103190941-9gfivh2mjuvi4z3f
Add -I option to python 3 on the interpreter script ("shebang") line

* mandos: Add -I option to /usr/bin/python3.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

Show diffs side-by-side

added added

removed removed

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