/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: 2011-02-27 15:45:24 UTC
  • mto: This revision was merged to the branch mainline in revision 467.
  • Revision ID: belorn@fukt.bsnet.se-20110227154524-zac8443jod8v1g1g
fixed bug with conflict detection between plymouthd and password-prompt

Show diffs side-by-side

added added

removed removed

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