/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

  • Committer: Björn Påhlsson
  • Date: 2010-09-07 16:48:58 UTC
  • mto: (237.7.1 mandos)
  • mto: This revision was merged to the branch mainline in revision 270.
  • Revision ID: belorn@fukt.bsnet.se-20100907164858-tcg8hkxdj41zizac
mandos server: Added debuglevel that adjust at what level information
               should be reported.
plugin-runner, askpass-fifo, password-prompt, splasy, usplash:
               Using error instead of perror

Show diffs side-by-side

added added

removed removed

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