/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 at bsnet
  • Date: 2010-08-24 18:18:01 UTC
  • mto: (24.1.154 mandos)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: teddy@fukt.bsnet.se-20100824181801-n798wxs117trv8iu
* mandos: Use logging.getLogger() as in the documentation.
* mandos-monitor: Suppress logging from dbus.proxies.

Show diffs side-by-side

added added

removed removed

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