/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2012-05-07 19:13:15 UTC
  • Revision ID: teddy@recompile.se-20120507191315-tbe55n4u1uq3l7ft
* mandos: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

Show diffs side-by-side

added added

removed removed

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