/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

* Makefile: Merge branch adding warning messages to "run-*" targets.

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