/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

adding missing words

Show diffs side-by-side

added added

removed removed

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