/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

* mandos: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

Show diffs side-by-side

added added

removed removed

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