/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Björn Påhlsson
  • Date: 2010-11-05 18:30:07 UTC
  • mto: This revision was merged to the branch mainline in revision 463.
  • Revision ID: belorn@fukt.bsnet.se-20101105183007-20us6fal38a60w4u
password-prompt: added conflic handling with plymouth daemon.
plymouth: bug fix when --ping dont return sucessful.

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