/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-09 07:35:16 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091109073516-v1vem352uz0vuwrd
* dbus-mandos.conf: New; to be copied to
                    "/etc/dbus-1/system.d/mandos.conf".

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
45
35
    properties and calls a hook function when any of them are
46
36
    changed.
47
37
    """
48
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
38
    def __init__(self, proxy_object=None, properties=None, *args,
 
39
                 **kwargs):
49
40
        self.proxy = proxy_object # Mandos Client proxy object
50
41
        
51
 
        self.properties = dict()
52
 
        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",
53
47
                                     self.property_changed,
54
48
                                     client_interface,
55
49
                                     byte_arrays=True)
56
50
        
57
 
        self.properties.update(
58
 
            self.proxy.GetAll(client_interface,
59
 
                              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))
60
55
        super(MandosClientPropertyCache, self).__init__(
61
 
            proxy_object=proxy_object, *args, **kwargs)
 
56
            proxy_object=proxy_object,
 
57
            properties=properties, *args, **kwargs)
62
58
    
63
59
    def property_changed(self, property=None, value=None):
64
60
        """This is called whenever we get a PropertyChanged signal
73
69
    """
74
70
    
75
71
    def __init__(self, server_proxy_object=None, update_hook=None,
76
 
                 delete_hook=None, logger=None, *args, **kwargs):
 
72
                 delete_hook=None, *args, **kwargs):
77
73
        # Called on update
78
74
        self.update_hook = update_hook
79
75
        # Called on delete
80
76
        self.delete_hook = delete_hook
81
77
        # Mandos Server proxy object
82
78
        self.server_proxy_object = server_proxy_object
83
 
        # Logger
84
 
        self.logger = logger
85
79
        
86
80
        # The widget shown normally
87
 
        self._text_widget = urwid.Text(u"")
 
81
        self._text_widget = urwid.Text("")
88
82
        # The widget shown when we have focus
89
 
        self._focus_text_widget = urwid.Text(u"")
 
83
        self._focus_text_widget = urwid.Text("")
90
84
        super(MandosClientWidget, self).__init__(
91
85
            update_hook=update_hook, delete_hook=delete_hook,
92
86
            *args, **kwargs)
93
87
        self.update()
94
88
        self.opened = False
95
 
        self.proxy.connect_to_signal(u"CheckerCompleted",
96
 
                                     self.checker_completed,
97
 
                                     client_interface,
98
 
                                     byte_arrays=True)
99
 
        self.proxy.connect_to_signal(u"CheckerStarted",
100
 
                                     self.checker_started,
101
 
                                     client_interface,
102
 
                                     byte_arrays=True)
103
 
        self.proxy.connect_to_signal(u"GotSecret",
104
 
                                     self.got_secret,
105
 
                                     client_interface,
106
 
                                     byte_arrays=True)
107
 
        self.proxy.connect_to_signal(u"NeedApproval",
108
 
                                     self.need_approval,
109
 
                                     client_interface,
110
 
                                     byte_arrays=True)
111
 
        self.proxy.connect_to_signal(u"Rejected",
112
 
                                     self.rejected,
113
 
                                     client_interface,
114
 
                                     byte_arrays=True)
115
 
    
116
 
    def checker_completed(self, exitstatus, condition, command):
117
 
        if exitstatus == 0:
118
 
            #self.logger(u'Checker for client %s (command "%s")'
119
 
            #            u' was successful'
120
 
            #            % (self.properties[u"name"], command))
121
 
            return
122
 
        if os.WIFEXITED(condition):
123
 
            self.logger(u'Checker for client %s (command "%s")'
124
 
                        u' failed with exit code %s'
125
 
                        % (self.properties[u"name"], command,
126
 
                           os.WEXITSTATUS(condition)))
127
 
            return
128
 
        if os.WIFSIGNALED(condition):
129
 
            self.logger(u'Checker for client %s (command "%s")'
130
 
                        u' was killed by signal %s'
131
 
                        % (self.properties[u"name"], command,
132
 
                           os.WTERMSIG(condition)))
133
 
            return
134
 
        if os.WCOREDUMP(condition):
135
 
            self.logger(u'Checker for client %s (command "%s")'
136
 
                        u' dumped core'
137
 
                        % (self.properties[u"name"], command))
138
 
        self.logger(u'Checker for client %s completed mysteriously')
139
 
    
140
 
    def checker_started(self, command):
141
 
        #self.logger(u'Client %s started checker "%s"'
142
 
        #            % (self.properties[u"name"], unicode(command)))
143
 
        pass
144
 
    
145
 
    def got_secret(self):
146
 
        self.logger(u'Client %s received its secret'
147
 
                    % self.properties[u"name"])
148
 
    
149
 
    def need_approval(self, timeout, default):
150
 
        if not default:
151
 
            message = u'Client %s needs approval within %s seconds'
152
 
        else:
153
 
            message = u'Client %s will get its secret in %s seconds'
154
 
        self.logger(message
155
 
                    % (self.properties[u"name"], timeout/1000))
156
 
    
157
 
    def rejected(self, reason):
158
 
        self.logger(u'Client %s was rejected; reason: %s'
159
 
                    % (self.properties[u"name"], reason))
160
89
    
161
90
    def selectable(self):
162
91
        """Make this a "selectable" widget.
186
115
                          }
187
116
        
188
117
        # Rebuild focus and non-focus widgets using current properties
189
 
        self._text = (u'%(name)s: %(enabled)s'
190
 
                      % { u"name": self.properties[u"name"],
191
 
                          u"enabled":
192
 
                              (u"enabled"
193
 
                               if self.properties[u"enabled"]
194
 
                               else u"DISABLED")})
 
118
        self._text = (u'name="%(name)s", enabled=%(enabled)s'
 
119
                      % self.properties)
195
120
        if not urwid.supports_unicode():
196
121
            self._text = self._text.encode("ascii", "replace")
197
 
        textlist = [(u"normal", self._text)]
 
122
        textlist = [(u"normal", u"BLARGH: "), (u"bold", self._text)]
198
123
        self._text_widget.set_text(textlist)
199
124
        self._focus_text_widget.set_text([(with_standout[text[0]],
200
125
                                           text[1])
225
150
            self.proxy.Enable()
226
151
        elif key == u"d" or key == u"-":
227
152
            self.proxy.Disable()
228
 
        elif key == u"r" or key == u"_" or key == u"ctrl k":
 
153
        elif key == u"r" or key == u"_":
229
154
            self.server_proxy_object.RemoveClient(self.proxy
230
155
                                                  .object_path)
231
156
        elif key == u"s":
232
157
            self.proxy.StartChecker()
 
158
        elif key == u"c":
 
159
            self.proxy.StopChecker()
233
160
        elif key == u"S":
234
 
            self.proxy.StopChecker()
235
 
        elif key == u"C":
236
161
            self.proxy.CheckedOK()
237
162
        # xxx
238
163
#         elif key == u"p" or key == "=":
241
166
#             self.proxy.unpause()
242
167
#         elif key == u"RET":
243
168
#             self.open()
244
 
        elif key == u"+":
245
 
            self.proxy.Approve(True)
246
 
        elif key == u"-":
247
 
            self.proxy.Approve(False)
248
169
        else:
249
170
            return key
250
171
    
302
223
                ))
303
224
        
304
225
        if urwid.supports_unicode():
305
 
            self.divider = u"─" # \u2500
306
 
            #self.divider = u"━" # \u2501
 
226
            #self.divider = u"─" # \u2500
 
227
            self.divider = u"━" # \u2501
307
228
        else:
308
229
            #self.divider = u"-" # \u002d
309
230
            self.divider = u"_" # \u005f
329
250
        self.log_wrap = u"any"
330
251
        
331
252
        self.rebuild()
332
 
        self.log_message_raw((u"bold",
333
 
                              u"Mandos Monitor version " + version))
334
 
        self.log_message_raw((u"bold",
335
 
                              u"q: Quit  ?: Help"))
 
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")
336
257
        
337
258
        self.busname = domain + '.Mandos'
338
259
        self.main_loop = gobject.MainLoop()
349
270
            mandos_clients = dbus.Dictionary()
350
271
        
351
272
        (self.mandos_serv
352
 
         .connect_to_signal(u"ClientRemoved",
 
273
         .connect_to_signal("ClientRemoved",
353
274
                            self.find_and_remove_client,
354
275
                            dbus_interface=server_interface,
355
276
                            byte_arrays=True))
356
277
        (self.mandos_serv
357
 
         .connect_to_signal(u"ClientAdded",
 
278
         .connect_to_signal("ClientAdded",
358
279
                            self.add_new_client,
359
280
                            dbus_interface=server_interface,
360
281
                            byte_arrays=True))
361
 
        (self.mandos_serv
362
 
         .connect_to_signal(u"ClientNotFound",
363
 
                            self.client_not_found,
364
 
                            dbus_interface=server_interface,
365
 
                            byte_arrays=True))
366
282
        for path, client in mandos_clients.iteritems():
367
283
            client_proxy_object = self.bus.get_object(self.busname,
368
284
                                                      path)
374
290
                                               update_hook
375
291
                                               =self.refresh,
376
292
                                               delete_hook
377
 
                                               =self.remove_client,
378
 
                                               logger
379
 
                                               =self.log_message),
 
293
                                               =self.remove_client),
380
294
                            path=path)
381
295
    
382
 
    def client_not_found(self, fingerprint, address):
383
 
        self.log_message((u"Client with address %s and fingerprint %s"
384
 
                          u" could not be found" % (address,
385
 
                                                    fingerprint)))
386
 
    
387
296
    def rebuild(self):
388
297
        """This rebuilds the User Interface.
389
298
        Call this when the widget layout needs to change"""
398
307
            pass
399
308
        self.topwidget = urwid.Pile(self.uilist)
400
309
    
401
 
    def log_message(self, message):
402
 
        timestamp = datetime.datetime.now().isoformat()
403
 
        self.log_message_raw(timestamp + u": " + message)
404
 
    
405
 
    def log_message_raw(self, markup):
 
310
    def log_message(self, markup):
406
311
        """Add a log message to the log buffer."""
407
312
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
408
313
        if (self.max_log_length
409
314
            and len(self.log) > self.max_log_length):
410
315
            del self.log[0:len(self.log)-self.max_log_length-1]
411
 
        self.logbox.set_focus(len(self.logbox.body.contents),
412
 
                              coming_from=u"above")
413
 
        self.refresh()
414
316
    
415
317
    def toggle_log_display(self):
416
318
        """Toggle visibility of the log buffer."""
442
344
            return
443
345
        self.remove_client(client, path)
444
346
    
445
 
    def add_new_client(self, path):
 
347
    def add_new_client(self, path, properties):
446
348
        client_proxy_object = self.bus.get_object(self.busname, path)
447
349
        self.add_client(MandosClientWidget(server_proxy_object
448
350
                                           =self.mandos_serv,
449
351
                                           proxy_object
450
352
                                           =client_proxy_object,
 
353
                                           properties=properties,
451
354
                                           update_hook
452
355
                                           =self.refresh,
453
356
                                           delete_hook
454
 
                                           =self.remove_client,
455
 
                                           logger
456
 
                                           =self.log_message),
 
357
                                           =self.remove_client),
457
358
                        path=path)
458
359
    
459
360
    def add_client(self, client, path=None):
528
429
            elif key == u"w" or key == u"i":
529
430
                self.change_log_display()
530
431
                self.refresh()
531
 
            elif key == u"?" or key == u"f1" or key == u"esc":
532
 
                if not self.log_visible:
533
 
                    self.log_visible = True
534
 
                    self.rebuild()
535
 
                self.log_message_raw((u"bold",
536
 
                                      u"  ".
537
 
                                      join((u"q: Quit",
538
 
                                            u"?: Help",
539
 
                                            u"l: Log window toggle",
540
 
                                            u"TAB: Switch window",
541
 
                                            u"w: Wrap (log)"))))
542
 
                self.log_message_raw((u"bold",
543
 
                                      u"  "
544
 
                                      .join((u"Clients:",
545
 
                                             u"e: Enable",
546
 
                                             u"d: Disable",
547
 
                                             u"r: Remove",
548
 
                                             u"s: Start new checker",
549
 
                                             u"S: Stop checker",
550
 
                                             u"C: Checker OK"))))
 
432
            elif key == u"?" or key == u"f1":
 
433
                self.log_message(u"Help!")
551
434
                self.refresh()
552
435
            elif key == u"tab":
553
436
                if self.topwidget.get_focus() is self.logbox:
555
438
                else:
556
439
                    self.topwidget.set_focus(self.logbox)
557
440
                self.refresh()
558
 
            #elif (key == u"end" or key == u"meta >" or key == u"G"
559
 
            #      or key == u">"):
560
 
            #    pass            # xxx end-of-buffer
561
 
            #elif (key == u"home" or key == u"meta <" or key == u"g"
562
 
            #      or key == u"<"):
563
 
            #    pass            # xxx beginning-of-buffer
564
 
            #elif key == u"ctrl e" or key == u"$":
565
 
            #    pass            # xxx move-end-of-line
566
 
            #elif key == u"ctrl a" or key == u"^":
567
 
            #    pass            # xxx move-beginning-of-line
568
 
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
569
 
            #    pass            # xxx left
570
 
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
571
 
            #    pass            # xxx right
572
 
            #elif key == u"a":
573
 
            #    pass            # scroll up log
574
 
            #elif key == u"z":
575
 
            #    pass            # scroll down log
 
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
576
459
            elif self.topwidget.selectable():
577
460
                self.topwidget.keypress(self.size, key)
578
461
                self.refresh()
581
464
ui = UserInterface()
582
465
try:
583
466
    ui.run()
584
 
except Exception, e:
585
 
    ui.log_message(unicode(e))
 
467
except:
586
468
    ui.screen.stop()
587
469
    raise