/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

* mandos: Added ClientDBus.approve_pending property.  Exposed
          approved_by_default, approved_delay, approved_duration as
          D-Bus properties.

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