/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: 2014-06-22 02:19:30 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 317.
  • Revision ID: teddy@recompile.se-20140622021930-icl7h4cm97blhjml
mandos-keygen: Generate "checker" option to use SSH fingerprints.

To turn this off, use a new "--no-ssh" option to mandos-keygen.

* INSTALL (Mandos Server, Mandos Client): Document new suggested
                                          installation of SSH.
* Makefile (confdir/clients.conf): Use new "--no-ssh" option to
                                   "mandos-keygen".
* debian/control (mandos/Depends): Changed to "fping | ssh-client".
  (mandos-client/Recommends): New; set to "ssh".
* intro.xml (FREQUENTLY ASKED QUESTIONS): Rename and rewrite section
                                          called "Faking ping
                                          replies?" to address new
                                          default behavior.
* mandos-clients.conf.xml (OPTIONS/checker): Briefly discuss new
                                             behavior of
                                             mandos-keygen.
* mandos-keygen: Bug fix: Suppress failure output of "shred" to remove
                 "sec*", since no such files may exist.
 (password mode): Scan for SSH key fingerprints and output as new
                  "checker" and "ssh_fingerprint" options, unless new
                  "--no-ssh" option is given.
* mandos-keygen.xml (SYNOPSIS/--force): Bug fix: Document short form.
  (OPTIONS/--no-ssh): New.
  (SEE ALSO): Add reference "ssh-keyscan(1)".
* plugins.d/mandos-client.xml (SECURITY): Briefly mention the
                                          possibility of using SSH key
                                          fingerprints for checking.

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