/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

* README: Hint that the intro(8mandos) manual page is in the server
          package.

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
3
24
 
4
 
from __future__ import division, absolute_import, with_statement
 
25
from __future__ import (division, absolute_import, print_function,
 
26
                        unicode_literals)
5
27
 
6
28
import sys
7
29
import os
21
43
 
22
44
import locale
23
45
 
24
 
locale.setlocale(locale.LC_ALL, u'')
 
46
locale.setlocale(locale.LC_ALL, '')
25
47
 
26
48
import logging
27
49
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
28
50
 
29
51
# Some useful constants
30
 
domain = 'se.bsnet.fukt'
 
52
domain = 'se.recompile'
31
53
server_interface = domain + '.Mandos'
32
54
client_interface = domain + '.Mandos.Client'
33
 
version = "1.0.15"
 
55
version = "1.5.0"
34
56
 
35
57
# Always run in monochrome mode
36
58
urwid.curses_display.curses.has_colors = lambda : False
40
62
urwid.curses_display.curses.A_UNDERLINE |= (
41
63
    urwid.curses_display.curses.A_BLINK)
42
64
 
 
65
def isoformat_to_datetime(iso):
 
66
    "Parse an ISO 8601 date string to a datetime.datetime()"
 
67
    if not iso:
 
68
        return None
 
69
    d, t = iso.split("T", 1)
 
70
    year, month, day = d.split("-", 2)
 
71
    hour, minute, second = t.split(":", 2)
 
72
    second, fraction = divmod(float(second), 1)
 
73
    return datetime.datetime(int(year),
 
74
                             int(month),
 
75
                             int(day),
 
76
                             int(hour),
 
77
                             int(minute),
 
78
                             int(second),           # Whole seconds
 
79
                             int(fraction*1000000)) # Microseconds
 
80
 
43
81
class MandosClientPropertyCache(object):
44
82
    """This wraps a Mandos Client D-Bus proxy object, caches the
45
83
    properties and calls a hook function when any of them are
49
87
        self.proxy = proxy_object # Mandos Client proxy object
50
88
        
51
89
        self.properties = dict()
52
 
        self.proxy.connect_to_signal(u"PropertyChanged",
53
 
                                     self.property_changed,
54
 
                                     client_interface,
55
 
                                     byte_arrays=True)
 
90
        self.property_changed_match = (
 
91
            self.proxy.connect_to_signal("PropertyChanged",
 
92
                                         self.property_changed,
 
93
                                         client_interface,
 
94
                                         byte_arrays=True))
56
95
        
57
96
        self.properties.update(
58
97
            self.proxy.GetAll(client_interface,
59
98
                              dbus_interface = dbus.PROPERTIES_IFACE))
60
 
        super(MandosClientPropertyCache, self).__init__(
61
 
            proxy_object=proxy_object, *args, **kwargs)
 
99
 
 
100
        #XXX This breaks good super behaviour
 
101
#        super(MandosClientPropertyCache, self).__init__(
 
102
#            *args, **kwargs)
62
103
    
63
104
    def property_changed(self, property=None, value=None):
64
105
        """This is called whenever we get a PropertyChanged signal
66
107
        """
67
108
        # Update properties dict with new value
68
109
        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)
69
115
 
70
116
 
71
117
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
83
129
        # Logger
84
130
        self.logger = logger
85
131
        
 
132
        self._update_timer_callback_tag = None
 
133
        self._update_timer_callback_lock = 0
 
134
        self.last_checker_failed = False
 
135
        
86
136
        # The widget shown normally
87
 
        self._text_widget = urwid.Text(u"")
 
137
        self._text_widget = urwid.Text("")
88
138
        # The widget shown when we have focus
89
 
        self._focus_text_widget = urwid.Text(u"")
 
139
        self._focus_text_widget = urwid.Text("")
90
140
        super(MandosClientWidget, self).__init__(
91
141
            update_hook=update_hook, delete_hook=delete_hook,
92
142
            *args, **kwargs)
93
143
        self.update()
94
144
        self.opened = False
95
 
        self.proxy.connect_to_signal(u"CheckerCompleted",
96
 
                                     self.checker_completed,
97
 
                                     client_interface,
98
 
                                     byte_arrays=True)
99
 
        self.proxy.connect_to_signal(u"CheckerStarted",
100
 
                                     self.checker_started,
101
 
                                     client_interface,
102
 
                                     byte_arrays=True)
103
 
        self.proxy.connect_to_signal(u"GotSecret",
104
 
                                     self.got_secret,
105
 
                                     client_interface,
106
 
                                     byte_arrays=True)
107
 
        self.proxy.connect_to_signal(u"Rejected",
108
 
                                     self.rejected,
109
 
                                     client_interface,
110
 
                                     byte_arrays=True)
 
145
        
 
146
        last_checked_ok = isoformat_to_datetime(self.properties
 
147
                                                ["LastCheckedOK"])
 
148
        if last_checked_ok is None:
 
149
            self.last_checker_failed = True
 
150
        else:
 
151
            self.last_checker_failed = ((datetime.datetime.utcnow()
 
152
                                         - last_checked_ok)
 
153
                                        > datetime.timedelta
 
154
                                        (milliseconds=
 
155
                                         self.properties
 
156
                                         ["Interval"]))
 
157
        
 
158
        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
            self._update_timer_callback_tag = (gobject.timeout_add
 
205
                                               (1000,
 
206
                                                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
111
210
    
112
211
    def checker_completed(self, exitstatus, condition, command):
113
212
        if exitstatus == 0:
114
 
            self.logger(u'Checker for client %s (command "%s")'
115
 
                        u' was successful'
116
 
                        % (self.properties[u"name"], command))
 
213
            if self.last_checker_failed:
 
214
                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))
 
219
            self.update()
117
220
            return
 
221
        # Checker failed
 
222
        if not self.last_checker_failed:
 
223
            self.last_checker_failed = True
 
224
            self.using_timer(True)
118
225
        if os.WIFEXITED(condition):
119
 
            self.logger(u'Checker for client %s (command "%s")'
120
 
                        u' failed with exit code %s'
121
 
                        % (self.properties[u"name"], command,
 
226
            self.logger('Checker for client %s (command "%s")'
 
227
                        ' failed with exit code %s'
 
228
                        % (self.properties["Name"], command,
122
229
                           os.WEXITSTATUS(condition)))
123
 
            return
124
 
        if os.WIFSIGNALED(condition):
125
 
            self.logger(u'Checker for client %s (command "%s")'
126
 
                        u' was killed by signal %s'
127
 
                        % (self.properties[u"name"], command,
 
230
        elif os.WIFSIGNALED(condition):
 
231
            self.logger('Checker for client %s (command "%s")'
 
232
                        ' was killed by signal %s'
 
233
                        % (self.properties["Name"], command,
128
234
                           os.WTERMSIG(condition)))
129
 
            return
130
 
        if os.WCOREDUMP(condition):
131
 
            self.logger(u'Checker for client %s (command "%s")'
132
 
                        u' dumped core'
133
 
                        % (self.properties[u"name"], command))
134
 
        self.logger(u'Checker for client %s completed mysteriously')
 
235
        elif os.WCOREDUMP(condition):
 
236
            self.logger('Checker for client %s (command "%s")'
 
237
                        ' dumped core'
 
238
                        % (self.properties["Name"], command))
 
239
        else:
 
240
            self.logger('Checker for client %s completed'
 
241
                        ' mysteriously')
 
242
        self.update()
135
243
    
136
244
    def checker_started(self, command):
137
 
        self.logger(u'Client %s started checker "%s"'
138
 
                    % (self.properties[u"name"], unicode(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)))
 
249
        pass
139
250
    
140
251
    def got_secret(self):
141
 
        self.logger(u'Client %s received its secret'
142
 
                    % self.properties[u"name"])
143
 
    
144
 
    def rejected(self):
145
 
        self.logger(u'Client %s was rejected'
146
 
                    % self.properties[u"name"])
 
252
        self.last_checker_failed = False
 
253
        self.logger('Client %s received its secret'
 
254
                    % self.properties["Name"])
 
255
    
 
256
    def need_approval(self, timeout, default):
 
257
        if not default:
 
258
            message = 'Client %s needs approval within %s seconds'
 
259
        else:
 
260
            message = 'Client %s will get its secret in %s seconds'
 
261
        self.logger(message
 
262
                    % (self.properties["Name"], timeout/1000))
 
263
        self.using_timer(True)
 
264
    
 
265
    def rejected(self, reason):
 
266
        self.logger('Client %s was rejected; reason: %s'
 
267
                    % (self.properties["Name"], reason))
147
268
    
148
269
    def selectable(self):
149
270
        """Make this a "selectable" widget.
150
271
        This overrides the method from urwid.FlowWidget."""
151
272
        return True
152
273
    
153
 
    def rows(self, (maxcol,), focus=False):
 
274
    def rows(self, maxcolrow, focus=False):
154
275
        """How many rows this widget will occupy might depend on
155
276
        whether we have focus or not.
156
277
        This overrides the method from urwid.FlowWidget"""
157
 
        return self.current_widget(focus).rows((maxcol,), focus=focus)
 
278
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
158
279
    
159
280
    def current_widget(self, focus=False):
160
281
        if focus or self.opened:
164
285
    def update(self):
165
286
        "Called when what is visible on the screen should be updated."
166
287
        # How to add standout mode to a style
167
 
        with_standout = { u"normal": u"standout",
168
 
                          u"bold": u"bold-standout",
169
 
                          u"underline-blink":
170
 
                              u"underline-blink-standout",
171
 
                          u"bold-underline-blink":
172
 
                              u"bold-underline-blink-standout",
 
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",
173
294
                          }
174
 
        
 
295
 
175
296
        # Rebuild focus and non-focus widgets using current properties
176
 
        self._text = (u'%(name)s: %(enabled)s'
177
 
                      % { u"name": self.properties[u"name"],
178
 
                          u"enabled":
179
 
                              (u"enabled"
180
 
                               if self.properties[u"enabled"]
181
 
                               else u"DISABLED")})
 
297
 
 
298
        # 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"]:
 
304
            timeout = datetime.timedelta(milliseconds
 
305
                                         = 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'
 
330
                           % unicode(timer).rsplit(".", 1)[0])
 
331
        else:
 
332
            message = "enabled"
 
333
        self._text = "%s%s" % (base, message)
 
334
            
182
335
        if not urwid.supports_unicode():
183
336
            self._text = self._text.encode("ascii", "replace")
184
 
        textlist = [(u"normal", self._text)]
 
337
        textlist = [("normal", self._text)]
185
338
        self._text_widget.set_text(textlist)
186
339
        self._focus_text_widget.set_text([(with_standout[text[0]],
187
340
                                           text[1])
195
348
        if self.update_hook is not None:
196
349
            self.update_hook()
197
350
    
198
 
    def delete(self):
 
351
    def update_timer(self):
 
352
        """called by gobject. Will indefinitely loop until
 
353
        gobject.source_remove() on tag is called"""
 
354
        self.update()
 
355
        return True             # Keep calling this
 
356
    
 
357
    def delete(self, *args, **kwargs):
 
358
        if self._update_timer_callback_tag is not None:
 
359
            gobject.source_remove(self._update_timer_callback_tag)
 
360
            self._update_timer_callback_tag = None
 
361
        for match in self.match_objects:
 
362
            match.remove()
 
363
        self.match_objects = ()
199
364
        if self.delete_hook is not None:
200
365
            self.delete_hook(self)
 
366
        return super(MandosClientWidget, self).delete(*args, **kwargs)
201
367
    
202
 
    def render(self, (maxcol,), focus=False):
 
368
    def render(self, maxcolrow, focus=False):
203
369
        """Render differently if we have focus.
204
370
        This overrides the method from urwid.FlowWidget"""
205
 
        return self.current_widget(focus).render((maxcol,),
 
371
        return self.current_widget(focus).render(maxcolrow,
206
372
                                                 focus=focus)
207
373
    
208
 
    def keypress(self, (maxcol,), key):
 
374
    def keypress(self, maxcolrow, key):
209
375
        """Handle keys.
210
376
        This overrides the method from urwid.FlowWidget"""
211
 
        if key == u"e" or key == u"+":
212
 
            self.proxy.Enable()
213
 
        elif key == u"d" or key == u"-":
214
 
            self.proxy.Disable()
215
 
        elif key == u"r" or key == u"_" or key == u"ctrl k":
 
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":
 
384
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
 
385
                               dbus_interface = client_interface,
 
386
                               ignore_reply=True)
 
387
        elif key == "d":
 
388
            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":
216
392
            self.server_proxy_object.RemoveClient(self.proxy
217
 
                                                  .object_path)
218
 
        elif key == u"s":
219
 
            self.proxy.StartChecker()
220
 
        elif key == u"S":
221
 
            self.proxy.StopChecker()
222
 
        elif key == u"C":
223
 
            self.proxy.CheckedOK()
 
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)
224
404
        # xxx
225
 
#         elif key == u"p" or key == "=":
 
405
#         elif key == "p" or key == "=":
226
406
#             self.proxy.pause()
227
 
#         elif key == u"u" or key == ":":
 
407
#         elif key == "u" or key == ":":
228
408
#             self.proxy.unpause()
229
 
#         elif key == u"RET":
 
409
#         elif key == "RET":
230
410
#             self.open()
231
411
        else:
232
412
            return key
248
428
    "down" key presses, thus not allowing any containing widgets to
249
429
    use them as an excuse to shift focus away from this widget.
250
430
    """
251
 
    def keypress(self, (maxcol, maxrow), key):
252
 
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
253
 
        if ret in (u"up", u"down"):
 
431
    def keypress(self, maxcolrow, key):
 
432
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
433
        if ret in ("up", "down"):
254
434
            return
255
435
        return ret
256
436
 
265
445
        self.screen = urwid.curses_display.Screen()
266
446
        
267
447
        self.screen.register_palette((
268
 
                (u"normal",
269
 
                 u"default", u"default", None),
270
 
                (u"bold",
271
 
                 u"default", u"default", u"bold"),
272
 
                (u"underline-blink",
273
 
                 u"default", u"default", u"underline"),
274
 
                (u"standout",
275
 
                 u"default", u"default", u"standout"),
276
 
                (u"bold-underline-blink",
277
 
                 u"default", u"default", (u"bold", u"underline")),
278
 
                (u"bold-standout",
279
 
                 u"default", u"default", (u"bold", u"standout")),
280
 
                (u"underline-blink-standout",
281
 
                 u"default", u"default", (u"underline", u"standout")),
282
 
                (u"bold-underline-blink-standout",
283
 
                 u"default", u"default", (u"bold", u"underline",
284
 
                                          u"standout")),
 
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")),
285
465
                ))
286
466
        
287
467
        if urwid.supports_unicode():
288
 
            self.divider = u"─" # \u2500
289
 
            #self.divider = u"━" # \u2501
 
468
            self.divider = "─" # \u2500
 
469
            #self.divider = "━" # \u2501
290
470
        else:
291
 
            #self.divider = u"-" # \u002d
292
 
            self.divider = u"_" # \u005f
 
471
            #self.divider = "-" # \u002d
 
472
            self.divider = "_" # \u005f
293
473
        
294
474
        self.screen.start()
295
475
        
309
489
        # This keeps track of whether self.uilist currently has
310
490
        # self.logbox in it or not
311
491
        self.log_visible = True
312
 
        self.log_wrap = u"any"
 
492
        self.log_wrap = "any"
313
493
        
314
494
        self.rebuild()
315
 
        self.log_message_raw((u"bold",
316
 
                              u"Mandos Monitor version " + version))
317
 
        self.log_message_raw((u"bold",
318
 
                              u"q: Quit  ?: Help"))
 
495
        self.log_message_raw(("bold",
 
496
                              "Mandos Monitor version " + version))
 
497
        self.log_message_raw(("bold",
 
498
                              "q: Quit  ?: Help"))
319
499
        
320
500
        self.busname = domain + '.Mandos'
321
501
        self.main_loop = gobject.MainLoop()
322
 
        self.bus = dbus.SystemBus()
323
 
        mandos_dbus_objc = self.bus.get_object(
324
 
            self.busname, u"/", follow_name_owner_changes=True)
325
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
326
 
                                          dbus_interface
327
 
                                          = server_interface)
328
 
        try:
329
 
            mandos_clients = (self.mandos_serv
330
 
                              .GetAllClientsWithProperties())
331
 
        except dbus.exceptions.DBusException:
332
 
            mandos_clients = dbus.Dictionary()
333
 
        
334
 
        (self.mandos_serv
335
 
         .connect_to_signal(u"ClientRemoved",
336
 
                            self.find_and_remove_client,
337
 
                            dbus_interface=server_interface,
338
 
                            byte_arrays=True))
339
 
        (self.mandos_serv
340
 
         .connect_to_signal(u"ClientAdded",
341
 
                            self.add_new_client,
342
 
                            dbus_interface=server_interface,
343
 
                            byte_arrays=True))
344
 
        (self.mandos_serv
345
 
         .connect_to_signal(u"ClientNotFound",
346
 
                            self.client_not_found,
347
 
                            dbus_interface=server_interface,
348
 
                            byte_arrays=True))
349
 
        for path, client in mandos_clients.iteritems():
350
 
            client_proxy_object = self.bus.get_object(self.busname,
351
 
                                                      path)
352
 
            self.add_client(MandosClientWidget(server_proxy_object
353
 
                                               =self.mandos_serv,
354
 
                                               proxy_object
355
 
                                               =client_proxy_object,
356
 
                                               properties=client,
357
 
                                               update_hook
358
 
                                               =self.refresh,
359
 
                                               delete_hook
360
 
                                               =self.remove_client,
361
 
                                               logger
362
 
                                               =self.log_message),
363
 
                            path=path)
364
502
    
365
503
    def client_not_found(self, fingerprint, address):
366
 
        self.log_message((u"Client with address %s and fingerprint %s"
367
 
                          u" could not be found" % (address,
 
504
        self.log_message(("Client with address %s and fingerprint %s"
 
505
                          " could not be found" % (address,
368
506
                                                    fingerprint)))
369
507
    
370
508
    def rebuild(self):
372
510
        Call this when the widget layout needs to change"""
373
511
        self.uilist = []
374
512
        #self.uilist.append(urwid.ListBox(self.clients))
375
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
 
513
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
514
                                                          clients),
376
515
                                       #header=urwid.Divider(),
377
516
                                       header=None,
378
 
                                       footer=urwid.Divider(div_char=self.divider)))
 
517
                                       footer=
 
518
                                       urwid.Divider(div_char=
 
519
                                                     self.divider)))
379
520
        if self.log_visible:
380
521
            self.uilist.append(self.logbox)
381
 
            pass
382
522
        self.topwidget = urwid.Pile(self.uilist)
383
523
    
384
524
    def log_message(self, message):
385
525
        timestamp = datetime.datetime.now().isoformat()
386
 
        self.log_message_raw(timestamp + u": " + message)
 
526
        self.log_message_raw(timestamp + ": " + message)
387
527
    
388
528
    def log_message_raw(self, markup):
389
529
        """Add a log message to the log buffer."""
392
532
            and len(self.log) > self.max_log_length):
393
533
            del self.log[0:len(self.log)-self.max_log_length-1]
394
534
        self.logbox.set_focus(len(self.logbox.body.contents),
395
 
                              coming_from=u"above")
 
535
                              coming_from="above")
396
536
        self.refresh()
397
537
    
398
538
    def toggle_log_display(self):
399
539
        """Toggle visibility of the log buffer."""
400
540
        self.log_visible = not self.log_visible
401
541
        self.rebuild()
402
 
        self.log_message(u"Log visibility changed to: "
403
 
                         + unicode(self.log_visible))
 
542
        #self.log_message("Log visibility changed to: "
 
543
        #                 + unicode(self.log_visible))
404
544
    
405
545
    def change_log_display(self):
406
546
        """Change type of log display.
407
547
        Currently, this toggles wrapping of text lines."""
408
 
        if self.log_wrap == u"clip":
409
 
            self.log_wrap = u"any"
 
548
        if self.log_wrap == "clip":
 
549
            self.log_wrap = "any"
410
550
        else:
411
 
            self.log_wrap = u"clip"
 
551
            self.log_wrap = "clip"
412
552
        for textwidget in self.log:
413
553
            textwidget.set_wrap_mode(self.log_wrap)
414
 
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
554
        #self.log_message("Wrap mode: " + self.log_wrap)
415
555
    
416
556
    def find_and_remove_client(self, path, name):
417
 
        """Find an client from its object path and remove it.
 
557
        """Find a client by its object path and remove it.
418
558
        
419
559
        This is connected to the ClientRemoved signal from the
420
560
        Mandos server object."""
422
562
            client = self.clients_dict[path]
423
563
        except KeyError:
424
564
            # not found?
 
565
            self.log_message("Unknown client %r (%r) removed", name,
 
566
                             path)
425
567
            return
426
 
        self.remove_client(client, path)
 
568
        client.delete()
427
569
    
428
570
    def add_new_client(self, path):
429
571
        client_proxy_object = self.bus.get_object(self.busname, path)
444
586
        if path is None:
445
587
            path = client.proxy.object_path
446
588
        self.clients_dict[path] = client
447
 
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
589
        self.clients.sort(None, lambda c: c.properties["Name"])
448
590
        self.refresh()
449
591
    
450
592
    def remove_client(self, client, path=None):
466
608
    
467
609
    def run(self):
468
610
        """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
 
469
654
        self.refresh()
470
655
        self._input_callback_tag = (gobject.io_add_watch
471
656
                                    (sys.stdin.fileno(),
481
666
    
482
667
    def process_input(self, source, condition):
483
668
        keys = self.screen.get_input()
484
 
        translations = { u"ctrl n": u"down",      # Emacs
485
 
                         u"ctrl p": u"up",        # Emacs
486
 
                         u"ctrl v": u"page down", # Emacs
487
 
                         u"meta v": u"page up",   # Emacs
488
 
                         u" ": u"page down",      # less
489
 
                         u"f": u"page down",      # less
490
 
                         u"b": u"page up",        # less
491
 
                         u"j": u"down",           # vi
492
 
                         u"k": u"up",             # vi
 
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
493
678
                         }
494
679
        for key in keys:
495
680
            try:
497
682
            except KeyError:    # :-)
498
683
                pass
499
684
            
500
 
            if key == u"q" or key == u"Q":
 
685
            if key == "q" or key == "Q":
501
686
                self.stop()
502
687
                break
503
 
            elif key == u"window resize":
 
688
            elif key == "window resize":
504
689
                self.size = self.screen.get_cols_rows()
505
690
                self.refresh()
506
 
            elif key == u"\f":  # Ctrl-L
 
691
            elif key == "\f":  # Ctrl-L
507
692
                self.refresh()
508
 
            elif key == u"l" or key == u"D":
 
693
            elif key == "l" or key == "D":
509
694
                self.toggle_log_display()
510
695
                self.refresh()
511
 
            elif key == u"w" or key == u"i":
 
696
            elif key == "w" or key == "i":
512
697
                self.change_log_display()
513
698
                self.refresh()
514
 
            elif key == u"?" or key == u"f1" or key == u"esc":
 
699
            elif key == "?" or key == "f1" or key == "esc":
515
700
                if not self.log_visible:
516
701
                    self.log_visible = True
517
702
                    self.rebuild()
518
 
                self.log_message_raw((u"bold",
519
 
                                      u"  ".
520
 
                                      join((u"q: Quit",
521
 
                                            u"?: Help",
522
 
                                            u"l: Log window toggle",
523
 
                                            u"TAB: Switch window",
524
 
                                            u"w: Wrap (log)"))))
525
 
                self.log_message_raw((u"bold",
526
 
                                      u"  "
527
 
                                      .join((u"Clients:",
528
 
                                             u"e: Enable",
529
 
                                             u"d: Disable",
530
 
                                             u"r: Remove",
531
 
                                             u"s: Start new checker",
532
 
                                             u"S: Stop checker",
533
 
                                             u"C: Checker OK"))))
 
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"))))
534
721
                self.refresh()
535
 
            elif key == u"tab":
 
722
            elif key == "tab":
536
723
                if self.topwidget.get_focus() is self.logbox:
537
724
                    self.topwidget.set_focus(0)
538
725
                else:
539
726
                    self.topwidget.set_focus(self.logbox)
540
727
                self.refresh()
541
 
            #elif (key == u"end" or key == u"meta >" or key == u"G"
542
 
            #      or key == u">"):
 
728
            #elif (key == "end" or key == "meta >" or key == "G"
 
729
            #      or key == ">"):
543
730
            #    pass            # xxx end-of-buffer
544
 
            #elif (key == u"home" or key == u"meta <" or key == u"g"
545
 
            #      or key == u"<"):
 
731
            #elif (key == "home" or key == "meta <" or key == "g"
 
732
            #      or key == "<"):
546
733
            #    pass            # xxx beginning-of-buffer
547
 
            #elif key == u"ctrl e" or key == u"$":
 
734
            #elif key == "ctrl e" or key == "$":
548
735
            #    pass            # xxx move-end-of-line
549
 
            #elif key == u"ctrl a" or key == u"^":
 
736
            #elif key == "ctrl a" or key == "^":
550
737
            #    pass            # xxx move-beginning-of-line
551
 
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
 
738
            #elif key == "ctrl b" or key == "meta (" or key == "h":
552
739
            #    pass            # xxx left
553
 
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
 
740
            #elif key == "ctrl f" or key == "meta )" or key == "l":
554
741
            #    pass            # xxx right
555
 
            #elif key == u"a":
 
742
            #elif key == "a":
556
743
            #    pass            # scroll up log
557
 
            #elif key == u"z":
 
744
            #elif key == "z":
558
745
            #    pass            # scroll down log
559
746
            elif self.topwidget.selectable():
560
747
                self.topwidget.keypress(self.size, key)
564
751
ui = UserInterface()
565
752
try:
566
753
    ui.run()
 
754
except KeyboardInterrupt:
 
755
    ui.screen.stop()
567
756
except Exception, e:
568
757
    ui.log_message(unicode(e))
569
758
    ui.screen.stop()