/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

* mandos (Client.runtime_expansions): Add "expires" and (bug fix)
                                      "last_approval_request".
  (main): Don't ignore SIGINT.
* mandos-clients.conf.xml (RUNTIME EXPANSION): Added "expires".

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