/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2011-07-25 18:52:11 UTC
  • mfrom: (237.7.37 trunk)
  • Revision ID: teddy@fukt.bsnet.se-20110725185211-wlitr9jvs70e1xh8
Merge from trunk.

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