/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

* mandos (MandosServer.handle_ipc): Better log message.
  (main/MandosDBusService.ClientNotFound): Add "address" argument.
                                           All callers changed.
* mandos-monitor (MandosClientWidget.__init__): Add "logger" argument.
  (MandosClientWidget.checker_completed,
  MandosClientWidget.checker_started, MandosClientWidget.got_secret,
  MandosClientWidget.rejected): New methods, connected to signals.
  (MandosClientWidget.update): Improve display.
  (UserInterface.client_not_found): New method, conneced to signal.
  (UserInterface.log_message): New; log with timestamp.
  (UserInterface.log_message_raw): Same as old "log_message".  Bug
                                  fix; always do "refresh()".

Show diffs side-by-side

added added

removed removed

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