/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
 
import logging
27
 
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
28
 
 
29
19
# Some useful constants
30
20
domain = 'se.bsnet.fukt'
31
21
server_interface = domain + '.Mandos'
32
22
client_interface = domain + '.Mandos.Client'
33
 
version = "1.0.15"
 
23
version = "1.0.14"
34
24
 
35
25
# Always run in monochrome mode
36
26
urwid.curses_display.curses.has_colors = lambda : False
40
30
urwid.curses_display.curses.A_UNDERLINE |= (
41
31
    urwid.curses_display.curses.A_BLINK)
42
32
 
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
 
 
59
33
class MandosClientPropertyCache(object):
60
34
    """This wraps a Mandos Client D-Bus proxy object, caches the
61
35
    properties and calls a hook function when any of them are
62
36
    changed.
63
37
    """
64
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
38
    def __init__(self, proxy_object=None, properties=None, *args,
 
39
                 **kwargs):
65
40
        self.proxy = proxy_object # Mandos Client proxy object
66
41
        
67
 
        self.properties = dict()
68
 
        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",
69
47
                                     self.property_changed,
70
48
                                     client_interface,
71
49
                                     byte_arrays=True)
72
50
        
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)
 
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)
80
58
    
81
59
    def property_changed(self, property=None, value=None):
82
60
        """This is called whenever we get a PropertyChanged signal
91
69
    """
92
70
    
93
71
    def __init__(self, server_proxy_object=None, update_hook=None,
94
 
                 delete_hook=None, logger=None, *args, **kwargs):
 
72
                 delete_hook=None, *args, **kwargs):
95
73
        # Called on update
96
74
        self.update_hook = update_hook
97
75
        # Called on delete
98
76
        self.delete_hook = delete_hook
99
77
        # Mandos Server proxy object
100
78
        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
106
79
        
107
80
        # The widget shown normally
108
 
        self._text_widget = urwid.Text(u"")
 
81
        self._text_widget = urwid.Text("")
109
82
        # The widget shown when we have focus
110
 
        self._focus_text_widget = urwid.Text(u"")
 
83
        self._focus_text_widget = urwid.Text("")
111
84
        super(MandosClientWidget, self).__init__(
112
85
            update_hook=update_hook, delete_hook=delete_hook,
113
86
            *args, **kwargs)
114
87
        self.update()
115
88
        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
 
                                                [u"LastCheckedOK"])
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
146
 
                                         [u"Interval"]))
147
 
        if self.last_checker_failed:
148
 
            self._update_timer_callback_tag = (gobject.timeout_add
149
 
                                               (1000,
150
 
                                                self.update_timer))
151
 
    
152
 
    def checker_completed(self, exitstatus, condition, command):
153
 
        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
 
            self.update()
162
 
            return
163
 
        # 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
 
        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,
173
 
                           os.WEXITSTATUS(condition)))
174
 
        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,
178
 
                           os.WTERMSIG(condition)))
179
 
        elif os.WCOREDUMP(condition):
180
 
            self.logger(u'Checker for client %s (command "%s")'
181
 
                        u' dumped core'
182
 
                        % (self.properties[u"Name"], command))
183
 
        else:
184
 
            self.logger(u'Checker for client %s completed'
185
 
                        u' mysteriously')
186
 
        self.update()
187
 
    
188
 
    def checker_started(self, command):
189
 
        #self.logger(u'Client %s started checker "%s"'
190
 
        #            % (self.properties[u"Name"], unicode(command)))
191
 
        pass
192
 
    
193
 
    def got_secret(self):
194
 
        self.last_checker_failed = False
195
 
        self.logger(u'Client %s received its secret'
196
 
                    % self.properties[u"Name"])
197
 
    
198
 
    def need_approval(self, timeout, default):
199
 
        if not default:
200
 
            message = u'Client %s needs approval within %s seconds'
201
 
        else:
202
 
            message = u'Client %s will get its secret in %s seconds'
203
 
        self.logger(message
204
 
                    % (self.properties[u"Name"], timeout/1000))
205
 
    
206
 
    def rejected(self, reason):
207
 
        self.logger(u'Client %s was rejected; reason: %s'
208
 
                    % (self.properties[u"Name"], reason))
209
89
    
210
90
    def selectable(self):
211
91
        """Make this a "selectable" widget.
233
113
                          u"bold-underline-blink":
234
114
                              u"bold-underline-blink-standout",
235
115
                          }
236
 
 
 
116
        
237
117
        # Rebuild focus and non-focus widgets using current properties
238
 
 
239
 
        # 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:
250
 
            timeout = datetime.timedelta(milliseconds
251
 
                                         = 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'
260
 
                           % unicode(timer).rsplit(".", 1)[0])
261
 
        else:
262
 
            message = u"enabled"
263
 
        self._text = "%s%s" % (base, message)
264
 
            
 
118
        self._text = (u'name="%(name)s", enabled=%(enabled)s'
 
119
                      % self.properties)
265
120
        if not urwid.supports_unicode():
266
121
            self._text = self._text.encode("ascii", "replace")
267
 
        textlist = [(u"normal", self._text)]
 
122
        textlist = [(u"normal", u"BLARGH: "), (u"bold", self._text)]
268
123
        self._text_widget.set_text(textlist)
269
124
        self._focus_text_widget.set_text([(with_standout[text[0]],
270
125
                                           text[1])
278
133
        if self.update_hook is not None:
279
134
            self.update_hook()
280
135
    
281
 
    def update_timer(self):
282
 
        "called by gobject"
283
 
        self.update()
284
 
        return True             # Keep calling this
285
 
    
286
136
    def delete(self):
287
 
        if self._update_timer_callback_tag is not None:
288
 
            gobject.source_remove(self._update_timer_callback_tag)
289
 
            self._update_timer_callback_tag = None
290
137
        if self.delete_hook is not None:
291
138
            self.delete_hook(self)
292
139
    
299
146
    def keypress(self, (maxcol,), key):
300
147
        """Handle keys.
301
148
        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":
307
 
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
308
 
                               dbus_interface = client_interface)
309
 
        elif key == u"d":
310
 
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
311
 
                                  dbus_interface = client_interface)
 
149
        if key == u"e" or key == u"+":
 
150
            self.proxy.Enable()
 
151
        elif key == u"d" or key == u"-":
 
152
            self.proxy.Disable()
312
153
        elif key == u"r" or key == u"_" or key == u"ctrl k":
313
154
            self.server_proxy_object.RemoveClient(self.proxy
314
155
                                                  .object_path)
315
156
        elif key == u"s":
316
 
            self.proxy.StartChecker(dbus_interface = client_interface)
 
157
            self.proxy.StartChecker()
317
158
        elif key == u"S":
318
 
            self.proxy.StopChecker(dbus_interface = client_interface)
 
159
            self.proxy.StopChecker()
319
160
        elif key == u"C":
320
 
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
161
            self.proxy.CheckedOK()
321
162
        # xxx
322
163
#         elif key == u"p" or key == "=":
323
164
#             self.proxy.pause()
325
166
#             self.proxy.unpause()
326
167
#         elif key == u"RET":
327
168
#             self.open()
328
 
#        elif key == u"+":
329
 
#            self.proxy.Approve(True)
330
 
#        elif key == u"-":
331
 
#            self.proxy.Approve(False)
332
169
        else:
333
170
            return key
334
171
    
350
187
    use them as an excuse to shift focus away from this widget.
351
188
    """
352
189
    def keypress(self, (maxcol, maxrow), key):
353
 
        ret = super(ConstrainedListBox, self).keypress((maxcol,
354
 
                                                        maxrow), key)
 
190
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
355
191
        if ret in (u"up", u"down"):
356
192
            return
357
193
        return ret
414
250
        self.log_wrap = u"any"
415
251
        
416
252
        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"))
 
253
        self.log_message((u"bold",
 
254
                          u"Mandos Monitor version " + version))
 
255
        self.log_message((u"bold",
 
256
                          u"q: Quit  ?: Help"))
421
257
        
422
258
        self.busname = domain + '.Mandos'
423
259
        self.main_loop = gobject.MainLoop()
434
270
            mandos_clients = dbus.Dictionary()
435
271
        
436
272
        (self.mandos_serv
437
 
         .connect_to_signal(u"ClientRemoved",
 
273
         .connect_to_signal("ClientRemoved",
438
274
                            self.find_and_remove_client,
439
275
                            dbus_interface=server_interface,
440
276
                            byte_arrays=True))
441
277
        (self.mandos_serv
442
 
         .connect_to_signal(u"ClientAdded",
 
278
         .connect_to_signal("ClientAdded",
443
279
                            self.add_new_client,
444
280
                            dbus_interface=server_interface,
445
281
                            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
282
        for path, client in mandos_clients.iteritems():
452
283
            client_proxy_object = self.bus.get_object(self.busname,
453
284
                                                      path)
459
290
                                               update_hook
460
291
                                               =self.refresh,
461
292
                                               delete_hook
462
 
                                               =self.remove_client,
463
 
                                               logger
464
 
                                               =self.log_message),
 
293
                                               =self.remove_client),
465
294
                            path=path)
466
295
    
467
 
    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,
470
 
                                                    fingerprint)))
471
 
    
472
296
    def rebuild(self):
473
297
        """This rebuilds the User Interface.
474
298
        Call this when the widget layout needs to change"""
475
299
        self.uilist = []
476
300
        #self.uilist.append(urwid.ListBox(self.clients))
477
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
478
 
                                                          clients),
 
301
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
479
302
                                       #header=urwid.Divider(),
480
303
                                       header=None,
481
 
                                       footer=
482
 
                                       urwid.Divider(div_char=
483
 
                                                     self.divider)))
 
304
                                       footer=urwid.Divider(div_char=self.divider)))
484
305
        if self.log_visible:
485
306
            self.uilist.append(self.logbox)
486
307
            pass
487
308
        self.topwidget = urwid.Pile(self.uilist)
488
309
    
489
 
    def log_message(self, message):
490
 
        timestamp = datetime.datetime.now().isoformat()
491
 
        self.log_message_raw(timestamp + u": " + message)
492
 
    
493
 
    def log_message_raw(self, markup):
 
310
    def log_message(self, markup):
494
311
        """Add a log message to the log buffer."""
495
312
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
496
313
        if (self.max_log_length
498
315
            del self.log[0:len(self.log)-self.max_log_length-1]
499
316
        self.logbox.set_focus(len(self.logbox.body.contents),
500
317
                              coming_from=u"above")
501
 
        self.refresh()
502
318
    
503
319
    def toggle_log_display(self):
504
320
        """Toggle visibility of the log buffer."""
530
346
            return
531
347
        self.remove_client(client, path)
532
348
    
533
 
    def add_new_client(self, path):
 
349
    def add_new_client(self, path, properties):
534
350
        client_proxy_object = self.bus.get_object(self.busname, path)
535
351
        self.add_client(MandosClientWidget(server_proxy_object
536
352
                                           =self.mandos_serv,
537
353
                                           proxy_object
538
354
                                           =client_proxy_object,
 
355
                                           properties=properties,
539
356
                                           update_hook
540
357
                                           =self.refresh,
541
358
                                           delete_hook
542
 
                                           =self.remove_client,
543
 
                                           logger
544
 
                                           =self.log_message),
 
359
                                           =self.remove_client),
545
360
                        path=path)
546
361
    
547
362
    def add_client(self, client, path=None):
549
364
        if path is None:
550
365
            path = client.proxy.object_path
551
366
        self.clients_dict[path] = client
552
 
        self.clients.sort(None, lambda c: c.properties[u"Name"])
 
367
        self.clients.sort(None, lambda c: c.properties[u"name"])
553
368
        self.refresh()
554
369
    
555
370
    def remove_client(self, client, path=None):
620
435
                if not self.log_visible:
621
436
                    self.log_visible = True
622
437
                    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"))))
 
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"))))
641
452
                self.refresh()
642
453
            elif key == u"tab":
643
454
                if self.topwidget.get_focus() is self.logbox:
671
482
ui = UserInterface()
672
483
try:
673
484
    ui.run()
674
 
except KeyboardInterrupt:
675
 
    ui.screen.stop()
676
 
except Exception, e:
677
 
    ui.log_message(unicode(e))
 
485
except:
678
486
    ui.screen.stop()
679
487
    raise