/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Björn Påhlsson
  • Date: 2010-09-07 18:48:56 UTC
  • mto: (237.7.1 mandos)
  • mto: This revision was merged to the branch mainline in revision 270.
  • Revision ID: belorn@fukt.bsnet.se-20100907184856-waz6cvxbm7ranha2
added the actually plugin file for plymouth

Show diffs side-by-side

added added

removed removed

Lines of Context:
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@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
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)
50
28
 
51
29
# Some useful constants
52
 
domain = 'se.recompile'
 
30
domain = 'se.bsnet.fukt'
53
31
server_interface = domain + '.Mandos'
54
32
client_interface = domain + '.Mandos.Client'
55
 
version = "1.4.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
66
44
    "Parse an ISO 8601 date string to a datetime.datetime()"
67
45
    if not iso:
68
46
        return None
69
 
    d, t = iso.split("T", 1)
70
 
    year, month, day = d.split("-", 2)
71
 
    hour, minute, second = t.split(":", 2)
 
47
    d, t = iso.split(u"T", 1)
 
48
    year, month, day = d.split(u"-", 2)
 
49
    hour, minute, second = t.split(u":", 2)
72
50
    second, fraction = divmod(float(second), 1)
73
51
    return datetime.datetime(int(year),
74
52
                             int(month),
87
65
        self.proxy = proxy_object # Mandos Client proxy object
88
66
        
89
67
        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))
 
68
        self.proxy.connect_to_signal(u"PropertyChanged",
 
69
                                     self.property_changed,
 
70
                                     client_interface,
 
71
                                     byte_arrays=True)
95
72
        
96
73
        self.properties.update(
97
74
            self.proxy.GetAll(client_interface,
98
75
                              dbus_interface = dbus.PROPERTIES_IFACE))
99
76
 
100
 
        #XXX This breaks good super behaviour
 
77
        #XXX This break good super behaviour!
101
78
#        super(MandosClientPropertyCache, self).__init__(
102
79
#            *args, **kwargs)
103
80
    
107
84
        """
108
85
        # Update properties dict with new value
109
86
        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
87
 
116
88
 
117
89
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
130
102
        self.logger = logger
131
103
        
132
104
        self._update_timer_callback_tag = None
133
 
        self._update_timer_callback_lock = 0
134
105
        self.last_checker_failed = False
135
106
        
136
107
        # The widget shown normally
137
 
        self._text_widget = urwid.Text("")
 
108
        self._text_widget = urwid.Text(u"")
138
109
        # The widget shown when we have focus
139
 
        self._focus_text_widget = urwid.Text("")
 
110
        self._focus_text_widget = urwid.Text(u"")
140
111
        super(MandosClientWidget, self).__init__(
141
112
            update_hook=update_hook, delete_hook=delete_hook,
142
113
            *args, **kwargs)
143
114
        self.update()
144
115
        self.opened = False
145
 
        
 
116
        self.proxy.connect_to_signal(u"CheckerCompleted",
 
117
                                     self.checker_completed,
 
118
                                     client_interface,
 
119
                                     byte_arrays=True)
 
120
        self.proxy.connect_to_signal(u"CheckerStarted",
 
121
                                     self.checker_started,
 
122
                                     client_interface,
 
123
                                     byte_arrays=True)
 
124
        self.proxy.connect_to_signal(u"GotSecret",
 
125
                                     self.got_secret,
 
126
                                     client_interface,
 
127
                                     byte_arrays=True)
 
128
        self.proxy.connect_to_signal(u"NeedApproval",
 
129
                                     self.need_approval,
 
130
                                     client_interface,
 
131
                                     byte_arrays=True)
 
132
        self.proxy.connect_to_signal(u"Rejected",
 
133
                                     self.rejected,
 
134
                                     client_interface,
 
135
                                     byte_arrays=True)
146
136
        last_checked_ok = isoformat_to_datetime(self.properties
147
 
                                                ["LastCheckedOK"])
 
137
                                                ["last_checked_ok"])
148
138
        if last_checked_ok is None:
149
139
            self.last_checker_failed = True
150
140
        else:
152
142
                                         - last_checked_ok)
153
143
                                        > datetime.timedelta
154
144
                                        (milliseconds=
155
 
                                         self.properties
156
 
                                         ["Interval"]))
157
 
        
 
145
                                         self.properties["interval"]))
158
146
        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
147
            self._update_timer_callback_tag = (gobject.timeout_add
205
148
                                               (1000,
206
149
                                                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
210
150
    
211
151
    def checker_completed(self, exitstatus, condition, command):
212
152
        if exitstatus == 0:
213
153
            if self.last_checker_failed:
214
154
                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))
 
155
                gobject.source_remove(self._update_timer_callback_tag)
 
156
                self._update_timer_callback_tag = None
 
157
            self.logger(u'Checker for client %s (command "%s")'
 
158
                        u' was successful'
 
159
                        % (self.properties[u"name"], command))
219
160
            self.update()
220
161
            return
221
162
        # Checker failed
222
163
        if not self.last_checker_failed:
223
164
            self.last_checker_failed = True
224
 
            self.using_timer(True)
 
165
            self._update_timer_callback_tag = (gobject.timeout_add
 
166
                                               (1000,
 
167
                                                self.update_timer))
225
168
        if os.WIFEXITED(condition):
226
 
            self.logger('Checker for client %s (command "%s")'
227
 
                        ' failed with exit code %s'
228
 
                        % (self.properties["Name"], command,
 
169
            self.logger(u'Checker for client %s (command "%s")'
 
170
                        u' failed with exit code %s'
 
171
                        % (self.properties[u"name"], command,
229
172
                           os.WEXITSTATUS(condition)))
230
173
        elif os.WIFSIGNALED(condition):
231
 
            self.logger('Checker for client %s (command "%s")'
232
 
                        ' was killed by signal %s'
233
 
                        % (self.properties["Name"], command,
 
174
            self.logger(u'Checker for client %s (command "%s")'
 
175
                        u' was killed by signal %s'
 
176
                        % (self.properties[u"name"], command,
234
177
                           os.WTERMSIG(condition)))
235
178
        elif os.WCOREDUMP(condition):
236
 
            self.logger('Checker for client %s (command "%s")'
237
 
                        ' dumped core'
238
 
                        % (self.properties["Name"], command))
 
179
            self.logger(u'Checker for client %s (command "%s")'
 
180
                        u' dumped core'
 
181
                        % (self.properties[u"name"], command))
239
182
        else:
240
 
            self.logger('Checker for client %s completed'
241
 
                        ' mysteriously')
 
183
            self.logger(u'Checker for client %s completed mysteriously')
242
184
        self.update()
243
185
    
244
186
    def checker_started(self, command):
245
 
        #self.logger('Client %s started checker "%s"'
246
 
        #            % (self.properties["Name"], unicode(command)))
 
187
        #self.logger(u'Client %s started checker "%s"'
 
188
        #            % (self.properties[u"name"], unicode(command)))
247
189
        pass
248
190
    
249
191
    def got_secret(self):
250
 
        self.last_checker_failed = False
251
 
        self.logger('Client %s received its secret'
252
 
                    % self.properties["Name"])
 
192
        self.logger(u'Client %s received its secret'
 
193
                    % self.properties[u"name"])
253
194
    
254
195
    def need_approval(self, timeout, default):
255
196
        if not default:
256
 
            message = 'Client %s needs approval within %s seconds'
 
197
            message = u'Client %s needs approval within %s seconds'
257
198
        else:
258
 
            message = 'Client %s will get its secret in %s seconds'
 
199
            message = u'Client %s will get its secret in %s seconds'
259
200
        self.logger(message
260
 
                    % (self.properties["Name"], timeout/1000))
261
 
        self.using_timer(True)
 
201
                    % (self.properties[u"name"], timeout/1000))
262
202
    
263
203
    def rejected(self, reason):
264
 
        self.logger('Client %s was rejected; reason: %s'
265
 
                    % (self.properties["Name"], reason))
 
204
        self.logger(u'Client %s was rejected; reason: %s'
 
205
                    % (self.properties[u"name"], reason))
266
206
    
267
207
    def selectable(self):
268
208
        """Make this a "selectable" widget.
269
209
        This overrides the method from urwid.FlowWidget."""
270
210
        return True
271
211
    
272
 
    def rows(self, maxcolrow, focus=False):
 
212
    def rows(self, (maxcol,), focus=False):
273
213
        """How many rows this widget will occupy might depend on
274
214
        whether we have focus or not.
275
215
        This overrides the method from urwid.FlowWidget"""
276
 
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
 
216
        return self.current_widget(focus).rows((maxcol,), focus=focus)
277
217
    
278
218
    def current_widget(self, focus=False):
279
219
        if focus or self.opened:
283
223
    def update(self):
284
224
        "Called when what is visible on the screen should be updated."
285
225
        # 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",
 
226
        with_standout = { u"normal": u"standout",
 
227
                          u"bold": u"bold-standout",
 
228
                          u"underline-blink":
 
229
                              u"underline-blink-standout",
 
230
                          u"bold-underline-blink":
 
231
                              u"bold-underline-blink-standout",
292
232
                          }
293
233
 
294
234
        # Rebuild focus and non-focus widgets using current properties
295
235
 
296
236
        # 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"]:
 
237
        base = (u'%(name)s: '
 
238
                      % {u"name": self.properties[u"name"]})
 
239
        if not self.properties[u"enabled"]:
 
240
            message = u"DISABLED"
 
241
        elif self.last_checker_failed:
302
242
            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])
 
243
                                         = self.properties[u"timeout"])
 
244
            last_ok = isoformat_to_datetime(
 
245
                max((self.properties["last_checked_ok"]
 
246
                     or self.properties["created"]),
 
247
                    self.properties[u"last_enabled"]))
 
248
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
 
249
 
 
250
            message = (u'A checker has failed! Time until client gets diabled: %s'
 
251
                           % unicode(timer))
 
252
        elif self.properties[u"approved_pending"]:
 
253
            if self.properties[u"approved_by_default"]:
 
254
                message = u"Connection established to client. (d)eny?"
 
255
            else:
 
256
                message = u"Seeks approval to send secret. (a)pprove?"
329
257
        else:
330
 
            message = "enabled"
 
258
            message = u"enabled"
331
259
        self._text = "%s%s" % (base, message)
332
260
            
333
261
        if not urwid.supports_unicode():
334
262
            self._text = self._text.encode("ascii", "replace")
335
 
        textlist = [("normal", self._text)]
 
263
        textlist = [(u"normal", self._text)]
336
264
        self._text_widget.set_text(textlist)
337
265
        self._focus_text_widget.set_text([(with_standout[text[0]],
338
266
                                           text[1])
347
275
            self.update_hook()
348
276
    
349
277
    def update_timer(self):
350
 
        """called by gobject. Will indefinitely loop until
351
 
        gobject.source_remove() on tag is called"""
 
278
        "called by gobject"
352
279
        self.update()
353
280
        return True             # Keep calling this
354
281
    
355
 
    def delete(self, *args, **kwargs):
 
282
    def delete(self):
356
283
        if self._update_timer_callback_tag is not None:
357
284
            gobject.source_remove(self._update_timer_callback_tag)
358
285
            self._update_timer_callback_tag = None
359
 
        for match in self.match_objects:
360
 
            match.remove()
361
 
        self.match_objects = ()
362
286
        if self.delete_hook is not None:
363
287
            self.delete_hook(self)
364
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
365
288
    
366
 
    def render(self, maxcolrow, focus=False):
 
289
    def render(self, (maxcol,), focus=False):
367
290
        """Render differently if we have focus.
368
291
        This overrides the method from urwid.FlowWidget"""
369
 
        return self.current_widget(focus).render(maxcolrow,
 
292
        return self.current_widget(focus).render((maxcol,),
370
293
                                                 focus=focus)
371
294
    
372
 
    def keypress(self, maxcolrow, key):
 
295
    def keypress(self, (maxcol,), key):
373
296
        """Handle keys.
374
297
        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":
 
298
        if key == u"+":
 
299
            self.proxy.Enable(dbus_interface = client_interface)
 
300
        elif key == u"-":
 
301
            self.proxy.Disable(dbus_interface = client_interface)
 
302
        elif key == u"a":
382
303
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
383
 
                               dbus_interface = client_interface,
384
 
                               ignore_reply=True)
385
 
        elif key == "d":
 
304
                               dbus_interface = client_interface)
 
305
        elif key == u"d":
386
306
            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":
 
307
                                  dbus_interface = client_interface)
 
308
        elif key == u"r" or key == u"_" or key == u"ctrl k":
390
309
            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)
 
310
                                                  .object_path)
 
311
        elif key == u"s":
 
312
            self.proxy.StartChecker(dbus_interface = client_interface)
 
313
        elif key == u"S":
 
314
            self.proxy.StopChecker(dbus_interface = client_interface)
 
315
        elif key == u"C":
 
316
            self.proxy.CheckedOK(dbus_interface = client_interface)
402
317
        # xxx
403
 
#         elif key == "p" or key == "=":
 
318
#         elif key == u"p" or key == "=":
404
319
#             self.proxy.pause()
405
 
#         elif key == "u" or key == ":":
 
320
#         elif key == u"u" or key == ":":
406
321
#             self.proxy.unpause()
407
 
#         elif key == "RET":
 
322
#         elif key == u"RET":
408
323
#             self.open()
 
324
#        elif key == u"+":
 
325
#            self.proxy.Approve(True)
 
326
#        elif key == u"-":
 
327
#            self.proxy.Approve(False)
409
328
        else:
410
329
            return key
411
330
    
426
345
    "down" key presses, thus not allowing any containing widgets to
427
346
    use them as an excuse to shift focus away from this widget.
428
347
    """
429
 
    def keypress(self, maxcolrow, key):
430
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
431
 
        if ret in ("up", "down"):
 
348
    def keypress(self, (maxcol, maxrow), key):
 
349
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
 
350
        if ret in (u"up", u"down"):
432
351
            return
433
352
        return ret
434
353
 
443
362
        self.screen = urwid.curses_display.Screen()
444
363
        
445
364
        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")),
 
365
                (u"normal",
 
366
                 u"default", u"default", None),
 
367
                (u"bold",
 
368
                 u"default", u"default", u"bold"),
 
369
                (u"underline-blink",
 
370
                 u"default", u"default", u"underline"),
 
371
                (u"standout",
 
372
                 u"default", u"default", u"standout"),
 
373
                (u"bold-underline-blink",
 
374
                 u"default", u"default", (u"bold", u"underline")),
 
375
                (u"bold-standout",
 
376
                 u"default", u"default", (u"bold", u"standout")),
 
377
                (u"underline-blink-standout",
 
378
                 u"default", u"default", (u"underline", u"standout")),
 
379
                (u"bold-underline-blink-standout",
 
380
                 u"default", u"default", (u"bold", u"underline",
 
381
                                          u"standout")),
463
382
                ))
464
383
        
465
384
        if urwid.supports_unicode():
466
 
            self.divider = "─" # \u2500
467
 
            #self.divider = "━" # \u2501
 
385
            self.divider = u"─" # \u2500
 
386
            #self.divider = u"━" # \u2501
468
387
        else:
469
 
            #self.divider = "-" # \u002d
470
 
            self.divider = "_" # \u005f
 
388
            #self.divider = u"-" # \u002d
 
389
            self.divider = u"_" # \u005f
471
390
        
472
391
        self.screen.start()
473
392
        
487
406
        # This keeps track of whether self.uilist currently has
488
407
        # self.logbox in it or not
489
408
        self.log_visible = True
490
 
        self.log_wrap = "any"
 
409
        self.log_wrap = u"any"
491
410
        
492
411
        self.rebuild()
493
 
        self.log_message_raw(("bold",
494
 
                              "Mandos Monitor version " + version))
495
 
        self.log_message_raw(("bold",
496
 
                              "q: Quit  ?: Help"))
 
412
        self.log_message_raw((u"bold",
 
413
                              u"Mandos Monitor version " + version))
 
414
        self.log_message_raw((u"bold",
 
415
                              u"q: Quit  ?: Help"))
497
416
        
498
417
        self.busname = domain + '.Mandos'
499
418
        self.main_loop = gobject.MainLoop()
500
419
        self.bus = dbus.SystemBus()
501
420
        mandos_dbus_objc = self.bus.get_object(
502
 
            self.busname, "/", follow_name_owner_changes=True)
 
421
            self.busname, u"/", follow_name_owner_changes=True)
503
422
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
504
423
                                          dbus_interface
505
424
                                          = server_interface)
510
429
            mandos_clients = dbus.Dictionary()
511
430
        
512
431
        (self.mandos_serv
513
 
         .connect_to_signal("ClientRemoved",
 
432
         .connect_to_signal(u"ClientRemoved",
514
433
                            self.find_and_remove_client,
515
434
                            dbus_interface=server_interface,
516
435
                            byte_arrays=True))
517
436
        (self.mandos_serv
518
 
         .connect_to_signal("ClientAdded",
 
437
         .connect_to_signal(u"ClientAdded",
519
438
                            self.add_new_client,
520
439
                            dbus_interface=server_interface,
521
440
                            byte_arrays=True))
522
441
        (self.mandos_serv
523
 
         .connect_to_signal("ClientNotFound",
 
442
         .connect_to_signal(u"ClientNotFound",
524
443
                            self.client_not_found,
525
444
                            dbus_interface=server_interface,
526
445
                            byte_arrays=True))
541
460
                            path=path)
542
461
    
543
462
    def client_not_found(self, fingerprint, address):
544
 
        self.log_message(("Client with address %s and fingerprint %s"
545
 
                          " could not be found" % (address,
 
463
        self.log_message((u"Client with address %s and fingerprint %s"
 
464
                          u" could not be found" % (address,
546
465
                                                    fingerprint)))
547
466
    
548
467
    def rebuild(self):
550
469
        Call this when the widget layout needs to change"""
551
470
        self.uilist = []
552
471
        #self.uilist.append(urwid.ListBox(self.clients))
553
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
554
 
                                                          clients),
 
472
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
555
473
                                       #header=urwid.Divider(),
556
474
                                       header=None,
557
 
                                       footer=
558
 
                                       urwid.Divider(div_char=
559
 
                                                     self.divider)))
 
475
                                       footer=urwid.Divider(div_char=self.divider)))
560
476
        if self.log_visible:
561
477
            self.uilist.append(self.logbox)
562
478
            pass
564
480
    
565
481
    def log_message(self, message):
566
482
        timestamp = datetime.datetime.now().isoformat()
567
 
        self.log_message_raw(timestamp + ": " + message)
 
483
        self.log_message_raw(timestamp + u": " + message)
568
484
    
569
485
    def log_message_raw(self, markup):
570
486
        """Add a log message to the log buffer."""
573
489
            and len(self.log) > self.max_log_length):
574
490
            del self.log[0:len(self.log)-self.max_log_length-1]
575
491
        self.logbox.set_focus(len(self.logbox.body.contents),
576
 
                              coming_from="above")
 
492
                              coming_from=u"above")
577
493
        self.refresh()
578
494
    
579
495
    def toggle_log_display(self):
580
496
        """Toggle visibility of the log buffer."""
581
497
        self.log_visible = not self.log_visible
582
498
        self.rebuild()
583
 
        #self.log_message("Log visibility changed to: "
584
 
        #                 + unicode(self.log_visible))
 
499
        self.log_message(u"Log visibility changed to: "
 
500
                         + unicode(self.log_visible))
585
501
    
586
502
    def change_log_display(self):
587
503
        """Change type of log display.
588
504
        Currently, this toggles wrapping of text lines."""
589
 
        if self.log_wrap == "clip":
590
 
            self.log_wrap = "any"
 
505
        if self.log_wrap == u"clip":
 
506
            self.log_wrap = u"any"
591
507
        else:
592
 
            self.log_wrap = "clip"
 
508
            self.log_wrap = u"clip"
593
509
        for textwidget in self.log:
594
510
            textwidget.set_wrap_mode(self.log_wrap)
595
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
511
        self.log_message(u"Wrap mode: " + self.log_wrap)
596
512
    
597
513
    def find_and_remove_client(self, path, name):
598
 
        """Find a client by its object path and remove it.
 
514
        """Find an client from its object path and remove it.
599
515
        
600
516
        This is connected to the ClientRemoved signal from the
601
517
        Mandos server object."""
603
519
            client = self.clients_dict[path]
604
520
        except KeyError:
605
521
            # not found?
606
 
            self.log_message("Unknown client %r (%r) removed", name,
607
 
                             path)
608
522
            return
609
 
        client.delete()
 
523
        self.remove_client(client, path)
610
524
    
611
525
    def add_new_client(self, path):
612
526
        client_proxy_object = self.bus.get_object(self.busname, path)
627
541
        if path is None:
628
542
            path = client.proxy.object_path
629
543
        self.clients_dict[path] = client
630
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
544
        self.clients.sort(None, lambda c: c.properties[u"name"])
631
545
        self.refresh()
632
546
    
633
547
    def remove_client(self, client, path=None):
664
578
    
665
579
    def process_input(self, source, condition):
666
580
        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
 
581
        translations = { u"ctrl n": u"down",      # Emacs
 
582
                         u"ctrl p": u"up",        # Emacs
 
583
                         u"ctrl v": u"page down", # Emacs
 
584
                         u"meta v": u"page up",   # Emacs
 
585
                         u" ": u"page down",      # less
 
586
                         u"f": u"page down",      # less
 
587
                         u"b": u"page up",        # less
 
588
                         u"j": u"down",           # vi
 
589
                         u"k": u"up",             # vi
676
590
                         }
677
591
        for key in keys:
678
592
            try:
680
594
            except KeyError:    # :-)
681
595
                pass
682
596
            
683
 
            if key == "q" or key == "Q":
 
597
            if key == u"q" or key == u"Q":
684
598
                self.stop()
685
599
                break
686
 
            elif key == "window resize":
 
600
            elif key == u"window resize":
687
601
                self.size = self.screen.get_cols_rows()
688
602
                self.refresh()
689
 
            elif key == "\f":  # Ctrl-L
 
603
            elif key == u"\f":  # Ctrl-L
690
604
                self.refresh()
691
 
            elif key == "l" or key == "D":
 
605
            elif key == u"l" or key == u"D":
692
606
                self.toggle_log_display()
693
607
                self.refresh()
694
 
            elif key == "w" or key == "i":
 
608
            elif key == u"w" or key == u"i":
695
609
                self.change_log_display()
696
610
                self.refresh()
697
 
            elif key == "?" or key == "f1" or key == "esc":
 
611
            elif key == u"?" or key == u"f1" or key == u"esc":
698
612
                if not self.log_visible:
699
613
                    self.log_visible = True
700
614
                    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"))))
 
615
                self.log_message_raw((u"bold",
 
616
                                      u"  ".
 
617
                                      join((u"q: Quit",
 
618
                                            u"?: Help",
 
619
                                            u"l: Log window toggle",
 
620
                                            u"TAB: Switch window",
 
621
                                            u"w: Wrap (log)"))))
 
622
                self.log_message_raw((u"bold",
 
623
                                      u"  "
 
624
                                      .join((u"Clients:",
 
625
                                             u"+: Enable",
 
626
                                             u"-: Disable",
 
627
                                             u"r: Remove",
 
628
                                             u"s: Start new checker",
 
629
                                             u"S: Stop checker",
 
630
                                             u"C: Checker OK",
 
631
                                             u"a: Approve",
 
632
                                             u"d: Deny"))))
719
633
                self.refresh()
720
 
            elif key == "tab":
 
634
            elif key == u"tab":
721
635
                if self.topwidget.get_focus() is self.logbox:
722
636
                    self.topwidget.set_focus(0)
723
637
                else:
724
638
                    self.topwidget.set_focus(self.logbox)
725
639
                self.refresh()
726
 
            #elif (key == "end" or key == "meta >" or key == "G"
727
 
            #      or key == ">"):
 
640
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
641
            #      or key == u">"):
728
642
            #    pass            # xxx end-of-buffer
729
 
            #elif (key == "home" or key == "meta <" or key == "g"
730
 
            #      or key == "<"):
 
643
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
644
            #      or key == u"<"):
731
645
            #    pass            # xxx beginning-of-buffer
732
 
            #elif key == "ctrl e" or key == "$":
 
646
            #elif key == u"ctrl e" or key == u"$":
733
647
            #    pass            # xxx move-end-of-line
734
 
            #elif key == "ctrl a" or key == "^":
 
648
            #elif key == u"ctrl a" or key == u"^":
735
649
            #    pass            # xxx move-beginning-of-line
736
 
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
650
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
737
651
            #    pass            # xxx left
738
 
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
652
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
739
653
            #    pass            # xxx right
740
 
            #elif key == "a":
 
654
            #elif key == u"a":
741
655
            #    pass            # scroll up log
742
 
            #elif key == "z":
 
656
            #elif key == u"z":
743
657
            #    pass            # scroll down log
744
658
            elif self.topwidget.selectable():
745
659
                self.topwidget.keypress(self.size, key)
749
663
ui = UserInterface()
750
664
try:
751
665
    ui.run()
752
 
except KeyboardInterrupt:
753
 
    ui.screen.stop()
754
666
except Exception, e:
755
667
    ui.log_message(unicode(e))
756
668
    ui.screen.stop()