/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2011-10-11 20:04:57 UTC
  • mfrom: (505.1.14 teddy)
  • Revision ID: teddy@recompile.se-20111011200457-gscdhu4raq6tgn4x
* Makefile (DOCBOOKTOMAN): Also check manual pages for warnings.
* debian/control (Build-Depends): Added "man".

Show diffs side-by-side

added added

removed removed

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