/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: 2014-07-15 19:35:03 UTC
  • Revision ID: teddy@recompile.se-20140715193503-e18hls7m4rv4l6iq
mandos-client: Fix mem free bug.

* plugins.d/mandos-client.c (add_server): Hide warning.
  (main): Free server->ip too, not just the server struct.

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-2012 Teddy Hogeborn
7
 
# Copyright © 2009-2012 Björn Påhlsson
 
6
# Copyright © 2009-2014 Teddy Hogeborn
 
7
# Copyright © 2009-2014 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
32
32
 
33
33
import sys
34
34
import os
35
 
import signal
36
35
 
37
36
import datetime
38
37
 
61
60
domain = 'se.recompile'
62
61
server_interface = domain + '.Mandos'
63
62
client_interface = domain + '.Mandos.Client'
64
 
version = "1.6.0"
 
63
version = "1.6.6"
65
64
 
66
65
def isoformat_to_datetime(iso):
67
66
    "Parse an ISO 8601 date string to a datetime.datetime()"
162
161
                                         self.rejected,
163
162
                                         client_interface,
164
163
                                         byte_arrays=True))
165
 
        #self.logger('Created client {0}'
166
 
        #            .format(self.properties["Name"]))
 
164
        self.logger('Created client {0}'
 
165
                    .format(self.properties["Name"]), level=0)
167
166
    
168
167
    def using_timer(self, flag):
169
168
        """Call this method with True or False when timer should be
180
179
    
181
180
    def checker_completed(self, exitstatus, condition, command):
182
181
        if exitstatus == 0:
 
182
            self.logger('Checker for client {0} (command "{1}")'
 
183
                        ' succeeded'.format(self.properties["Name"],
 
184
                                            command), level=0)
183
185
            self.update()
184
186
            return
185
187
        # Checker failed
204
206
        self.update()
205
207
    
206
208
    def checker_started(self, command):
207
 
        """Server signals that a checker started. This could be useful
208
 
           to log in the future. """
209
 
        #self.logger('Client {0} started checker "{1}"'
210
 
        #            .format(self.properties["Name"],
211
 
        #                    str(command)))
212
 
        pass
 
209
        """Server signals that a checker started."""
 
210
        self.logger('Client {0} started checker "{1}"'
 
211
                    .format(self.properties["Name"],
 
212
                            command), level=0)
213
213
    
214
214
    def got_secret(self):
215
215
        self.logger('Client {0} received its secret'
404
404
    """This is the entire user interface - the whole screen
405
405
    with boxes, lists of client widgets, etc.
406
406
    """
407
 
    def __init__(self, max_log_length=1000):
 
407
    def __init__(self, max_log_length=1000, log_level=1):
408
408
        DBusGMainLoop(set_as_default=True)
409
409
        
410
410
        self.screen = urwid.curses_display.Screen()
448
448
        self.log = []
449
449
        self.max_log_length = max_log_length
450
450
        
 
451
        self.log_level = log_level
 
452
        
451
453
        # We keep a reference to the log widget so we can remove it
452
454
        # from the ListWalker without it getting destroyed
453
455
        self.logbox = ConstrainedListBox(self.log)
487
489
            self.uilist.append(self.logbox)
488
490
        self.topwidget = urwid.Pile(self.uilist)
489
491
    
490
 
    def log_message(self, message):
 
492
    def log_message(self, message, level=1):
491
493
        """Log message formatted with timestamp"""
 
494
        if level < self.log_level:
 
495
            return
492
496
        timestamp = datetime.datetime.now().isoformat()
493
 
        self.log_message_raw(timestamp + ": " + message)
 
497
        self.log_message_raw("{0}: {1}".format(timestamp, message),
 
498
                             level=level)
494
499
    
495
 
    def log_message_raw(self, markup):
 
500
    def log_message_raw(self, markup, level=1):
496
501
        """Add a log message to the log buffer."""
 
502
        if level < self.log_level:
 
503
            return
497
504
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
498
505
        if (self.max_log_length
499
506
            and len(self.log) > self.max_log_length):
506
513
        """Toggle visibility of the log buffer."""
507
514
        self.log_visible = not self.log_visible
508
515
        self.rebuild()
509
 
        #self.log_message("Log visibility changed to: "
510
 
        #                 + str(self.log_visible))
 
516
        self.log_message("Log visibility changed to: {0}"
 
517
                         .format(self.log_visible), level=0)
511
518
    
512
519
    def change_log_display(self):
513
520
        """Change type of log display.
518
525
            self.log_wrap = "clip"
519
526
        for textwidget in self.log:
520
527
            textwidget.set_wrap_mode(self.log_wrap)
521
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
528
        self.log_message("Wrap mode: {0}".format(self.log_wrap),
 
529
                         level=0)
522
530
    
523
531
    def find_and_remove_client(self, path, name):
524
532
        """Find a client by its object path and remove it.
671
679
                                            "?: Help",
672
680
                                            "l: Log window toggle",
673
681
                                            "TAB: Switch window",
674
 
                                            "w: Wrap (log)"))))
 
682
                                            "w: Wrap (log lines)",
 
683
                                            "v: Toggle verbose log",
 
684
                                            ))))
675
685
                self.log_message_raw(("bold",
676
686
                                      "  "
677
687
                                      .join(("Clients:",
690
700
                else:
691
701
                    self.topwidget.set_focus(self.logbox)
692
702
                self.refresh()
 
703
            elif key == "v":
 
704
                if self.log_level == 0:
 
705
                    self.log_level = 1
 
706
                    self.log_message("Verbose mode: Off")
 
707
                else:
 
708
                    self.log_level = 0
 
709
                    self.log_message("Verbose mode: On")
693
710
            #elif (key == "end" or key == "meta >" or key == "G"
694
711
            #      or key == ">"):
695
712
            #    pass            # xxx end-of-buffer