/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

* mandos: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

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