/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: 2012-05-07 19:13:15 UTC
  • Revision ID: teddy@recompile.se-20120507191315-tbe55n4u1uq3l7ft
* mandos: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

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