/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2012-05-05 09:27:47 UTC
  • Revision ID: teddy@recompile.se-20120505092747-d8s061chuhlt961h
* mandos-ctl (print_clients): Bug fix: Don't show "Extended Timeout"
                              as milliseconds.

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