/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2019-11-03 19:17:57 UTC
  • mto: This revision was merged to the branch mainline in revision 396.
  • Revision ID: teddy@recompile.se-20191103191757-1hdpp0u5fxa8iumo
INSTALL: Add "-" argument to "su" invocations.

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 %s' % (self.properties["Name"]))
176
 
    
177
 
    def property_changed(self, property=None, value=None):
178
 
        super(self, MandosClientWidget).property_changed(property,
179
 
                                                         value)
180
 
        if property == "ApprovalPending":
181
 
            using_timer(bool(value))
182
 
        if property == "LastCheckerStatus":
183
 
            using_timer(value != 0)
184
 
            #self.logger('Checker for client %s (command "%s")'
185
 
            #            ' was successful'
186
 
            #            % (self.properties["Name"], command))
187
 
    
 
168
        log.debug("Created client %s", self.properties["Name"])
 
169
 
188
170
    def using_timer(self, flag):
189
171
        """Call this method with True or False when timer should be
190
172
        activated or deactivated.
191
173
        """
192
 
        old = self._update_timer_callback_lock
193
 
        if flag:
194
 
            self._update_timer_callback_lock += 1
195
 
        else:
196
 
            self._update_timer_callback_lock -= 1
197
 
        if old == 0 and self._update_timer_callback_lock:
 
174
        if flag and self._update_timer_callback_tag is None:
198
175
            # Will update the shown timer value every second
199
 
            self._update_timer_callback_tag = (gobject.timeout_add
200
 
                                               (1000,
201
 
                                                self.update_timer))
202
 
        elif old and self._update_timer_callback_lock == 0:
203
 
            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)
204
181
            self._update_timer_callback_tag = None
205
 
    
 
182
 
206
183
    def checker_completed(self, exitstatus, condition, command):
207
184
        if exitstatus == 0:
 
185
            log.debug('Checker for client %s (command "%s")'
 
186
                      " succeeded", self.properties["Name"], command)
208
187
            self.update()
209
188
            return
210
189
        # Checker failed
211
190
        if os.WIFEXITED(condition):
212
 
            self.logger('Checker for client %s (command "%s")'
213
 
                        ' failed with exit code %s'
214
 
                        % (self.properties["Name"], command,
215
 
                           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))
216
194
        elif os.WIFSIGNALED(condition):
217
 
            self.logger('Checker for client %s (command "%s")'
218
 
                        ' was killed by signal %s'
219
 
                        % (self.properties["Name"], command,
220
 
                           os.WTERMSIG(condition)))
221
 
        elif os.WCOREDUMP(condition):
222
 
            self.logger('Checker for client %s (command "%s")'
223
 
                        ' dumped core'
224
 
                        % (self.properties["Name"], command))
225
 
        else:
226
 
            self.logger('Checker for client %s completed'
227
 
                        ' mysteriously')
 
195
            log.info('Checker for client %s (command "%s") was'
 
196
                     " killed by signal %d", self.properties["Name"],
 
197
                     command, os.WTERMSIG(condition))
228
198
        self.update()
229
 
    
 
199
 
230
200
    def checker_started(self, command):
231
 
        """Server signals that a checker started. This could be useful
232
 
           to log in the future. """
233
 
        #self.logger('Client %s started checker "%s"'
234
 
        #            % (self.properties["Name"], unicode(command)))
235
 
        pass
236
 
    
 
201
        """Server signals that a checker started."""
 
202
        log.debug('Client %s started checker "%s"',
 
203
                  self.properties["Name"], command)
 
204
 
237
205
    def got_secret(self):
238
 
        self.logger('Client %s received its secret'
239
 
                    % self.properties["Name"])
240
 
    
 
206
        log.info("Client %s received its secret",
 
207
                 self.properties["Name"])
 
208
 
241
209
    def need_approval(self, timeout, default):
242
210
        if not default:
243
 
            message = 'Client %s needs approval within %s seconds'
 
211
            message = "Client %s needs approval within %f seconds"
244
212
        else:
245
 
            message = 'Client %s will get its secret in %s seconds'
246
 
        self.logger(message
247
 
                    % (self.properties["Name"], timeout/1000))
248
 
        self.using_timer(True)
249
 
    
 
213
            message = "Client %s will get its secret in %f seconds"
 
214
        log.info(message, self.properties["Name"], timeout/1000)
 
215
 
250
216
    def rejected(self, reason):
251
 
        self.logger('Client %s was rejected; reason: %s'
252
 
                    % (self.properties["Name"], reason))
253
 
    
 
217
        log.info("Client %s was rejected; reason: %s",
 
218
                 self.properties["Name"], reason)
 
219
 
254
220
    def selectable(self):
255
221
        """Make this a "selectable" widget.
256
222
        This overrides the method from urwid.FlowWidget."""
257
223
        return True
258
 
    
 
224
 
259
225
    def rows(self, maxcolrow, focus=False):
260
226
        """How many rows this widget will occupy might depend on
261
227
        whether we have focus or not.
262
228
        This overrides the method from urwid.FlowWidget"""
263
229
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
264
 
    
 
230
 
265
231
    def current_widget(self, focus=False):
266
232
        if focus or self.opened:
267
233
            return self._focus_widget
268
234
        return self._widget
269
 
    
 
235
 
270
236
    def update(self):
271
237
        "Called when what is visible on the screen should be updated."
272
238
        # How to add standout mode to a style
273
 
        with_standout = { "normal": "standout",
274
 
                          "bold": "bold-standout",
275
 
                          "underline-blink":
276
 
                              "underline-blink-standout",
277
 
                          "bold-underline-blink":
278
 
                              "bold-underline-blink-standout",
279
 
                          }
 
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
                         }
280
246
 
281
247
        # Rebuild focus and non-focus widgets using current properties
282
248
 
283
249
        # Base part of a client. Name!
284
 
        base = ('%(name)s: '
285
 
                      % {"name": self.properties["Name"]})
 
250
        base = "{name}: ".format(name=self.properties["Name"])
286
251
        if not self.properties["Enabled"]:
287
252
            message = "DISABLED"
 
253
            self.using_timer(False)
288
254
        elif self.properties["ApprovalPending"]:
289
 
            timeout = datetime.timedelta(milliseconds
290
 
                                         = self.properties
291
 
                                         ["ApprovalDelay"])
 
255
            timeout = datetime.timedelta(
 
256
                milliseconds=self.properties["ApprovalDelay"])
292
257
            last_approval_request = isoformat_to_datetime(
293
258
                self.properties["LastApprovalRequest"])
294
259
            if last_approval_request is not None:
295
 
                timer = timeout - (datetime.datetime.utcnow()
296
 
                                   - last_approval_request)
 
260
                timer = max(timeout - (datetime.datetime.utcnow()
 
261
                                       - last_approval_request),
 
262
                            datetime.timedelta())
297
263
            else:
298
264
                timer = datetime.timedelta()
299
265
            if self.properties["ApprovedByDefault"]:
300
 
                message = "Approval in %s. (d)eny?"
 
266
                message = "Approval in {}. (d)eny?"
301
267
            else:
302
 
                message = "Denial in %s. (a)pprove?"
303
 
            message = message % 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)
304
271
        elif self.properties["LastCheckerStatus"] != 0:
305
 
            # When checker has failed, print a timer until client expires
 
272
            # When checker has failed, show timer until client expires
306
273
            expires = self.properties["Expires"]
307
274
            if expires == "":
308
275
                timer = datetime.timedelta(0)
309
276
            else:
310
 
                expires = datetime.datetime.strptime(expires,
311
 
                                                     '%Y-%m-%dT%H:%M:%S.%f')
312
 
                timer = expires - datetime.datetime.utcnow()
313
 
            message = ('A checker has failed! Time until client'
314
 
                       ' gets disabled: %s'
315
 
                           % 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)
316
285
        else:
317
286
            message = "enabled"
318
 
        self._text = "%s%s" % (base, message)
319
 
            
 
287
            self.using_timer(False)
 
288
        self._text = "{}{}".format(base, message)
 
289
 
320
290
        if not urwid.supports_unicode():
321
291
            self._text = self._text.encode("ascii", "replace")
322
292
        textlist = [("normal", self._text)]
332
302
        # Run update hook, if any
333
303
        if self.update_hook is not None:
334
304
            self.update_hook()
335
 
    
 
305
 
336
306
    def update_timer(self):
337
 
        """called by gobject. Will indefinitely loop until
338
 
        gobject.source_remove() on tag is called"""
 
307
        """called by GLib. Will indefinitely loop until
 
308
        GLib.source_remove() on tag is called
 
309
        """
339
310
        self.update()
340
311
        return True             # Keep calling this
341
 
    
342
 
    def delete(self, *args, **kwargs):
 
312
 
 
313
    def delete(self, **kwargs):
343
314
        if self._update_timer_callback_tag is not None:
344
 
            gobject.source_remove(self._update_timer_callback_tag)
 
315
            GLib.source_remove(self._update_timer_callback_tag)
345
316
            self._update_timer_callback_tag = None
346
317
        for match in self.match_objects:
347
318
            match.remove()
348
319
        self.match_objects = ()
349
320
        if self.delete_hook is not None:
350
321
            self.delete_hook(self)
351
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
352
 
    
 
322
        return super(MandosClientWidget, self).delete(**kwargs)
 
323
 
353
324
    def render(self, maxcolrow, focus=False):
354
325
        """Render differently if we have focus.
355
326
        This overrides the method from urwid.FlowWidget"""
356
327
        return self.current_widget(focus).render(maxcolrow,
357
328
                                                 focus=focus)
358
 
    
 
329
 
359
330
    def keypress(self, maxcolrow, key):
360
331
        """Handle keys.
361
332
        This overrides the method from urwid.FlowWidget"""
362
333
        if key == "+":
363
 
            self.proxy.Enable(dbus_interface = client_interface,
364
 
                              ignore_reply=True)
 
334
            self.proxy.Set(client_interface, "Enabled",
 
335
                           dbus.Boolean(True), ignore_reply=True,
 
336
                           dbus_interface=dbus.PROPERTIES_IFACE)
365
337
        elif key == "-":
366
 
            self.proxy.Disable(dbus_interface = client_interface,
367
 
                               ignore_reply=True)
 
338
            self.proxy.Set(client_interface, "Enabled", False,
 
339
                           ignore_reply=True,
 
340
                           dbus_interface=dbus.PROPERTIES_IFACE)
368
341
        elif key == "a":
369
342
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
370
 
                               dbus_interface = client_interface,
 
343
                               dbus_interface=client_interface,
371
344
                               ignore_reply=True)
372
345
        elif key == "d":
373
346
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
374
 
                                  dbus_interface = client_interface,
 
347
                               dbus_interface=client_interface,
375
348
                               ignore_reply=True)
376
349
        elif key == "R" or key == "_" or key == "ctrl k":
377
350
            self.server_proxy_object.RemoveClient(self.proxy
378
351
                                                  .object_path,
379
352
                                                  ignore_reply=True)
380
353
        elif key == "s":
381
 
            self.proxy.StartChecker(dbus_interface = client_interface,
382
 
                                    ignore_reply=True)
 
354
            self.proxy.Set(client_interface, "CheckerRunning",
 
355
                           dbus.Boolean(True), ignore_reply=True,
 
356
                           dbus_interface=dbus.PROPERTIES_IFACE)
383
357
        elif key == "S":
384
 
            self.proxy.StopChecker(dbus_interface = client_interface,
385
 
                                   ignore_reply=True)
 
358
            self.proxy.Set(client_interface, "CheckerRunning",
 
359
                           dbus.Boolean(False), ignore_reply=True,
 
360
                           dbus_interface=dbus.PROPERTIES_IFACE)
386
361
        elif key == "C":
387
 
            self.proxy.CheckedOK(dbus_interface = client_interface,
 
362
            self.proxy.CheckedOK(dbus_interface=client_interface,
388
363
                                 ignore_reply=True)
389
364
        # xxx
390
365
#         elif key == "p" or key == "=":
395
370
#             self.open()
396
371
        else:
397
372
            return key
398
 
    
399
 
    def property_changed(self, property=None, value=None,
400
 
                         *args, **kwargs):
401
 
        """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.
402
376
        This overrides the method from MandosClientPropertyCache"""
403
 
        property_name = unicode(property)
404
 
        old_value = self.properties.get(property_name)
405
 
        super(MandosClientWidget, self).property_changed(
406
 
            property=property, value=value, *args, **kwargs)
407
 
        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):
408
383
            self.update()
409
384
 
410
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
 
411
396
class ConstrainedListBox(urwid.ListBox):
412
397
    """Like a normal urwid.ListBox, but will consume all "up" or
413
398
    "down" key presses, thus not allowing any containing widgets to
414
399
    use them as an excuse to shift focus away from this widget.
415
400
    """
416
 
    def keypress(self, maxcolrow, key):
417
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
401
    def keypress(self, *args, **kwargs):
 
402
        ret = (super(ConstrainedListBox, self)
 
403
               .keypress(*args, **kwargs))
418
404
        if ret in ("up", "down"):
419
405
            return
420
406
        return ret
426
412
    """
427
413
    def __init__(self, max_log_length=1000):
428
414
        DBusGMainLoop(set_as_default=True)
429
 
        
 
415
 
430
416
        self.screen = urwid.curses_display.Screen()
431
 
        
 
417
 
432
418
        self.screen.register_palette((
433
419
                ("normal",
434
420
                 "default", "default", None),
435
421
                ("bold",
436
 
                 "default", "default", "bold"),
 
422
                 "bold", "default", "bold"),
437
423
                ("underline-blink",
438
 
                 "default", "default", "underline"),
 
424
                 "underline,blink", "default", "underline,blink"),
439
425
                ("standout",
440
 
                 "default", "default", "standout"),
 
426
                 "standout", "default", "standout"),
441
427
                ("bold-underline-blink",
442
 
                 "default", "default", ("bold", "underline")),
 
428
                 "bold,underline,blink", "default",
 
429
                 "bold,underline,blink"),
443
430
                ("bold-standout",
444
 
                 "default", "default", ("bold", "standout")),
 
431
                 "bold,standout", "default", "bold,standout"),
445
432
                ("underline-blink-standout",
446
 
                 "default", "default", ("underline", "standout")),
 
433
                 "underline,blink,standout", "default",
 
434
                 "underline,blink,standout"),
447
435
                ("bold-underline-blink-standout",
448
 
                 "default", "default", ("bold", "underline",
449
 
                                          "standout")),
 
436
                 "bold,underline,blink,standout", "default",
 
437
                 "bold,underline,blink,standout"),
450
438
                ))
451
 
        
 
439
 
452
440
        if urwid.supports_unicode():
453
 
            self.divider = "─" # \u2500
454
 
            #self.divider = "━" # \u2501
 
441
            self.divider = "─"  # \u2500
455
442
        else:
456
 
            #self.divider = "-" # \u002d
457
 
            self.divider = "_" # \u005f
458
 
        
 
443
            self.divider = "_"  # \u005f
 
444
 
459
445
        self.screen.start()
460
 
        
 
446
 
461
447
        self.size = self.screen.get_cols_rows()
462
 
        
 
448
 
463
449
        self.clients = urwid.SimpleListWalker([])
464
450
        self.clients_dict = {}
465
 
        
 
451
 
466
452
        # We will add Text widgets to this list
467
 
        self.log = []
 
453
        self.log = urwid.SimpleListWalker([])
468
454
        self.max_log_length = max_log_length
469
 
        
 
455
 
470
456
        # We keep a reference to the log widget so we can remove it
471
457
        # from the ListWalker without it getting destroyed
472
458
        self.logbox = ConstrainedListBox(self.log)
473
 
        
 
459
 
474
460
        # This keeps track of whether self.uilist currently has
475
461
        # self.logbox in it or not
476
462
        self.log_visible = True
477
463
        self.log_wrap = "any"
478
 
        
 
464
 
 
465
        self.loghandler = UILogHandler(self)
 
466
 
479
467
        self.rebuild()
480
 
        self.log_message_raw(("bold",
481
 
                              "Mandos Monitor version " + version))
482
 
        self.log_message_raw(("bold",
483
 
                              "q: Quit  ?: Help"))
484
 
        
485
 
        self.busname = domain + '.Mandos'
486
 
        self.main_loop = gobject.MainLoop()
487
 
    
488
 
    def client_not_found(self, fingerprint, address):
489
 
        self.log_message(("Client with address %s and fingerprint %s"
490
 
                          " could not be found" % (address,
491
 
                                                    fingerprint)))
492
 
    
 
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
 
493
479
    def rebuild(self):
494
480
        """This rebuilds the User Interface.
495
481
        Call this when the widget layout needs to change"""
496
482
        self.uilist = []
497
 
        #self.uilist.append(urwid.ListBox(self.clients))
 
483
        # self.uilist.append(urwid.ListBox(self.clients))
498
484
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
499
485
                                                          clients),
500
 
                                       #header=urwid.Divider(),
 
486
                                       # header=urwid.Divider(),
501
487
                                       header=None,
502
 
                                       footer=
503
 
                                       urwid.Divider(div_char=
504
 
                                                     self.divider)))
 
488
                                       footer=urwid.Divider(
 
489
                                           div_char=self.divider)))
505
490
        if self.log_visible:
506
491
            self.uilist.append(self.logbox)
507
492
        self.topwidget = urwid.Pile(self.uilist)
508
 
    
509
 
    def log_message(self, message):
510
 
        timestamp = datetime.datetime.now().isoformat()
511
 
        self.log_message_raw(timestamp + ": " + message)
512
 
    
513
 
    def log_message_raw(self, markup):
514
 
        """Add a log message to the log buffer."""
 
493
 
 
494
    def add_log_line(self, markup):
515
495
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
516
 
        if (self.max_log_length
517
 
            and len(self.log) > self.max_log_length):
518
 
            del self.log[0:len(self.log)-self.max_log_length-1]
519
 
        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,
520
500
                              coming_from="above")
521
501
        self.refresh()
522
 
    
 
502
 
523
503
    def toggle_log_display(self):
524
504
        """Toggle visibility of the log buffer."""
525
505
        self.log_visible = not self.log_visible
526
506
        self.rebuild()
527
 
        #self.log_message("Log visibility changed to: "
528
 
        #                 + unicode(self.log_visible))
529
 
    
 
507
        log.debug("Log visibility changed to: %s", self.log_visible)
 
508
 
530
509
    def change_log_display(self):
531
510
        """Change type of log display.
532
511
        Currently, this toggles wrapping of text lines."""
536
515
            self.log_wrap = "clip"
537
516
        for textwidget in self.log:
538
517
            textwidget.set_wrap_mode(self.log_wrap)
539
 
        #self.log_message("Wrap mode: " + self.log_wrap)
540
 
    
541
 
    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):
542
521
        """Find a client by its object path and remove it.
543
 
        
544
 
        This is connected to the ClientRemoved signal from the
 
522
 
 
523
        This is connected to the InterfacesRemoved signal from the
545
524
        Mandos server object."""
 
525
        if client_interface not in interfaces:
 
526
            # Not a Mandos client object; ignore
 
527
            return
546
528
        try:
547
529
            client = self.clients_dict[path]
548
530
        except KeyError:
549
531
            # not found?
550
 
            self.log_message("Unknown client %r (%r) removed", name,
551
 
                             path)
 
532
            log.warning("Unknown client %s removed", path)
552
533
            return
553
534
        client.delete()
554
 
    
555
 
    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
556
545
        client_proxy_object = self.bus.get_object(self.busname, path)
557
 
        self.add_client(MandosClientWidget(server_proxy_object
558
 
                                           =self.mandos_serv,
559
 
                                           proxy_object
560
 
                                           =client_proxy_object,
561
 
                                           update_hook
562
 
                                           =self.refresh,
563
 
                                           delete_hook
564
 
                                           =self.remove_client,
565
 
                                           logger
566
 
                                           =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])),
567
552
                        path=path)
568
 
    
 
553
 
569
554
    def add_client(self, client, path=None):
570
555
        self.clients.append(client)
571
556
        if path is None:
572
557
            path = client.proxy.object_path
573
558
        self.clients_dict[path] = client
574
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
559
        self.clients.sort(key=lambda c: c.properties["Name"])
575
560
        self.refresh()
576
 
    
 
561
 
577
562
    def remove_client(self, client, path=None):
578
563
        self.clients.remove(client)
579
564
        if path is None:
580
565
            path = client.proxy.object_path
581
566
        del self.clients_dict[path]
582
 
        if not self.clients_dict:
583
 
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
584
 
            # is completely emptied, we need to recreate it.
585
 
            self.clients = urwid.SimpleListWalker([])
586
 
            self.rebuild()
587
567
        self.refresh()
588
 
    
 
568
 
589
569
    def refresh(self):
590
570
        """Redraw the screen"""
591
571
        canvas = self.topwidget.render(self.size, focus=True)
592
572
        self.screen.draw_screen(self.size, canvas)
593
 
    
 
573
 
594
574
    def run(self):
595
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")
596
581
        self.bus = dbus.SystemBus()
597
582
        mandos_dbus_objc = self.bus.get_object(
598
583
            self.busname, "/", follow_name_owner_changes=True)
599
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
600
 
                                          dbus_interface
601
 
                                          = server_interface)
 
584
        self.mandos_serv = dbus.Interface(
 
585
            mandos_dbus_objc, dbus_interface=server_interface)
602
586
        try:
603
587
            mandos_clients = (self.mandos_serv
604
588
                              .GetAllClientsWithProperties())
 
589
            if not mandos_clients:
 
590
                log.warning("Note: Server has no clients.")
605
591
        except dbus.exceptions.DBusException:
 
592
            log.warning("Note: No Mandos server running.")
606
593
            mandos_clients = dbus.Dictionary()
607
 
        
 
594
 
608
595
        (self.mandos_serv
609
 
         .connect_to_signal("ClientRemoved",
 
596
         .connect_to_signal("InterfacesRemoved",
610
597
                            self.find_and_remove_client,
611
 
                            dbus_interface=server_interface,
 
598
                            dbus_interface=dbus.OBJECT_MANAGER_IFACE,
612
599
                            byte_arrays=True))
613
600
        (self.mandos_serv
614
 
         .connect_to_signal("ClientAdded",
 
601
         .connect_to_signal("InterfacesAdded",
615
602
                            self.add_new_client,
616
 
                            dbus_interface=server_interface,
 
603
                            dbus_interface=dbus.OBJECT_MANAGER_IFACE,
617
604
                            byte_arrays=True))
618
605
        (self.mandos_serv
619
606
         .connect_to_signal("ClientNotFound",
620
607
                            self.client_not_found,
621
608
                            dbus_interface=server_interface,
622
609
                            byte_arrays=True))
623
 
        for path, client in mandos_clients.iteritems():
 
610
        for path, client in mandos_clients.items():
624
611
            client_proxy_object = self.bus.get_object(self.busname,
625
612
                                                      path)
626
 
            self.add_client(MandosClientWidget(server_proxy_object
627
 
                                               =self.mandos_serv,
628
 
                                               proxy_object
629
 
                                               =client_proxy_object,
630
 
                                               properties=client,
631
 
                                               update_hook
632
 
                                               =self.refresh,
633
 
                                               delete_hook
634
 
                                               =self.remove_client,
635
 
                                               logger
636
 
                                               =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),
637
619
                            path=path)
638
620
 
639
621
        self.refresh()
640
 
        self._input_callback_tag = (gobject.io_add_watch
641
 
                                    (sys.stdin.fileno(),
642
 
                                     gobject.IO_IN,
643
 
                                     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)))
644
627
        self.main_loop.run()
645
628
        # Main loop has finished, we should close everything now
646
 
        gobject.source_remove(self._input_callback_tag)
647
 
        self.screen.stop()
648
 
    
 
629
        GLib.source_remove(self._input_callback_tag)
 
630
        with warnings.catch_warnings():
 
631
            warnings.simplefilter("ignore", BytesWarning)
 
632
            self.screen.stop()
 
633
 
649
634
    def stop(self):
650
635
        self.main_loop.quit()
651
 
    
 
636
        log.removeHandler(self.loghandler)
 
637
        log.propagate = self.orig_log_propagate
 
638
 
652
639
    def process_input(self, source, condition):
653
640
        keys = self.screen.get_input()
654
 
        translations = { "ctrl n": "down",      # Emacs
655
 
                         "ctrl p": "up",        # Emacs
656
 
                         "ctrl v": "page down", # Emacs
657
 
                         "meta v": "page up",   # Emacs
658
 
                         " ": "page down",      # less
659
 
                         "f": "page down",      # less
660
 
                         "b": "page up",        # less
661
 
                         "j": "down",           # vi
662
 
                         "k": "up",             # vi
663
 
                         }
 
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
                        }
664
651
        for key in keys:
665
652
            try:
666
653
                key = translations[key]
667
654
            except KeyError:    # :-)
668
655
                pass
669
 
            
 
656
 
670
657
            if key == "q" or key == "Q":
671
658
                self.stop()
672
659
                break
673
660
            elif key == "window resize":
674
661
                self.size = self.screen.get_cols_rows()
675
662
                self.refresh()
676
 
            elif key == "\f":  # Ctrl-L
 
663
            elif key == "ctrl l":
 
664
                self.screen.clear()
677
665
                self.refresh()
678
666
            elif key == "l" or key == "D":
679
667
                self.toggle_log_display()
685
673
                if not self.log_visible:
686
674
                    self.log_visible = True
687
675
                    self.rebuild()
688
 
                self.log_message_raw(("bold",
689
 
                                      "  ".
690
 
                                      join(("q: Quit",
691
 
                                            "?: Help",
692
 
                                            "l: Log window toggle",
693
 
                                            "TAB: Switch window",
694
 
                                            "w: Wrap (log)"))))
695
 
                self.log_message_raw(("bold",
696
 
                                      "  "
697
 
                                      .join(("Clients:",
698
 
                                             "+: Enable",
699
 
                                             "-: Disable",
700
 
                                             "R: Remove",
701
 
                                             "s: Start new checker",
702
 
                                             "S: Stop checker",
703
 
                                             "C: Checker OK",
704
 
                                             "a: Approve",
705
 
                                             "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
                                   ))))
706
695
                self.refresh()
707
696
            elif key == "tab":
708
697
                if self.topwidget.get_focus() is self.logbox:
710
699
                else:
711
700
                    self.topwidget.set_focus(self.logbox)
712
701
                self.refresh()
713
 
            #elif (key == "end" or key == "meta >" or key == "G"
714
 
            #      or key == ">"):
715
 
            #    pass            # xxx end-of-buffer
716
 
            #elif (key == "home" or key == "meta <" or key == "g"
717
 
            #      or key == "<"):
718
 
            #    pass            # xxx beginning-of-buffer
719
 
            #elif key == "ctrl e" or key == "$":
720
 
            #    pass            # xxx move-end-of-line
721
 
            #elif key == "ctrl a" or key == "^":
722
 
            #    pass            # xxx move-beginning-of-line
723
 
            #elif key == "ctrl b" or key == "meta (" or key == "h":
724
 
            #    pass            # xxx left
725
 
            #elif key == "ctrl f" or key == "meta )" or key == "l":
726
 
            #    pass            # xxx right
727
 
            #elif key == "a":
728
 
            #    pass            # scroll up log
729
 
            #elif key == "z":
730
 
            #    pass            # scroll down log
 
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
731
727
            elif self.topwidget.selectable():
732
728
                self.topwidget.keypress(self.size, key)
733
729
                self.refresh()
734
730
        return True
735
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
 
736
746
ui = UserInterface()
737
747
try:
738
748
    ui.run()
739
749
except KeyboardInterrupt:
740
 
    ui.screen.stop()
741
 
except Exception, e:
742
 
    ui.log_message(unicode(e))
743
 
    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()
744
757
    raise