/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 at bsnet
  • Date: 2010-09-14 18:22:03 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100914182203-w26c64tdthto4jg2
* mandos-monitor.xml: New.
* Makefile (PROGS): Add "mandos-monitor".
  (DOCS): Add "mandos-monitor.xml".
  (mandos-monitor.8, mandos-monitor.8.xhtml, mandos-monitor): New.
  (install-server): Install "mandos-ctl" and "mandos-monitor" too.
  (uninstall-server): Remove "mandos-ctl" and "mandos-monitor" too.
* mandos-monitor: Don't log uninteresting messages.

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