/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-2014 Teddy Hogeborn
7
 
# Copyright © 2009-2014 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
 
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)
175
111
    
176
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()
 
114
            self.logger(u'Checker for client %s (command "%s")'
 
115
                        u' was successful'
 
116
                        % (self.properties[u"name"], command))
182
117
            return
183
 
        # Checker failed
184
118
        if os.WIFEXITED(condition):
185
 
            self.logger('Checker for client {} (command "{}") failed'
186
 
                        ' with exit code {}'
187
 
                        .format(self.properties["Name"], command,
188
 
                                os.WEXITSTATUS(condition)))
189
 
        elif os.WIFSIGNALED(condition):
190
 
            self.logger('Checker for client {} (command "{}") was'
191
 
                        ' killed by signal {}'
192
 
                        .format(self.properties["Name"], command,
193
 
                                os.WTERMSIG(condition)))
194
 
        elif os.WCOREDUMP(condition):
195
 
            self.logger('Checker for client {} (command "{}") dumped'
196
 
                        ' core'.format(self.properties["Name"],
197
 
                                       command))
198
 
        else:
199
 
            self.logger('Checker for client {} completed'
200
 
                        ' mysteriously'
201
 
                        .format(self.properties["Name"]))
202
 
        self.update()
 
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')
203
135
    
204
136
    def checker_started(self, command):
205
 
        """Server signals that a checker started."""
206
 
        self.logger('Client {} started checker "{}"'
207
 
                    .format(self.properties["Name"],
208
 
                            command), level=0)
 
137
        self.logger(u'Client %s started checker "%s"'
 
138
                    % (self.properties[u"name"], unicode(command)))
209
139
    
210
140
    def got_secret(self):
211
 
        self.logger('Client {} received its secret'
212
 
                    .format(self.properties["Name"]))
213
 
    
214
 
    def need_approval(self, timeout, default):
215
 
        if not default:
216
 
            message = 'Client {} needs approval within {} seconds'
217
 
        else:
218
 
            message = 'Client {} will get its secret in {} seconds'
219
 
        self.logger(message.format(self.properties["Name"],
220
 
                                   timeout/1000))
221
 
    
222
 
    def rejected(self, reason):
223
 
        self.logger('Client {} was rejected; reason: {}'
224
 
                    .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"])
225
147
    
226
148
    def selectable(self):
227
149
        """Make this a "selectable" widget.
228
150
        This overrides the method from urwid.FlowWidget."""
229
151
        return True
230
152
    
231
 
    def rows(self, maxcolrow, focus=False):
 
153
    def rows(self, (maxcol,), focus=False):
232
154
        """How many rows this widget will occupy might depend on
233
155
        whether we have focus or not.
234
156
        This overrides the method from urwid.FlowWidget"""
235
 
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
 
157
        return self.current_widget(focus).rows((maxcol,), focus=focus)
236
158
    
237
159
    def current_widget(self, focus=False):
238
160
        if focus or self.opened:
242
164
    def update(self):
243
165
        "Called when what is visible on the screen should be updated."
244
166
        # How to add standout mode to a style
245
 
        with_standout = { "normal": "standout",
246
 
                          "bold": "bold-standout",
247
 
                          "underline-blink":
248
 
                              "underline-blink-standout",
249
 
                          "bold-underline-blink":
250
 
                              "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",
251
173
                          }
252
174
        
253
175
        # Rebuild focus and non-focus widgets using current properties
254
 
        
255
 
        # Base part of a client. Name!
256
 
        base = '{name}: '.format(name=self.properties["Name"])
257
 
        if not self.properties["Enabled"]:
258
 
            message = "DISABLED"
259
 
            self.using_timer(False)
260
 
        elif self.properties["ApprovalPending"]:
261
 
            timeout = datetime.timedelta(milliseconds
262
 
                                         = self.properties
263
 
                                         ["ApprovalDelay"])
264
 
            last_approval_request = isoformat_to_datetime(
265
 
                self.properties["LastApprovalRequest"])
266
 
            if last_approval_request is not None:
267
 
                timer = max(timeout - (datetime.datetime.utcnow()
268
 
                                       - last_approval_request),
269
 
                            datetime.timedelta())
270
 
            else:
271
 
                timer = datetime.timedelta()
272
 
            if self.properties["ApprovedByDefault"]:
273
 
                message = "Approval in {}. (d)eny?"
274
 
            else:
275
 
                message = "Denial in {}. (a)pprove?"
276
 
            message = message.format(str(timer).rsplit(".", 1)[0])
277
 
            self.using_timer(True)
278
 
        elif self.properties["LastCheckerStatus"] != 0:
279
 
            # When checker has failed, show timer until client expires
280
 
            expires = self.properties["Expires"]
281
 
            if expires == "":
282
 
                timer = datetime.timedelta(0)
283
 
            else:
284
 
                expires = (datetime.datetime.strptime
285
 
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
286
 
                timer = max(expires - datetime.datetime.utcnow(),
287
 
                            datetime.timedelta())
288
 
            message = ('A checker has failed! Time until client'
289
 
                       ' gets disabled: {}'
290
 
                       .format(str(timer).rsplit(".", 1)[0]))
291
 
            self.using_timer(True)
292
 
        else:
293
 
            message = "enabled"
294
 
            self.using_timer(False)
295
 
        self._text = "{}{}".format(base, message)
296
 
        
 
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")})
297
182
        if not urwid.supports_unicode():
298
183
            self._text = self._text.encode("ascii", "replace")
299
 
        textlist = [("normal", self._text)]
 
184
        textlist = [(u"normal", self._text)]
300
185
        self._text_widget.set_text(textlist)
301
186
        self._focus_text_widget.set_text([(with_standout[text[0]],
302
187
                                           text[1])
310
195
        if self.update_hook is not None:
311
196
            self.update_hook()
312
197
    
313
 
    def update_timer(self):
314
 
        """called by gobject. Will indefinitely loop until
315
 
        gobject.source_remove() on tag is called"""
316
 
        self.update()
317
 
        return True             # Keep calling this
318
 
    
319
 
    def delete(self, **kwargs):
320
 
        if self._update_timer_callback_tag is not None:
321
 
            gobject.source_remove(self._update_timer_callback_tag)
322
 
            self._update_timer_callback_tag = None
323
 
        for match in self.match_objects:
324
 
            match.remove()
325
 
        self.match_objects = ()
 
198
    def delete(self):
326
199
        if self.delete_hook is not None:
327
200
            self.delete_hook(self)
328
 
        return super(MandosClientWidget, self).delete(**kwargs)
329
201
    
330
 
    def render(self, maxcolrow, focus=False):
 
202
    def render(self, (maxcol,), focus=False):
331
203
        """Render differently if we have focus.
332
204
        This overrides the method from urwid.FlowWidget"""
333
 
        return self.current_widget(focus).render(maxcolrow,
 
205
        return self.current_widget(focus).render((maxcol,),
334
206
                                                 focus=focus)
335
207
    
336
 
    def keypress(self, maxcolrow, key):
 
208
    def keypress(self, (maxcol,), key):
337
209
        """Handle keys.
338
210
        This overrides the method from urwid.FlowWidget"""
339
 
        if key == "+":
340
 
            self.proxy.Enable(dbus_interface = client_interface,
341
 
                              ignore_reply=True)
342
 
        elif key == "-":
343
 
            self.proxy.Disable(dbus_interface = client_interface,
344
 
                               ignore_reply=True)
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":
 
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":
354
216
            self.server_proxy_object.RemoveClient(self.proxy
355
 
                                                  .object_path,
356
 
                                                  ignore_reply=True)
357
 
        elif key == "s":
358
 
            self.proxy.StartChecker(dbus_interface = client_interface,
359
 
                                    ignore_reply=True)
360
 
        elif key == "S":
361
 
            self.proxy.StopChecker(dbus_interface = client_interface,
362
 
                                   ignore_reply=True)
363
 
        elif key == "C":
364
 
            self.proxy.CheckedOK(dbus_interface = client_interface,
365
 
                                 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()
366
224
        # xxx
367
 
#         elif key == "p" or key == "=":
 
225
#         elif key == u"p" or key == "=":
368
226
#             self.proxy.pause()
369
 
#         elif key == "u" or key == ":":
 
227
#         elif key == u"u" or key == ":":
370
228
#             self.proxy.unpause()
371
 
#         elif key == "RET":
 
229
#         elif key == u"RET":
372
230
#             self.open()
373
231
        else:
374
232
            return key
375
233
    
376
 
    def properties_changed(self, interface, properties, invalidated):
377
 
        """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.
378
237
        This overrides the method from MandosClientPropertyCache"""
379
 
        old_values = { key: self.properties.get(key)
380
 
                       for key in properties.keys() }
381
 
        super(MandosClientWidget, self).properties_changed(
382
 
            interface, properties, invalidated)
383
 
        if any(old_values[key] != self.properties.get(key)
384
 
               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:
385
243
            self.update()
386
244
 
387
245
 
390
248
    "down" key presses, thus not allowing any containing widgets to
391
249
    use them as an excuse to shift focus away from this widget.
392
250
    """
393
 
    def keypress(self, *args, **kwargs):
394
 
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
395
 
        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"):
396
254
            return
397
255
        return ret
398
256
 
401
259
    """This is the entire user interface - the whole screen
402
260
    with boxes, lists of client widgets, etc.
403
261
    """
404
 
    def __init__(self, max_log_length=1000, log_level=1):
 
262
    def __init__(self, max_log_length=1000):
405
263
        DBusGMainLoop(set_as_default=True)
406
264
        
407
265
        self.screen = urwid.curses_display.Screen()
408
266
        
409
267
        self.screen.register_palette((
410
 
                ("normal",
411
 
                 "default", "default", None),
412
 
                ("bold",
413
 
                 "bold", "default", "bold"),
414
 
                ("underline-blink",
415
 
                 "underline,blink", "default", "underline,blink"),
416
 
                ("standout",
417
 
                 "standout", "default", "standout"),
418
 
                ("bold-underline-blink",
419
 
                 "bold,underline,blink", "default", "bold,underline,blink"),
420
 
                ("bold-standout",
421
 
                 "bold,standout", "default", "bold,standout"),
422
 
                ("underline-blink-standout",
423
 
                 "underline,blink,standout", "default",
424
 
                 "underline,blink,standout"),
425
 
                ("bold-underline-blink-standout",
426
 
                 "bold,underline,blink,standout", "default",
427
 
                 "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")),
428
285
                ))
429
286
        
430
287
        if urwid.supports_unicode():
431
 
            self.divider = "─" # \u2500
432
 
            #self.divider = "━" # \u2501
 
288
            self.divider = u"─" # \u2500
 
289
            #self.divider = u"━" # \u2501
433
290
        else:
434
 
            #self.divider = "-" # \u002d
435
 
            self.divider = "_" # \u005f
 
291
            #self.divider = u"-" # \u002d
 
292
            self.divider = u"_" # \u005f
436
293
        
437
294
        self.screen.start()
438
295
        
445
302
        self.log = []
446
303
        self.max_log_length = max_log_length
447
304
        
448
 
        self.log_level = log_level
449
 
        
450
305
        # We keep a reference to the log widget so we can remove it
451
306
        # from the ListWalker without it getting destroyed
452
307
        self.logbox = ConstrainedListBox(self.log)
454
309
        # This keeps track of whether self.uilist currently has
455
310
        # self.logbox in it or not
456
311
        self.log_visible = True
457
 
        self.log_wrap = "any"
 
312
        self.log_wrap = u"any"
458
313
        
459
314
        self.rebuild()
460
 
        self.log_message_raw(("bold",
461
 
                              "Mandos Monitor version " + version))
462
 
        self.log_message_raw(("bold",
463
 
                              "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"))
464
319
        
465
320
        self.busname = domain + '.Mandos'
466
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)
467
364
    
468
365
    def client_not_found(self, fingerprint, address):
469
 
        self.log_message("Client with address {} and fingerprint {}"
470
 
                         " could not be found"
471
 
                         .format(address, fingerprint))
 
366
        self.log_message((u"Client with address %s and fingerprint %s"
 
367
                          u" could not be found" % (address,
 
368
                                                    fingerprint)))
472
369
    
473
370
    def rebuild(self):
474
371
        """This rebuilds the User Interface.
475
372
        Call this when the widget layout needs to change"""
476
373
        self.uilist = []
477
374
        #self.uilist.append(urwid.ListBox(self.clients))
478
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
479
 
                                                          clients),
 
375
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
480
376
                                       #header=urwid.Divider(),
481
377
                                       header=None,
482
 
                                       footer=
483
 
                                       urwid.Divider(div_char=
484
 
                                                     self.divider)))
 
378
                                       footer=urwid.Divider(div_char=self.divider)))
485
379
        if self.log_visible:
486
380
            self.uilist.append(self.logbox)
 
381
            pass
487
382
        self.topwidget = urwid.Pile(self.uilist)
488
383
    
489
 
    def log_message(self, message, level=1):
490
 
        """Log message formatted with timestamp"""
491
 
        if level < self.log_level:
492
 
            return
 
384
    def log_message(self, message):
493
385
        timestamp = datetime.datetime.now().isoformat()
494
 
        self.log_message_raw("{}: {}".format(timestamp, message),
495
 
                             level=level)
 
386
        self.log_message_raw(timestamp + u": " + message)
496
387
    
497
 
    def log_message_raw(self, markup, level=1):
 
388
    def log_message_raw(self, markup):
498
389
        """Add a log message to the log buffer."""
499
 
        if level < self.log_level:
500
 
            return
501
390
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
502
391
        if (self.max_log_length
503
392
            and len(self.log) > self.max_log_length):
504
393
            del self.log[0:len(self.log)-self.max_log_length-1]
505
394
        self.logbox.set_focus(len(self.logbox.body.contents),
506
 
                              coming_from="above")
 
395
                              coming_from=u"above")
507
396
        self.refresh()
508
397
    
509
398
    def toggle_log_display(self):
510
399
        """Toggle visibility of the log buffer."""
511
400
        self.log_visible = not self.log_visible
512
401
        self.rebuild()
513
 
        self.log_message("Log visibility changed to: {}"
514
 
                         .format(self.log_visible), level=0)
 
402
        self.log_message(u"Log visibility changed to: "
 
403
                         + unicode(self.log_visible))
515
404
    
516
405
    def change_log_display(self):
517
406
        """Change type of log display.
518
407
        Currently, this toggles wrapping of text lines."""
519
 
        if self.log_wrap == "clip":
520
 
            self.log_wrap = "any"
 
408
        if self.log_wrap == u"clip":
 
409
            self.log_wrap = u"any"
521
410
        else:
522
 
            self.log_wrap = "clip"
 
411
            self.log_wrap = u"clip"
523
412
        for textwidget in self.log:
524
413
            textwidget.set_wrap_mode(self.log_wrap)
525
 
        self.log_message("Wrap mode: {}".format(self.log_wrap),
526
 
                         level=0)
 
414
        self.log_message(u"Wrap mode: " + self.log_wrap)
527
415
    
528
416
    def find_and_remove_client(self, path, name):
529
 
        """Find a client by its object path and remove it.
 
417
        """Find an client from its object path and remove it.
530
418
        
531
419
        This is connected to the ClientRemoved signal from the
532
420
        Mandos server object."""
534
422
            client = self.clients_dict[path]
535
423
        except KeyError:
536
424
            # not found?
537
 
            self.log_message("Unknown client {!r} ({!r}) removed"
538
 
                             .format(name, path))
539
425
            return
540
 
        client.delete()
 
426
        self.remove_client(client, path)
541
427
    
542
428
    def add_new_client(self, path):
543
429
        client_proxy_object = self.bus.get_object(self.busname, path)
558
444
        if path is None:
559
445
            path = client.proxy.object_path
560
446
        self.clients_dict[path] = client
561
 
        self.clients.sort(key=lambda c: c.properties["Name"])
 
447
        self.clients.sort(None, lambda c: c.properties[u"name"])
562
448
        self.refresh()
563
449
    
564
450
    def remove_client(self, client, path=None):
566
452
        if path is None:
567
453
            path = client.proxy.object_path
568
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()
569
460
        self.refresh()
570
461
    
571
462
    def refresh(self):
575
466
    
576
467
    def run(self):
577
468
        """Start the main loop and exit when it's done."""
578
 
        self.bus = dbus.SystemBus()
579
 
        mandos_dbus_objc = self.bus.get_object(
580
 
            self.busname, "/", follow_name_owner_changes=True)
581
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
582
 
                                          dbus_interface
583
 
                                          = server_interface)
584
 
        try:
585
 
            mandos_clients = (self.mandos_serv
586
 
                              .GetAllClientsWithProperties())
587
 
            if not mandos_clients:
588
 
                self.log_message_raw(("bold", "Note: Server has no clients."))
589
 
        except dbus.exceptions.DBusException:
590
 
            self.log_message_raw(("bold", "Note: No Mandos server running."))
591
 
            mandos_clients = dbus.Dictionary()
592
 
        
593
 
        (self.mandos_serv
594
 
         .connect_to_signal("ClientRemoved",
595
 
                            self.find_and_remove_client,
596
 
                            dbus_interface=server_interface,
597
 
                            byte_arrays=True))
598
 
        (self.mandos_serv
599
 
         .connect_to_signal("ClientAdded",
600
 
                            self.add_new_client,
601
 
                            dbus_interface=server_interface,
602
 
                            byte_arrays=True))
603
 
        (self.mandos_serv
604
 
         .connect_to_signal("ClientNotFound",
605
 
                            self.client_not_found,
606
 
                            dbus_interface=server_interface,
607
 
                            byte_arrays=True))
608
 
        for path, client in mandos_clients.items():
609
 
            client_proxy_object = self.bus.get_object(self.busname,
610
 
                                                      path)
611
 
            self.add_client(MandosClientWidget(server_proxy_object
612
 
                                               =self.mandos_serv,
613
 
                                               proxy_object
614
 
                                               =client_proxy_object,
615
 
                                               properties=client,
616
 
                                               update_hook
617
 
                                               =self.refresh,
618
 
                                               delete_hook
619
 
                                               =self.remove_client,
620
 
                                               logger
621
 
                                               =self.log_message),
622
 
                            path=path)
623
 
        
624
469
        self.refresh()
625
470
        self._input_callback_tag = (gobject.io_add_watch
626
471
                                    (sys.stdin.fileno(),
636
481
    
637
482
    def process_input(self, source, condition):
638
483
        keys = self.screen.get_input()
639
 
        translations = { "ctrl n": "down",      # Emacs
640
 
                         "ctrl p": "up",        # Emacs
641
 
                         "ctrl v": "page down", # Emacs
642
 
                         "meta v": "page up",   # Emacs
643
 
                         " ": "page down",      # less
644
 
                         "f": "page down",      # less
645
 
                         "b": "page up",        # less
646
 
                         "j": "down",           # vi
647
 
                         "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
648
493
                         }
649
494
        for key in keys:
650
495
            try:
652
497
            except KeyError:    # :-)
653
498
                pass
654
499
            
655
 
            if key == "q" or key == "Q":
 
500
            if key == u"q" or key == u"Q":
656
501
                self.stop()
657
502
                break
658
 
            elif key == "window resize":
 
503
            elif key == u"window resize":
659
504
                self.size = self.screen.get_cols_rows()
660
505
                self.refresh()
661
 
            elif key == "ctrl l":
662
 
                self.screen.clear()
 
506
            elif key == u"\f":  # Ctrl-L
663
507
                self.refresh()
664
 
            elif key == "l" or key == "D":
 
508
            elif key == u"l" or key == u"D":
665
509
                self.toggle_log_display()
666
510
                self.refresh()
667
 
            elif key == "w" or key == "i":
 
511
            elif key == u"w" or key == u"i":
668
512
                self.change_log_display()
669
513
                self.refresh()
670
 
            elif key == "?" or key == "f1" or key == "esc":
 
514
            elif key == u"?" or key == u"f1" or key == u"esc":
671
515
                if not self.log_visible:
672
516
                    self.log_visible = True
673
517
                    self.rebuild()
674
 
                self.log_message_raw(("bold",
675
 
                                      "  ".
676
 
                                      join(("q: Quit",
677
 
                                            "?: Help",
678
 
                                            "l: Log window toggle",
679
 
                                            "TAB: Switch window",
680
 
                                            "w: Wrap (log lines)",
681
 
                                            "v: Toggle verbose log",
682
 
                                            ))))
683
 
                self.log_message_raw(("bold",
684
 
                                      "  "
685
 
                                      .join(("Clients:",
686
 
                                             "+: Enable",
687
 
                                             "-: Disable",
688
 
                                             "R: Remove",
689
 
                                             "s: Start new checker",
690
 
                                             "S: Stop checker",
691
 
                                             "C: Checker OK",
692
 
                                             "a: Approve",
693
 
                                             "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"))))
694
534
                self.refresh()
695
 
            elif key == "tab":
 
535
            elif key == u"tab":
696
536
                if self.topwidget.get_focus() is self.logbox:
697
537
                    self.topwidget.set_focus(0)
698
538
                else:
699
539
                    self.topwidget.set_focus(self.logbox)
700
540
                self.refresh()
701
 
            elif key == "v":
702
 
                if self.log_level == 0:
703
 
                    self.log_level = 1
704
 
                    self.log_message("Verbose mode: Off")
705
 
                else:
706
 
                    self.log_level = 0
707
 
                    self.log_message("Verbose mode: On")
708
 
            #elif (key == "end" or key == "meta >" or key == "G"
709
 
            #      or key == ">"):
 
541
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
542
            #      or key == u">"):
710
543
            #    pass            # xxx end-of-buffer
711
 
            #elif (key == "home" or key == "meta <" or key == "g"
712
 
            #      or key == "<"):
 
544
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
545
            #      or key == u"<"):
713
546
            #    pass            # xxx beginning-of-buffer
714
 
            #elif key == "ctrl e" or key == "$":
 
547
            #elif key == u"ctrl e" or key == u"$":
715
548
            #    pass            # xxx move-end-of-line
716
 
            #elif key == "ctrl a" or key == "^":
 
549
            #elif key == u"ctrl a" or key == u"^":
717
550
            #    pass            # xxx move-beginning-of-line
718
 
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
551
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
719
552
            #    pass            # xxx left
720
 
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
553
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
721
554
            #    pass            # xxx right
722
 
            #elif key == "a":
 
555
            #elif key == u"a":
723
556
            #    pass            # scroll up log
724
 
            #elif key == "z":
 
557
            #elif key == u"z":
725
558
            #    pass            # scroll down log
726
559
            elif self.topwidget.selectable():
727
560
                self.topwidget.keypress(self.size, key)
731
564
ui = UserInterface()
732
565
try:
733
566
    ui.run()
734
 
except KeyboardInterrupt:
735
 
    ui.screen.stop()
736
 
except Exception as e:
737
 
    ui.log_message(str(e))
 
567
except Exception, e:
 
568
    ui.log_message(unicode(e))
738
569
    ui.screen.stop()
739
570
    raise