/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: 2009-11-11 00:25:22 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091111002522-t416fifqw46xaqn4
* debian/rules: Only set BROKEN_PIE if binutils is a specific range of
                versions.
* mandos-monitor (MandosClientWidget.keypress): Also accept "Ctrl-K"
                                                for removing client.
  (UserInterface.__init__): Use non-bold line drawing charater.
  (UserInterface.log_message): Scroll to bottom.
  (UserInterface.process_input): Also show help on "ESC" key.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
4
4
from __future__ import division, absolute_import, with_statement
5
5
 
6
6
import sys
7
 
import os
8
7
import signal
9
8
 
10
 
import datetime
11
 
 
12
9
import urwid.curses_display
13
10
import urwid
14
11
 
19
16
 
20
17
import UserList
21
18
 
22
 
import locale
23
 
 
24
 
locale.setlocale(locale.LC_ALL, u'')
25
 
 
26
19
# Some useful constants
27
20
domain = 'se.bsnet.fukt'
28
21
server_interface = domain + '.Mandos'
37
30
urwid.curses_display.curses.A_UNDERLINE |= (
38
31
    urwid.curses_display.curses.A_BLINK)
39
32
 
40
 
def isoformat_to_datetime(iso):
41
 
    "Parse an ISO 8601 date string to a datetime.datetime()"
42
 
    if not iso:
43
 
        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)
47
 
    second, fraction = divmod(float(second), 1)
48
 
    return datetime.datetime(int(year),
49
 
                             int(month),
50
 
                             int(day),
51
 
                             int(hour),
52
 
                             int(minute),
53
 
                             int(second),           # Whole seconds
54
 
                             int(fraction*1000000)) # Microseconds
55
 
 
56
33
class MandosClientPropertyCache(object):
57
34
    """This wraps a Mandos Client D-Bus proxy object, caches the
58
35
    properties and calls a hook function when any of them are
59
36
    changed.
60
37
    """
61
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
38
    def __init__(self, proxy_object=None, properties=None, *args,
 
39
                 **kwargs):
62
40
        self.proxy = proxy_object # Mandos Client proxy object
63
41
        
64
 
        self.properties = dict()
65
 
        self.proxy.connect_to_signal(u"PropertyChanged",
 
42
        if properties is None:
 
43
            self.properties = dict()
 
44
        else:
 
45
            self.properties = properties
 
46
        self.proxy.connect_to_signal("PropertyChanged",
66
47
                                     self.property_changed,
67
48
                                     client_interface,
68
49
                                     byte_arrays=True)
69
50
        
70
 
        self.properties.update(
71
 
            self.proxy.GetAll(client_interface,
72
 
                              dbus_interface = dbus.PROPERTIES_IFACE))
 
51
        if properties is None:
 
52
            self.properties.update(self.proxy.GetAll(client_interface,
 
53
                                                     dbus_interface =
 
54
                                                     dbus.PROPERTIES_IFACE))
73
55
        super(MandosClientPropertyCache, self).__init__(
74
 
            proxy_object=proxy_object, *args, **kwargs)
 
56
            proxy_object=proxy_object,
 
57
            properties=properties, *args, **kwargs)
75
58
    
76
59
    def property_changed(self, property=None, value=None):
77
60
        """This is called whenever we get a PropertyChanged signal
86
69
    """
87
70
    
88
71
    def __init__(self, server_proxy_object=None, update_hook=None,
89
 
                 delete_hook=None, logger=None, *args, **kwargs):
 
72
                 delete_hook=None, *args, **kwargs):
90
73
        # Called on update
91
74
        self.update_hook = update_hook
92
75
        # Called on delete
93
76
        self.delete_hook = delete_hook
94
77
        # Mandos Server proxy object
95
78
        self.server_proxy_object = server_proxy_object
96
 
        # Logger
97
 
        self.logger = logger
98
 
        
99
 
        self._update_timer_callback_tag = None
100
 
        self.last_checker_failed = False
101
79
        
102
80
        # The widget shown normally
103
 
        self._text_widget = urwid.Text(u"")
 
81
        self._text_widget = urwid.Text("")
104
82
        # The widget shown when we have focus
105
 
        self._focus_text_widget = urwid.Text(u"")
 
83
        self._focus_text_widget = urwid.Text("")
106
84
        super(MandosClientWidget, self).__init__(
107
85
            update_hook=update_hook, delete_hook=delete_hook,
108
86
            *args, **kwargs)
109
87
        self.update()
110
88
        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)
127
 
        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
131
 
        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:
138
 
            self._update_timer_callback_tag = (gobject.timeout_add
139
 
                                               (1000,
140
 
                                                self.update_timer))
141
 
    
142
 
    def checker_completed(self, exitstatus, condition, command):
143
 
        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
 
            self.update()
152
 
            return
153
 
        # 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
 
        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)))
164
 
        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)))
169
 
        elif os.WCOREDUMP(condition):
170
 
            self.logger(u'Checker for client %s (command "%s")'
171
 
                        u' dumped core'
172
 
                        % (self.properties[u"name"], command))
173
 
        else:
174
 
            self.logger(u'Checker for client %s completed mysteriously')
175
 
        self.update()
176
 
    
177
 
    def checker_started(self, command):
178
 
        self.logger(u'Client %s started checker "%s"'
179
 
                    % (self.properties[u"name"], unicode(command)))
180
 
    
181
 
    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"])
188
89
    
189
90
    def selectable(self):
190
91
        """Make this a "selectable" widget.
214
115
                          }
215
116
        
216
117
        # 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"")})
 
118
        self._text = (u'name="%(name)s", enabled=%(enabled)s'
 
119
                      % self.properties)
240
120
        if not urwid.supports_unicode():
241
121
            self._text = self._text.encode("ascii", "replace")
242
 
        textlist = [(u"normal", self._text)]
 
122
        textlist = [(u"normal", u"BLARGH: "), (u"bold", self._text)]
243
123
        self._text_widget.set_text(textlist)
244
124
        self._focus_text_widget.set_text([(with_standout[text[0]],
245
125
                                           text[1])
253
133
        if self.update_hook is not None:
254
134
            self.update_hook()
255
135
    
256
 
    def update_timer(self):
257
 
        "called by gobject"
258
 
        self.update()
259
 
        return True             # Keep calling this
260
 
    
261
136
    def delete(self):
262
 
        if self._update_timer_callback_tag is not None:
263
 
            gobject.source_remove(self._update_timer_callback_tag)
264
 
            self._update_timer_callback_tag = None
265
137
        if self.delete_hook is not None:
266
138
            self.delete_hook(self)
267
139
    
378
250
        self.log_wrap = u"any"
379
251
        
380
252
        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"))
 
253
        self.log_message((u"bold",
 
254
                          u"Mandos Monitor version " + version))
 
255
        self.log_message((u"bold",
 
256
                          u"q: Quit  ?: Help"))
385
257
        
386
258
        self.busname = domain + '.Mandos'
387
259
        self.main_loop = gobject.MainLoop()
398
270
            mandos_clients = dbus.Dictionary()
399
271
        
400
272
        (self.mandos_serv
401
 
         .connect_to_signal(u"ClientRemoved",
 
273
         .connect_to_signal("ClientRemoved",
402
274
                            self.find_and_remove_client,
403
275
                            dbus_interface=server_interface,
404
276
                            byte_arrays=True))
405
277
        (self.mandos_serv
406
 
         .connect_to_signal(u"ClientAdded",
 
278
         .connect_to_signal("ClientAdded",
407
279
                            self.add_new_client,
408
280
                            dbus_interface=server_interface,
409
281
                            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
282
        for path, client in mandos_clients.iteritems():
416
283
            client_proxy_object = self.bus.get_object(self.busname,
417
284
                                                      path)
423
290
                                               update_hook
424
291
                                               =self.refresh,
425
292
                                               delete_hook
426
 
                                               =self.remove_client,
427
 
                                               logger
428
 
                                               =self.log_message),
 
293
                                               =self.remove_client),
429
294
                            path=path)
430
295
    
431
 
    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)))
435
 
    
436
296
    def rebuild(self):
437
297
        """This rebuilds the User Interface.
438
298
        Call this when the widget layout needs to change"""
447
307
            pass
448
308
        self.topwidget = urwid.Pile(self.uilist)
449
309
    
450
 
    def log_message(self, message):
451
 
        timestamp = datetime.datetime.now().isoformat()
452
 
        self.log_message_raw(timestamp + u": " + message)
453
 
    
454
 
    def log_message_raw(self, markup):
 
310
    def log_message(self, markup):
455
311
        """Add a log message to the log buffer."""
456
312
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
457
313
        if (self.max_log_length
459
315
            del self.log[0:len(self.log)-self.max_log_length-1]
460
316
        self.logbox.set_focus(len(self.logbox.body.contents),
461
317
                              coming_from=u"above")
462
 
        self.refresh()
463
318
    
464
319
    def toggle_log_display(self):
465
320
        """Toggle visibility of the log buffer."""
491
346
            return
492
347
        self.remove_client(client, path)
493
348
    
494
 
    def add_new_client(self, path):
 
349
    def add_new_client(self, path, properties):
495
350
        client_proxy_object = self.bus.get_object(self.busname, path)
496
351
        self.add_client(MandosClientWidget(server_proxy_object
497
352
                                           =self.mandos_serv,
498
353
                                           proxy_object
499
354
                                           =client_proxy_object,
 
355
                                           properties=properties,
500
356
                                           update_hook
501
357
                                           =self.refresh,
502
358
                                           delete_hook
503
 
                                           =self.remove_client,
504
 
                                           logger
505
 
                                           =self.log_message),
 
359
                                           =self.remove_client),
506
360
                        path=path)
507
361
    
508
362
    def add_client(self, client, path=None):
581
435
                if not self.log_visible:
582
436
                    self.log_visible = True
583
437
                    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"))))
 
438
                self.log_message((u"bold",
 
439
                                  u"  ".join((u"q: Quit",
 
440
                                              u"?: Help",
 
441
                                              u"l: Log window toggle",
 
442
                                              u"TAB: Switch window",
 
443
                                              u"w: Wrap (log)"))))
 
444
                self.log_message((u"bold",
 
445
                                  u"  ".join((u"Clients:",
 
446
                                              u"e: Enable",
 
447
                                              u"d: Disable",
 
448
                                              u"r: Remove",
 
449
                                              u"s: Start new checker",
 
450
                                              u"S: Stop checker",
 
451
                                              u"C: Checker OK"))))
600
452
                self.refresh()
601
453
            elif key == u"tab":
602
454
                if self.topwidget.get_focus() is self.logbox:
630
482
ui = UserInterface()
631
483
try:
632
484
    ui.run()
633
 
except Exception, e:
634
 
    ui.log_message(unicode(e))
 
485
except:
635
486
    ui.screen.stop()
636
487
    raise