/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

merge
new approve/deny functionallity in mandos-monitor

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