/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:20:23 UTC
  • mfrom: (569.1.2 ctl-using-properties)
  • Revision ID: teddy@recompile.se-20120505092023-es5pn711z02193ny
* mandos-ctl (main): Use D-Bus properties instead of methods.

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