/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: 2014-03-28 22:32:21 UTC
  • Revision ID: teddy@recompile.se-20140328223221-w579qlvlex5if3dn
Fix location and format of signing key file.

* debian/upstream/signing-key.asc: Added.
* debian/upstream-signing-key.pgp: Removed.

Show diffs side-by-side

added added

removed removed

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