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