/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2012-06-15 17:18:34 UTC
  • Revision ID: teddy@recompile.se-20120615171834-gzzgknth003j903u
* plugins.d/mandos-client.c (main): Bug fix: Set DEVICE environment
                                    variable correctly for network
                                    hooks.  Also, don't call
                                    run_network_hooks() with NULL
                                    value.

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
 
from __future__ import division, absolute_import, with_statement
 
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 *
5
30
 
6
31
import sys
7
32
import os
21
46
 
22
47
import locale
23
48
 
24
 
locale.setlocale(locale.LC_ALL, u'')
 
49
locale.setlocale(locale.LC_ALL, '')
25
50
 
26
51
import logging
27
52
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
28
53
 
29
54
# Some useful constants
30
 
domain = 'se.bsnet.fukt'
 
55
domain = 'se.recompile'
31
56
server_interface = domain + '.Mandos'
32
57
client_interface = domain + '.Mandos.Client'
33
 
version = "1.0.15"
 
58
version = "1.5.5"
34
59
 
35
60
# Always run in monochrome mode
36
61
urwid.curses_display.curses.has_colors = lambda : False
40
65
urwid.curses_display.curses.A_UNDERLINE |= (
41
66
    urwid.curses_display.curses.A_BLINK)
42
67
 
 
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
 
43
84
class MandosClientPropertyCache(object):
44
85
    """This wraps a Mandos Client D-Bus proxy object, caches the
45
86
    properties and calls a hook function when any of them are
46
87
    changed.
47
88
    """
48
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
89
    def __init__(self, proxy_object=None, properties=None, **kwargs):
49
90
        self.proxy = proxy_object # Mandos Client proxy object
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)
 
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)
64
109
    
65
110
    def property_changed(self, property=None, value=None):
66
111
        """This is called whenever we get a PropertyChanged signal
68
113
        """
69
114
        # Update properties dict with new value
70
115
        self.properties[property] = value
 
116
    
 
117
    def delete(self):
 
118
        self.property_changed_match.remove()
71
119
 
72
120
 
73
121
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
75
123
    """
76
124
    
77
125
    def __init__(self, server_proxy_object=None, update_hook=None,
78
 
                 delete_hook=None, logger=None, *args, **kwargs):
 
126
                 delete_hook=None, logger=None, **kwargs):
79
127
        # Called on update
80
128
        self.update_hook = update_hook
81
129
        # Called on delete
85
133
        # Logger
86
134
        self.logger = logger
87
135
        
 
136
        self._update_timer_callback_tag = None
 
137
        
88
138
        # The widget shown normally
89
 
        self._text_widget = urwid.Text(u"")
 
139
        self._text_widget = urwid.Text("")
90
140
        # The widget shown when we have focus
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)
 
141
        self._focus_text_widget = urwid.Text("")
 
142
        super(MandosClientWidget, self).__init__(**kwargs)
95
143
        self.update()
96
144
        self.opened = False
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)
 
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
117
182
    
118
183
    def checker_completed(self, exitstatus, condition, command):
119
184
        if exitstatus == 0:
120
 
            #self.logger(u'Checker for client %s (command "%s")'
121
 
            #            u' was successful'
122
 
            #            % (self.properties[u"name"], command))
 
185
            self.update()
123
186
            return
 
187
        # Checker failed
124
188
        if os.WIFEXITED(condition):
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')
 
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()
141
207
    
142
208
    def checker_started(self, command):
143
 
        #self.logger(u'Client %s started checker "%s"'
144
 
        #            % (self.properties[u"name"], unicode(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)))
145
214
        pass
146
215
    
147
216
    def got_secret(self):
148
 
        self.logger(u'Client %s received its secret'
149
 
                    % self.properties[u"name"])
 
217
        self.logger('Client {0} received its secret'
 
218
                    .format(self.properties["Name"]))
150
219
    
151
220
    def need_approval(self, timeout, default):
152
221
        if not default:
153
 
            message = u'Client %s needs approval within %s seconds'
 
222
            message = 'Client {0} needs approval within {1} seconds'
154
223
        else:
155
 
            message = u'Client %s will get its secret in %s seconds'
156
 
        self.logger(message
157
 
                    % (self.properties[u"name"], timeout/1000))
 
224
            message = 'Client {0} will get its secret in {1} seconds'
 
225
        self.logger(message.format(self.properties["Name"],
 
226
                                   timeout/1000))
158
227
    
159
228
    def rejected(self, reason):
160
 
        self.logger(u'Client %s was rejected; reason: %s'
161
 
                    % (self.properties[u"name"], reason))
 
229
        self.logger('Client {0} was rejected; reason: {1}'
 
230
                    .format(self.properties["Name"], reason))
162
231
    
163
232
    def selectable(self):
164
233
        """Make this a "selectable" widget.
165
234
        This overrides the method from urwid.FlowWidget."""
166
235
        return True
167
236
    
168
 
    def rows(self, (maxcol,), focus=False):
 
237
    def rows(self, maxcolrow, focus=False):
169
238
        """How many rows this widget will occupy might depend on
170
239
        whether we have focus or not.
171
240
        This overrides the method from urwid.FlowWidget"""
172
 
        return self.current_widget(focus).rows((maxcol,), focus=focus)
 
241
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
173
242
    
174
243
    def current_widget(self, focus=False):
175
244
        if focus or self.opened:
179
248
    def update(self):
180
249
        "Called when what is visible on the screen should be updated."
181
250
        # How to add standout mode to a style
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",
 
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",
188
257
                          }
189
 
 
 
258
        
190
259
        # Rebuild focus and non-focus widgets using current properties
191
 
 
 
260
        
192
261
        # Base part of a client. Name!
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?"
 
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)
201
298
        else:
202
 
            self._text += (u'%(enabled)s'
203
 
                           % {u"enabled":
204
 
                               (u"enabled"
205
 
                                if self.properties[u"enabled"]
206
 
                                else u"DISABLED")})
 
299
            message = "enabled"
 
300
            self.using_timer(False)
 
301
        self._text = "{0}{1}".format(base, message)
 
302
        
207
303
        if not urwid.supports_unicode():
208
304
            self._text = self._text.encode("ascii", "replace")
209
 
        textlist = [(u"normal", self._text)]
 
305
        textlist = [("normal", self._text)]
210
306
        self._text_widget.set_text(textlist)
211
307
        self._focus_text_widget.set_text([(with_standout[text[0]],
212
308
                                           text[1])
220
316
        if self.update_hook is not None:
221
317
            self.update_hook()
222
318
    
223
 
    def delete(self):
 
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 = ()
224
332
        if self.delete_hook is not None:
225
333
            self.delete_hook(self)
 
334
        return super(MandosClientWidget, self).delete(**kwargs)
226
335
    
227
 
    def render(self, (maxcol,), focus=False):
 
336
    def render(self, maxcolrow, focus=False):
228
337
        """Render differently if we have focus.
229
338
        This overrides the method from urwid.FlowWidget"""
230
 
        return self.current_widget(focus).render((maxcol,),
 
339
        return self.current_widget(focus).render(maxcolrow,
231
340
                                                 focus=focus)
232
341
    
233
 
    def keypress(self, (maxcol,), key):
 
342
    def keypress(self, maxcolrow, key):
234
343
        """Handle keys.
235
344
        This overrides the method from urwid.FlowWidget"""
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":
 
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":
241
352
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
242
 
                               dbus_interface = client_interface)
243
 
        elif key == u"d":
 
353
                               dbus_interface = client_interface,
 
354
                               ignore_reply=True)
 
355
        elif key == "d":
244
356
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
245
 
                                  dbus_interface = client_interface)
246
 
        elif key == u"r" or key == u"_" or key == u"ctrl k":
 
357
                                  dbus_interface = client_interface,
 
358
                               ignore_reply=True)
 
359
        elif key == "R" or key == "_" or key == "ctrl k":
247
360
            self.server_proxy_object.RemoveClient(self.proxy
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)
 
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)
255
372
        # xxx
256
 
#         elif key == u"p" or key == "=":
 
373
#         elif key == "p" or key == "=":
257
374
#             self.proxy.pause()
258
 
#         elif key == u"u" or key == ":":
 
375
#         elif key == "u" or key == ":":
259
376
#             self.proxy.unpause()
260
 
#         elif key == u"RET":
 
377
#         elif key == "RET":
261
378
#             self.open()
262
 
#        elif key == u"+":
263
 
#            self.proxy.Approve(True)
264
 
#        elif key == u"-":
265
 
#            self.proxy.Approve(False)
266
379
        else:
267
380
            return key
268
381
    
269
 
    def property_changed(self, property=None, value=None,
270
 
                         *args, **kwargs):
 
382
    def property_changed(self, property=None, **kwargs):
271
383
        """Call self.update() if old value is not new value.
272
384
        This overrides the method from MandosClientPropertyCache"""
273
385
        property_name = unicode(property)
274
386
        old_value = self.properties.get(property_name)
275
387
        super(MandosClientWidget, self).property_changed(
276
 
            property=property, value=value, *args, **kwargs)
 
388
            property=property, **kwargs)
277
389
        if self.properties.get(property_name) != old_value:
278
390
            self.update()
279
391
 
283
395
    "down" key presses, thus not allowing any containing widgets to
284
396
    use them as an excuse to shift focus away from this widget.
285
397
    """
286
 
    def keypress(self, (maxcol, maxrow), key):
287
 
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
288
 
        if ret in (u"up", u"down"):
 
398
    def keypress(self, *args, **kwargs):
 
399
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
 
400
        if ret in ("up", "down"):
289
401
            return
290
402
        return ret
291
403
 
300
412
        self.screen = urwid.curses_display.Screen()
301
413
        
302
414
        self.screen.register_palette((
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")),
 
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")),
320
432
                ))
321
433
        
322
434
        if urwid.supports_unicode():
323
 
            self.divider = u"─" # \u2500
324
 
            #self.divider = u"━" # \u2501
 
435
            self.divider = "─" # \u2500
 
436
            #self.divider = "━" # \u2501
325
437
        else:
326
 
            #self.divider = u"-" # \u002d
327
 
            self.divider = u"_" # \u005f
 
438
            #self.divider = "-" # \u002d
 
439
            self.divider = "_" # \u005f
328
440
        
329
441
        self.screen.start()
330
442
        
344
456
        # This keeps track of whether self.uilist currently has
345
457
        # self.logbox in it or not
346
458
        self.log_visible = True
347
 
        self.log_wrap = u"any"
 
459
        self.log_wrap = "any"
348
460
        
349
461
        self.rebuild()
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"))
 
462
        self.log_message_raw(("bold",
 
463
                              "Mandos Monitor version " + version))
 
464
        self.log_message_raw(("bold",
 
465
                              "q: Quit  ?: Help"))
354
466
        
355
467
        self.busname = domain + '.Mandos'
356
468
        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)
399
469
    
400
470
    def client_not_found(self, fingerprint, address):
401
 
        self.log_message((u"Client with address %s and fingerprint %s"
402
 
                          u" could not be found" % (address,
403
 
                                                    fingerprint)))
 
471
        self.log_message("Client with address {0} and fingerprint"
 
472
                         " {1} could not be found"
 
473
                         .format(address, fingerprint))
404
474
    
405
475
    def rebuild(self):
406
476
        """This rebuilds the User Interface.
407
477
        Call this when the widget layout needs to change"""
408
478
        self.uilist = []
409
479
        #self.uilist.append(urwid.ListBox(self.clients))
410
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
 
480
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
481
                                                          clients),
411
482
                                       #header=urwid.Divider(),
412
483
                                       header=None,
413
 
                                       footer=urwid.Divider(div_char=self.divider)))
 
484
                                       footer=
 
485
                                       urwid.Divider(div_char=
 
486
                                                     self.divider)))
414
487
        if self.log_visible:
415
488
            self.uilist.append(self.logbox)
416
 
            pass
417
489
        self.topwidget = urwid.Pile(self.uilist)
418
490
    
419
491
    def log_message(self, message):
420
492
        timestamp = datetime.datetime.now().isoformat()
421
 
        self.log_message_raw(timestamp + u": " + message)
 
493
        self.log_message_raw(timestamp + ": " + message)
422
494
    
423
495
    def log_message_raw(self, markup):
424
496
        """Add a log message to the log buffer."""
427
499
            and len(self.log) > self.max_log_length):
428
500
            del self.log[0:len(self.log)-self.max_log_length-1]
429
501
        self.logbox.set_focus(len(self.logbox.body.contents),
430
 
                              coming_from=u"above")
 
502
                              coming_from="above")
431
503
        self.refresh()
432
504
    
433
505
    def toggle_log_display(self):
434
506
        """Toggle visibility of the log buffer."""
435
507
        self.log_visible = not self.log_visible
436
508
        self.rebuild()
437
 
        self.log_message(u"Log visibility changed to: "
438
 
                         + unicode(self.log_visible))
 
509
        #self.log_message("Log visibility changed to: "
 
510
        #                 + unicode(self.log_visible))
439
511
    
440
512
    def change_log_display(self):
441
513
        """Change type of log display.
442
514
        Currently, this toggles wrapping of text lines."""
443
 
        if self.log_wrap == u"clip":
444
 
            self.log_wrap = u"any"
 
515
        if self.log_wrap == "clip":
 
516
            self.log_wrap = "any"
445
517
        else:
446
 
            self.log_wrap = u"clip"
 
518
            self.log_wrap = "clip"
447
519
        for textwidget in self.log:
448
520
            textwidget.set_wrap_mode(self.log_wrap)
449
 
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
521
        #self.log_message("Wrap mode: " + self.log_wrap)
450
522
    
451
523
    def find_and_remove_client(self, path, name):
452
 
        """Find an client from its object path and remove it.
 
524
        """Find a client by its object path and remove it.
453
525
        
454
526
        This is connected to the ClientRemoved signal from the
455
527
        Mandos server object."""
457
529
            client = self.clients_dict[path]
458
530
        except KeyError:
459
531
            # not found?
 
532
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
533
                             .format(name, path))
460
534
            return
461
 
        self.remove_client(client, path)
 
535
        client.delete()
462
536
    
463
537
    def add_new_client(self, path):
464
538
        client_proxy_object = self.bus.get_object(self.busname, path)
479
553
        if path is None:
480
554
            path = client.proxy.object_path
481
555
        self.clients_dict[path] = client
482
 
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
556
        self.clients.sort(None, lambda c: c.properties["Name"])
483
557
        self.refresh()
484
558
    
485
559
    def remove_client(self, client, path=None):
501
575
    
502
576
    def run(self):
503
577
        """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
        
504
621
        self.refresh()
505
622
        self._input_callback_tag = (gobject.io_add_watch
506
623
                                    (sys.stdin.fileno(),
516
633
    
517
634
    def process_input(self, source, condition):
518
635
        keys = self.screen.get_input()
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
 
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
528
645
                         }
529
646
        for key in keys:
530
647
            try:
532
649
            except KeyError:    # :-)
533
650
                pass
534
651
            
535
 
            if key == u"q" or key == u"Q":
 
652
            if key == "q" or key == "Q":
536
653
                self.stop()
537
654
                break
538
 
            elif key == u"window resize":
 
655
            elif key == "window resize":
539
656
                self.size = self.screen.get_cols_rows()
540
657
                self.refresh()
541
 
            elif key == u"\f":  # Ctrl-L
 
658
            elif key == "\f":  # Ctrl-L
542
659
                self.refresh()
543
 
            elif key == u"l" or key == u"D":
 
660
            elif key == "l" or key == "D":
544
661
                self.toggle_log_display()
545
662
                self.refresh()
546
 
            elif key == u"w" or key == u"i":
 
663
            elif key == "w" or key == "i":
547
664
                self.change_log_display()
548
665
                self.refresh()
549
 
            elif key == u"?" or key == u"f1" or key == u"esc":
 
666
            elif key == "?" or key == "f1" or key == "esc":
550
667
                if not self.log_visible:
551
668
                    self.log_visible = True
552
669
                    self.rebuild()
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"))))
 
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"))))
571
688
                self.refresh()
572
 
            elif key == u"tab":
 
689
            elif key == "tab":
573
690
                if self.topwidget.get_focus() is self.logbox:
574
691
                    self.topwidget.set_focus(0)
575
692
                else:
576
693
                    self.topwidget.set_focus(self.logbox)
577
694
                self.refresh()
578
 
            #elif (key == u"end" or key == u"meta >" or key == u"G"
579
 
            #      or key == u">"):
 
695
            #elif (key == "end" or key == "meta >" or key == "G"
 
696
            #      or key == ">"):
580
697
            #    pass            # xxx end-of-buffer
581
 
            #elif (key == u"home" or key == u"meta <" or key == u"g"
582
 
            #      or key == u"<"):
 
698
            #elif (key == "home" or key == "meta <" or key == "g"
 
699
            #      or key == "<"):
583
700
            #    pass            # xxx beginning-of-buffer
584
 
            #elif key == u"ctrl e" or key == u"$":
 
701
            #elif key == "ctrl e" or key == "$":
585
702
            #    pass            # xxx move-end-of-line
586
 
            #elif key == u"ctrl a" or key == u"^":
 
703
            #elif key == "ctrl a" or key == "^":
587
704
            #    pass            # xxx move-beginning-of-line
588
 
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
 
705
            #elif key == "ctrl b" or key == "meta (" or key == "h":
589
706
            #    pass            # xxx left
590
 
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
 
707
            #elif key == "ctrl f" or key == "meta )" or key == "l":
591
708
            #    pass            # xxx right
592
 
            #elif key == u"a":
 
709
            #elif key == "a":
593
710
            #    pass            # scroll up log
594
 
            #elif key == u"z":
 
711
            #elif key == "z":
595
712
            #    pass            # scroll down log
596
713
            elif self.topwidget.selectable():
597
714
                self.topwidget.keypress(self.size, key)
601
718
ui = UserInterface()
602
719
try:
603
720
    ui.run()
 
721
except KeyboardInterrupt:
 
722
    ui.screen.stop()
604
723
except Exception, e:
605
724
    ui.log_message(unicode(e))
606
725
    ui.screen.stop()