/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2014-02-16 02:42:42 UTC
  • Revision ID: teddy@recompile.se-20140216024242-9wiw1nkxgt7ohovj
Fix running of self-tests.

* debian/control (Build-Depends): Add Python dependencies to
                                  successfully run self-tests.
* debian/copyright: GPLv3 now has its own license file - use it.
* debian/watch: Set PGP signature URL.
* mandos (main): Bug fix: When running self-tests, set exit code.
* mandos-ctl (main): Cosmetic fix; use os.EX_OK instead of plain 0.

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