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