/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: 2015-07-20 04:03:32 UTC
  • Revision ID: teddy@recompile.se-20150720040332-hw6s7nh14ju259z3
Update copyright year.

* debian/copyright (Copyright): Update copyright year.
* intro.xml (COPYRIGHT): - '' -
* mandos-clients.conf.xml (COPYRIGHT): - '' -
* mandos-ctl.xml (COPYRIGHT): - '' -
* mandos-keygen.xml (COPYRIGHT): - '' -
* mandos-monitor.xml (COPYRIGHT): - '' -
* mandos.conf.xml (COPYRIGHT): - '' -
* mandos.xml (COPYRIGHT): - '' -
* plugin-runner.c: - '' -
* plugin-runner.xml (COPYRIGHT): - '' -
* plugins.d/askpass-fifo.c: - '' -
* plugins.d/askpass-fifo.xml (COPYRIGHT): - '' -
* plugins.d/mandos-client.xml (COPYRIGHT): - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/password-prompt.xml (COPYRIGHT): - '' -
* plugins.d/plymouth.c: - '' -
* plugins.d/plymouth.xml (COPYRIGHT): - '' -
* plugins.d/splashy.c: - '' -
* plugins.d/splashy.xml (COPYRIGHT): - '' -
* plugins.d/usplash.c: - '' -
* plugins.d/usplash.xml (COPYRIGHT): - '' -

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-2015 Teddy Hogeborn
 
7
# Copyright © 2009-2015 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
 
49
48
 
50
49
import locale
51
50
 
52
 
if sys.version_info[0] == 2:
 
51
if sys.version_info.major == 2:
53
52
    str = unicode
54
53
 
55
54
locale.setlocale(locale.LC_ALL, '')
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.9"
65
64
 
66
65
def isoformat_to_datetime(iso):
67
66
    "Parse an ISO 8601 date string to a datetime.datetime()"
88
87
        self.proxy = proxy_object # Mandos Client proxy object
89
88
        self.properties = dict() if properties is None else properties
90
89
        self.property_changed_match = (
91
 
            self.proxy.connect_to_signal("PropertyChanged",
92
 
                                         self._property_changed,
93
 
                                         client_interface,
 
90
            self.proxy.connect_to_signal("PropertiesChanged",
 
91
                                         self.properties_changed,
 
92
                                         dbus.PROPERTIES_IFACE,
94
93
                                         byte_arrays=True))
95
94
        
96
95
        if properties is None:
101
100
        
102
101
        super(MandosClientPropertyCache, self).__init__(**kwargs)
103
102
    
104
 
    def _property_changed(self, property, value):
105
 
        """Helper which takes positional arguments"""
106
 
        return self.property_changed(property=property, value=value)
107
 
    
108
 
    def property_changed(self, property=None, value=None):
109
 
        """This is called whenever we get a PropertyChanged signal
110
 
        It updates the changed property in the "properties" dict.
 
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.
111
106
        """
112
107
        # Update properties dict with new value
113
 
        self.properties[property] = value
 
108
        self.properties.update(properties)
114
109
    
115
110
    def delete(self):
116
111
        self.property_changed_match.remove()
162
157
                                         self.rejected,
163
158
                                         client_interface,
164
159
                                         byte_arrays=True))
165
 
        #self.logger('Created client {0}'
166
 
        #            .format(self.properties["Name"]))
 
160
        self.logger('Created client {}'
 
161
                    .format(self.properties["Name"]), level=0)
167
162
    
168
163
    def using_timer(self, flag):
169
164
        """Call this method with True or False when timer should be
178
173
            gobject.source_remove(self._update_timer_callback_tag)
179
174
            self._update_timer_callback_tag = None
180
175
    
181
 
    def checker_completed(self, exitstatus, condition, command):
 
176
    def checker_completed(self, exitstatus, signal, command):
182
177
        if exitstatus == 0:
 
178
            self.logger('Checker for client {} (command "{}")'
 
179
                        ' succeeded'.format(self.properties["Name"],
 
180
                                            command), level=0)
183
181
            self.update()
184
182
            return
185
183
        # Checker failed
186
 
        if os.WIFEXITED(condition):
187
 
            self.logger('Checker for client {0} (command "{1}")'
188
 
                        ' failed with exit code {2}'
189
 
                        .format(self.properties["Name"], command,
190
 
                                os.WEXITSTATUS(condition)))
191
 
        elif os.WIFSIGNALED(condition):
192
 
            self.logger('Checker for client {0} (command "{1}") was'
193
 
                        ' killed by signal {2}'
194
 
                        .format(self.properties["Name"], command,
195
 
                                os.WTERMSIG(condition)))
196
 
        elif os.WCOREDUMP(condition):
197
 
            self.logger('Checker for client {0} (command "{1}")'
198
 
                        ' dumped core'
199
 
                        .format(self.properties["Name"], command))
 
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))
200
194
        else:
201
 
            self.logger('Checker for client {0} completed'
 
195
            self.logger('Checker for client {} completed'
202
196
                        ' mysteriously'
203
197
                        .format(self.properties["Name"]))
204
198
        self.update()
205
199
    
206
200
    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
 
201
        """Server signals that a checker started."""
 
202
        self.logger('Client {} started checker "{}"'
 
203
                    .format(self.properties["Name"],
 
204
                            command), level=0)
213
205
    
214
206
    def got_secret(self):
215
 
        self.logger('Client {0} received its secret'
 
207
        self.logger('Client {} received its secret'
216
208
                    .format(self.properties["Name"]))
217
209
    
218
210
    def need_approval(self, timeout, default):
219
211
        if not default:
220
 
            message = 'Client {0} needs approval within {1} seconds'
 
212
            message = 'Client {} needs approval within {} seconds'
221
213
        else:
222
 
            message = 'Client {0} will get its secret in {1} seconds'
 
214
            message = 'Client {} will get its secret in {} seconds'
223
215
        self.logger(message.format(self.properties["Name"],
224
216
                                   timeout/1000))
225
217
    
226
218
    def rejected(self, reason):
227
 
        self.logger('Client {0} was rejected; reason: {1}'
 
219
        self.logger('Client {} was rejected; reason: {}'
228
220
                    .format(self.properties["Name"], reason))
229
221
    
230
222
    def selectable(self):
274
266
            else:
275
267
                timer = datetime.timedelta()
276
268
            if self.properties["ApprovedByDefault"]:
277
 
                message = "Approval in {0}. (d)eny?"
 
269
                message = "Approval in {}. (d)eny?"
278
270
            else:
279
 
                message = "Denial in {0}. (a)pprove?"
 
271
                message = "Denial in {}. (a)pprove?"
280
272
            message = message.format(str(timer).rsplit(".", 1)[0])
281
273
            self.using_timer(True)
282
274
        elif self.properties["LastCheckerStatus"] != 0:
290
282
                timer = max(expires - datetime.datetime.utcnow(),
291
283
                            datetime.timedelta())
292
284
            message = ('A checker has failed! Time until client'
293
 
                       ' gets disabled: {0}'
 
285
                       ' gets disabled: {}'
294
286
                       .format(str(timer).rsplit(".", 1)[0]))
295
287
            self.using_timer(True)
296
288
        else:
297
289
            message = "enabled"
298
290
            self.using_timer(False)
299
 
        self._text = "{0}{1}".format(base, message)
 
291
        self._text = "{}{}".format(base, message)
300
292
        
301
293
        if not urwid.supports_unicode():
302
294
            self._text = self._text.encode("ascii", "replace")
377
369
        else:
378
370
            return key
379
371
    
380
 
    def property_changed(self, property=None, **kwargs):
381
 
        """Call self.update() if old value is not new value.
 
372
    def properties_changed(self, interface, properties, invalidated):
 
373
        """Call self.update() if any properties changed.
382
374
        This overrides the method from MandosClientPropertyCache"""
383
 
        property_name = str(property)
384
 
        old_value = self.properties.get(property_name)
385
 
        super(MandosClientWidget, self).property_changed(
386
 
            property=property, **kwargs)
387
 
        if self.properties.get(property_name) != old_value:
 
375
        old_values = { key: self.properties.get(key)
 
376
                       for key in properties.keys() }
 
377
        super(MandosClientWidget, self).properties_changed(
 
378
            interface, properties, invalidated)
 
379
        if any(old_values[key] != self.properties.get(key)
 
380
               for key in old_values):
388
381
            self.update()
389
382
 
390
383
 
404
397
    """This is the entire user interface - the whole screen
405
398
    with boxes, lists of client widgets, etc.
406
399
    """
407
 
    def __init__(self, max_log_length=1000):
 
400
    def __init__(self, max_log_length=1000, log_level=1):
408
401
        DBusGMainLoop(set_as_default=True)
409
402
        
410
403
        self.screen = urwid.curses_display.Screen()
448
441
        self.log = []
449
442
        self.max_log_length = max_log_length
450
443
        
 
444
        self.log_level = log_level
 
445
        
451
446
        # We keep a reference to the log widget so we can remove it
452
447
        # from the ListWalker without it getting destroyed
453
448
        self.logbox = ConstrainedListBox(self.log)
467
462
        self.main_loop = gobject.MainLoop()
468
463
    
469
464
    def client_not_found(self, fingerprint, address):
470
 
        self.log_message("Client with address {0} and fingerprint"
471
 
                         " {1} could not be found"
 
465
        self.log_message("Client with address {} and fingerprint {}"
 
466
                         " could not be found"
472
467
                         .format(address, fingerprint))
473
468
    
474
469
    def rebuild(self):
487
482
            self.uilist.append(self.logbox)
488
483
        self.topwidget = urwid.Pile(self.uilist)
489
484
    
490
 
    def log_message(self, message):
 
485
    def log_message(self, message, level=1):
491
486
        """Log message formatted with timestamp"""
 
487
        if level < self.log_level:
 
488
            return
492
489
        timestamp = datetime.datetime.now().isoformat()
493
 
        self.log_message_raw(timestamp + ": " + message)
 
490
        self.log_message_raw("{}: {}".format(timestamp, message),
 
491
                             level=level)
494
492
    
495
 
    def log_message_raw(self, markup):
 
493
    def log_message_raw(self, markup, level=1):
496
494
        """Add a log message to the log buffer."""
 
495
        if level < self.log_level:
 
496
            return
497
497
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
498
498
        if (self.max_log_length
499
499
            and len(self.log) > self.max_log_length):
506
506
        """Toggle visibility of the log buffer."""
507
507
        self.log_visible = not self.log_visible
508
508
        self.rebuild()
509
 
        #self.log_message("Log visibility changed to: "
510
 
        #                 + str(self.log_visible))
 
509
        self.log_message("Log visibility changed to: {}"
 
510
                         .format(self.log_visible), level=0)
511
511
    
512
512
    def change_log_display(self):
513
513
        """Change type of log display.
518
518
            self.log_wrap = "clip"
519
519
        for textwidget in self.log:
520
520
            textwidget.set_wrap_mode(self.log_wrap)
521
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
521
        self.log_message("Wrap mode: {}".format(self.log_wrap),
 
522
                         level=0)
522
523
    
523
524
    def find_and_remove_client(self, path, name):
524
525
        """Find a client by its object path and remove it.
529
530
            client = self.clients_dict[path]
530
531
        except KeyError:
531
532
            # not found?
532
 
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
533
            self.log_message("Unknown client {!r} ({!r}) removed"
533
534
                             .format(name, path))
534
535
            return
535
536
        client.delete()
653
654
            elif key == "window resize":
654
655
                self.size = self.screen.get_cols_rows()
655
656
                self.refresh()
656
 
            elif key == "\f":  # Ctrl-L
 
657
            elif key == "ctrl l":
 
658
                self.screen.clear()
657
659
                self.refresh()
658
660
            elif key == "l" or key == "D":
659
661
                self.toggle_log_display()
671
673
                                            "?: Help",
672
674
                                            "l: Log window toggle",
673
675
                                            "TAB: Switch window",
674
 
                                            "w: Wrap (log)"))))
 
676
                                            "w: Wrap (log lines)",
 
677
                                            "v: Toggle verbose log",
 
678
                                            ))))
675
679
                self.log_message_raw(("bold",
676
680
                                      "  "
677
681
                                      .join(("Clients:",
690
694
                else:
691
695
                    self.topwidget.set_focus(self.logbox)
692
696
                self.refresh()
 
697
            elif key == "v":
 
698
                if self.log_level == 0:
 
699
                    self.log_level = 1
 
700
                    self.log_message("Verbose mode: Off")
 
701
                else:
 
702
                    self.log_level = 0
 
703
                    self.log_message("Verbose mode: On")
693
704
            #elif (key == "end" or key == "meta >" or key == "G"
694
705
            #      or key == ">"):
695
706
            #    pass            # xxx end-of-buffer