/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
21
 
# <http://www.gnu.org/licenses/>.
22
 
# 
23
 
# Contact the authors at <mandos@recompile.se>.
24
 
# 
25
 
 
26
 
from __future__ import (division, absolute_import, print_function,
27
 
                        unicode_literals)
28
 
 
29
 
from future_builtins import *
 
3
 
 
4
from __future__ import division, absolute_import, with_statement
30
5
 
31
6
import sys
32
7
import os
44
19
 
45
20
import UserList
46
21
 
47
 
import locale
48
 
 
49
 
locale.setlocale(locale.LC_ALL, '')
50
 
 
51
 
import logging
52
 
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
53
 
 
54
22
# Some useful constants
55
 
domain = 'se.recompile'
 
23
domain = 'se.bsnet.fukt'
56
24
server_interface = domain + '.Mandos'
57
25
client_interface = domain + '.Mandos.Client'
58
 
version = "1.5.3"
 
26
version = "1.0.14"
59
27
 
60
28
# Always run in monochrome mode
61
29
urwid.curses_display.curses.has_colors = lambda : False
65
33
urwid.curses_display.curses.A_UNDERLINE |= (
66
34
    urwid.curses_display.curses.A_BLINK)
67
35
 
68
 
def isoformat_to_datetime(iso):
69
 
    "Parse an ISO 8601 date string to a datetime.datetime()"
70
 
    if not iso:
71
 
        return None
72
 
    d, t = iso.split("T", 1)
73
 
    year, month, day = d.split("-", 2)
74
 
    hour, minute, second = t.split(":", 2)
75
 
    second, fraction = divmod(float(second), 1)
76
 
    return datetime.datetime(int(year),
77
 
                             int(month),
78
 
                             int(day),
79
 
                             int(hour),
80
 
                             int(minute),
81
 
                             int(second),           # Whole seconds
82
 
                             int(fraction*1000000)) # Microseconds
83
 
 
84
36
class MandosClientPropertyCache(object):
85
37
    """This wraps a Mandos Client D-Bus proxy object, caches the
86
38
    properties and calls a hook function when any of them are
87
39
    changed.
88
40
    """
89
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
41
    def __init__(self, proxy_object=None, properties=None, *args,
 
42
                 **kwargs):
90
43
        self.proxy = proxy_object # Mandos Client proxy object
91
44
        
92
 
        self.properties = dict()
93
 
        self.property_changed_match = (
94
 
            self.proxy.connect_to_signal("PropertyChanged",
95
 
                                         self.property_changed,
96
 
                                         client_interface,
97
 
                                         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)
98
53
        
99
 
        self.properties.update(
100
 
            self.proxy.GetAll(client_interface,
101
 
                              dbus_interface = dbus.PROPERTIES_IFACE))
102
 
 
103
 
        #XXX This breaks good super behaviour
104
 
#        super(MandosClientPropertyCache, self).__init__(
105
 
#            *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)
106
61
    
107
62
    def property_changed(self, property=None, value=None):
108
63
        """This is called whenever we get a PropertyChanged signal
110
65
        """
111
66
        # Update properties dict with new value
112
67
        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)
118
68
 
119
69
 
120
70
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
132
82
        # Logger
133
83
        self.logger = logger
134
84
        
135
 
        self._update_timer_callback_tag = None
136
 
        self._update_timer_callback_lock = 0
137
 
        
138
85
        # The widget shown normally
139
 
        self._text_widget = urwid.Text("")
 
86
        self._text_widget = urwid.Text(u"")
140
87
        # The widget shown when we have focus
141
 
        self._focus_text_widget = urwid.Text("")
 
88
        self._focus_text_widget = urwid.Text(u"")
142
89
        super(MandosClientWidget, self).__init__(
143
90
            update_hook=update_hook, delete_hook=delete_hook,
144
91
            *args, **kwargs)
145
92
        self.update()
146
93
        self.opened = False
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
 
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)
209
110
    
210
111
    def checker_completed(self, exitstatus, condition, command):
211
112
        if exitstatus == 0:
212
 
            self.update()
 
113
            self.logger(u'Checker for client %s (command "%s")'
 
114
                        u' was successful'
 
115
                        % (self.properties[u"name"], command))
213
116
            return
214
 
        # Checker failed
215
117
        if os.WIFEXITED(condition):
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()
 
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')
234
134
    
235
135
    def checker_started(self, 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)))
241
 
        pass
 
136
        self.logger(u'Client %s started checker "%s"'
 
137
                    % (self.properties[u"name"], unicode(command)))
242
138
    
243
139
    def got_secret(self):
244
 
        self.logger('Client {0} received its secret'
245
 
                    .format(self.properties["Name"]))
246
 
    
247
 
    def need_approval(self, timeout, default):
248
 
        if not default:
249
 
            message = 'Client {0} needs approval within {1} seconds'
250
 
        else:
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)
255
 
    
256
 
    def rejected(self, reason):
257
 
        self.logger('Client {0} was rejected; reason: {1}'
258
 
                    .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"])
259
146
    
260
147
    def selectable(self):
261
148
        """Make this a "selectable" widget.
262
149
        This overrides the method from urwid.FlowWidget."""
263
150
        return True
264
151
    
265
 
    def rows(self, maxcolrow, focus=False):
 
152
    def rows(self, (maxcol,), focus=False):
266
153
        """How many rows this widget will occupy might depend on
267
154
        whether we have focus or not.
268
155
        This overrides the method from urwid.FlowWidget"""
269
 
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
 
156
        return self.current_widget(focus).rows((maxcol,), focus=focus)
270
157
    
271
158
    def current_widget(self, focus=False):
272
159
        if focus or self.opened:
276
163
    def update(self):
277
164
        "Called when what is visible on the screen should be updated."
278
165
        # How to add standout mode to a style
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",
 
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",
285
172
                          }
286
 
 
 
173
        
287
174
        # Rebuild focus and non-focus widgets using current properties
288
 
 
289
 
        # Base part of a client. Name!
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]))
321
 
        else:
322
 
            message = "enabled"
323
 
        self._text = "{0}{1}".format(base, message)
324
 
            
 
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")})
325
181
        if not urwid.supports_unicode():
326
182
            self._text = self._text.encode("ascii", "replace")
327
 
        textlist = [("normal", self._text)]
 
183
        textlist = [(u"normal", self._text)]
328
184
        self._text_widget.set_text(textlist)
329
185
        self._focus_text_widget.set_text([(with_standout[text[0]],
330
186
                                           text[1])
338
194
        if self.update_hook is not None:
339
195
            self.update_hook()
340
196
    
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 = ()
 
197
    def delete(self):
354
198
        if self.delete_hook is not None:
355
199
            self.delete_hook(self)
356
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
357
200
    
358
 
    def render(self, maxcolrow, focus=False):
 
201
    def render(self, (maxcol,), focus=False):
359
202
        """Render differently if we have focus.
360
203
        This overrides the method from urwid.FlowWidget"""
361
 
        return self.current_widget(focus).render(maxcolrow,
 
204
        return self.current_widget(focus).render((maxcol,),
362
205
                                                 focus=focus)
363
206
    
364
 
    def keypress(self, maxcolrow, key):
 
207
    def keypress(self, (maxcol,), key):
365
208
        """Handle keys.
366
209
        This overrides the method from urwid.FlowWidget"""
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":
374
 
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
375
 
                               dbus_interface = client_interface,
376
 
                               ignore_reply=True)
377
 
        elif key == "d":
378
 
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
379
 
                                  dbus_interface = client_interface,
380
 
                               ignore_reply=True)
381
 
        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":
382
215
            self.server_proxy_object.RemoveClient(self.proxy
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)
 
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()
394
223
        # xxx
395
 
#         elif key == "p" or key == "=":
 
224
#         elif key == u"p" or key == "=":
396
225
#             self.proxy.pause()
397
 
#         elif key == "u" or key == ":":
 
226
#         elif key == u"u" or key == ":":
398
227
#             self.proxy.unpause()
399
 
#         elif key == "RET":
 
228
#         elif key == u"RET":
400
229
#             self.open()
401
230
        else:
402
231
            return key
418
247
    "down" key presses, thus not allowing any containing widgets to
419
248
    use them as an excuse to shift focus away from this widget.
420
249
    """
421
 
    def keypress(self, maxcolrow, key):
422
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
423
 
        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"):
424
253
            return
425
254
        return ret
426
255
 
435
264
        self.screen = urwid.curses_display.Screen()
436
265
        
437
266
        self.screen.register_palette((
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")),
 
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")),
455
284
                ))
456
285
        
457
286
        if urwid.supports_unicode():
458
 
            self.divider = "─" # \u2500
459
 
            #self.divider = "━" # \u2501
 
287
            self.divider = u"─" # \u2500
 
288
            #self.divider = u"━" # \u2501
460
289
        else:
461
 
            #self.divider = "-" # \u002d
462
 
            self.divider = "_" # \u005f
 
290
            #self.divider = u"-" # \u002d
 
291
            self.divider = u"_" # \u005f
463
292
        
464
293
        self.screen.start()
465
294
        
479
308
        # This keeps track of whether self.uilist currently has
480
309
        # self.logbox in it or not
481
310
        self.log_visible = True
482
 
        self.log_wrap = "any"
 
311
        self.log_wrap = u"any"
483
312
        
484
313
        self.rebuild()
485
 
        self.log_message_raw(("bold",
486
 
                              "Mandos Monitor version " + version))
487
 
        self.log_message_raw(("bold",
488
 
                              "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"))
489
318
        
490
319
        self.busname = domain + '.Mandos'
491
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)
492
363
    
493
364
    def client_not_found(self, fingerprint, address):
494
 
        self.log_message("Client with address {0} and fingerprint"
495
 
                         " {1} could not be found"
496
 
                         .format(address, fingerprint))
 
365
        self.log_message((u"Client with address %s and fingerprint %s"
 
366
                          u" could not be found" % (address,
 
367
                                                    fingerprint)))
497
368
    
498
369
    def rebuild(self):
499
370
        """This rebuilds the User Interface.
500
371
        Call this when the widget layout needs to change"""
501
372
        self.uilist = []
502
373
        #self.uilist.append(urwid.ListBox(self.clients))
503
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
504
 
                                                          clients),
 
374
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
505
375
                                       #header=urwid.Divider(),
506
376
                                       header=None,
507
 
                                       footer=
508
 
                                       urwid.Divider(div_char=
509
 
                                                     self.divider)))
 
377
                                       footer=urwid.Divider(div_char=self.divider)))
510
378
        if self.log_visible:
511
379
            self.uilist.append(self.logbox)
 
380
            pass
512
381
        self.topwidget = urwid.Pile(self.uilist)
513
382
    
514
383
    def log_message(self, message):
515
384
        timestamp = datetime.datetime.now().isoformat()
516
 
        self.log_message_raw(timestamp + ": " + message)
 
385
        self.log_message_raw(timestamp + u": " + message)
517
386
    
518
387
    def log_message_raw(self, markup):
519
388
        """Add a log message to the log buffer."""
522
391
            and len(self.log) > self.max_log_length):
523
392
            del self.log[0:len(self.log)-self.max_log_length-1]
524
393
        self.logbox.set_focus(len(self.logbox.body.contents),
525
 
                              coming_from="above")
 
394
                              coming_from=u"above")
526
395
        self.refresh()
527
396
    
528
397
    def toggle_log_display(self):
529
398
        """Toggle visibility of the log buffer."""
530
399
        self.log_visible = not self.log_visible
531
400
        self.rebuild()
532
 
        #self.log_message("Log visibility changed to: "
533
 
        #                 + unicode(self.log_visible))
 
401
        self.log_message(u"Log visibility changed to: "
 
402
                         + unicode(self.log_visible))
534
403
    
535
404
    def change_log_display(self):
536
405
        """Change type of log display.
537
406
        Currently, this toggles wrapping of text lines."""
538
 
        if self.log_wrap == "clip":
539
 
            self.log_wrap = "any"
 
407
        if self.log_wrap == u"clip":
 
408
            self.log_wrap = u"any"
540
409
        else:
541
 
            self.log_wrap = "clip"
 
410
            self.log_wrap = u"clip"
542
411
        for textwidget in self.log:
543
412
            textwidget.set_wrap_mode(self.log_wrap)
544
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
413
        self.log_message(u"Wrap mode: " + self.log_wrap)
545
414
    
546
415
    def find_and_remove_client(self, path, name):
547
 
        """Find a client by its object path and remove it.
 
416
        """Find an client from its object path and remove it.
548
417
        
549
418
        This is connected to the ClientRemoved signal from the
550
419
        Mandos server object."""
552
421
            client = self.clients_dict[path]
553
422
        except KeyError:
554
423
            # not found?
555
 
            self.log_message("Unknown client {0!r} ({1!r}) removed"
556
 
                             .format(name, path))
557
424
            return
558
 
        client.delete()
 
425
        self.remove_client(client, path)
559
426
    
560
 
    def add_new_client(self, path):
 
427
    def add_new_client(self, path, properties):
561
428
        client_proxy_object = self.bus.get_object(self.busname, path)
562
429
        self.add_client(MandosClientWidget(server_proxy_object
563
430
                                           =self.mandos_serv,
564
431
                                           proxy_object
565
432
                                           =client_proxy_object,
 
433
                                           properties=properties,
566
434
                                           update_hook
567
435
                                           =self.refresh,
568
436
                                           delete_hook
569
 
                                           =self.remove_client,
570
 
                                           logger
571
 
                                           =self.log_message),
 
437
                                           =self.remove_client),
572
438
                        path=path)
573
439
    
574
440
    def add_client(self, client, path=None):
576
442
        if path is None:
577
443
            path = client.proxy.object_path
578
444
        self.clients_dict[path] = client
579
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
445
        self.clients.sort(None, lambda c: c.properties[u"name"])
580
446
        self.refresh()
581
447
    
582
448
    def remove_client(self, client, path=None):
598
464
    
599
465
    def run(self):
600
466
        """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
 
 
644
467
        self.refresh()
645
468
        self._input_callback_tag = (gobject.io_add_watch
646
469
                                    (sys.stdin.fileno(),
656
479
    
657
480
    def process_input(self, source, condition):
658
481
        keys = self.screen.get_input()
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
 
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
668
491
                         }
669
492
        for key in keys:
670
493
            try:
672
495
            except KeyError:    # :-)
673
496
                pass
674
497
            
675
 
            if key == "q" or key == "Q":
 
498
            if key == u"q" or key == u"Q":
676
499
                self.stop()
677
500
                break
678
 
            elif key == "window resize":
 
501
            elif key == u"window resize":
679
502
                self.size = self.screen.get_cols_rows()
680
503
                self.refresh()
681
 
            elif key == "\f":  # Ctrl-L
 
504
            elif key == u"\f":  # Ctrl-L
682
505
                self.refresh()
683
 
            elif key == "l" or key == "D":
 
506
            elif key == u"l" or key == u"D":
684
507
                self.toggle_log_display()
685
508
                self.refresh()
686
 
            elif key == "w" or key == "i":
 
509
            elif key == u"w" or key == u"i":
687
510
                self.change_log_display()
688
511
                self.refresh()
689
 
            elif key == "?" or key == "f1" or key == "esc":
 
512
            elif key == u"?" or key == u"f1" or key == u"esc":
690
513
                if not self.log_visible:
691
514
                    self.log_visible = True
692
515
                    self.rebuild()
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"))))
 
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"))))
711
532
                self.refresh()
712
 
            elif key == "tab":
 
533
            elif key == u"tab":
713
534
                if self.topwidget.get_focus() is self.logbox:
714
535
                    self.topwidget.set_focus(0)
715
536
                else:
716
537
                    self.topwidget.set_focus(self.logbox)
717
538
                self.refresh()
718
 
            #elif (key == "end" or key == "meta >" or key == "G"
719
 
            #      or key == ">"):
 
539
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
540
            #      or key == u">"):
720
541
            #    pass            # xxx end-of-buffer
721
 
            #elif (key == "home" or key == "meta <" or key == "g"
722
 
            #      or key == "<"):
 
542
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
543
            #      or key == u"<"):
723
544
            #    pass            # xxx beginning-of-buffer
724
 
            #elif key == "ctrl e" or key == "$":
 
545
            #elif key == u"ctrl e" or key == u"$":
725
546
            #    pass            # xxx move-end-of-line
726
 
            #elif key == "ctrl a" or key == "^":
 
547
            #elif key == u"ctrl a" or key == u"^":
727
548
            #    pass            # xxx move-beginning-of-line
728
 
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
549
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
729
550
            #    pass            # xxx left
730
 
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
551
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
731
552
            #    pass            # xxx right
732
 
            #elif key == "a":
 
553
            #elif key == u"a":
733
554
            #    pass            # scroll up log
734
 
            #elif key == "z":
 
555
            #elif key == u"z":
735
556
            #    pass            # scroll down log
736
557
            elif self.topwidget.selectable():
737
558
                self.topwidget.keypress(self.size, key)
741
562
ui = UserInterface()
742
563
try:
743
564
    ui.run()
744
 
except KeyboardInterrupt:
745
 
    ui.screen.stop()
746
 
except Exception, e:
747
 
    ui.log_message(unicode(e))
 
565
except:
748
566
    ui.screen.stop()
749
567
    raise