/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2011-12-31 20:07:11 UTC
  • mfrom: (535.1.9 wireless-network-hook)
  • Revision ID: teddy@recompile.se-20111231200711-6dli3r8drftem57r
Merge new wireless network hook.  Fix bridge network hook to use
hardware addresses instead of interface names.  Implement and document
new "CONNECT" environment variable for network hooks.

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.1"
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
        """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)))
 
249
        pass
 
250
    
 
251
    def got_secret(self):
 
252
        self.last_checker_failed = False
 
253
        self.logger('Client %s received its secret'
 
254
                    % self.properties["Name"])
 
255
    
 
256
    def need_approval(self, timeout, default):
 
257
        if not default:
 
258
            message = 'Client %s needs approval within %s seconds'
 
259
        else:
 
260
            message = 'Client %s will get its secret in %s seconds'
 
261
        self.logger(message
 
262
                    % (self.properties["Name"], timeout/1000))
 
263
        self.using_timer(True)
 
264
    
 
265
    def rejected(self, reason):
 
266
        self.logger('Client %s was rejected; reason: %s'
 
267
                    % (self.properties["Name"], reason))
89
268
    
90
269
    def selectable(self):
91
270
        """Make this a "selectable" widget.
92
271
        This overrides the method from urwid.FlowWidget."""
93
272
        return True
94
273
    
95
 
    def rows(self, (maxcol,), focus=False):
 
274
    def rows(self, maxcolrow, focus=False):
96
275
        """How many rows this widget will occupy might depend on
97
276
        whether we have focus or not.
98
277
        This overrides the method from urwid.FlowWidget"""
99
 
        return self.current_widget(focus).rows((maxcol,), focus=focus)
 
278
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
100
279
    
101
280
    def current_widget(self, focus=False):
102
281
        if focus or self.opened:
106
285
    def update(self):
107
286
        "Called when what is visible on the screen should be updated."
108
287
        # 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",
 
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",
115
294
                          }
116
 
        
 
295
 
117
296
        # Rebuild focus and non-focus widgets using current properties
118
 
        self._text = (u'name="%(name)s", enabled=%(enabled)s'
119
 
                      % self.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
            
120
335
        if not urwid.supports_unicode():
121
336
            self._text = self._text.encode("ascii", "replace")
122
 
        textlist = [(u"normal", u"BLARGH: "), (u"bold", self._text)]
 
337
        textlist = [("normal", self._text)]
123
338
        self._text_widget.set_text(textlist)
124
339
        self._focus_text_widget.set_text([(with_standout[text[0]],
125
340
                                           text[1])
133
348
        if self.update_hook is not None:
134
349
            self.update_hook()
135
350
    
136
 
    def delete(self):
 
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 = ()
137
364
        if self.delete_hook is not None:
138
365
            self.delete_hook(self)
 
366
        return super(MandosClientWidget, self).delete(*args, **kwargs)
139
367
    
140
 
    def render(self, (maxcol,), focus=False):
 
368
    def render(self, maxcolrow, focus=False):
141
369
        """Render differently if we have focus.
142
370
        This overrides the method from urwid.FlowWidget"""
143
 
        return self.current_widget(focus).render((maxcol,),
 
371
        return self.current_widget(focus).render(maxcolrow,
144
372
                                                 focus=focus)
145
373
    
146
 
    def keypress(self, (maxcol,), key):
 
374
    def keypress(self, maxcolrow, key):
147
375
        """Handle keys.
148
376
        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"_":
 
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":
154
392
            self.server_proxy_object.RemoveClient(self.proxy
155
 
                                                  .object_path)
156
 
        elif key == u"s":
157
 
            self.proxy.StartChecker()
158
 
        elif key == u"c":
159
 
            self.proxy.StopChecker()
160
 
        elif key == u"S":
161
 
            self.proxy.CheckedOK()
 
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)
162
404
        # xxx
163
 
#         elif key == u"p" or key == "=":
 
405
#         elif key == "p" or key == "=":
164
406
#             self.proxy.pause()
165
 
#         elif key == u"u" or key == ":":
 
407
#         elif key == "u" or key == ":":
166
408
#             self.proxy.unpause()
167
 
#         elif key == u"RET":
 
409
#         elif key == "RET":
168
410
#             self.open()
169
411
        else:
170
412
            return key
186
428
    "down" key presses, thus not allowing any containing widgets to
187
429
    use them as an excuse to shift focus away from this widget.
188
430
    """
189
 
    def keypress(self, (maxcol, maxrow), key):
190
 
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
191
 
        if ret in (u"up", u"down"):
 
431
    def keypress(self, maxcolrow, key):
 
432
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
433
        if ret in ("up", "down"):
192
434
            return
193
435
        return ret
194
436
 
203
445
        self.screen = urwid.curses_display.Screen()
204
446
        
205
447
        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")),
 
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")),
223
465
                ))
224
466
        
225
467
        if urwid.supports_unicode():
226
 
            #self.divider = u"─" # \u2500
227
 
            self.divider = u"━" # \u2501
 
468
            self.divider = "─" # \u2500
 
469
            #self.divider = "━" # \u2501
228
470
        else:
229
 
            #self.divider = u"-" # \u002d
230
 
            self.divider = u"_" # \u005f
 
471
            #self.divider = "-" # \u002d
 
472
            self.divider = "_" # \u005f
231
473
        
232
474
        self.screen.start()
233
475
        
247
489
        # This keeps track of whether self.uilist currently has
248
490
        # self.logbox in it or not
249
491
        self.log_visible = True
250
 
        self.log_wrap = u"any"
 
492
        self.log_wrap = "any"
251
493
        
252
494
        self.rebuild()
253
 
        self.log_message(u"Message")
254
 
        self.log_message(u"Message0 Message1 Message2 Message3 Message4 Message5 Message6 Message7 Message8 Message9")
255
 
        self.log_message(u"Message10 Message11 Message12 Message13 Message14 Message15 Message16 Message17 Message18 Message19")
256
 
        self.log_message(u"Message20 Message21 Message22 Message23 Message24 Message25 Message26 Message27 Message28 Message29")
 
495
        self.log_message_raw(("bold",
 
496
                              "Mandos Monitor version " + version))
 
497
        self.log_message_raw(("bold",
 
498
                              "q: Quit  ?: Help"))
257
499
        
258
500
        self.busname = domain + '.Mandos'
259
501
        self.main_loop = gobject.MainLoop()
260
 
        self.bus = dbus.SystemBus()
261
 
        mandos_dbus_objc = self.bus.get_object(
262
 
            self.busname, u"/", follow_name_owner_changes=True)
263
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
264
 
                                          dbus_interface
265
 
                                          = server_interface)
266
 
        try:
267
 
            mandos_clients = (self.mandos_serv
268
 
                              .GetAllClientsWithProperties())
269
 
        except dbus.exceptions.DBusException:
270
 
            mandos_clients = dbus.Dictionary()
271
 
        
272
 
        (self.mandos_serv
273
 
         .connect_to_signal("ClientRemoved",
274
 
                            self.find_and_remove_client,
275
 
                            dbus_interface=server_interface,
276
 
                            byte_arrays=True))
277
 
        (self.mandos_serv
278
 
         .connect_to_signal("ClientAdded",
279
 
                            self.add_new_client,
280
 
                            dbus_interface=server_interface,
281
 
                            byte_arrays=True))
282
 
        for path, client in mandos_clients.iteritems():
283
 
            client_proxy_object = self.bus.get_object(self.busname,
284
 
                                                      path)
285
 
            self.add_client(MandosClientWidget(server_proxy_object
286
 
                                               =self.mandos_serv,
287
 
                                               proxy_object
288
 
                                               =client_proxy_object,
289
 
                                               properties=client,
290
 
                                               update_hook
291
 
                                               =self.refresh,
292
 
                                               delete_hook
293
 
                                               =self.remove_client),
294
 
                            path=path)
 
502
    
 
503
    def client_not_found(self, fingerprint, address):
 
504
        self.log_message(("Client with address %s and fingerprint %s"
 
505
                          " could not be found" % (address,
 
506
                                                    fingerprint)))
295
507
    
296
508
    def rebuild(self):
297
509
        """This rebuilds the User Interface.
298
510
        Call this when the widget layout needs to change"""
299
511
        self.uilist = []
300
512
        #self.uilist.append(urwid.ListBox(self.clients))
301
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
 
513
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
514
                                                          clients),
302
515
                                       #header=urwid.Divider(),
303
516
                                       header=None,
304
 
                                       footer=urwid.Divider(div_char=self.divider)))
 
517
                                       footer=
 
518
                                       urwid.Divider(div_char=
 
519
                                                     self.divider)))
305
520
        if self.log_visible:
306
521
            self.uilist.append(self.logbox)
307
 
            pass
308
522
        self.topwidget = urwid.Pile(self.uilist)
309
523
    
310
 
    def log_message(self, markup):
 
524
    def log_message(self, message):
 
525
        timestamp = datetime.datetime.now().isoformat()
 
526
        self.log_message_raw(timestamp + ": " + message)
 
527
    
 
528
    def log_message_raw(self, markup):
311
529
        """Add a log message to the log buffer."""
312
530
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
313
531
        if (self.max_log_length
314
532
            and len(self.log) > self.max_log_length):
315
533
            del self.log[0:len(self.log)-self.max_log_length-1]
 
534
        self.logbox.set_focus(len(self.logbox.body.contents),
 
535
                              coming_from="above")
 
536
        self.refresh()
316
537
    
317
538
    def toggle_log_display(self):
318
539
        """Toggle visibility of the log buffer."""
319
540
        self.log_visible = not self.log_visible
320
541
        self.rebuild()
321
 
        self.log_message(u"Log visibility changed to: "
322
 
                         + unicode(self.log_visible))
 
542
        #self.log_message("Log visibility changed to: "
 
543
        #                 + unicode(self.log_visible))
323
544
    
324
545
    def change_log_display(self):
325
546
        """Change type of log display.
326
547
        Currently, this toggles wrapping of text lines."""
327
 
        if self.log_wrap == u"clip":
328
 
            self.log_wrap = u"any"
 
548
        if self.log_wrap == "clip":
 
549
            self.log_wrap = "any"
329
550
        else:
330
 
            self.log_wrap = u"clip"
 
551
            self.log_wrap = "clip"
331
552
        for textwidget in self.log:
332
553
            textwidget.set_wrap_mode(self.log_wrap)
333
 
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
554
        #self.log_message("Wrap mode: " + self.log_wrap)
334
555
    
335
556
    def find_and_remove_client(self, path, name):
336
 
        """Find an client from its object path and remove it.
 
557
        """Find a client by its object path and remove it.
337
558
        
338
559
        This is connected to the ClientRemoved signal from the
339
560
        Mandos server object."""
341
562
            client = self.clients_dict[path]
342
563
        except KeyError:
343
564
            # not found?
 
565
            self.log_message("Unknown client %r (%r) removed", name,
 
566
                             path)
344
567
            return
345
 
        self.remove_client(client, path)
 
568
        client.delete()
346
569
    
347
 
    def add_new_client(self, path, properties):
 
570
    def add_new_client(self, path):
348
571
        client_proxy_object = self.bus.get_object(self.busname, path)
349
572
        self.add_client(MandosClientWidget(server_proxy_object
350
573
                                           =self.mandos_serv,
351
574
                                           proxy_object
352
575
                                           =client_proxy_object,
353
 
                                           properties=properties,
354
576
                                           update_hook
355
577
                                           =self.refresh,
356
578
                                           delete_hook
357
 
                                           =self.remove_client),
 
579
                                           =self.remove_client,
 
580
                                           logger
 
581
                                           =self.log_message),
358
582
                        path=path)
359
583
    
360
584
    def add_client(self, client, path=None):
362
586
        if path is None:
363
587
            path = client.proxy.object_path
364
588
        self.clients_dict[path] = client
365
 
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
589
        self.clients.sort(None, lambda c: c.properties["Name"])
366
590
        self.refresh()
367
591
    
368
592
    def remove_client(self, client, path=None):
384
608
    
385
609
    def run(self):
386
610
        """Start the main loop and exit when it's done."""
 
611
        self.bus = dbus.SystemBus()
 
612
        mandos_dbus_objc = self.bus.get_object(
 
613
            self.busname, "/", follow_name_owner_changes=True)
 
614
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
615
                                          dbus_interface
 
616
                                          = server_interface)
 
617
        try:
 
618
            mandos_clients = (self.mandos_serv
 
619
                              .GetAllClientsWithProperties())
 
620
        except dbus.exceptions.DBusException:
 
621
            mandos_clients = dbus.Dictionary()
 
622
        
 
623
        (self.mandos_serv
 
624
         .connect_to_signal("ClientRemoved",
 
625
                            self.find_and_remove_client,
 
626
                            dbus_interface=server_interface,
 
627
                            byte_arrays=True))
 
628
        (self.mandos_serv
 
629
         .connect_to_signal("ClientAdded",
 
630
                            self.add_new_client,
 
631
                            dbus_interface=server_interface,
 
632
                            byte_arrays=True))
 
633
        (self.mandos_serv
 
634
         .connect_to_signal("ClientNotFound",
 
635
                            self.client_not_found,
 
636
                            dbus_interface=server_interface,
 
637
                            byte_arrays=True))
 
638
        for path, client in mandos_clients.iteritems():
 
639
            client_proxy_object = self.bus.get_object(self.busname,
 
640
                                                      path)
 
641
            self.add_client(MandosClientWidget(server_proxy_object
 
642
                                               =self.mandos_serv,
 
643
                                               proxy_object
 
644
                                               =client_proxy_object,
 
645
                                               properties=client,
 
646
                                               update_hook
 
647
                                               =self.refresh,
 
648
                                               delete_hook
 
649
                                               =self.remove_client,
 
650
                                               logger
 
651
                                               =self.log_message),
 
652
                            path=path)
 
653
 
387
654
        self.refresh()
388
655
        self._input_callback_tag = (gobject.io_add_watch
389
656
                                    (sys.stdin.fileno(),
399
666
    
400
667
    def process_input(self, source, condition):
401
668
        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
 
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
411
678
                         }
412
679
        for key in keys:
413
680
            try:
415
682
            except KeyError:    # :-)
416
683
                pass
417
684
            
418
 
            if key == u"q" or key == u"Q":
 
685
            if key == "q" or key == "Q":
419
686
                self.stop()
420
687
                break
421
 
            elif key == u"window resize":
 
688
            elif key == "window resize":
422
689
                self.size = self.screen.get_cols_rows()
423
690
                self.refresh()
424
 
            elif key == u"\f":  # Ctrl-L
 
691
            elif key == "\f":  # Ctrl-L
425
692
                self.refresh()
426
 
            elif key == u"l" or key == u"D":
 
693
            elif key == "l" or key == "D":
427
694
                self.toggle_log_display()
428
695
                self.refresh()
429
 
            elif key == u"w" or key == u"i":
 
696
            elif key == "w" or key == "i":
430
697
                self.change_log_display()
431
698
                self.refresh()
432
 
            elif key == u"?" or key == u"f1":
433
 
                self.log_message(u"Help!")
 
699
            elif key == "?" or key == "f1" or key == "esc":
 
700
                if not self.log_visible:
 
701
                    self.log_visible = True
 
702
                    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"))))
434
721
                self.refresh()
435
 
            elif key == u"tab":
 
722
            elif key == "tab":
436
723
                if self.topwidget.get_focus() is self.logbox:
437
724
                    self.topwidget.set_focus(0)
438
725
                else:
439
726
                    self.topwidget.set_focus(self.logbox)
440
727
                self.refresh()
441
 
            elif (key == u"end" or key == u"meta >" or key == u"G"
442
 
                  or key == u">"):
443
 
                pass            # xxx end-of-buffer
444
 
            elif (key == u"home" or key == u"meta <" or key == u"g"
445
 
                  or key == u"<"):
446
 
                pass            # xxx beginning-of-buffer
447
 
            elif key == u"ctrl e" or key == u"$":
448
 
                pass            # xxx move-end-of-line
449
 
            elif key == u"ctrl a" or key == u"^":
450
 
                pass            # xxx move-beginning-of-line
451
 
            elif key == u"ctrl b" or key == u"meta (" or key == u"h":
452
 
                pass            # xxx left
453
 
            elif key == u"ctrl f" or key == u"meta )" or key == u"l":
454
 
                pass            # xxx right
455
 
            elif key == u"a":
456
 
                pass            # scroll up log
457
 
            elif key == u"z":
458
 
                pass            # scroll down log
 
728
            #elif (key == "end" or key == "meta >" or key == "G"
 
729
            #      or key == ">"):
 
730
            #    pass            # xxx end-of-buffer
 
731
            #elif (key == "home" or key == "meta <" or key == "g"
 
732
            #      or key == "<"):
 
733
            #    pass            # xxx beginning-of-buffer
 
734
            #elif key == "ctrl e" or key == "$":
 
735
            #    pass            # xxx move-end-of-line
 
736
            #elif key == "ctrl a" or key == "^":
 
737
            #    pass            # xxx move-beginning-of-line
 
738
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
739
            #    pass            # xxx left
 
740
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
741
            #    pass            # xxx right
 
742
            #elif key == "a":
 
743
            #    pass            # scroll up log
 
744
            #elif key == "z":
 
745
            #    pass            # scroll down log
459
746
            elif self.topwidget.selectable():
460
747
                self.topwidget.keypress(self.size, key)
461
748
                self.refresh()
464
751
ui = UserInterface()
465
752
try:
466
753
    ui.run()
467
 
except:
 
754
except KeyboardInterrupt:
 
755
    ui.screen.stop()
 
756
except Exception, e:
 
757
    ui.log_message(unicode(e))
468
758
    ui.screen.stop()
469
759
    raise