/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: Björn Påhlsson
  • Date: 2010-09-07 16:48:58 UTC
  • mto: (237.4.3 mandos-release)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: belorn@fukt.bsnet.se-20100907164858-tcg8hkxdj41zizac
mandos server: Added debuglevel that adjust at what level information
               should be reported.
plugin-runner, askpass-fifo, password-prompt, splasy, usplash:
               Using error instead of perror

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