/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: 2010-09-12 03:08:51 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100912030851-f48xth0u8yck0wrv
* mandos-monitor (MandosClientWidget.checker_completed): Do not log a
                                                         successful
                                                         checker.

Show diffs side-by-side

added added

removed removed

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