/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2015-07-20 03:03:33 UTC
  • Revision ID: teddy@recompile.se-20150720030333-203m2aeblypcsfte
Bug fix for GnuTLS 3: be compatible with old 2048-bit DSA keys.

The mandos-keygen program in Mandos version 1.6.0 and older generated
2048-bit DSA keys, and when GnuTLS uses these it has trouble
connecting using the Mandos default priority string.  This was
previously fixed in Mandos 1.6.2, but the bug reappeared when using
GnuTLS 3, so the default priority string has to change again; this
time also the Mandos client has to change its default, so now the
server and the client should use the same default priority string:

SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA:+SIGN-DSA-SHA256

* mandos (main/server_defaults): Changed default priority string.
* mandos-options.xml (/section/para[id="priority_compat"]): Removed.
  (/section/para[id="priority"]): Changed default priority string.
* mandos.conf ([DEFAULT]/priority): - '' -
* mandos.conf.xml (OPTIONS/priority): Refer to the id "priority"
                                      instead of "priority_compat".
* mandos.xml (OPTIONS/--priority): - '' -
* plugins.d/mandos-client.c (main): Changed default priority string.

Show diffs side-by-side

added added

removed removed

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