/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2011-12-31 23:05:34 UTC
  • Revision ID: teddy@recompile.se-20111231230534-o5w0uhwx30gwhmk7
Updated year in copyright notices.

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
 
 
250
 
            message = (u'A checker has failed! Time until client gets diabled: %s'
251
 
                           % unicode(timer))
252
 
        elif self.properties[u"approved_pending"]:
253
 
            if self.properties[u"approved_by_default"]:
254
 
                message = u"Connection established to client. (d)eny?"
 
320
            # When checker has failed, print a timer until client expires
 
321
            expires = self.properties["Expires"]
 
322
            if expires == "":
 
323
                timer = datetime.timedelta(0)
255
324
            else:
256
 
                message = u"Seeks approval to send secret. (a)pprove?"
 
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'
 
330
                           % unicode(timer).rsplit(".", 1)[0])
257
331
        else:
258
 
            message = u"enabled"
 
332
            message = "enabled"
259
333
        self._text = "%s%s" % (base, message)
260
334
            
261
335
        if not urwid.supports_unicode():
262
336
            self._text = self._text.encode("ascii", "replace")
263
 
        textlist = [(u"normal", self._text)]
 
337
        textlist = [("normal", self._text)]
264
338
        self._text_widget.set_text(textlist)
265
339
        self._focus_text_widget.set_text([(with_standout[text[0]],
266
340
                                           text[1])
275
349
            self.update_hook()
276
350
    
277
351
    def update_timer(self):
278
 
        "called by gobject"
 
352
        """called by gobject. Will indefinitely loop until
 
353
        gobject.source_remove() on tag is called"""
279
354
        self.update()
280
355
        return True             # Keep calling this
281
356
    
282
 
    def delete(self):
 
357
    def delete(self, *args, **kwargs):
283
358
        if self._update_timer_callback_tag is not None:
284
359
            gobject.source_remove(self._update_timer_callback_tag)
285
360
            self._update_timer_callback_tag = None
 
361
        for match in self.match_objects:
 
362
            match.remove()
 
363
        self.match_objects = ()
286
364
        if self.delete_hook is not None:
287
365
            self.delete_hook(self)
 
366
        return super(MandosClientWidget, self).delete(*args, **kwargs)
288
367
    
289
 
    def render(self, (maxcol,), focus=False):
 
368
    def render(self, maxcolrow, focus=False):
290
369
        """Render differently if we have focus.
291
370
        This overrides the method from urwid.FlowWidget"""
292
 
        return self.current_widget(focus).render((maxcol,),
 
371
        return self.current_widget(focus).render(maxcolrow,
293
372
                                                 focus=focus)
294
373
    
295
 
    def keypress(self, (maxcol,), key):
 
374
    def keypress(self, maxcolrow, key):
296
375
        """Handle keys.
297
376
        This overrides the method from urwid.FlowWidget"""
298
 
        if key == u"+":
299
 
            self.proxy.Enable(dbus_interface = client_interface)
300
 
        elif key == u"-":
301
 
            self.proxy.Disable(dbus_interface = client_interface)
302
 
        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":
303
384
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
304
 
                               dbus_interface = client_interface)
305
 
        elif key == u"d":
 
385
                               dbus_interface = client_interface,
 
386
                               ignore_reply=True)
 
387
        elif key == "d":
306
388
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
307
 
                                  dbus_interface = client_interface)
308
 
        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":
309
392
            self.server_proxy_object.RemoveClient(self.proxy
310
 
                                                  .object_path)
311
 
        elif key == u"s":
312
 
            self.proxy.StartChecker(dbus_interface = client_interface)
313
 
        elif key == u"S":
314
 
            self.proxy.StopChecker(dbus_interface = client_interface)
315
 
        elif key == u"C":
316
 
            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)
317
404
        # xxx
318
 
#         elif key == u"p" or key == "=":
 
405
#         elif key == "p" or key == "=":
319
406
#             self.proxy.pause()
320
 
#         elif key == u"u" or key == ":":
 
407
#         elif key == "u" or key == ":":
321
408
#             self.proxy.unpause()
322
 
#         elif key == u"RET":
 
409
#         elif key == "RET":
323
410
#             self.open()
324
 
#        elif key == u"+":
325
 
#            self.proxy.Approve(True)
326
 
#        elif key == u"-":
327
 
#            self.proxy.Approve(False)
328
411
        else:
329
412
            return key
330
413
    
345
428
    "down" key presses, thus not allowing any containing widgets to
346
429
    use them as an excuse to shift focus away from this widget.
347
430
    """
348
 
    def keypress(self, (maxcol, maxrow), key):
349
 
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
350
 
        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"):
351
434
            return
352
435
        return ret
353
436
 
362
445
        self.screen = urwid.curses_display.Screen()
363
446
        
364
447
        self.screen.register_palette((
365
 
                (u"normal",
366
 
                 u"default", u"default", None),
367
 
                (u"bold",
368
 
                 u"default", u"default", u"bold"),
369
 
                (u"underline-blink",
370
 
                 u"default", u"default", u"underline"),
371
 
                (u"standout",
372
 
                 u"default", u"default", u"standout"),
373
 
                (u"bold-underline-blink",
374
 
                 u"default", u"default", (u"bold", u"underline")),
375
 
                (u"bold-standout",
376
 
                 u"default", u"default", (u"bold", u"standout")),
377
 
                (u"underline-blink-standout",
378
 
                 u"default", u"default", (u"underline", u"standout")),
379
 
                (u"bold-underline-blink-standout",
380
 
                 u"default", u"default", (u"bold", u"underline",
381
 
                                          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")),
382
465
                ))
383
466
        
384
467
        if urwid.supports_unicode():
385
 
            self.divider = u"─" # \u2500
386
 
            #self.divider = u"━" # \u2501
 
468
            self.divider = "─" # \u2500
 
469
            #self.divider = "━" # \u2501
387
470
        else:
388
 
            #self.divider = u"-" # \u002d
389
 
            self.divider = u"_" # \u005f
 
471
            #self.divider = "-" # \u002d
 
472
            self.divider = "_" # \u005f
390
473
        
391
474
        self.screen.start()
392
475
        
406
489
        # This keeps track of whether self.uilist currently has
407
490
        # self.logbox in it or not
408
491
        self.log_visible = True
409
 
        self.log_wrap = u"any"
 
492
        self.log_wrap = "any"
410
493
        
411
494
        self.rebuild()
412
 
        self.log_message_raw((u"bold",
413
 
                              u"Mandos Monitor version " + version))
414
 
        self.log_message_raw((u"bold",
415
 
                              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"))
416
499
        
417
500
        self.busname = domain + '.Mandos'
418
501
        self.main_loop = gobject.MainLoop()
419
 
        self.bus = dbus.SystemBus()
420
 
        mandos_dbus_objc = self.bus.get_object(
421
 
            self.busname, u"/", follow_name_owner_changes=True)
422
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
423
 
                                          dbus_interface
424
 
                                          = server_interface)
425
 
        try:
426
 
            mandos_clients = (self.mandos_serv
427
 
                              .GetAllClientsWithProperties())
428
 
        except dbus.exceptions.DBusException:
429
 
            mandos_clients = dbus.Dictionary()
430
 
        
431
 
        (self.mandos_serv
432
 
         .connect_to_signal(u"ClientRemoved",
433
 
                            self.find_and_remove_client,
434
 
                            dbus_interface=server_interface,
435
 
                            byte_arrays=True))
436
 
        (self.mandos_serv
437
 
         .connect_to_signal(u"ClientAdded",
438
 
                            self.add_new_client,
439
 
                            dbus_interface=server_interface,
440
 
                            byte_arrays=True))
441
 
        (self.mandos_serv
442
 
         .connect_to_signal(u"ClientNotFound",
443
 
                            self.client_not_found,
444
 
                            dbus_interface=server_interface,
445
 
                            byte_arrays=True))
446
 
        for path, client in mandos_clients.iteritems():
447
 
            client_proxy_object = self.bus.get_object(self.busname,
448
 
                                                      path)
449
 
            self.add_client(MandosClientWidget(server_proxy_object
450
 
                                               =self.mandos_serv,
451
 
                                               proxy_object
452
 
                                               =client_proxy_object,
453
 
                                               properties=client,
454
 
                                               update_hook
455
 
                                               =self.refresh,
456
 
                                               delete_hook
457
 
                                               =self.remove_client,
458
 
                                               logger
459
 
                                               =self.log_message),
460
 
                            path=path)
461
502
    
462
503
    def client_not_found(self, fingerprint, address):
463
 
        self.log_message((u"Client with address %s and fingerprint %s"
464
 
                          u" could not be found" % (address,
 
504
        self.log_message(("Client with address %s and fingerprint %s"
 
505
                          " could not be found" % (address,
465
506
                                                    fingerprint)))
466
507
    
467
508
    def rebuild(self):
469
510
        Call this when the widget layout needs to change"""
470
511
        self.uilist = []
471
512
        #self.uilist.append(urwid.ListBox(self.clients))
472
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
 
513
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
514
                                                          clients),
473
515
                                       #header=urwid.Divider(),
474
516
                                       header=None,
475
 
                                       footer=urwid.Divider(div_char=self.divider)))
 
517
                                       footer=
 
518
                                       urwid.Divider(div_char=
 
519
                                                     self.divider)))
476
520
        if self.log_visible:
477
521
            self.uilist.append(self.logbox)
478
 
            pass
479
522
        self.topwidget = urwid.Pile(self.uilist)
480
523
    
481
524
    def log_message(self, message):
482
525
        timestamp = datetime.datetime.now().isoformat()
483
 
        self.log_message_raw(timestamp + u": " + message)
 
526
        self.log_message_raw(timestamp + ": " + message)
484
527
    
485
528
    def log_message_raw(self, markup):
486
529
        """Add a log message to the log buffer."""
489
532
            and len(self.log) > self.max_log_length):
490
533
            del self.log[0:len(self.log)-self.max_log_length-1]
491
534
        self.logbox.set_focus(len(self.logbox.body.contents),
492
 
                              coming_from=u"above")
 
535
                              coming_from="above")
493
536
        self.refresh()
494
537
    
495
538
    def toggle_log_display(self):
496
539
        """Toggle visibility of the log buffer."""
497
540
        self.log_visible = not self.log_visible
498
541
        self.rebuild()
499
 
        self.log_message(u"Log visibility changed to: "
500
 
                         + unicode(self.log_visible))
 
542
        #self.log_message("Log visibility changed to: "
 
543
        #                 + unicode(self.log_visible))
501
544
    
502
545
    def change_log_display(self):
503
546
        """Change type of log display.
504
547
        Currently, this toggles wrapping of text lines."""
505
 
        if self.log_wrap == u"clip":
506
 
            self.log_wrap = u"any"
 
548
        if self.log_wrap == "clip":
 
549
            self.log_wrap = "any"
507
550
        else:
508
 
            self.log_wrap = u"clip"
 
551
            self.log_wrap = "clip"
509
552
        for textwidget in self.log:
510
553
            textwidget.set_wrap_mode(self.log_wrap)
511
 
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
554
        #self.log_message("Wrap mode: " + self.log_wrap)
512
555
    
513
556
    def find_and_remove_client(self, path, name):
514
 
        """Find an client from its object path and remove it.
 
557
        """Find a client by its object path and remove it.
515
558
        
516
559
        This is connected to the ClientRemoved signal from the
517
560
        Mandos server object."""
519
562
            client = self.clients_dict[path]
520
563
        except KeyError:
521
564
            # not found?
 
565
            self.log_message("Unknown client %r (%r) removed", name,
 
566
                             path)
522
567
            return
523
 
        self.remove_client(client, path)
 
568
        client.delete()
524
569
    
525
570
    def add_new_client(self, path):
526
571
        client_proxy_object = self.bus.get_object(self.busname, path)
541
586
        if path is None:
542
587
            path = client.proxy.object_path
543
588
        self.clients_dict[path] = client
544
 
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
589
        self.clients.sort(None, lambda c: c.properties["Name"])
545
590
        self.refresh()
546
591
    
547
592
    def remove_client(self, client, path=None):
563
608
    
564
609
    def run(self):
565
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
 
566
654
        self.refresh()
567
655
        self._input_callback_tag = (gobject.io_add_watch
568
656
                                    (sys.stdin.fileno(),
578
666
    
579
667
    def process_input(self, source, condition):
580
668
        keys = self.screen.get_input()
581
 
        translations = { u"ctrl n": u"down",      # Emacs
582
 
                         u"ctrl p": u"up",        # Emacs
583
 
                         u"ctrl v": u"page down", # Emacs
584
 
                         u"meta v": u"page up",   # Emacs
585
 
                         u" ": u"page down",      # less
586
 
                         u"f": u"page down",      # less
587
 
                         u"b": u"page up",        # less
588
 
                         u"j": u"down",           # vi
589
 
                         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
590
678
                         }
591
679
        for key in keys:
592
680
            try:
594
682
            except KeyError:    # :-)
595
683
                pass
596
684
            
597
 
            if key == u"q" or key == u"Q":
 
685
            if key == "q" or key == "Q":
598
686
                self.stop()
599
687
                break
600
 
            elif key == u"window resize":
 
688
            elif key == "window resize":
601
689
                self.size = self.screen.get_cols_rows()
602
690
                self.refresh()
603
 
            elif key == u"\f":  # Ctrl-L
 
691
            elif key == "\f":  # Ctrl-L
604
692
                self.refresh()
605
 
            elif key == u"l" or key == u"D":
 
693
            elif key == "l" or key == "D":
606
694
                self.toggle_log_display()
607
695
                self.refresh()
608
 
            elif key == u"w" or key == u"i":
 
696
            elif key == "w" or key == "i":
609
697
                self.change_log_display()
610
698
                self.refresh()
611
 
            elif key == u"?" or key == u"f1" or key == u"esc":
 
699
            elif key == "?" or key == "f1" or key == "esc":
612
700
                if not self.log_visible:
613
701
                    self.log_visible = True
614
702
                    self.rebuild()
615
 
                self.log_message_raw((u"bold",
616
 
                                      u"  ".
617
 
                                      join((u"q: Quit",
618
 
                                            u"?: Help",
619
 
                                            u"l: Log window toggle",
620
 
                                            u"TAB: Switch window",
621
 
                                            u"w: Wrap (log)"))))
622
 
                self.log_message_raw((u"bold",
623
 
                                      u"  "
624
 
                                      .join((u"Clients:",
625
 
                                             u"+: Enable",
626
 
                                             u"-: Disable",
627
 
                                             u"r: Remove",
628
 
                                             u"s: Start new checker",
629
 
                                             u"S: Stop checker",
630
 
                                             u"C: Checker OK",
631
 
                                             u"a: Approve",
632
 
                                             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"))))
633
721
                self.refresh()
634
 
            elif key == u"tab":
 
722
            elif key == "tab":
635
723
                if self.topwidget.get_focus() is self.logbox:
636
724
                    self.topwidget.set_focus(0)
637
725
                else:
638
726
                    self.topwidget.set_focus(self.logbox)
639
727
                self.refresh()
640
 
            #elif (key == u"end" or key == u"meta >" or key == u"G"
641
 
            #      or key == u">"):
 
728
            #elif (key == "end" or key == "meta >" or key == "G"
 
729
            #      or key == ">"):
642
730
            #    pass            # xxx end-of-buffer
643
 
            #elif (key == u"home" or key == u"meta <" or key == u"g"
644
 
            #      or key == u"<"):
 
731
            #elif (key == "home" or key == "meta <" or key == "g"
 
732
            #      or key == "<"):
645
733
            #    pass            # xxx beginning-of-buffer
646
 
            #elif key == u"ctrl e" or key == u"$":
 
734
            #elif key == "ctrl e" or key == "$":
647
735
            #    pass            # xxx move-end-of-line
648
 
            #elif key == u"ctrl a" or key == u"^":
 
736
            #elif key == "ctrl a" or key == "^":
649
737
            #    pass            # xxx move-beginning-of-line
650
 
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
 
738
            #elif key == "ctrl b" or key == "meta (" or key == "h":
651
739
            #    pass            # xxx left
652
 
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
 
740
            #elif key == "ctrl f" or key == "meta )" or key == "l":
653
741
            #    pass            # xxx right
654
 
            #elif key == u"a":
 
742
            #elif key == "a":
655
743
            #    pass            # scroll up log
656
 
            #elif key == u"z":
 
744
            #elif key == "z":
657
745
            #    pass            # scroll down log
658
746
            elif self.topwidget.selectable():
659
747
                self.topwidget.keypress(self.size, key)
663
751
ui = UserInterface()
664
752
try:
665
753
    ui.run()
 
754
except KeyboardInterrupt:
 
755
    ui.screen.stop()
666
756
except Exception, e:
667
757
    ui.log_message(unicode(e))
668
758
    ui.screen.stop()