/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 Hogeborn
  • Date: 2010-09-26 17:44:43 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100926174443-452k363uuvczuuzg
* mandos-ctl: Also show "LastApprovalRequest" property.

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