/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: teddy at bsnet
  • Date: 2010-08-24 18:18:01 UTC
  • mto: (24.1.154 mandos)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: teddy@fukt.bsnet.se-20100824181801-n798wxs117trv8iu
* mandos: Use logging.getLogger() as in the documentation.
* mandos-monitor: Suppress logging from dbus.proxies.

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