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