/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-01-15 21:07:44 UTC
  • mto: (237.4.29 release)
  • mto: This revision was merged to the branch mainline in revision 559.
  • Revision ID: teddy@recompile.se-20120115210744-xc33sww1zxrk92s9
Tags: version-1.5.3-1
* Makefile (version): Changed to "1.5.3".
* NEWS (Version 1.5.3): New entry.
* debian/changelog (1.5.3-1): - '' -

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