/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: 2019-11-23 22:27:35 UTC
  • mto: This revision was merged to the branch mainline in revision 396.
  • Revision ID: teddy@recompile.se-20191123222735-wp6z91c2kau3o63u
Server: Fix bug when setting Secret property of clients via D-Bus

* mandos (DBusObjectWithProperties.Set): On byte arrays, simply cast
  the value to "bytes".

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