/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: 2010-09-11 18:34:55 UTC
  • mfrom: (24.1.162 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20100911183455-kmzttvbywdbfbepm
Merge from Björn.

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
 
 
26
import logging
 
27
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
 
28
 
19
29
# Some useful constants
20
30
domain = 'se.bsnet.fukt'
21
31
server_interface = domain + '.Mandos'
22
32
client_interface = domain + '.Mandos.Client'
23
 
version = "1.0.14"
 
33
version = "1.0.15"
24
34
 
25
35
# Always run in monochrome mode
26
36
urwid.curses_display.curses.has_colors = lambda : False
30
40
urwid.curses_display.curses.A_UNDERLINE |= (
31
41
    urwid.curses_display.curses.A_BLINK)
32
42
 
 
43
def isoformat_to_datetime(iso):
 
44
    "Parse an ISO 8601 date string to a datetime.datetime()"
 
45
    if not iso:
 
46
        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)
 
50
    second, fraction = divmod(float(second), 1)
 
51
    return datetime.datetime(int(year),
 
52
                             int(month),
 
53
                             int(day),
 
54
                             int(hour),
 
55
                             int(minute),
 
56
                             int(second),           # Whole seconds
 
57
                             int(fraction*1000000)) # Microseconds
 
58
 
33
59
class MandosClientPropertyCache(object):
34
60
    """This wraps a Mandos Client D-Bus proxy object, caches the
35
61
    properties and calls a hook function when any of them are
36
62
    changed.
37
63
    """
38
 
    def __init__(self, proxy_object=None, properties=None, *args,
39
 
                 **kwargs):
 
64
    def __init__(self, proxy_object=None, *args, **kwargs):
40
65
        self.proxy = proxy_object # Mandos Client proxy object
41
66
        
42
 
        if properties is None:
43
 
            self.properties = dict()
44
 
        else:
45
 
            self.properties = properties
46
 
        self.proxy.connect_to_signal("PropertyChanged",
 
67
        self.properties = dict()
 
68
        self.proxy.connect_to_signal(u"PropertyChanged",
47
69
                                     self.property_changed,
48
70
                                     client_interface,
49
71
                                     byte_arrays=True)
50
72
        
51
 
        if properties is None:
52
 
            self.properties.update(self.proxy.GetAll(client_interface,
53
 
                                                     dbus_interface =
54
 
                                                     dbus.PROPERTIES_IFACE))
55
 
        super(MandosClientPropertyCache, self).__init__(
56
 
            proxy_object=proxy_object,
57
 
            properties=properties, *args, **kwargs)
 
73
        self.properties.update(
 
74
            self.proxy.GetAll(client_interface,
 
75
                              dbus_interface = dbus.PROPERTIES_IFACE))
 
76
 
 
77
        #XXX This break good super behaviour!
 
78
#        super(MandosClientPropertyCache, self).__init__(
 
79
#            *args, **kwargs)
58
80
    
59
81
    def property_changed(self, property=None, value=None):
60
82
        """This is called whenever we get a PropertyChanged signal
69
91
    """
70
92
    
71
93
    def __init__(self, server_proxy_object=None, update_hook=None,
72
 
                 delete_hook=None, *args, **kwargs):
 
94
                 delete_hook=None, logger=None, *args, **kwargs):
73
95
        # Called on update
74
96
        self.update_hook = update_hook
75
97
        # Called on delete
76
98
        self.delete_hook = delete_hook
77
99
        # Mandos Server proxy object
78
100
        self.server_proxy_object = server_proxy_object
 
101
        # Logger
 
102
        self.logger = logger
 
103
        
 
104
        self._update_timer_callback_tag = None
 
105
        self.last_checker_failed = False
79
106
        
80
107
        # The widget shown normally
81
 
        self._text_widget = urwid.Text("")
 
108
        self._text_widget = urwid.Text(u"")
82
109
        # The widget shown when we have focus
83
 
        self._focus_text_widget = urwid.Text("")
 
110
        self._focus_text_widget = urwid.Text(u"")
84
111
        super(MandosClientWidget, self).__init__(
85
112
            update_hook=update_hook, delete_hook=delete_hook,
86
113
            *args, **kwargs)
87
114
        self.update()
88
115
        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)
 
136
        last_checked_ok = isoformat_to_datetime(self.properties
 
137
                                                ["last_checked_ok"])
 
138
        if last_checked_ok is None:
 
139
            self.last_checker_failed = True
 
140
        else:
 
141
            self.last_checker_failed = ((datetime.datetime.utcnow()
 
142
                                         - last_checked_ok)
 
143
                                        > datetime.timedelta
 
144
                                        (milliseconds=
 
145
                                         self.properties["interval"]))
 
146
        if self.last_checker_failed:
 
147
            self._update_timer_callback_tag = (gobject.timeout_add
 
148
                                               (1000,
 
149
                                                self.update_timer))
 
150
    
 
151
    def checker_completed(self, exitstatus, condition, command):
 
152
        if exitstatus == 0:
 
153
            if self.last_checker_failed:
 
154
                self.last_checker_failed = False
 
155
                gobject.source_remove(self._update_timer_callback_tag)
 
156
                self._update_timer_callback_tag = None
 
157
            self.logger(u'Checker for client %s (command "%s")'
 
158
                        u' was successful'
 
159
                        % (self.properties[u"name"], command))
 
160
            self.update()
 
161
            return
 
162
        # Checker failed
 
163
        if not self.last_checker_failed:
 
164
            self.last_checker_failed = True
 
165
            self._update_timer_callback_tag = (gobject.timeout_add
 
166
                                               (1000,
 
167
                                                self.update_timer))
 
168
        if os.WIFEXITED(condition):
 
169
            self.logger(u'Checker for client %s (command "%s")'
 
170
                        u' failed with exit code %s'
 
171
                        % (self.properties[u"name"], command,
 
172
                           os.WEXITSTATUS(condition)))
 
173
        elif os.WIFSIGNALED(condition):
 
174
            self.logger(u'Checker for client %s (command "%s")'
 
175
                        u' was killed by signal %s'
 
176
                        % (self.properties[u"name"], command,
 
177
                           os.WTERMSIG(condition)))
 
178
        elif os.WCOREDUMP(condition):
 
179
            self.logger(u'Checker for client %s (command "%s")'
 
180
                        u' dumped core'
 
181
                        % (self.properties[u"name"], command))
 
182
        else:
 
183
            self.logger(u'Checker for client %s completed mysteriously')
 
184
        self.update()
 
185
    
 
186
    def checker_started(self, command):
 
187
        #self.logger(u'Client %s started checker "%s"'
 
188
        #            % (self.properties[u"name"], unicode(command)))
 
189
        pass
 
190
    
 
191
    def got_secret(self):
 
192
        self.last_checker_failed = False
 
193
        self.logger(u'Client %s received its secret'
 
194
                    % self.properties[u"name"])
 
195
    
 
196
    def need_approval(self, timeout, default):
 
197
        if not default:
 
198
            message = u'Client %s needs approval within %s seconds'
 
199
        else:
 
200
            message = u'Client %s will get its secret in %s seconds'
 
201
        self.logger(message
 
202
                    % (self.properties[u"name"], timeout/1000))
 
203
    
 
204
    def rejected(self, reason):
 
205
        self.logger(u'Client %s was rejected; reason: %s'
 
206
                    % (self.properties[u"name"], reason))
89
207
    
90
208
    def selectable(self):
91
209
        """Make this a "selectable" widget.
113
231
                          u"bold-underline-blink":
114
232
                              u"bold-underline-blink-standout",
115
233
                          }
116
 
        
 
234
 
117
235
        # Rebuild focus and non-focus widgets using current properties
118
 
        self._text = (u'name="%(name)s", enabled=%(enabled)s'
119
 
                      % self.properties)
 
236
 
 
237
        # Base part of a client. Name!
 
238
        base = (u'%(name)s: '
 
239
                      % {u"name": self.properties[u"name"]})
 
240
        if not self.properties[u"enabled"]:
 
241
            message = u"DISABLED"
 
242
        elif self.properties[u"approved_pending"]:
 
243
            if self.properties[u"approved_by_default"]:
 
244
                message = u"Connection established to client. (d)eny?"
 
245
            else:
 
246
                message = u"Seeks approval to send secret. (a)pprove?"
 
247
        elif self.last_checker_failed:
 
248
            timeout = datetime.timedelta(milliseconds
 
249
                                         = self.properties[u"timeout"])
 
250
            last_ok = isoformat_to_datetime(
 
251
                max((self.properties["last_checked_ok"]
 
252
                     or self.properties["created"]),
 
253
                    self.properties[u"last_enabled"]))
 
254
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
 
255
            message = (u'A checker has failed! Time until client gets diabled: %s'
 
256
                           % unicode(timer).rsplit(".", 1)[0])
 
257
        else:
 
258
            message = u"enabled"
 
259
        self._text = "%s%s" % (base, message)
 
260
            
120
261
        if not urwid.supports_unicode():
121
262
            self._text = self._text.encode("ascii", "replace")
122
 
        textlist = [(u"normal", u"BLARGH: "), (u"bold", self._text)]
 
263
        textlist = [(u"normal", self._text)]
123
264
        self._text_widget.set_text(textlist)
124
265
        self._focus_text_widget.set_text([(with_standout[text[0]],
125
266
                                           text[1])
133
274
        if self.update_hook is not None:
134
275
            self.update_hook()
135
276
    
 
277
    def update_timer(self):
 
278
        "called by gobject"
 
279
        self.update()
 
280
        return True             # Keep calling this
 
281
    
136
282
    def delete(self):
 
283
        if self._update_timer_callback_tag is not None:
 
284
            gobject.source_remove(self._update_timer_callback_tag)
 
285
            self._update_timer_callback_tag = None
137
286
        if self.delete_hook is not None:
138
287
            self.delete_hook(self)
139
288
    
146
295
    def keypress(self, (maxcol,), key):
147
296
        """Handle keys.
148
297
        This overrides the method from urwid.FlowWidget"""
149
 
        if key == u"e" or key == u"+":
150
 
            self.proxy.Enable()
151
 
        elif key == u"d" or key == u"-":
152
 
            self.proxy.Disable()
153
 
        elif key == u"r" or key == u"_":
 
298
        if key == u"+":
 
299
            self.proxy.Enable(dbus_interface = client_interface)
 
300
        elif key == u"-":
 
301
            self.proxy.Disable(dbus_interface = client_interface)
 
302
        elif key == u"a":
 
303
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
 
304
                               dbus_interface = client_interface)
 
305
        elif key == u"d":
 
306
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
 
307
                                  dbus_interface = client_interface)
 
308
        elif key == u"r" or key == u"_" or key == u"ctrl k":
154
309
            self.server_proxy_object.RemoveClient(self.proxy
155
310
                                                  .object_path)
156
311
        elif key == u"s":
157
 
            self.proxy.StartChecker()
158
 
        elif key == u"c":
159
 
            self.proxy.StopChecker()
 
312
            self.proxy.StartChecker(dbus_interface = client_interface)
160
313
        elif key == u"S":
161
 
            self.proxy.CheckedOK()
 
314
            self.proxy.StopChecker(dbus_interface = client_interface)
 
315
        elif key == u"C":
 
316
            self.proxy.CheckedOK(dbus_interface = client_interface)
162
317
        # xxx
163
318
#         elif key == u"p" or key == "=":
164
319
#             self.proxy.pause()
166
321
#             self.proxy.unpause()
167
322
#         elif key == u"RET":
168
323
#             self.open()
 
324
#        elif key == u"+":
 
325
#            self.proxy.Approve(True)
 
326
#        elif key == u"-":
 
327
#            self.proxy.Approve(False)
169
328
        else:
170
329
            return key
171
330
    
223
382
                ))
224
383
        
225
384
        if urwid.supports_unicode():
226
 
            #self.divider = u"─" # \u2500
227
 
            self.divider = u"━" # \u2501
 
385
            self.divider = u"─" # \u2500
 
386
            #self.divider = u"━" # \u2501
228
387
        else:
229
388
            #self.divider = u"-" # \u002d
230
389
            self.divider = u"_" # \u005f
250
409
        self.log_wrap = u"any"
251
410
        
252
411
        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")
 
412
        self.log_message_raw((u"bold",
 
413
                              u"Mandos Monitor version " + version))
 
414
        self.log_message_raw((u"bold",
 
415
                              u"q: Quit  ?: Help"))
257
416
        
258
417
        self.busname = domain + '.Mandos'
259
418
        self.main_loop = gobject.MainLoop()
270
429
            mandos_clients = dbus.Dictionary()
271
430
        
272
431
        (self.mandos_serv
273
 
         .connect_to_signal("ClientRemoved",
 
432
         .connect_to_signal(u"ClientRemoved",
274
433
                            self.find_and_remove_client,
275
434
                            dbus_interface=server_interface,
276
435
                            byte_arrays=True))
277
436
        (self.mandos_serv
278
 
         .connect_to_signal("ClientAdded",
 
437
         .connect_to_signal(u"ClientAdded",
279
438
                            self.add_new_client,
280
439
                            dbus_interface=server_interface,
281
440
                            byte_arrays=True))
 
441
        (self.mandos_serv
 
442
         .connect_to_signal(u"ClientNotFound",
 
443
                            self.client_not_found,
 
444
                            dbus_interface=server_interface,
 
445
                            byte_arrays=True))
282
446
        for path, client in mandos_clients.iteritems():
283
447
            client_proxy_object = self.bus.get_object(self.busname,
284
448
                                                      path)
290
454
                                               update_hook
291
455
                                               =self.refresh,
292
456
                                               delete_hook
293
 
                                               =self.remove_client),
 
457
                                               =self.remove_client,
 
458
                                               logger
 
459
                                               =self.log_message),
294
460
                            path=path)
295
461
    
 
462
    def client_not_found(self, fingerprint, address):
 
463
        self.log_message((u"Client with address %s and fingerprint %s"
 
464
                          u" could not be found" % (address,
 
465
                                                    fingerprint)))
 
466
    
296
467
    def rebuild(self):
297
468
        """This rebuilds the User Interface.
298
469
        Call this when the widget layout needs to change"""
307
478
            pass
308
479
        self.topwidget = urwid.Pile(self.uilist)
309
480
    
310
 
    def log_message(self, markup):
 
481
    def log_message(self, message):
 
482
        timestamp = datetime.datetime.now().isoformat()
 
483
        self.log_message_raw(timestamp + u": " + message)
 
484
    
 
485
    def log_message_raw(self, markup):
311
486
        """Add a log message to the log buffer."""
312
487
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
313
488
        if (self.max_log_length
314
489
            and len(self.log) > self.max_log_length):
315
490
            del self.log[0:len(self.log)-self.max_log_length-1]
 
491
        self.logbox.set_focus(len(self.logbox.body.contents),
 
492
                              coming_from=u"above")
 
493
        self.refresh()
316
494
    
317
495
    def toggle_log_display(self):
318
496
        """Toggle visibility of the log buffer."""
344
522
            return
345
523
        self.remove_client(client, path)
346
524
    
347
 
    def add_new_client(self, path, properties):
 
525
    def add_new_client(self, path):
348
526
        client_proxy_object = self.bus.get_object(self.busname, path)
349
527
        self.add_client(MandosClientWidget(server_proxy_object
350
528
                                           =self.mandos_serv,
351
529
                                           proxy_object
352
530
                                           =client_proxy_object,
353
 
                                           properties=properties,
354
531
                                           update_hook
355
532
                                           =self.refresh,
356
533
                                           delete_hook
357
 
                                           =self.remove_client),
 
534
                                           =self.remove_client,
 
535
                                           logger
 
536
                                           =self.log_message),
358
537
                        path=path)
359
538
    
360
539
    def add_client(self, client, path=None):
429
608
            elif key == u"w" or key == u"i":
430
609
                self.change_log_display()
431
610
                self.refresh()
432
 
            elif key == u"?" or key == u"f1":
433
 
                self.log_message(u"Help!")
 
611
            elif key == u"?" or key == u"f1" or key == u"esc":
 
612
                if not self.log_visible:
 
613
                    self.log_visible = True
 
614
                    self.rebuild()
 
615
                self.log_message_raw((u"bold",
 
616
                                      u"  ".
 
617
                                      join((u"q: Quit",
 
618
                                            u"?: Help",
 
619
                                            u"l: Log window toggle",
 
620
                                            u"TAB: Switch window",
 
621
                                            u"w: Wrap (log)"))))
 
622
                self.log_message_raw((u"bold",
 
623
                                      u"  "
 
624
                                      .join((u"Clients:",
 
625
                                             u"+: Enable",
 
626
                                             u"-: Disable",
 
627
                                             u"r: Remove",
 
628
                                             u"s: Start new checker",
 
629
                                             u"S: Stop checker",
 
630
                                             u"C: Checker OK",
 
631
                                             u"a: Approve",
 
632
                                             u"d: Deny"))))
434
633
                self.refresh()
435
634
            elif key == u"tab":
436
635
                if self.topwidget.get_focus() is self.logbox:
438
637
                else:
439
638
                    self.topwidget.set_focus(self.logbox)
440
639
                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
 
640
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
641
            #      or key == u">"):
 
642
            #    pass            # xxx end-of-buffer
 
643
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
644
            #      or key == u"<"):
 
645
            #    pass            # xxx beginning-of-buffer
 
646
            #elif key == u"ctrl e" or key == u"$":
 
647
            #    pass            # xxx move-end-of-line
 
648
            #elif key == u"ctrl a" or key == u"^":
 
649
            #    pass            # xxx move-beginning-of-line
 
650
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
 
651
            #    pass            # xxx left
 
652
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
 
653
            #    pass            # xxx right
 
654
            #elif key == u"a":
 
655
            #    pass            # scroll up log
 
656
            #elif key == u"z":
 
657
            #    pass            # scroll down log
459
658
            elif self.topwidget.selectable():
460
659
                self.topwidget.keypress(self.size, key)
461
660
                self.refresh()
464
663
ui = UserInterface()
465
664
try:
466
665
    ui.run()
467
 
except:
 
666
except KeyboardInterrupt:
 
667
    ui.screen.stop()
 
668
except Exception, e:
 
669
    ui.log_message(unicode(e))
468
670
    ui.screen.stop()
469
671
    raise