/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: 2009-11-11 00:25:22 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091111002522-t416fifqw46xaqn4
* debian/rules: Only set BROKEN_PIE if binutils is a specific range of
                versions.
* mandos-monitor (MandosClientWidget.keypress): Also accept "Ctrl-K"
                                                for removing client.
  (UserInterface.__init__): Use non-bold line drawing charater.
  (UserInterface.log_message): Scroll to bottom.
  (UserInterface.process_input): Also show help on "ESC" key.

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