/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: 2019-11-03 18:44:41 UTC
  • Revision ID: teddy@recompile.se-20191103184441-1vhjuf06hjqgfohh
mandos-monitor: Use Python's standard loggging module

* mandos-monitor: Use Python's standard loggging module, also for
                  warnings.  Suppress BytesWarning from urwid when
                  exiting.
  (log): New global logger object.  This replaces UserInterface
        log_message().
  (MandosClientWidget.__init__): Remove "logger" argument.
  (MandosClientWidget.using_timer): Wrap self.update_timer using new
                                    glib_safely() function.
  (glib_safely): New function to log any exceptions instead of letting
                 exceptions propagate up to GLib.
  (UserInterface.__init__): Remove "log_level" argument.  Set new
                            "loghandler" attribute, instance of new
                            "UILogHandler".
  (UserInterface.log_message): Removed.
  (UserInterface.log_message_raw): Renamed to "add_log_line"; all
                                   callers changed.  Also fix
                                   off-by-one error in max_log_length
                                   logic.
  (UserInterface.run): Add self.loghandler to logger "log". Wrap
                       self.process_input using new glib_safely()
                       function.
  (UserInterface.stop): Remove self.loghandler from logger "log".
  (UserInterface.process_input): Make verbosity toggle affect log
                                 level of logger "log".
  (UILogHandler): New.

Show diffs side-by-side

added added

removed removed

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