/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-09-07 18:48:56 UTC
  • mto: (237.4.3 mandos-release)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: belorn@fukt.bsnet.se-20100907184856-waz6cvxbm7ranha2
added the actually plugin file for plymouth

Show diffs side-by-side

added added

removed removed

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