/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: 2016-03-13 22:00:48 UTC
  • mto: This revision was merged to the branch mainline in revision 832.
  • Revision ID: teddy@recompile.se-20160313220048-kd3k2gyviupsw1oj
Tags: version-1.7.6-1
Update version number to 1.7.6

* Makefile (version): Changed to "1.7.6"
* NEWS (Version 1.7.6): New entry.
* debian/changelog(1.7.6-1): - '' -

Show diffs side-by-side

added added

removed removed

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