/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: 2023-02-11 06:46:26 UTC
  • Revision ID: teddy@recompile.se-20230211064626-2aqhtdd46jbif6h6
Really enable FORTIFY_SOURCE=3

Use -DFORTIFY_SOURCE=3 by appending it to CPPFLAGS directly instead of
adding it indirectly to CFLAGS.

* Makefile (FORTIFY): Remove "-D_FORTIFY_SOURCE=3".
  (Fortify section/CPPFLAGS): New; append "-D_FORTIFY_SOURCE=3".
  (FEATURES): Remove.  Contents moved to CPPFLAGS.
  (CPPFLAGS): New; append "-D_FILE_OFFSET_BITS=64".
  (CFLAGS): Do not use "$(FEATURES)".

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