/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 at bsnet
  • Date: 2010-09-09 18:16:14 UTC
  • mfrom: (237.2.35 mandos-empty-device)
  • Revision ID: teddy@fukt.bsnet.se-20100909181614-oanlmvkzsiodbo3c
Merge in branch to interpret an empty device name to mean
"autodetect".

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
7
8
import signal
8
9
 
 
10
import datetime
 
11
 
9
12
import urwid.curses_display
10
13
import urwid
11
14
 
16
19
 
17
20
import UserList
18
21
 
 
22
import locale
 
23
 
 
24
locale.setlocale(locale.LC_ALL, u'')
 
25
 
19
26
# Some useful constants
20
27
domain = 'se.bsnet.fukt'
21
28
server_interface = domain + '.Mandos'
30
37
urwid.curses_display.curses.A_UNDERLINE |= (
31
38
    urwid.curses_display.curses.A_BLINK)
32
39
 
 
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
 
33
56
class MandosClientPropertyCache(object):
34
57
    """This wraps a Mandos Client D-Bus proxy object, caches the
35
58
    properties and calls a hook function when any of them are
36
59
    changed.
37
60
    """
38
 
    def __init__(self, proxy_object=None, properties=None, *args,
39
 
                 **kwargs):
 
61
    def __init__(self, proxy_object=None, *args, **kwargs):
40
62
        self.proxy = proxy_object # Mandos Client proxy object
41
63
        
42
 
        if properties is None:
43
 
            self.properties = dict()
44
 
        else:
45
 
            self.properties = properties
46
 
        self.proxy.connect_to_signal("PropertyChanged",
 
64
        self.properties = dict()
 
65
        self.proxy.connect_to_signal(u"PropertyChanged",
47
66
                                     self.property_changed,
48
67
                                     client_interface,
49
68
                                     byte_arrays=True)
50
69
        
51
 
        if properties is None:
52
 
            self.properties.update(self.proxy.GetAll(client_interface,
53
 
                                                     dbus_interface =
54
 
                                                     dbus.PROPERTIES_IFACE))
 
70
        self.properties.update(
 
71
            self.proxy.GetAll(client_interface,
 
72
                              dbus_interface = dbus.PROPERTIES_IFACE))
55
73
        super(MandosClientPropertyCache, self).__init__(
56
 
            proxy_object=proxy_object,
57
 
            properties=properties, *args, **kwargs)
 
74
            proxy_object=proxy_object, *args, **kwargs)
58
75
    
59
76
    def property_changed(self, property=None, value=None):
60
77
        """This is called whenever we get a PropertyChanged signal
69
86
    """
70
87
    
71
88
    def __init__(self, server_proxy_object=None, update_hook=None,
72
 
                 delete_hook=None, *args, **kwargs):
 
89
                 delete_hook=None, logger=None, *args, **kwargs):
73
90
        # Called on update
74
91
        self.update_hook = update_hook
75
92
        # Called on delete
76
93
        self.delete_hook = delete_hook
77
94
        # Mandos Server proxy object
78
95
        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
79
101
        
80
102
        # The widget shown normally
81
 
        self._text_widget = urwid.Text("")
 
103
        self._text_widget = urwid.Text(u"")
82
104
        # The widget shown when we have focus
83
 
        self._focus_text_widget = urwid.Text("")
 
105
        self._focus_text_widget = urwid.Text(u"")
84
106
        super(MandosClientWidget, self).__init__(
85
107
            update_hook=update_hook, delete_hook=delete_hook,
86
108
            *args, **kwargs)
87
109
        self.update()
88
110
        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"])
89
188
    
90
189
    def selectable(self):
91
190
        """Make this a "selectable" widget.
115
214
                          }
116
215
        
117
216
        # Rebuild focus and non-focus widgets using current properties
118
 
        self._text = (u'name="%(name)s", enabled=%(enabled)s'
119
 
                      % self.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"")})
120
240
        if not urwid.supports_unicode():
121
241
            self._text = self._text.encode("ascii", "replace")
122
 
        textlist = [(u"normal", u"BLARGH: "), (u"bold", self._text)]
 
242
        textlist = [(u"normal", self._text)]
123
243
        self._text_widget.set_text(textlist)
124
244
        self._focus_text_widget.set_text([(with_standout[text[0]],
125
245
                                           text[1])
133
253
        if self.update_hook is not None:
134
254
            self.update_hook()
135
255
    
 
256
    def update_timer(self):
 
257
        "called by gobject"
 
258
        self.update()
 
259
        return True             # Keep calling this
 
260
    
136
261
    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
137
265
        if self.delete_hook is not None:
138
266
            self.delete_hook(self)
139
267
    
150
278
            self.proxy.Enable()
151
279
        elif key == u"d" or key == u"-":
152
280
            self.proxy.Disable()
153
 
        elif key == u"r" or key == u"_":
 
281
        elif key == u"r" or key == u"_" or key == u"ctrl k":
154
282
            self.server_proxy_object.RemoveClient(self.proxy
155
283
                                                  .object_path)
156
284
        elif key == u"s":
157
285
            self.proxy.StartChecker()
158
 
        elif key == u"c":
 
286
        elif key == u"S":
159
287
            self.proxy.StopChecker()
160
 
        elif key == u"S":
 
288
        elif key == u"C":
161
289
            self.proxy.CheckedOK()
162
290
        # xxx
163
291
#         elif key == u"p" or key == "=":
223
351
                ))
224
352
        
225
353
        if urwid.supports_unicode():
226
 
            #self.divider = u"─" # \u2500
227
 
            self.divider = u"━" # \u2501
 
354
            self.divider = u"─" # \u2500
 
355
            #self.divider = u"━" # \u2501
228
356
        else:
229
357
            #self.divider = u"-" # \u002d
230
358
            self.divider = u"_" # \u005f
250
378
        self.log_wrap = u"any"
251
379
        
252
380
        self.rebuild()
253
 
        self.log_message(u"Message")
254
 
        self.log_message(u"Message0 Message1 Message2 Message3 Message4 Message5 Message6 Message7 Message8 Message9")
255
 
        self.log_message(u"Message10 Message11 Message12 Message13 Message14 Message15 Message16 Message17 Message18 Message19")
256
 
        self.log_message(u"Message20 Message21 Message22 Message23 Message24 Message25 Message26 Message27 Message28 Message29")
 
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"))
257
385
        
258
386
        self.busname = domain + '.Mandos'
259
387
        self.main_loop = gobject.MainLoop()
270
398
            mandos_clients = dbus.Dictionary()
271
399
        
272
400
        (self.mandos_serv
273
 
         .connect_to_signal("ClientRemoved",
 
401
         .connect_to_signal(u"ClientRemoved",
274
402
                            self.find_and_remove_client,
275
403
                            dbus_interface=server_interface,
276
404
                            byte_arrays=True))
277
405
        (self.mandos_serv
278
 
         .connect_to_signal("ClientAdded",
 
406
         .connect_to_signal(u"ClientAdded",
279
407
                            self.add_new_client,
280
408
                            dbus_interface=server_interface,
281
409
                            byte_arrays=True))
 
410
        (self.mandos_serv
 
411
         .connect_to_signal(u"ClientNotFound",
 
412
                            self.client_not_found,
 
413
                            dbus_interface=server_interface,
 
414
                            byte_arrays=True))
282
415
        for path, client in mandos_clients.iteritems():
283
416
            client_proxy_object = self.bus.get_object(self.busname,
284
417
                                                      path)
290
423
                                               update_hook
291
424
                                               =self.refresh,
292
425
                                               delete_hook
293
 
                                               =self.remove_client),
 
426
                                               =self.remove_client,
 
427
                                               logger
 
428
                                               =self.log_message),
294
429
                            path=path)
295
430
    
 
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
    
296
436
    def rebuild(self):
297
437
        """This rebuilds the User Interface.
298
438
        Call this when the widget layout needs to change"""
307
447
            pass
308
448
        self.topwidget = urwid.Pile(self.uilist)
309
449
    
310
 
    def log_message(self, markup):
 
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):
311
455
        """Add a log message to the log buffer."""
312
456
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
313
457
        if (self.max_log_length
314
458
            and len(self.log) > self.max_log_length):
315
459
            del self.log[0:len(self.log)-self.max_log_length-1]
 
460
        self.logbox.set_focus(len(self.logbox.body.contents),
 
461
                              coming_from=u"above")
 
462
        self.refresh()
316
463
    
317
464
    def toggle_log_display(self):
318
465
        """Toggle visibility of the log buffer."""
344
491
            return
345
492
        self.remove_client(client, path)
346
493
    
347
 
    def add_new_client(self, path, properties):
 
494
    def add_new_client(self, path):
348
495
        client_proxy_object = self.bus.get_object(self.busname, path)
349
496
        self.add_client(MandosClientWidget(server_proxy_object
350
497
                                           =self.mandos_serv,
351
498
                                           proxy_object
352
499
                                           =client_proxy_object,
353
 
                                           properties=properties,
354
500
                                           update_hook
355
501
                                           =self.refresh,
356
502
                                           delete_hook
357
 
                                           =self.remove_client),
 
503
                                           =self.remove_client,
 
504
                                           logger
 
505
                                           =self.log_message),
358
506
                        path=path)
359
507
    
360
508
    def add_client(self, client, path=None):
429
577
            elif key == u"w" or key == u"i":
430
578
                self.change_log_display()
431
579
                self.refresh()
432
 
            elif key == u"?" or key == u"f1":
433
 
                self.log_message(u"Help!")
 
580
            elif key == u"?" or key == u"f1" or key == u"esc":
 
581
                if not self.log_visible:
 
582
                    self.log_visible = True
 
583
                    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"))))
434
600
                self.refresh()
435
601
            elif key == u"tab":
436
602
                if self.topwidget.get_focus() is self.logbox:
438
604
                else:
439
605
                    self.topwidget.set_focus(self.logbox)
440
606
                self.refresh()
441
 
            elif (key == u"end" or key == u"meta >" or key == u"G"
442
 
                  or key == u">"):
443
 
                pass            # xxx end-of-buffer
444
 
            elif (key == u"home" or key == u"meta <" or key == u"g"
445
 
                  or key == u"<"):
446
 
                pass            # xxx beginning-of-buffer
447
 
            elif key == u"ctrl e" or key == u"$":
448
 
                pass            # xxx move-end-of-line
449
 
            elif key == u"ctrl a" or key == u"^":
450
 
                pass            # xxx move-beginning-of-line
451
 
            elif key == u"ctrl b" or key == u"meta (" or key == u"h":
452
 
                pass            # xxx left
453
 
            elif key == u"ctrl f" or key == u"meta )" or key == u"l":
454
 
                pass            # xxx right
455
 
            elif key == u"a":
456
 
                pass            # scroll up log
457
 
            elif key == u"z":
458
 
                pass            # scroll down log
 
607
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
608
            #      or key == u">"):
 
609
            #    pass            # xxx end-of-buffer
 
610
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
611
            #      or key == u"<"):
 
612
            #    pass            # xxx beginning-of-buffer
 
613
            #elif key == u"ctrl e" or key == u"$":
 
614
            #    pass            # xxx move-end-of-line
 
615
            #elif key == u"ctrl a" or key == u"^":
 
616
            #    pass            # xxx move-beginning-of-line
 
617
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
 
618
            #    pass            # xxx left
 
619
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
 
620
            #    pass            # xxx right
 
621
            #elif key == u"a":
 
622
            #    pass            # scroll up log
 
623
            #elif key == u"z":
 
624
            #    pass            # scroll down log
459
625
            elif self.topwidget.selectable():
460
626
                self.topwidget.keypress(self.size, key)
461
627
                self.refresh()
464
630
ui = UserInterface()
465
631
try:
466
632
    ui.run()
467
 
except:
 
633
except Exception, e:
 
634
    ui.log_message(unicode(e))
468
635
    ui.screen.stop()
469
636
    raise