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