/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

* debian/mandos.dirs: Added "etc/dbus-1/system.d".

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