/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2012-06-01 16:07:20 UTC
  • mfrom: (237.7.140 trunk)
  • mto: This revision was merged to the branch mainline in revision 301.
  • Revision ID: teddy@recompile.se-20120601160720-vsivlnue8qqkcsla
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
3
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
# 
6
 
# Copyright © 2009-2015 Teddy Hogeborn
7
 
# Copyright © 2009-2015 Björn Påhlsson
 
6
# Copyright © 2009-2012 Teddy Hogeborn
 
7
# Copyright © 2009-2012 Björn Påhlsson
8
8
# 
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
25
25
 
26
26
from __future__ import (division, absolute_import, print_function,
27
27
                        unicode_literals)
28
 
try:
29
 
    from future_builtins import *
30
 
except ImportError:
31
 
    pass
 
28
 
 
29
from future_builtins import *
32
30
 
33
31
import sys
34
32
import os
 
33
import signal
35
34
 
36
35
import datetime
37
36
 
39
38
import urwid
40
39
 
41
40
from dbus.mainloop.glib import DBusGMainLoop
42
 
try:
43
 
    import gobject
44
 
except ImportError:
45
 
    from gi.repository import GObject as gobject
 
41
import gobject
46
42
 
47
43
import dbus
48
44
 
 
45
import UserList
 
46
 
49
47
import locale
50
48
 
51
 
if sys.version_info.major == 2:
52
 
    str = unicode
53
 
 
54
49
locale.setlocale(locale.LC_ALL, '')
55
50
 
56
51
import logging
60
55
domain = 'se.recompile'
61
56
server_interface = domain + '.Mandos'
62
57
client_interface = domain + '.Mandos.Client'
63
 
version = "1.6.9"
 
58
version = "1.5.4"
 
59
 
 
60
# Always run in monochrome mode
 
61
urwid.curses_display.curses.has_colors = lambda : False
 
62
 
 
63
# Urwid doesn't support blinking, but we want it.  Since we have no
 
64
# use for underline on its own, we make underline also always blink.
 
65
urwid.curses_display.curses.A_UNDERLINE |= (
 
66
    urwid.curses_display.curses.A_BLINK)
64
67
 
65
68
def isoformat_to_datetime(iso):
66
69
    "Parse an ISO 8601 date string to a datetime.datetime()"
87
90
        self.proxy = proxy_object # Mandos Client proxy object
88
91
        self.properties = dict() if properties is None else properties
89
92
        self.property_changed_match = (
90
 
            self.proxy.connect_to_signal("PropertiesChanged",
91
 
                                         self.properties_changed,
92
 
                                         dbus.PROPERTIES_IFACE,
 
93
            self.proxy.connect_to_signal("PropertyChanged",
 
94
                                         self._property_changed,
 
95
                                         client_interface,
93
96
                                         byte_arrays=True))
94
97
        
95
98
        if properties is None:
100
103
        
101
104
        super(MandosClientPropertyCache, self).__init__(**kwargs)
102
105
    
103
 
    def properties_changed(self, interface, properties, invalidated):
104
 
        """This is called whenever we get a PropertiesChanged signal
105
 
        It updates the changed properties in the "properties" dict.
 
106
    def _property_changed(self, property, value):
 
107
        """Helper which takes positional arguments"""
 
108
        return self.property_changed(property=property, value=value)
 
109
    
 
110
    def property_changed(self, property=None, value=None):
 
111
        """This is called whenever we get a PropertyChanged signal
 
112
        It updates the changed property in the "properties" dict.
106
113
        """
107
114
        # Update properties dict with new value
108
 
        self.properties.update(properties)
 
115
        self.properties[property] = value
109
116
    
110
117
    def delete(self):
111
118
        self.property_changed_match.remove()
157
164
                                         self.rejected,
158
165
                                         client_interface,
159
166
                                         byte_arrays=True))
160
 
        self.logger('Created client {}'
161
 
                    .format(self.properties["Name"]), level=0)
 
167
        #self.logger('Created client {0}'
 
168
        #            .format(self.properties["Name"]))
162
169
    
163
170
    def using_timer(self, flag):
164
171
        """Call this method with True or False when timer should be
173
180
            gobject.source_remove(self._update_timer_callback_tag)
174
181
            self._update_timer_callback_tag = None
175
182
    
176
 
    def checker_completed(self, exitstatus, signal, command):
 
183
    def checker_completed(self, exitstatus, condition, command):
177
184
        if exitstatus == 0:
178
 
            self.logger('Checker for client {} (command "{}")'
179
 
                        ' succeeded'.format(self.properties["Name"],
180
 
                                            command), level=0)
181
185
            self.update()
182
186
            return
183
187
        # Checker failed
184
 
        if exitstatus >= 0:
185
 
            self.logger('Checker for client {} (command "{}") failed'
186
 
                        ' with exit code {}'
187
 
                        .format(self.properties["Name"], command,
188
 
                                exitstatus))
189
 
        elif signal != 0:
190
 
            self.logger('Checker for client {} (command "{}") was'
191
 
                        ' killed by signal {}'
192
 
                        .format(self.properties["Name"], command,
193
 
                                signal))
 
188
        if os.WIFEXITED(condition):
 
189
            self.logger('Checker for client {0} (command "{1}")'
 
190
                        ' failed with exit code {2}'
 
191
                        .format(self.properties["Name"], command,
 
192
                                os.WEXITSTATUS(condition)))
 
193
        elif os.WIFSIGNALED(condition):
 
194
            self.logger('Checker for client {0} (command "{1}") was'
 
195
                        ' killed by signal {2}'
 
196
                        .format(self.properties["Name"], command,
 
197
                                os.WTERMSIG(condition)))
 
198
        elif os.WCOREDUMP(condition):
 
199
            self.logger('Checker for client {0} (command "{1}")'
 
200
                        ' dumped core'
 
201
                        .format(self.properties["Name"], command))
194
202
        else:
195
 
            self.logger('Checker for client {} completed'
 
203
            self.logger('Checker for client {0} completed'
196
204
                        ' mysteriously'
197
205
                        .format(self.properties["Name"]))
198
206
        self.update()
199
207
    
200
208
    def checker_started(self, command):
201
 
        """Server signals that a checker started."""
202
 
        self.logger('Client {} started checker "{}"'
203
 
                    .format(self.properties["Name"],
204
 
                            command), level=0)
 
209
        """Server signals that a checker started. This could be useful
 
210
           to log in the future. """
 
211
        #self.logger('Client {0} started checker "{1}"'
 
212
        #            .format(self.properties["Name"],
 
213
        #                    unicode(command)))
 
214
        pass
205
215
    
206
216
    def got_secret(self):
207
 
        self.logger('Client {} received its secret'
 
217
        self.logger('Client {0} received its secret'
208
218
                    .format(self.properties["Name"]))
209
219
    
210
220
    def need_approval(self, timeout, default):
211
221
        if not default:
212
 
            message = 'Client {} needs approval within {} seconds'
 
222
            message = 'Client {0} needs approval within {1} seconds'
213
223
        else:
214
 
            message = 'Client {} will get its secret in {} seconds'
 
224
            message = 'Client {0} will get its secret in {1} seconds'
215
225
        self.logger(message.format(self.properties["Name"],
216
226
                                   timeout/1000))
217
227
    
218
228
    def rejected(self, reason):
219
 
        self.logger('Client {} was rejected; reason: {}'
 
229
        self.logger('Client {0} was rejected; reason: {1}'
220
230
                    .format(self.properties["Name"], reason))
221
231
    
222
232
    def selectable(self):
266
276
            else:
267
277
                timer = datetime.timedelta()
268
278
            if self.properties["ApprovedByDefault"]:
269
 
                message = "Approval in {}. (d)eny?"
 
279
                message = "Approval in {0}. (d)eny?"
270
280
            else:
271
 
                message = "Denial in {}. (a)pprove?"
272
 
            message = message.format(str(timer).rsplit(".", 1)[0])
 
281
                message = "Denial in {0}. (a)pprove?"
 
282
            message = message.format(unicode(timer).rsplit(".", 1)[0])
273
283
            self.using_timer(True)
274
284
        elif self.properties["LastCheckerStatus"] != 0:
275
285
            # When checker has failed, show timer until client expires
282
292
                timer = max(expires - datetime.datetime.utcnow(),
283
293
                            datetime.timedelta())
284
294
            message = ('A checker has failed! Time until client'
285
 
                       ' gets disabled: {}'
286
 
                       .format(str(timer).rsplit(".", 1)[0]))
 
295
                       ' gets disabled: {0}'
 
296
                       .format(unicode(timer).rsplit(".", 1)[0]))
287
297
            self.using_timer(True)
288
298
        else:
289
299
            message = "enabled"
290
300
            self.using_timer(False)
291
 
        self._text = "{}{}".format(base, message)
 
301
        self._text = "{0}{1}".format(base, message)
292
302
        
293
303
        if not urwid.supports_unicode():
294
304
            self._text = self._text.encode("ascii", "replace")
333
343
        """Handle keys.
334
344
        This overrides the method from urwid.FlowWidget"""
335
345
        if key == "+":
336
 
            self.proxy.Set(client_interface, "Enabled",
337
 
                           dbus.Boolean(True), ignore_reply = True,
338
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
346
            self.proxy.Enable(dbus_interface = client_interface,
 
347
                              ignore_reply=True)
339
348
        elif key == "-":
340
 
            self.proxy.Set(client_interface, "Enabled", False,
341
 
                           ignore_reply = True,
342
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
349
            self.proxy.Disable(dbus_interface = client_interface,
 
350
                               ignore_reply=True)
343
351
        elif key == "a":
344
352
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
345
353
                               dbus_interface = client_interface,
353
361
                                                  .object_path,
354
362
                                                  ignore_reply=True)
355
363
        elif key == "s":
356
 
            self.proxy.Set(client_interface, "CheckerRunning",
357
 
                           dbus.Boolean(True), ignore_reply = True,
358
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
364
            self.proxy.StartChecker(dbus_interface = client_interface,
 
365
                                    ignore_reply=True)
359
366
        elif key == "S":
360
 
            self.proxy.Set(client_interface, "CheckerRunning",
361
 
                           dbus.Boolean(False), ignore_reply = True,
362
 
                           dbus_interface = dbus.PROPERTIES_IFACE)
 
367
            self.proxy.StopChecker(dbus_interface = client_interface,
 
368
                                   ignore_reply=True)
363
369
        elif key == "C":
364
370
            self.proxy.CheckedOK(dbus_interface = client_interface,
365
371
                                 ignore_reply=True)
373
379
        else:
374
380
            return key
375
381
    
376
 
    def properties_changed(self, interface, properties, invalidated):
377
 
        """Call self.update() if any properties changed.
 
382
    def property_changed(self, property=None, **kwargs):
 
383
        """Call self.update() if old value is not new value.
378
384
        This overrides the method from MandosClientPropertyCache"""
379
 
        old_values = { key: self.properties.get(key)
380
 
                       for key in properties.keys() }
381
 
        super(MandosClientWidget, self).properties_changed(
382
 
            interface, properties, invalidated)
383
 
        if any(old_values[key] != self.properties.get(key)
384
 
               for key in old_values):
 
385
        property_name = unicode(property)
 
386
        old_value = self.properties.get(property_name)
 
387
        super(MandosClientWidget, self).property_changed(
 
388
            property=property, **kwargs)
 
389
        if self.properties.get(property_name) != old_value:
385
390
            self.update()
386
391
 
387
392
 
401
406
    """This is the entire user interface - the whole screen
402
407
    with boxes, lists of client widgets, etc.
403
408
    """
404
 
    def __init__(self, max_log_length=1000, log_level=1):
 
409
    def __init__(self, max_log_length=1000):
405
410
        DBusGMainLoop(set_as_default=True)
406
411
        
407
412
        self.screen = urwid.curses_display.Screen()
410
415
                ("normal",
411
416
                 "default", "default", None),
412
417
                ("bold",
413
 
                 "bold", "default", "bold"),
 
418
                 "default", "default", "bold"),
414
419
                ("underline-blink",
415
 
                 "underline,blink", "default", "underline,blink"),
 
420
                 "default", "default", "underline"),
416
421
                ("standout",
417
 
                 "standout", "default", "standout"),
 
422
                 "default", "default", "standout"),
418
423
                ("bold-underline-blink",
419
 
                 "bold,underline,blink", "default", "bold,underline,blink"),
 
424
                 "default", "default", ("bold", "underline")),
420
425
                ("bold-standout",
421
 
                 "bold,standout", "default", "bold,standout"),
 
426
                 "default", "default", ("bold", "standout")),
422
427
                ("underline-blink-standout",
423
 
                 "underline,blink,standout", "default",
424
 
                 "underline,blink,standout"),
 
428
                 "default", "default", ("underline", "standout")),
425
429
                ("bold-underline-blink-standout",
426
 
                 "bold,underline,blink,standout", "default",
427
 
                 "bold,underline,blink,standout"),
 
430
                 "default", "default", ("bold", "underline",
 
431
                                          "standout")),
428
432
                ))
429
433
        
430
434
        if urwid.supports_unicode():
445
449
        self.log = []
446
450
        self.max_log_length = max_log_length
447
451
        
448
 
        self.log_level = log_level
449
 
        
450
452
        # We keep a reference to the log widget so we can remove it
451
453
        # from the ListWalker without it getting destroyed
452
454
        self.logbox = ConstrainedListBox(self.log)
466
468
        self.main_loop = gobject.MainLoop()
467
469
    
468
470
    def client_not_found(self, fingerprint, address):
469
 
        self.log_message("Client with address {} and fingerprint {}"
470
 
                         " could not be found"
 
471
        self.log_message("Client with address {0} and fingerprint"
 
472
                         " {1} could not be found"
471
473
                         .format(address, fingerprint))
472
474
    
473
475
    def rebuild(self):
486
488
            self.uilist.append(self.logbox)
487
489
        self.topwidget = urwid.Pile(self.uilist)
488
490
    
489
 
    def log_message(self, message, level=1):
490
 
        """Log message formatted with timestamp"""
491
 
        if level < self.log_level:
492
 
            return
 
491
    def log_message(self, message):
493
492
        timestamp = datetime.datetime.now().isoformat()
494
 
        self.log_message_raw("{}: {}".format(timestamp, message),
495
 
                             level=level)
 
493
        self.log_message_raw(timestamp + ": " + message)
496
494
    
497
 
    def log_message_raw(self, markup, level=1):
 
495
    def log_message_raw(self, markup):
498
496
        """Add a log message to the log buffer."""
499
 
        if level < self.log_level:
500
 
            return
501
497
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
502
498
        if (self.max_log_length
503
499
            and len(self.log) > self.max_log_length):
510
506
        """Toggle visibility of the log buffer."""
511
507
        self.log_visible = not self.log_visible
512
508
        self.rebuild()
513
 
        self.log_message("Log visibility changed to: {}"
514
 
                         .format(self.log_visible), level=0)
 
509
        #self.log_message("Log visibility changed to: "
 
510
        #                 + unicode(self.log_visible))
515
511
    
516
512
    def change_log_display(self):
517
513
        """Change type of log display.
522
518
            self.log_wrap = "clip"
523
519
        for textwidget in self.log:
524
520
            textwidget.set_wrap_mode(self.log_wrap)
525
 
        self.log_message("Wrap mode: {}".format(self.log_wrap),
526
 
                         level=0)
 
521
        #self.log_message("Wrap mode: " + self.log_wrap)
527
522
    
528
523
    def find_and_remove_client(self, path, name):
529
524
        """Find a client by its object path and remove it.
534
529
            client = self.clients_dict[path]
535
530
        except KeyError:
536
531
            # not found?
537
 
            self.log_message("Unknown client {!r} ({!r}) removed"
 
532
            self.log_message("Unknown client {0!r} ({1!r}) removed"
538
533
                             .format(name, path))
539
534
            return
540
535
        client.delete()
558
553
        if path is None:
559
554
            path = client.proxy.object_path
560
555
        self.clients_dict[path] = client
561
 
        self.clients.sort(key=lambda c: c.properties["Name"])
 
556
        self.clients.sort(None, lambda c: c.properties["Name"])
562
557
        self.refresh()
563
558
    
564
559
    def remove_client(self, client, path=None):
566
561
        if path is None:
567
562
            path = client.proxy.object_path
568
563
        del self.clients_dict[path]
 
564
        if not self.clients_dict:
 
565
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
 
566
            # is completely emptied, we need to recreate it.
 
567
            self.clients = urwid.SimpleListWalker([])
 
568
            self.rebuild()
569
569
        self.refresh()
570
570
    
571
571
    def refresh(self):
584
584
        try:
585
585
            mandos_clients = (self.mandos_serv
586
586
                              .GetAllClientsWithProperties())
587
 
            if not mandos_clients:
588
 
                self.log_message_raw(("bold", "Note: Server has no clients."))
589
587
        except dbus.exceptions.DBusException:
590
 
            self.log_message_raw(("bold", "Note: No Mandos server running."))
591
588
            mandos_clients = dbus.Dictionary()
592
589
        
593
590
        (self.mandos_serv
605
602
                            self.client_not_found,
606
603
                            dbus_interface=server_interface,
607
604
                            byte_arrays=True))
608
 
        for path, client in mandos_clients.items():
 
605
        for path, client in mandos_clients.iteritems():
609
606
            client_proxy_object = self.bus.get_object(self.busname,
610
607
                                                      path)
611
608
            self.add_client(MandosClientWidget(server_proxy_object
658
655
            elif key == "window resize":
659
656
                self.size = self.screen.get_cols_rows()
660
657
                self.refresh()
661
 
            elif key == "ctrl l":
662
 
                self.screen.clear()
 
658
            elif key == "\f":  # Ctrl-L
663
659
                self.refresh()
664
660
            elif key == "l" or key == "D":
665
661
                self.toggle_log_display()
677
673
                                            "?: Help",
678
674
                                            "l: Log window toggle",
679
675
                                            "TAB: Switch window",
680
 
                                            "w: Wrap (log lines)",
681
 
                                            "v: Toggle verbose log",
682
 
                                            ))))
 
676
                                            "w: Wrap (log)"))))
683
677
                self.log_message_raw(("bold",
684
678
                                      "  "
685
679
                                      .join(("Clients:",
698
692
                else:
699
693
                    self.topwidget.set_focus(self.logbox)
700
694
                self.refresh()
701
 
            elif key == "v":
702
 
                if self.log_level == 0:
703
 
                    self.log_level = 1
704
 
                    self.log_message("Verbose mode: Off")
705
 
                else:
706
 
                    self.log_level = 0
707
 
                    self.log_message("Verbose mode: On")
708
695
            #elif (key == "end" or key == "meta >" or key == "G"
709
696
            #      or key == ">"):
710
697
            #    pass            # xxx end-of-buffer
733
720
    ui.run()
734
721
except KeyboardInterrupt:
735
722
    ui.screen.stop()
736
 
except Exception as e:
737
 
    ui.log_message(str(e))
 
723
except Exception, e:
 
724
    ui.log_message(unicode(e))
738
725
    ui.screen.stop()
739
726
    raise