/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

* mandos-monitor: Speedup: Use properties from D-Bus
                  GetAllClientsWithProperties() call.  Also use
                  super() properly - only use keyword arguments and
                  strip them off as "kwargs" is passed on.
  (MandosClientPropertyCache.__init__): Take new "properties"
                                        argument; use it to skip
                                        calling D-Bus GetAll() method.
                                        Call super().  Bind self._
  (MandosClientPropertyCache._property_changed): New helper function.
  (MandosClientPropertyCache.property_changed): Changed to take
                                                keyword arguments.
  (MandosClientPropertyCache.delete): Bug fix: Don't call
                                      super().__init__().
  (MandosClientWidget.__init__): Don't take *args.  Strip used keyword
                                 arguments before calling super().
  (MandosClientWidget.property_changed): Removed dead code.
  (MandosClientWidget.delete): Don't take *args.
  (MandosClientWidget.property_changed): Don't take "value" argument,
                                         since it is not used.
  (ConstrainedListBox.keypress): Take *args, **kwargs and pass them on
                                 to super().

Show diffs side-by-side

added added

removed removed

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