/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: 2009-11-15 10:12:09 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091115101209-d0zrfwkp6u0l7v7b
* mandos (MandosServer.handle_ipc): Better log message.
  (main/MandosDBusService.ClientNotFound): Add "address" argument.
                                           All callers changed.
* mandos-monitor (MandosClientWidget.__init__): Add "logger" argument.
  (MandosClientWidget.checker_completed,
  MandosClientWidget.checker_started, MandosClientWidget.got_secret,
  MandosClientWidget.rejected): New methods, connected to signals.
  (MandosClientWidget.update): Improve display.
  (UserInterface.client_not_found): New method, conneced to signal.
  (UserInterface.log_message): New; log with timestamp.
  (UserInterface.log_message_raw): Same as old "log_message".  Bug
                                  fix; always do "refresh()".

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