/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-03-08 22:04:44 UTC
  • mfrom: (561.1.1 dbus-annotations)
  • Revision ID: teddy@recompile.se-20120308220444-8jjcgoxka6xz1tss
Merge general D-Bus annotations support.

Show diffs side-by-side

added added

removed removed

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