/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: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

Show diffs side-by-side

added added

removed removed

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