/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Björn Påhlsson
  • Date: 2010-09-07 16:48:58 UTC
  • mto: (237.4.3 mandos-release)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: belorn@fukt.bsnet.se-20100907164858-tcg8hkxdj41zizac
mandos server: Added debuglevel that adjust at what level information
               should be reported.
plugin-runner, askpass-fifo, password-prompt, splasy, usplash:
               Using error instead of perror

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