/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 at bsnet
  • Date: 2011-02-11 18:54:14 UTC
  • mto: This revision was merged to the branch mainline in revision 465.
  • Revision ID: teddy@fukt.bsnet.se-20110211185414-cjmw3hppv9i3h9wh
* mandos-monitor: Use only unicode string literals.
  (MandosClientWidget.rows, MandosClientWidget.render,
  MandosClientWidget.keypress, ConstrainedListBox.keypress) Don't use
                                                            argument
                                                            tuple
                                                            unpacking.

Show diffs side-by-side

added added

removed removed

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