/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: 2010-09-09 18:16:14 UTC
  • mfrom: (237.2.35 mandos-empty-device)
  • Revision ID: teddy@fukt.bsnet.se-20100909181614-oanlmvkzsiodbo3c
Merge in branch to interpret an empty device name to mean
"autodetect".

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