/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
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
 
3
# 
 
4
# Mandos Monitor - Control and monitor the Mandos server
 
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
 
11
# the Free Software Foundation, either version 3 of the License, or
 
12
# (at your option) any later version.
 
13
#
 
14
#     This program is distributed in the hope that it will be useful,
 
15
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
 
16
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
17
#     GNU General Public License for more details.
 
18
# 
 
19
# You should have received a copy of the GNU General Public License
 
20
# along with this program.  If not, see
 
21
# <http://www.gnu.org/licenses/>.
 
22
# 
 
23
# Contact the authors at <mandos@recompile.se>.
 
24
# 
3
25
 
4
 
from __future__ import division, absolute_import, with_statement
 
26
from __future__ import (division, absolute_import, print_function,
 
27
                        unicode_literals)
 
28
try:
 
29
    from future_builtins import *
 
30
except ImportError:
 
31
    pass
5
32
 
6
33
import sys
7
 
import signal
 
34
import os
 
35
 
 
36
import datetime
8
37
 
9
38
import urwid.curses_display
10
39
import urwid
11
40
 
12
41
from dbus.mainloop.glib import DBusGMainLoop
13
 
import gobject
 
42
try:
 
43
    import gobject
 
44
except ImportError:
 
45
    from gi.repository import GObject as gobject
14
46
 
15
47
import dbus
16
48
 
17
 
import UserList
 
49
import locale
 
50
 
 
51
if sys.version_info[0] == 2:
 
52
    str = unicode
 
53
 
 
54
locale.setlocale(locale.LC_ALL, '')
 
55
 
 
56
import logging
 
57
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
18
58
 
19
59
# Some useful constants
20
 
domain = 'se.bsnet.fukt'
 
60
domain = 'se.recompile'
21
61
server_interface = domain + '.Mandos'
22
62
client_interface = domain + '.Mandos.Client'
23
 
version = "1.0.14"
24
 
 
25
 
# Always run in monochrome mode
26
 
urwid.curses_display.curses.has_colors = lambda : False
27
 
 
28
 
# Urwid doesn't support blinking, but we want it.  Since we have no
29
 
# use for underline on its own, we make underline also always blink.
30
 
urwid.curses_display.curses.A_UNDERLINE |= (
31
 
    urwid.curses_display.curses.A_BLINK)
 
63
version = "1.6.5"
 
64
 
 
65
def isoformat_to_datetime(iso):
 
66
    "Parse an ISO 8601 date string to a datetime.datetime()"
 
67
    if not iso:
 
68
        return None
 
69
    d, t = iso.split("T", 1)
 
70
    year, month, day = d.split("-", 2)
 
71
    hour, minute, second = t.split(":", 2)
 
72
    second, fraction = divmod(float(second), 1)
 
73
    return datetime.datetime(int(year),
 
74
                             int(month),
 
75
                             int(day),
 
76
                             int(hour),
 
77
                             int(minute),
 
78
                             int(second),           # Whole seconds
 
79
                             int(fraction*1000000)) # Microseconds
32
80
 
33
81
class MandosClientPropertyCache(object):
34
82
    """This wraps a Mandos Client D-Bus proxy object, caches the
35
83
    properties and calls a hook function when any of them are
36
84
    changed.
37
85
    """
38
 
    def __init__(self, proxy_object=None, properties=None, *args,
39
 
                 **kwargs):
 
86
    def __init__(self, proxy_object=None, properties=None, **kwargs):
40
87
        self.proxy = proxy_object # Mandos Client proxy object
41
 
        
42
 
        if properties is None:
43
 
            self.properties = dict()
44
 
        else:
45
 
            self.properties = properties
46
 
        self.proxy.connect_to_signal("PropertyChanged",
47
 
                                     self.property_changed,
48
 
                                     client_interface,
49
 
                                     byte_arrays=True)
50
 
        
51
 
        if properties is None:
52
 
            self.properties.update(self.proxy.GetAll(client_interface,
53
 
                                                     dbus_interface =
54
 
                                                     dbus.PROPERTIES_IFACE))
55
 
        super(MandosClientPropertyCache, self).__init__(
56
 
            proxy_object=proxy_object,
57
 
            properties=properties, *args, **kwargs)
 
88
        self.properties = dict() if properties is None else properties
 
89
        self.property_changed_match = (
 
90
            self.proxy.connect_to_signal("PropertyChanged",
 
91
                                         self._property_changed,
 
92
                                         client_interface,
 
93
                                         byte_arrays=True))
 
94
        
 
95
        if properties is None:
 
96
            self.properties.update(
 
97
                self.proxy.GetAll(client_interface,
 
98
                                  dbus_interface
 
99
                                  = dbus.PROPERTIES_IFACE))
 
100
        
 
101
        super(MandosClientPropertyCache, self).__init__(**kwargs)
 
102
    
 
103
    def _property_changed(self, property, value):
 
104
        """Helper which takes positional arguments"""
 
105
        return self.property_changed(property=property, value=value)
58
106
    
59
107
    def property_changed(self, property=None, value=None):
60
108
        """This is called whenever we get a PropertyChanged signal
62
110
        """
63
111
        # Update properties dict with new value
64
112
        self.properties[property] = value
 
113
    
 
114
    def delete(self):
 
115
        self.property_changed_match.remove()
65
116
 
66
117
 
67
118
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
69
120
    """
70
121
    
71
122
    def __init__(self, server_proxy_object=None, update_hook=None,
72
 
                 delete_hook=None, *args, **kwargs):
 
123
                 delete_hook=None, logger=None, **kwargs):
73
124
        # Called on update
74
125
        self.update_hook = update_hook
75
126
        # Called on delete
76
127
        self.delete_hook = delete_hook
77
128
        # Mandos Server proxy object
78
129
        self.server_proxy_object = server_proxy_object
 
130
        # Logger
 
131
        self.logger = logger
 
132
        
 
133
        self._update_timer_callback_tag = None
79
134
        
80
135
        # The widget shown normally
81
136
        self._text_widget = urwid.Text("")
82
137
        # The widget shown when we have focus
83
138
        self._focus_text_widget = urwid.Text("")
84
 
        super(MandosClientWidget, self).__init__(
85
 
            update_hook=update_hook, delete_hook=delete_hook,
86
 
            *args, **kwargs)
 
139
        super(MandosClientWidget, self).__init__(**kwargs)
87
140
        self.update()
88
141
        self.opened = False
 
142
        
 
143
        self.match_objects = (
 
144
            self.proxy.connect_to_signal("CheckerCompleted",
 
145
                                         self.checker_completed,
 
146
                                         client_interface,
 
147
                                         byte_arrays=True),
 
148
            self.proxy.connect_to_signal("CheckerStarted",
 
149
                                         self.checker_started,
 
150
                                         client_interface,
 
151
                                         byte_arrays=True),
 
152
            self.proxy.connect_to_signal("GotSecret",
 
153
                                         self.got_secret,
 
154
                                         client_interface,
 
155
                                         byte_arrays=True),
 
156
            self.proxy.connect_to_signal("NeedApproval",
 
157
                                         self.need_approval,
 
158
                                         client_interface,
 
159
                                         byte_arrays=True),
 
160
            self.proxy.connect_to_signal("Rejected",
 
161
                                         self.rejected,
 
162
                                         client_interface,
 
163
                                         byte_arrays=True))
 
164
        #self.logger('Created client {0}'
 
165
        #            .format(self.properties["Name"]))
 
166
    
 
167
    def using_timer(self, flag):
 
168
        """Call this method with True or False when timer should be
 
169
        activated or deactivated.
 
170
        """
 
171
        if flag and self._update_timer_callback_tag is None:
 
172
            # Will update the shown timer value every second
 
173
            self._update_timer_callback_tag = (gobject.timeout_add
 
174
                                               (1000,
 
175
                                                self.update_timer))
 
176
        elif not (flag or self._update_timer_callback_tag is None):
 
177
            gobject.source_remove(self._update_timer_callback_tag)
 
178
            self._update_timer_callback_tag = None
 
179
    
 
180
    def checker_completed(self, exitstatus, condition, command):
 
181
        if exitstatus == 0:
 
182
            self.update()
 
183
            return
 
184
        # Checker failed
 
185
        if os.WIFEXITED(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)))
 
190
        elif os.WIFSIGNALED(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"]))
 
203
        self.update()
 
204
    
 
205
    def checker_started(self, command):
 
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
    
 
213
    def got_secret(self):
 
214
        self.logger('Client {0} received its secret'
 
215
                    .format(self.properties["Name"]))
 
216
    
 
217
    def need_approval(self, timeout, default):
 
218
        if not default:
 
219
            message = 'Client {0} needs approval within {1} seconds'
 
220
        else:
 
221
            message = 'Client {0} will get its secret in {1} seconds'
 
222
        self.logger(message.format(self.properties["Name"],
 
223
                                   timeout/1000))
 
224
    
 
225
    def rejected(self, reason):
 
226
        self.logger('Client {0} was rejected; reason: {1}'
 
227
                    .format(self.properties["Name"], reason))
89
228
    
90
229
    def selectable(self):
91
230
        """Make this a "selectable" widget.
92
231
        This overrides the method from urwid.FlowWidget."""
93
232
        return True
94
233
    
95
 
    def rows(self, (maxcol,), focus=False):
 
234
    def rows(self, maxcolrow, focus=False):
96
235
        """How many rows this widget will occupy might depend on
97
236
        whether we have focus or not.
98
237
        This overrides the method from urwid.FlowWidget"""
99
 
        return self.current_widget(focus).rows((maxcol,), focus=focus)
 
238
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
100
239
    
101
240
    def current_widget(self, focus=False):
102
241
        if focus or self.opened:
106
245
    def update(self):
107
246
        "Called when what is visible on the screen should be updated."
108
247
        # How to add standout mode to a style
109
 
        with_standout = { u"normal": u"standout",
110
 
                          u"bold": u"bold-standout",
111
 
                          u"underline-blink":
112
 
                              u"underline-blink-standout",
113
 
                          u"bold-underline-blink":
114
 
                              u"bold-underline-blink-standout",
 
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",
115
254
                          }
116
255
        
117
256
        # Rebuild focus and non-focus widgets using current properties
118
 
        self._text = (u'name="%(name)s", enabled=%(enabled)s'
119
 
                      % self.properties)
 
257
        
 
258
        # Base part of a client. Name!
 
259
        base = '{name}: '.format(name=self.properties["Name"])
 
260
        if not self.properties["Enabled"]:
 
261
            message = "DISABLED"
 
262
            self.using_timer(False)
 
263
        elif self.properties["ApprovalPending"]:
 
264
            timeout = datetime.timedelta(milliseconds
 
265
                                         = self.properties
 
266
                                         ["ApprovalDelay"])
 
267
            last_approval_request = isoformat_to_datetime(
 
268
                self.properties["LastApprovalRequest"])
 
269
            if last_approval_request is not None:
 
270
                timer = max(timeout - (datetime.datetime.utcnow()
 
271
                                       - last_approval_request),
 
272
                            datetime.timedelta())
 
273
            else:
 
274
                timer = datetime.timedelta()
 
275
            if self.properties["ApprovedByDefault"]:
 
276
                message = "Approval in {0}. (d)eny?"
 
277
            else:
 
278
                message = "Denial in {0}. (a)pprove?"
 
279
            message = message.format(str(timer).rsplit(".", 1)[0])
 
280
            self.using_timer(True)
 
281
        elif self.properties["LastCheckerStatus"] != 0:
 
282
            # When checker has failed, show timer until client expires
 
283
            expires = self.properties["Expires"]
 
284
            if expires == "":
 
285
                timer = datetime.timedelta(0)
 
286
            else:
 
287
                expires = (datetime.datetime.strptime
 
288
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
 
289
                timer = max(expires - datetime.datetime.utcnow(),
 
290
                            datetime.timedelta())
 
291
            message = ('A checker has failed! Time until client'
 
292
                       ' gets disabled: {0}'
 
293
                       .format(str(timer).rsplit(".", 1)[0]))
 
294
            self.using_timer(True)
 
295
        else:
 
296
            message = "enabled"
 
297
            self.using_timer(False)
 
298
        self._text = "{0}{1}".format(base, message)
 
299
        
120
300
        if not urwid.supports_unicode():
121
301
            self._text = self._text.encode("ascii", "replace")
122
 
        textlist = [(u"normal", u"BLARGH: "), (u"bold", self._text)]
 
302
        textlist = [("normal", self._text)]
123
303
        self._text_widget.set_text(textlist)
124
304
        self._focus_text_widget.set_text([(with_standout[text[0]],
125
305
                                           text[1])
133
313
        if self.update_hook is not None:
134
314
            self.update_hook()
135
315
    
136
 
    def delete(self):
 
316
    def update_timer(self):
 
317
        """called by gobject. Will indefinitely loop until
 
318
        gobject.source_remove() on tag is called"""
 
319
        self.update()
 
320
        return True             # Keep calling this
 
321
    
 
322
    def delete(self, **kwargs):
 
323
        if self._update_timer_callback_tag is not None:
 
324
            gobject.source_remove(self._update_timer_callback_tag)
 
325
            self._update_timer_callback_tag = None
 
326
        for match in self.match_objects:
 
327
            match.remove()
 
328
        self.match_objects = ()
137
329
        if self.delete_hook is not None:
138
330
            self.delete_hook(self)
 
331
        return super(MandosClientWidget, self).delete(**kwargs)
139
332
    
140
 
    def render(self, (maxcol,), focus=False):
 
333
    def render(self, maxcolrow, focus=False):
141
334
        """Render differently if we have focus.
142
335
        This overrides the method from urwid.FlowWidget"""
143
 
        return self.current_widget(focus).render((maxcol,),
 
336
        return self.current_widget(focus).render(maxcolrow,
144
337
                                                 focus=focus)
145
338
    
146
 
    def keypress(self, (maxcol,), key):
 
339
    def keypress(self, maxcolrow, key):
147
340
        """Handle keys.
148
341
        This overrides the method from urwid.FlowWidget"""
149
 
        if key == u"e" or key == u"+":
150
 
            self.proxy.Enable()
151
 
        elif key == u"d" or key == u"-":
152
 
            self.proxy.Disable()
153
 
        elif key == u"r" or key == u"_" or key == u"ctrl k":
 
342
        if key == "+":
 
343
            self.proxy.Enable(dbus_interface = client_interface,
 
344
                              ignore_reply=True)
 
345
        elif key == "-":
 
346
            self.proxy.Disable(dbus_interface = client_interface,
 
347
                               ignore_reply=True)
 
348
        elif key == "a":
 
349
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
 
350
                               dbus_interface = client_interface,
 
351
                               ignore_reply=True)
 
352
        elif key == "d":
 
353
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
 
354
                                  dbus_interface = client_interface,
 
355
                               ignore_reply=True)
 
356
        elif key == "R" or key == "_" or key == "ctrl k":
154
357
            self.server_proxy_object.RemoveClient(self.proxy
155
 
                                                  .object_path)
156
 
        elif key == u"s":
157
 
            self.proxy.StartChecker()
158
 
        elif key == u"S":
159
 
            self.proxy.StopChecker()
160
 
        elif key == u"C":
161
 
            self.proxy.CheckedOK()
 
358
                                                  .object_path,
 
359
                                                  ignore_reply=True)
 
360
        elif key == "s":
 
361
            self.proxy.StartChecker(dbus_interface = client_interface,
 
362
                                    ignore_reply=True)
 
363
        elif key == "S":
 
364
            self.proxy.StopChecker(dbus_interface = client_interface,
 
365
                                   ignore_reply=True)
 
366
        elif key == "C":
 
367
            self.proxy.CheckedOK(dbus_interface = client_interface,
 
368
                                 ignore_reply=True)
162
369
        # xxx
163
 
#         elif key == u"p" or key == "=":
 
370
#         elif key == "p" or key == "=":
164
371
#             self.proxy.pause()
165
 
#         elif key == u"u" or key == ":":
 
372
#         elif key == "u" or key == ":":
166
373
#             self.proxy.unpause()
167
 
#         elif key == u"RET":
 
374
#         elif key == "RET":
168
375
#             self.open()
169
376
        else:
170
377
            return key
171
378
    
172
 
    def property_changed(self, property=None, value=None,
173
 
                         *args, **kwargs):
 
379
    def property_changed(self, property=None, **kwargs):
174
380
        """Call self.update() if old value is not new value.
175
381
        This overrides the method from MandosClientPropertyCache"""
176
 
        property_name = unicode(property)
 
382
        property_name = str(property)
177
383
        old_value = self.properties.get(property_name)
178
384
        super(MandosClientWidget, self).property_changed(
179
 
            property=property, value=value, *args, **kwargs)
 
385
            property=property, **kwargs)
180
386
        if self.properties.get(property_name) != old_value:
181
387
            self.update()
182
388
 
186
392
    "down" key presses, thus not allowing any containing widgets to
187
393
    use them as an excuse to shift focus away from this widget.
188
394
    """
189
 
    def keypress(self, (maxcol, maxrow), key):
190
 
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
191
 
        if ret in (u"up", u"down"):
 
395
    def keypress(self, *args, **kwargs):
 
396
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
 
397
        if ret in ("up", "down"):
192
398
            return
193
399
        return ret
194
400
 
203
409
        self.screen = urwid.curses_display.Screen()
204
410
        
205
411
        self.screen.register_palette((
206
 
                (u"normal",
207
 
                 u"default", u"default", None),
208
 
                (u"bold",
209
 
                 u"default", u"default", u"bold"),
210
 
                (u"underline-blink",
211
 
                 u"default", u"default", u"underline"),
212
 
                (u"standout",
213
 
                 u"default", u"default", u"standout"),
214
 
                (u"bold-underline-blink",
215
 
                 u"default", u"default", (u"bold", u"underline")),
216
 
                (u"bold-standout",
217
 
                 u"default", u"default", (u"bold", u"standout")),
218
 
                (u"underline-blink-standout",
219
 
                 u"default", u"default", (u"underline", u"standout")),
220
 
                (u"bold-underline-blink-standout",
221
 
                 u"default", u"default", (u"bold", u"underline",
222
 
                                          u"standout")),
 
412
                ("normal",
 
413
                 "default", "default", None),
 
414
                ("bold",
 
415
                 "bold", "default", "bold"),
 
416
                ("underline-blink",
 
417
                 "underline,blink", "default", "underline,blink"),
 
418
                ("standout",
 
419
                 "standout", "default", "standout"),
 
420
                ("bold-underline-blink",
 
421
                 "bold,underline,blink", "default", "bold,underline,blink"),
 
422
                ("bold-standout",
 
423
                 "bold,standout", "default", "bold,standout"),
 
424
                ("underline-blink-standout",
 
425
                 "underline,blink,standout", "default",
 
426
                 "underline,blink,standout"),
 
427
                ("bold-underline-blink-standout",
 
428
                 "bold,underline,blink,standout", "default",
 
429
                 "bold,underline,blink,standout"),
223
430
                ))
224
431
        
225
432
        if urwid.supports_unicode():
226
 
            self.divider = u"─" # \u2500
227
 
            #self.divider = u"━" # \u2501
 
433
            self.divider = "─" # \u2500
 
434
            #self.divider = "━" # \u2501
228
435
        else:
229
 
            #self.divider = u"-" # \u002d
230
 
            self.divider = u"_" # \u005f
 
436
            #self.divider = "-" # \u002d
 
437
            self.divider = "_" # \u005f
231
438
        
232
439
        self.screen.start()
233
440
        
247
454
        # This keeps track of whether self.uilist currently has
248
455
        # self.logbox in it or not
249
456
        self.log_visible = True
250
 
        self.log_wrap = u"any"
 
457
        self.log_wrap = "any"
251
458
        
252
459
        self.rebuild()
253
 
        self.log_message((u"bold",
254
 
                          u"Mandos Monitor version " + version))
255
 
        self.log_message((u"bold",
256
 
                          u"q: Quit  ?: Help"))
 
460
        self.log_message_raw(("bold",
 
461
                              "Mandos Monitor version " + version))
 
462
        self.log_message_raw(("bold",
 
463
                              "q: Quit  ?: Help"))
257
464
        
258
465
        self.busname = domain + '.Mandos'
259
466
        self.main_loop = gobject.MainLoop()
260
 
        self.bus = dbus.SystemBus()
261
 
        mandos_dbus_objc = self.bus.get_object(
262
 
            self.busname, u"/", follow_name_owner_changes=True)
263
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
264
 
                                          dbus_interface
265
 
                                          = server_interface)
266
 
        try:
267
 
            mandos_clients = (self.mandos_serv
268
 
                              .GetAllClientsWithProperties())
269
 
        except dbus.exceptions.DBusException:
270
 
            mandos_clients = dbus.Dictionary()
271
 
        
272
 
        (self.mandos_serv
273
 
         .connect_to_signal("ClientRemoved",
274
 
                            self.find_and_remove_client,
275
 
                            dbus_interface=server_interface,
276
 
                            byte_arrays=True))
277
 
        (self.mandos_serv
278
 
         .connect_to_signal("ClientAdded",
279
 
                            self.add_new_client,
280
 
                            dbus_interface=server_interface,
281
 
                            byte_arrays=True))
282
 
        for path, client in mandos_clients.iteritems():
283
 
            client_proxy_object = self.bus.get_object(self.busname,
284
 
                                                      path)
285
 
            self.add_client(MandosClientWidget(server_proxy_object
286
 
                                               =self.mandos_serv,
287
 
                                               proxy_object
288
 
                                               =client_proxy_object,
289
 
                                               properties=client,
290
 
                                               update_hook
291
 
                                               =self.refresh,
292
 
                                               delete_hook
293
 
                                               =self.remove_client),
294
 
                            path=path)
 
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))
295
472
    
296
473
    def rebuild(self):
297
474
        """This rebuilds the User Interface.
298
475
        Call this when the widget layout needs to change"""
299
476
        self.uilist = []
300
477
        #self.uilist.append(urwid.ListBox(self.clients))
301
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
 
478
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
479
                                                          clients),
302
480
                                       #header=urwid.Divider(),
303
481
                                       header=None,
304
 
                                       footer=urwid.Divider(div_char=self.divider)))
 
482
                                       footer=
 
483
                                       urwid.Divider(div_char=
 
484
                                                     self.divider)))
305
485
        if self.log_visible:
306
486
            self.uilist.append(self.logbox)
307
 
            pass
308
487
        self.topwidget = urwid.Pile(self.uilist)
309
488
    
310
 
    def log_message(self, markup):
 
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):
311
495
        """Add a log message to the log buffer."""
312
496
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
313
497
        if (self.max_log_length
314
498
            and len(self.log) > self.max_log_length):
315
499
            del self.log[0:len(self.log)-self.max_log_length-1]
316
500
        self.logbox.set_focus(len(self.logbox.body.contents),
317
 
                              coming_from=u"above")
 
501
                              coming_from="above")
 
502
        self.refresh()
318
503
    
319
504
    def toggle_log_display(self):
320
505
        """Toggle visibility of the log buffer."""
321
506
        self.log_visible = not self.log_visible
322
507
        self.rebuild()
323
 
        self.log_message(u"Log visibility changed to: "
324
 
                         + unicode(self.log_visible))
 
508
        #self.log_message("Log visibility changed to: "
 
509
        #                 + str(self.log_visible))
325
510
    
326
511
    def change_log_display(self):
327
512
        """Change type of log display.
328
513
        Currently, this toggles wrapping of text lines."""
329
 
        if self.log_wrap == u"clip":
330
 
            self.log_wrap = u"any"
 
514
        if self.log_wrap == "clip":
 
515
            self.log_wrap = "any"
331
516
        else:
332
 
            self.log_wrap = u"clip"
 
517
            self.log_wrap = "clip"
333
518
        for textwidget in self.log:
334
519
            textwidget.set_wrap_mode(self.log_wrap)
335
 
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
520
        #self.log_message("Wrap mode: " + self.log_wrap)
336
521
    
337
522
    def find_and_remove_client(self, path, name):
338
 
        """Find an client from its object path and remove it.
 
523
        """Find a client by its object path and remove it.
339
524
        
340
525
        This is connected to the ClientRemoved signal from the
341
526
        Mandos server object."""
343
528
            client = self.clients_dict[path]
344
529
        except KeyError:
345
530
            # not found?
 
531
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
532
                             .format(name, path))
346
533
            return
347
 
        self.remove_client(client, path)
 
534
        client.delete()
348
535
    
349
 
    def add_new_client(self, path, properties):
 
536
    def add_new_client(self, path):
350
537
        client_proxy_object = self.bus.get_object(self.busname, path)
351
538
        self.add_client(MandosClientWidget(server_proxy_object
352
539
                                           =self.mandos_serv,
353
540
                                           proxy_object
354
541
                                           =client_proxy_object,
355
 
                                           properties=properties,
356
542
                                           update_hook
357
543
                                           =self.refresh,
358
544
                                           delete_hook
359
 
                                           =self.remove_client),
 
545
                                           =self.remove_client,
 
546
                                           logger
 
547
                                           =self.log_message),
360
548
                        path=path)
361
549
    
362
550
    def add_client(self, client, path=None):
364
552
        if path is None:
365
553
            path = client.proxy.object_path
366
554
        self.clients_dict[path] = client
367
 
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
555
        self.clients.sort(key=lambda c: c.properties["Name"])
368
556
        self.refresh()
369
557
    
370
558
    def remove_client(self, client, path=None):
372
560
        if path is None:
373
561
            path = client.proxy.object_path
374
562
        del self.clients_dict[path]
375
 
        if not self.clients_dict:
376
 
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
377
 
            # is completely emptied, we need to recreate it.
378
 
            self.clients = urwid.SimpleListWalker([])
379
 
            self.rebuild()
380
563
        self.refresh()
381
564
    
382
565
    def refresh(self):
386
569
    
387
570
    def run(self):
388
571
        """Start the main loop and exit when it's done."""
 
572
        self.bus = dbus.SystemBus()
 
573
        mandos_dbus_objc = self.bus.get_object(
 
574
            self.busname, "/", follow_name_owner_changes=True)
 
575
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
576
                                          dbus_interface
 
577
                                          = server_interface)
 
578
        try:
 
579
            mandos_clients = (self.mandos_serv
 
580
                              .GetAllClientsWithProperties())
 
581
            if not mandos_clients:
 
582
                self.log_message_raw(("bold", "Note: Server has no clients."))
 
583
        except dbus.exceptions.DBusException:
 
584
            self.log_message_raw(("bold", "Note: No Mandos server running."))
 
585
            mandos_clients = dbus.Dictionary()
 
586
        
 
587
        (self.mandos_serv
 
588
         .connect_to_signal("ClientRemoved",
 
589
                            self.find_and_remove_client,
 
590
                            dbus_interface=server_interface,
 
591
                            byte_arrays=True))
 
592
        (self.mandos_serv
 
593
         .connect_to_signal("ClientAdded",
 
594
                            self.add_new_client,
 
595
                            dbus_interface=server_interface,
 
596
                            byte_arrays=True))
 
597
        (self.mandos_serv
 
598
         .connect_to_signal("ClientNotFound",
 
599
                            self.client_not_found,
 
600
                            dbus_interface=server_interface,
 
601
                            byte_arrays=True))
 
602
        for path, client in mandos_clients.items():
 
603
            client_proxy_object = self.bus.get_object(self.busname,
 
604
                                                      path)
 
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),
 
616
                            path=path)
 
617
        
389
618
        self.refresh()
390
619
        self._input_callback_tag = (gobject.io_add_watch
391
620
                                    (sys.stdin.fileno(),
401
630
    
402
631
    def process_input(self, source, condition):
403
632
        keys = self.screen.get_input()
404
 
        translations = { u"ctrl n": u"down",      # Emacs
405
 
                         u"ctrl p": u"up",        # Emacs
406
 
                         u"ctrl v": u"page down", # Emacs
407
 
                         u"meta v": u"page up",   # Emacs
408
 
                         u" ": u"page down",      # less
409
 
                         u"f": u"page down",      # less
410
 
                         u"b": u"page up",        # less
411
 
                         u"j": u"down",           # vi
412
 
                         u"k": u"up",             # vi
 
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
413
642
                         }
414
643
        for key in keys:
415
644
            try:
417
646
            except KeyError:    # :-)
418
647
                pass
419
648
            
420
 
            if key == u"q" or key == u"Q":
 
649
            if key == "q" or key == "Q":
421
650
                self.stop()
422
651
                break
423
 
            elif key == u"window resize":
 
652
            elif key == "window resize":
424
653
                self.size = self.screen.get_cols_rows()
425
654
                self.refresh()
426
 
            elif key == u"\f":  # Ctrl-L
 
655
            elif key == "\f":  # Ctrl-L
427
656
                self.refresh()
428
 
            elif key == u"l" or key == u"D":
 
657
            elif key == "l" or key == "D":
429
658
                self.toggle_log_display()
430
659
                self.refresh()
431
 
            elif key == u"w" or key == u"i":
 
660
            elif key == "w" or key == "i":
432
661
                self.change_log_display()
433
662
                self.refresh()
434
 
            elif key == u"?" or key == u"f1" or key == u"esc":
 
663
            elif key == "?" or key == "f1" or key == "esc":
435
664
                if not self.log_visible:
436
665
                    self.log_visible = True
437
666
                    self.rebuild()
438
 
                self.log_message((u"bold",
439
 
                                  u"  ".join((u"q: Quit",
440
 
                                              u"?: Help",
441
 
                                              u"l: Log window toggle",
442
 
                                              u"TAB: Switch window",
443
 
                                              u"w: Wrap (log)"))))
444
 
                self.log_message((u"bold",
445
 
                                  u"  ".join((u"Clients:",
446
 
                                              u"e: Enable",
447
 
                                              u"d: Disable",
448
 
                                              u"r: Remove",
449
 
                                              u"s: Start new checker",
450
 
                                              u"S: Stop checker",
451
 
                                              u"C: Checker OK"))))
 
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"))))
452
685
                self.refresh()
453
 
            elif key == u"tab":
 
686
            elif key == "tab":
454
687
                if self.topwidget.get_focus() is self.logbox:
455
688
                    self.topwidget.set_focus(0)
456
689
                else:
457
690
                    self.topwidget.set_focus(self.logbox)
458
691
                self.refresh()
459
 
            #elif (key == u"end" or key == u"meta >" or key == u"G"
460
 
            #      or key == u">"):
 
692
            #elif (key == "end" or key == "meta >" or key == "G"
 
693
            #      or key == ">"):
461
694
            #    pass            # xxx end-of-buffer
462
 
            #elif (key == u"home" or key == u"meta <" or key == u"g"
463
 
            #      or key == u"<"):
 
695
            #elif (key == "home" or key == "meta <" or key == "g"
 
696
            #      or key == "<"):
464
697
            #    pass            # xxx beginning-of-buffer
465
 
            #elif key == u"ctrl e" or key == u"$":
 
698
            #elif key == "ctrl e" or key == "$":
466
699
            #    pass            # xxx move-end-of-line
467
 
            #elif key == u"ctrl a" or key == u"^":
 
700
            #elif key == "ctrl a" or key == "^":
468
701
            #    pass            # xxx move-beginning-of-line
469
 
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
 
702
            #elif key == "ctrl b" or key == "meta (" or key == "h":
470
703
            #    pass            # xxx left
471
 
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
 
704
            #elif key == "ctrl f" or key == "meta )" or key == "l":
472
705
            #    pass            # xxx right
473
 
            #elif key == u"a":
 
706
            #elif key == "a":
474
707
            #    pass            # scroll up log
475
 
            #elif key == u"z":
 
708
            #elif key == "z":
476
709
            #    pass            # scroll down log
477
710
            elif self.topwidget.selectable():
478
711
                self.topwidget.keypress(self.size, key)
482
715
ui = UserInterface()
483
716
try:
484
717
    ui.run()
485
 
except:
 
718
except KeyboardInterrupt:
 
719
    ui.screen.stop()
 
720
except Exception as e:
 
721
    ui.log_message(str(e))
486
722
    ui.screen.stop()
487
723
    raise