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