/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

Initial design on approval system.

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