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