/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: Björn Påhlsson
  • Date: 2010-09-02 18:53:38 UTC
  • mto: (237.4.3 mandos-release)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: belorn@fukt.bsnet.se-20100902185338-d1022sv517txn3sb
early commit to ease todays coding

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
24
3
 
25
 
from __future__ import (division, absolute_import, print_function,
26
 
                        unicode_literals)
 
4
from __future__ import division, absolute_import, with_statement
27
5
 
28
6
import sys
29
7
import os
43
21
 
44
22
import locale
45
23
 
46
 
locale.setlocale(locale.LC_ALL, '')
 
24
locale.setlocale(locale.LC_ALL, u'')
47
25
 
48
26
import logging
49
27
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
50
28
 
51
29
# Some useful constants
52
 
domain = 'se.recompile'
 
30
domain = 'se.bsnet.fukt'
53
31
server_interface = domain + '.Mandos'
54
32
client_interface = domain + '.Mandos.Client'
55
 
version = "1.5.0"
 
33
version = "1.0.15"
56
34
 
57
35
# Always run in monochrome mode
58
36
urwid.curses_display.curses.has_colors = lambda : False
62
40
urwid.curses_display.curses.A_UNDERLINE |= (
63
41
    urwid.curses_display.curses.A_BLINK)
64
42
 
65
 
def isoformat_to_datetime(iso):
66
 
    "Parse an ISO 8601 date string to a datetime.datetime()"
67
 
    if not iso:
68
 
        return None
69
 
    d, t = iso.split("T", 1)
70
 
    year, month, day = d.split("-", 2)
71
 
    hour, minute, second = t.split(":", 2)
72
 
    second, fraction = divmod(float(second), 1)
73
 
    return datetime.datetime(int(year),
74
 
                             int(month),
75
 
                             int(day),
76
 
                             int(hour),
77
 
                             int(minute),
78
 
                             int(second),           # Whole seconds
79
 
                             int(fraction*1000000)) # Microseconds
80
 
 
81
43
class MandosClientPropertyCache(object):
82
44
    """This wraps a Mandos Client D-Bus proxy object, caches the
83
45
    properties and calls a hook function when any of them are
87
49
        self.proxy = proxy_object # Mandos Client proxy object
88
50
        
89
51
        self.properties = dict()
90
 
        self.property_changed_match = (
91
 
            self.proxy.connect_to_signal("PropertyChanged",
92
 
                                         self.property_changed,
93
 
                                         client_interface,
94
 
                                         byte_arrays=True))
 
52
        self.proxy.connect_to_signal(u"PropertyChanged",
 
53
                                     self.property_changed,
 
54
                                     client_interface,
 
55
                                     byte_arrays=True)
95
56
        
96
57
        self.properties.update(
97
58
            self.proxy.GetAll(client_interface,
98
59
                              dbus_interface = dbus.PROPERTIES_IFACE))
99
 
 
100
 
        #XXX This breaks good super behaviour
101
 
#        super(MandosClientPropertyCache, self).__init__(
102
 
#            *args, **kwargs)
 
60
        super(MandosClientPropertyCache, self).__init__(
 
61
            *args, **kwargs)
103
62
    
104
63
    def property_changed(self, property=None, value=None):
105
64
        """This is called whenever we get a PropertyChanged signal
107
66
        """
108
67
        # Update properties dict with new value
109
68
        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)
115
69
 
116
70
 
117
71
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
129
83
        # Logger
130
84
        self.logger = logger
131
85
        
132
 
        self._update_timer_callback_tag = None
133
 
        self._update_timer_callback_lock = 0
134
 
        self.last_checker_failed = False
135
 
        
136
86
        # The widget shown normally
137
 
        self._text_widget = urwid.Text("")
 
87
        self._text_widget = urwid.Text(u"")
138
88
        # The widget shown when we have focus
139
 
        self._focus_text_widget = urwid.Text("")
 
89
        self._focus_text_widget = urwid.Text(u"")
140
90
        super(MandosClientWidget, self).__init__(
141
91
            update_hook=update_hook, delete_hook=delete_hook,
142
92
            *args, **kwargs)
143
93
        self.update()
144
94
        self.opened = False
145
 
        
146
 
        last_checked_ok = isoformat_to_datetime(self.properties
147
 
                                                ["LastCheckedOK"])
148
 
        if last_checked_ok is None:
149
 
            self.last_checker_failed = True
150
 
        else:
151
 
            self.last_checker_failed = ((datetime.datetime.utcnow()
152
 
                                         - last_checked_ok)
153
 
                                        > datetime.timedelta
154
 
                                        (milliseconds=
155
 
                                         self.properties
156
 
                                         ["Interval"]))
157
 
        
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
204
 
            self._update_timer_callback_tag = (gobject.timeout_add
205
 
                                               (1000,
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
 
95
        self.proxy.connect_to_signal(u"CheckerCompleted",
 
96
                                     self.checker_completed,
 
97
                                     client_interface,
 
98
                                     byte_arrays=True)
 
99
        self.proxy.connect_to_signal(u"CheckerStarted",
 
100
                                     self.checker_started,
 
101
                                     client_interface,
 
102
                                     byte_arrays=True)
 
103
        self.proxy.connect_to_signal(u"GotSecret",
 
104
                                     self.got_secret,
 
105
                                     client_interface,
 
106
                                     byte_arrays=True)
 
107
        self.proxy.connect_to_signal(u"NeedApproval",
 
108
                                     self.need_approval,
 
109
                                     client_interface,
 
110
                                     byte_arrays=True)
 
111
        self.proxy.connect_to_signal(u"Rejected",
 
112
                                     self.rejected,
 
113
                                     client_interface,
 
114
                                     byte_arrays=True)
210
115
    
211
116
    def checker_completed(self, exitstatus, condition, command):
212
117
        if exitstatus == 0:
213
 
            if self.last_checker_failed:
214
 
                self.last_checker_failed = False
215
 
                self.using_timer(False)
216
 
            #self.logger('Checker for client %s (command "%s")'
217
 
            #            ' was successful'
218
 
            #            % (self.properties["Name"], command))
219
 
            self.update()
 
118
            #self.logger(u'Checker for client %s (command "%s")'
 
119
            #            u' was successful'
 
120
            #            % (self.properties[u"name"], command))
220
121
            return
221
 
        # Checker failed
222
 
        if not self.last_checker_failed:
223
 
            self.last_checker_failed = True
224
 
            self.using_timer(True)
225
122
        if os.WIFEXITED(condition):
226
 
            self.logger('Checker for client %s (command "%s")'
227
 
                        ' failed with exit code %s'
228
 
                        % (self.properties["Name"], command,
 
123
            self.logger(u'Checker for client %s (command "%s")'
 
124
                        u' failed with exit code %s'
 
125
                        % (self.properties[u"name"], command,
229
126
                           os.WEXITSTATUS(condition)))
230
 
        elif os.WIFSIGNALED(condition):
231
 
            self.logger('Checker for client %s (command "%s")'
232
 
                        ' was killed by signal %s'
233
 
                        % (self.properties["Name"], command,
 
127
            return
 
128
        if os.WIFSIGNALED(condition):
 
129
            self.logger(u'Checker for client %s (command "%s")'
 
130
                        u' was killed by signal %s'
 
131
                        % (self.properties[u"name"], command,
234
132
                           os.WTERMSIG(condition)))
235
 
        elif os.WCOREDUMP(condition):
236
 
            self.logger('Checker for client %s (command "%s")'
237
 
                        ' dumped core'
238
 
                        % (self.properties["Name"], command))
239
 
        else:
240
 
            self.logger('Checker for client %s completed'
241
 
                        ' mysteriously')
242
 
        self.update()
 
133
            return
 
134
        if os.WCOREDUMP(condition):
 
135
            self.logger(u'Checker for client %s (command "%s")'
 
136
                        u' dumped core'
 
137
                        % (self.properties[u"name"], command))
 
138
        self.logger(u'Checker for client %s completed mysteriously')
243
139
    
244
140
    def checker_started(self, 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)))
 
141
        #self.logger(u'Client %s started checker "%s"'
 
142
        #            % (self.properties[u"name"], unicode(command)))
249
143
        pass
250
144
    
251
145
    def got_secret(self):
252
 
        self.last_checker_failed = False
253
 
        self.logger('Client %s received its secret'
254
 
                    % self.properties["Name"])
 
146
        self.logger(u'Client %s received its secret'
 
147
                    % self.properties[u"name"])
255
148
    
256
149
    def need_approval(self, timeout, default):
257
150
        if not default:
258
 
            message = 'Client %s needs approval within %s seconds'
 
151
            message = u'Client %s needs approval within %s seconds'
259
152
        else:
260
 
            message = 'Client %s will get its secret in %s seconds'
 
153
            message = u'Client %s will get its secret in %s seconds'
261
154
        self.logger(message
262
 
                    % (self.properties["Name"], timeout/1000))
263
 
        self.using_timer(True)
 
155
                    % (self.properties[u"name"], timeout/1000))
264
156
    
265
157
    def rejected(self, reason):
266
 
        self.logger('Client %s was rejected; reason: %s'
267
 
                    % (self.properties["Name"], reason))
 
158
        self.logger(u'Client %s was rejected; reason: %s'
 
159
                    % (self.properties[u"name"], reason))
268
160
    
269
161
    def selectable(self):
270
162
        """Make this a "selectable" widget.
271
163
        This overrides the method from urwid.FlowWidget."""
272
164
        return True
273
165
    
274
 
    def rows(self, maxcolrow, focus=False):
 
166
    def rows(self, (maxcol,), focus=False):
275
167
        """How many rows this widget will occupy might depend on
276
168
        whether we have focus or not.
277
169
        This overrides the method from urwid.FlowWidget"""
278
 
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
 
170
        return self.current_widget(focus).rows((maxcol,), focus=focus)
279
171
    
280
172
    def current_widget(self, focus=False):
281
173
        if focus or self.opened:
285
177
    def update(self):
286
178
        "Called when what is visible on the screen should be updated."
287
179
        # How to add standout mode to a style
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",
 
180
        with_standout = { u"normal": u"standout",
 
181
                          u"bold": u"bold-standout",
 
182
                          u"underline-blink":
 
183
                              u"underline-blink-standout",
 
184
                          u"bold-underline-blink":
 
185
                              u"bold-underline-blink-standout",
294
186
                          }
295
 
 
 
187
        
296
188
        # Rebuild focus and non-focus widgets using current properties
297
 
 
298
 
        # Base part of a client. Name!
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]
319
 
        elif self.last_checker_failed:
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'
330
 
                           % unicode(timer).rsplit(".", 1)[0])
331
 
        else:
332
 
            message = "enabled"
333
 
        self._text = "%s%s" % (base, message)
334
 
            
 
189
        self._text = (u'%(name)s: %(enabled)s'
 
190
                      % { u"name": self.properties[u"name"],
 
191
                          u"enabled":
 
192
                              (u"enabled"
 
193
                               if self.properties[u"enabled"]
 
194
                               else u"DISABLED")})
335
195
        if not urwid.supports_unicode():
336
196
            self._text = self._text.encode("ascii", "replace")
337
 
        textlist = [("normal", self._text)]
 
197
        textlist = [(u"normal", self._text)]
338
198
        self._text_widget.set_text(textlist)
339
199
        self._focus_text_widget.set_text([(with_standout[text[0]],
340
200
                                           text[1])
348
208
        if self.update_hook is not None:
349
209
            self.update_hook()
350
210
    
351
 
    def update_timer(self):
352
 
        """called by gobject. Will indefinitely loop until
353
 
        gobject.source_remove() on tag is called"""
354
 
        self.update()
355
 
        return True             # Keep calling this
356
 
    
357
 
    def delete(self, *args, **kwargs):
358
 
        if self._update_timer_callback_tag is not None:
359
 
            gobject.source_remove(self._update_timer_callback_tag)
360
 
            self._update_timer_callback_tag = None
361
 
        for match in self.match_objects:
362
 
            match.remove()
363
 
        self.match_objects = ()
 
211
    def delete(self):
364
212
        if self.delete_hook is not None:
365
213
            self.delete_hook(self)
366
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
367
214
    
368
 
    def render(self, maxcolrow, focus=False):
 
215
    def render(self, (maxcol,), focus=False):
369
216
        """Render differently if we have focus.
370
217
        This overrides the method from urwid.FlowWidget"""
371
 
        return self.current_widget(focus).render(maxcolrow,
 
218
        return self.current_widget(focus).render((maxcol,),
372
219
                                                 focus=focus)
373
220
    
374
 
    def keypress(self, maxcolrow, key):
 
221
    def keypress(self, (maxcol,), key):
375
222
        """Handle keys.
376
223
        This overrides the method from urwid.FlowWidget"""
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":
384
 
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
385
 
                               dbus_interface = client_interface,
386
 
                               ignore_reply=True)
387
 
        elif key == "d":
388
 
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
389
 
                                  dbus_interface = client_interface,
390
 
                               ignore_reply=True)
391
 
        elif key == "R" or key == "_" or key == "ctrl k":
 
224
        if key == u"e" or key == u"+":
 
225
            self.proxy.Enable()
 
226
        elif key == u"d" or key == u"-":
 
227
            self.proxy.Disable()
 
228
        elif key == u"r" or key == u"_" or key == u"ctrl k":
392
229
            self.server_proxy_object.RemoveClient(self.proxy
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)
 
230
                                                  .object_path)
 
231
        elif key == u"s":
 
232
            self.proxy.StartChecker()
 
233
        elif key == u"S":
 
234
            self.proxy.StopChecker()
 
235
        elif key == u"C":
 
236
            self.proxy.CheckedOK()
404
237
        # xxx
405
 
#         elif key == "p" or key == "=":
 
238
#         elif key == u"p" or key == "=":
406
239
#             self.proxy.pause()
407
 
#         elif key == "u" or key == ":":
 
240
#         elif key == u"u" or key == ":":
408
241
#             self.proxy.unpause()
409
 
#         elif key == "RET":
 
242
#         elif key == u"RET":
410
243
#             self.open()
 
244
        elif key == u"+":
 
245
            self.proxy.Approve(True)
 
246
        elif key == u"-":
 
247
            self.proxy.Approve(False)
411
248
        else:
412
249
            return key
413
250
    
428
265
    "down" key presses, thus not allowing any containing widgets to
429
266
    use them as an excuse to shift focus away from this widget.
430
267
    """
431
 
    def keypress(self, maxcolrow, key):
432
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
433
 
        if ret in ("up", "down"):
 
268
    def keypress(self, (maxcol, maxrow), key):
 
269
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
 
270
        if ret in (u"up", u"down"):
434
271
            return
435
272
        return ret
436
273
 
445
282
        self.screen = urwid.curses_display.Screen()
446
283
        
447
284
        self.screen.register_palette((
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")),
 
285
                (u"normal",
 
286
                 u"default", u"default", None),
 
287
                (u"bold",
 
288
                 u"default", u"default", u"bold"),
 
289
                (u"underline-blink",
 
290
                 u"default", u"default", u"underline"),
 
291
                (u"standout",
 
292
                 u"default", u"default", u"standout"),
 
293
                (u"bold-underline-blink",
 
294
                 u"default", u"default", (u"bold", u"underline")),
 
295
                (u"bold-standout",
 
296
                 u"default", u"default", (u"bold", u"standout")),
 
297
                (u"underline-blink-standout",
 
298
                 u"default", u"default", (u"underline", u"standout")),
 
299
                (u"bold-underline-blink-standout",
 
300
                 u"default", u"default", (u"bold", u"underline",
 
301
                                          u"standout")),
465
302
                ))
466
303
        
467
304
        if urwid.supports_unicode():
468
 
            self.divider = "─" # \u2500
469
 
            #self.divider = "━" # \u2501
 
305
            self.divider = u"─" # \u2500
 
306
            #self.divider = u"━" # \u2501
470
307
        else:
471
 
            #self.divider = "-" # \u002d
472
 
            self.divider = "_" # \u005f
 
308
            #self.divider = u"-" # \u002d
 
309
            self.divider = u"_" # \u005f
473
310
        
474
311
        self.screen.start()
475
312
        
489
326
        # This keeps track of whether self.uilist currently has
490
327
        # self.logbox in it or not
491
328
        self.log_visible = True
492
 
        self.log_wrap = "any"
 
329
        self.log_wrap = u"any"
493
330
        
494
331
        self.rebuild()
495
 
        self.log_message_raw(("bold",
496
 
                              "Mandos Monitor version " + version))
497
 
        self.log_message_raw(("bold",
498
 
                              "q: Quit  ?: Help"))
 
332
        self.log_message_raw((u"bold",
 
333
                              u"Mandos Monitor version " + version))
 
334
        self.log_message_raw((u"bold",
 
335
                              u"q: Quit  ?: Help"))
499
336
        
500
337
        self.busname = domain + '.Mandos'
501
338
        self.main_loop = gobject.MainLoop()
 
339
        self.bus = dbus.SystemBus()
 
340
        mandos_dbus_objc = self.bus.get_object(
 
341
            self.busname, u"/", follow_name_owner_changes=True)
 
342
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
343
                                          dbus_interface
 
344
                                          = server_interface)
 
345
        try:
 
346
            mandos_clients = (self.mandos_serv
 
347
                              .GetAllClientsWithProperties())
 
348
        except dbus.exceptions.DBusException:
 
349
            mandos_clients = dbus.Dictionary()
 
350
        
 
351
        (self.mandos_serv
 
352
         .connect_to_signal(u"ClientRemoved",
 
353
                            self.find_and_remove_client,
 
354
                            dbus_interface=server_interface,
 
355
                            byte_arrays=True))
 
356
        (self.mandos_serv
 
357
         .connect_to_signal(u"ClientAdded",
 
358
                            self.add_new_client,
 
359
                            dbus_interface=server_interface,
 
360
                            byte_arrays=True))
 
361
        (self.mandos_serv
 
362
         .connect_to_signal(u"ClientNotFound",
 
363
                            self.client_not_found,
 
364
                            dbus_interface=server_interface,
 
365
                            byte_arrays=True))
 
366
        for path, client in mandos_clients.iteritems():
 
367
            client_proxy_object = self.bus.get_object(self.busname,
 
368
                                                      path)
 
369
            self.add_client(MandosClientWidget(server_proxy_object
 
370
                                               =self.mandos_serv,
 
371
                                               proxy_object
 
372
                                               =client_proxy_object,
 
373
                                               properties=client,
 
374
                                               update_hook
 
375
                                               =self.refresh,
 
376
                                               delete_hook
 
377
                                               =self.remove_client,
 
378
                                               logger
 
379
                                               =self.log_message),
 
380
                            path=path)
502
381
    
503
382
    def client_not_found(self, fingerprint, address):
504
 
        self.log_message(("Client with address %s and fingerprint %s"
505
 
                          " could not be found" % (address,
 
383
        self.log_message((u"Client with address %s and fingerprint %s"
 
384
                          u" could not be found" % (address,
506
385
                                                    fingerprint)))
507
386
    
508
387
    def rebuild(self):
510
389
        Call this when the widget layout needs to change"""
511
390
        self.uilist = []
512
391
        #self.uilist.append(urwid.ListBox(self.clients))
513
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
514
 
                                                          clients),
 
392
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
515
393
                                       #header=urwid.Divider(),
516
394
                                       header=None,
517
 
                                       footer=
518
 
                                       urwid.Divider(div_char=
519
 
                                                     self.divider)))
 
395
                                       footer=urwid.Divider(div_char=self.divider)))
520
396
        if self.log_visible:
521
397
            self.uilist.append(self.logbox)
 
398
            pass
522
399
        self.topwidget = urwid.Pile(self.uilist)
523
400
    
524
401
    def log_message(self, message):
525
402
        timestamp = datetime.datetime.now().isoformat()
526
 
        self.log_message_raw(timestamp + ": " + message)
 
403
        self.log_message_raw(timestamp + u": " + message)
527
404
    
528
405
    def log_message_raw(self, markup):
529
406
        """Add a log message to the log buffer."""
532
409
            and len(self.log) > self.max_log_length):
533
410
            del self.log[0:len(self.log)-self.max_log_length-1]
534
411
        self.logbox.set_focus(len(self.logbox.body.contents),
535
 
                              coming_from="above")
 
412
                              coming_from=u"above")
536
413
        self.refresh()
537
414
    
538
415
    def toggle_log_display(self):
539
416
        """Toggle visibility of the log buffer."""
540
417
        self.log_visible = not self.log_visible
541
418
        self.rebuild()
542
 
        #self.log_message("Log visibility changed to: "
543
 
        #                 + unicode(self.log_visible))
 
419
        self.log_message(u"Log visibility changed to: "
 
420
                         + unicode(self.log_visible))
544
421
    
545
422
    def change_log_display(self):
546
423
        """Change type of log display.
547
424
        Currently, this toggles wrapping of text lines."""
548
 
        if self.log_wrap == "clip":
549
 
            self.log_wrap = "any"
 
425
        if self.log_wrap == u"clip":
 
426
            self.log_wrap = u"any"
550
427
        else:
551
 
            self.log_wrap = "clip"
 
428
            self.log_wrap = u"clip"
552
429
        for textwidget in self.log:
553
430
            textwidget.set_wrap_mode(self.log_wrap)
554
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
431
        self.log_message(u"Wrap mode: " + self.log_wrap)
555
432
    
556
433
    def find_and_remove_client(self, path, name):
557
 
        """Find a client by its object path and remove it.
 
434
        """Find an client from its object path and remove it.
558
435
        
559
436
        This is connected to the ClientRemoved signal from the
560
437
        Mandos server object."""
562
439
            client = self.clients_dict[path]
563
440
        except KeyError:
564
441
            # not found?
565
 
            self.log_message("Unknown client %r (%r) removed", name,
566
 
                             path)
567
442
            return
568
 
        client.delete()
 
443
        self.remove_client(client, path)
569
444
    
570
445
    def add_new_client(self, path):
571
446
        client_proxy_object = self.bus.get_object(self.busname, path)
586
461
        if path is None:
587
462
            path = client.proxy.object_path
588
463
        self.clients_dict[path] = client
589
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
464
        self.clients.sort(None, lambda c: c.properties[u"name"])
590
465
        self.refresh()
591
466
    
592
467
    def remove_client(self, client, path=None):
608
483
    
609
484
    def run(self):
610
485
        """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
 
 
654
486
        self.refresh()
655
487
        self._input_callback_tag = (gobject.io_add_watch
656
488
                                    (sys.stdin.fileno(),
666
498
    
667
499
    def process_input(self, source, condition):
668
500
        keys = self.screen.get_input()
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
 
501
        translations = { u"ctrl n": u"down",      # Emacs
 
502
                         u"ctrl p": u"up",        # Emacs
 
503
                         u"ctrl v": u"page down", # Emacs
 
504
                         u"meta v": u"page up",   # Emacs
 
505
                         u" ": u"page down",      # less
 
506
                         u"f": u"page down",      # less
 
507
                         u"b": u"page up",        # less
 
508
                         u"j": u"down",           # vi
 
509
                         u"k": u"up",             # vi
678
510
                         }
679
511
        for key in keys:
680
512
            try:
682
514
            except KeyError:    # :-)
683
515
                pass
684
516
            
685
 
            if key == "q" or key == "Q":
 
517
            if key == u"q" or key == u"Q":
686
518
                self.stop()
687
519
                break
688
 
            elif key == "window resize":
 
520
            elif key == u"window resize":
689
521
                self.size = self.screen.get_cols_rows()
690
522
                self.refresh()
691
 
            elif key == "\f":  # Ctrl-L
 
523
            elif key == u"\f":  # Ctrl-L
692
524
                self.refresh()
693
 
            elif key == "l" or key == "D":
 
525
            elif key == u"l" or key == u"D":
694
526
                self.toggle_log_display()
695
527
                self.refresh()
696
 
            elif key == "w" or key == "i":
 
528
            elif key == u"w" or key == u"i":
697
529
                self.change_log_display()
698
530
                self.refresh()
699
 
            elif key == "?" or key == "f1" or key == "esc":
 
531
            elif key == u"?" or key == u"f1" or key == u"esc":
700
532
                if not self.log_visible:
701
533
                    self.log_visible = True
702
534
                    self.rebuild()
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"))))
 
535
                self.log_message_raw((u"bold",
 
536
                                      u"  ".
 
537
                                      join((u"q: Quit",
 
538
                                            u"?: Help",
 
539
                                            u"l: Log window toggle",
 
540
                                            u"TAB: Switch window",
 
541
                                            u"w: Wrap (log)"))))
 
542
                self.log_message_raw((u"bold",
 
543
                                      u"  "
 
544
                                      .join((u"Clients:",
 
545
                                             u"e: Enable",
 
546
                                             u"d: Disable",
 
547
                                             u"r: Remove",
 
548
                                             u"s: Start new checker",
 
549
                                             u"S: Stop checker",
 
550
                                             u"C: Checker OK"))))
721
551
                self.refresh()
722
 
            elif key == "tab":
 
552
            elif key == u"tab":
723
553
                if self.topwidget.get_focus() is self.logbox:
724
554
                    self.topwidget.set_focus(0)
725
555
                else:
726
556
                    self.topwidget.set_focus(self.logbox)
727
557
                self.refresh()
728
 
            #elif (key == "end" or key == "meta >" or key == "G"
729
 
            #      or key == ">"):
 
558
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
559
            #      or key == u">"):
730
560
            #    pass            # xxx end-of-buffer
731
 
            #elif (key == "home" or key == "meta <" or key == "g"
732
 
            #      or key == "<"):
 
561
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
562
            #      or key == u"<"):
733
563
            #    pass            # xxx beginning-of-buffer
734
 
            #elif key == "ctrl e" or key == "$":
 
564
            #elif key == u"ctrl e" or key == u"$":
735
565
            #    pass            # xxx move-end-of-line
736
 
            #elif key == "ctrl a" or key == "^":
 
566
            #elif key == u"ctrl a" or key == u"^":
737
567
            #    pass            # xxx move-beginning-of-line
738
 
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
568
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
739
569
            #    pass            # xxx left
740
 
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
570
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
741
571
            #    pass            # xxx right
742
 
            #elif key == "a":
 
572
            #elif key == u"a":
743
573
            #    pass            # scroll up log
744
 
            #elif key == "z":
 
574
            #elif key == u"z":
745
575
            #    pass            # scroll down log
746
576
            elif self.topwidget.selectable():
747
577
                self.topwidget.keypress(self.size, key)
751
581
ui = UserInterface()
752
582
try:
753
583
    ui.run()
754
 
except KeyboardInterrupt:
755
 
    ui.screen.stop()
756
584
except Exception, e:
757
585
    ui.log_message(unicode(e))
758
586
    ui.screen.stop()