/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-21 19:30:47 UTC
  • mto: This revision was merged to the branch mainline in revision 396.
  • Revision ID: teddy@recompile.se-20191121193047-nszsowvqcvk081p2
Makefile: Use target-specific variables

Instead of overriding a whole rule and invoking $(LINK.c) explicitly
for certain targets (in order to append special compilation flags),
set CFLAGS and LDLIBS as target-specific variables on those targets.

* Makefile (plugins.d/mandos-client): Replace with a target-specific
  variable setting.
  (plugin-helpers/mandos-client-iprouteadddel): - ''-
  (dracut-module/password-agent): - '' -

Show diffs side-by-side

added added

removed removed

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