/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: 2024-11-22 20:28:54 UTC
  • Revision ID: teddy@recompile.se-20241122202854-dycuf117byxhxl32
mandos-monitor: Avoid debug messages from urwid

Avoid debug messages from urwid.  Any logging output before the screen
has been set up will mangle the screen.

* mandos-monitor: When setting up logging, set urwid to only show log
  messages of level INFO or above.

(Thanks to an anonymous contributor for reporting this.)

Show diffs side-by-side

added added

removed removed

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