/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2016-03-13 00:37:02 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 339.
  • Revision ID: teddy@recompile.se-20160313003702-dulwtwt8ilpojra9
Server: Fix bug where it did not exit timely on signals

Use GLib.unix_signal_add() instead of signal.signal() to catch
signals; this will allow GLib to do its internal magic with signal
file descriptors.  (GLib does not handle signals properly otherwise.)
The function unix_signal_add() requires GLib 2.30 or later, which was
not required by PyGobject until version 3.7.1, so depend on this.

* INSTALL (Mandos Server): Document dependency on PyGObject 3.7.1
* mandos (main): Use GLib.unix_signal_add instead of signal.signal.
* init.d-mandos (do_stop): Remove workaround.
* mandos.service ([Service]): - '' -

Show diffs side-by-side

added added

removed removed

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