/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: Björn Påhlsson
  • Date: 2010-09-07 20:22:16 UTC
  • mto: (237.4.3 mandos-release)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: belorn@fukt.bsnet.se-20100907202216-vypcn3nsd02mqz4s
mandos-monitor: removed milisecondsseconds from countdown.

Show diffs side-by-side

added added

removed removed

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