/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: 2013-10-05 19:34:40 UTC
  • Revision ID: teddy@recompile.se-20131005193440-ldh85msvzxzmwhgr
* debian/control (Build-Depends): Depend on debhelper 8.9.7 for using
  "override-*-arch" and "override-*-indep" targets in debian/rules.
* debian/rules: Completely rewritten to use features from debhelper v7.
* plugins.d/mandos-client.c (fprintf_plus): Cast return value to
  return type; this fixes a warning since TEMP_FAILURE_RETRY seems to
  return a long int, not whatever type its inner expresson returns.
* plugins.d/password-prompt.c (fprintf_plus): - '' -

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-2014 Teddy Hogeborn
7
 
# Copyright © 2009-2014 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
32
32
 
33
33
import sys
34
34
import os
 
35
import signal
35
36
 
36
37
import datetime
37
38
 
48
49
 
49
50
import locale
50
51
 
51
 
if sys.version_info.major == 2:
 
52
if sys.version_info[0] == 2:
52
53
    str = unicode
53
54
 
54
55
locale.setlocale(locale.LC_ALL, '')
60
61
domain = 'se.recompile'
61
62
server_interface = domain + '.Mandos'
62
63
client_interface = domain + '.Mandos.Client'
63
 
version = "1.6.9"
 
64
version = "1.6.0"
64
65
 
65
66
def isoformat_to_datetime(iso):
66
67
    "Parse an ISO 8601 date string to a datetime.datetime()"
87
88
        self.proxy = proxy_object # Mandos Client proxy object
88
89
        self.properties = dict() if properties is None else properties
89
90
        self.property_changed_match = (
90
 
            self.proxy.connect_to_signal("PropertiesChanged",
91
 
                                         self.properties_changed,
92
 
                                         dbus.PROPERTIES_IFACE,
 
91
            self.proxy.connect_to_signal("PropertyChanged",
 
92
                                         self._property_changed,
 
93
                                         client_interface,
93
94
                                         byte_arrays=True))
94
95
        
95
96
        if properties is None:
100
101
        
101
102
        super(MandosClientPropertyCache, self).__init__(**kwargs)
102
103
    
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.
 
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.
106
111
        """
107
112
        # Update properties dict with new value
108
 
        self.properties.update(properties)
 
113
        self.properties[property] = value
109
114
    
110
115
    def delete(self):
111
116
        self.property_changed_match.remove()
157
162
                                         self.rejected,
158
163
                                         client_interface,
159
164
                                         byte_arrays=True))
160
 
        self.logger('Created client {}'
161
 
                    .format(self.properties["Name"]), level=0)
 
165
        #self.logger('Created client {0}'
 
166
        #            .format(self.properties["Name"]))
162
167
    
163
168
    def using_timer(self, flag):
164
169
        """Call this method with True or False when timer should be
175
180
    
176
181
    def checker_completed(self, exitstatus, condition, command):
177
182
        if exitstatus == 0:
178
 
            self.logger('Checker for client {} (command "{}")'
179
 
                        ' succeeded'.format(self.properties["Name"],
180
 
                                            command), level=0)
181
183
            self.update()
182
184
            return
183
185
        # Checker failed
184
186
        if os.WIFEXITED(condition):
185
 
            self.logger('Checker for client {} (command "{}") failed'
186
 
                        ' with exit code {}'
 
187
            self.logger('Checker for client {0} (command "{1}")'
 
188
                        ' failed with exit code {2}'
187
189
                        .format(self.properties["Name"], command,
188
190
                                os.WEXITSTATUS(condition)))
189
191
        elif os.WIFSIGNALED(condition):
190
 
            self.logger('Checker for client {} (command "{}") was'
191
 
                        ' killed by signal {}'
 
192
            self.logger('Checker for client {0} (command "{1}") was'
 
193
                        ' killed by signal {2}'
192
194
                        .format(self.properties["Name"], command,
193
195
                                os.WTERMSIG(condition)))
194
196
        elif os.WCOREDUMP(condition):
195
 
            self.logger('Checker for client {} (command "{}") dumped'
196
 
                        ' core'.format(self.properties["Name"],
197
 
                                       command))
 
197
            self.logger('Checker for client {0} (command "{1}")'
 
198
                        ' dumped core'
 
199
                        .format(self.properties["Name"], command))
198
200
        else:
199
 
            self.logger('Checker for client {} completed'
 
201
            self.logger('Checker for client {0} completed'
200
202
                        ' mysteriously'
201
203
                        .format(self.properties["Name"]))
202
204
        self.update()
203
205
    
204
206
    def checker_started(self, command):
205
 
        """Server signals that a checker started."""
206
 
        self.logger('Client {} started checker "{}"'
207
 
                    .format(self.properties["Name"],
208
 
                            command), level=0)
 
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
213
    
210
214
    def got_secret(self):
211
 
        self.logger('Client {} received its secret'
 
215
        self.logger('Client {0} received its secret'
212
216
                    .format(self.properties["Name"]))
213
217
    
214
218
    def need_approval(self, timeout, default):
215
219
        if not default:
216
 
            message = 'Client {} needs approval within {} seconds'
 
220
            message = 'Client {0} needs approval within {1} seconds'
217
221
        else:
218
 
            message = 'Client {} will get its secret in {} seconds'
 
222
            message = 'Client {0} will get its secret in {1} seconds'
219
223
        self.logger(message.format(self.properties["Name"],
220
224
                                   timeout/1000))
221
225
    
222
226
    def rejected(self, reason):
223
 
        self.logger('Client {} was rejected; reason: {}'
 
227
        self.logger('Client {0} was rejected; reason: {1}'
224
228
                    .format(self.properties["Name"], reason))
225
229
    
226
230
    def selectable(self):
270
274
            else:
271
275
                timer = datetime.timedelta()
272
276
            if self.properties["ApprovedByDefault"]:
273
 
                message = "Approval in {}. (d)eny?"
 
277
                message = "Approval in {0}. (d)eny?"
274
278
            else:
275
 
                message = "Denial in {}. (a)pprove?"
 
279
                message = "Denial in {0}. (a)pprove?"
276
280
            message = message.format(str(timer).rsplit(".", 1)[0])
277
281
            self.using_timer(True)
278
282
        elif self.properties["LastCheckerStatus"] != 0:
286
290
                timer = max(expires - datetime.datetime.utcnow(),
287
291
                            datetime.timedelta())
288
292
            message = ('A checker has failed! Time until client'
289
 
                       ' gets disabled: {}'
 
293
                       ' gets disabled: {0}'
290
294
                       .format(str(timer).rsplit(".", 1)[0]))
291
295
            self.using_timer(True)
292
296
        else:
293
297
            message = "enabled"
294
298
            self.using_timer(False)
295
 
        self._text = "{}{}".format(base, message)
 
299
        self._text = "{0}{1}".format(base, message)
296
300
        
297
301
        if not urwid.supports_unicode():
298
302
            self._text = self._text.encode("ascii", "replace")
373
377
        else:
374
378
            return key
375
379
    
376
 
    def properties_changed(self, interface, properties, invalidated):
377
 
        """Call self.update() if any properties changed.
 
380
    def property_changed(self, property=None, **kwargs):
 
381
        """Call self.update() if old value is not new value.
378
382
        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):
 
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:
385
388
            self.update()
386
389
 
387
390
 
401
404
    """This is the entire user interface - the whole screen
402
405
    with boxes, lists of client widgets, etc.
403
406
    """
404
 
    def __init__(self, max_log_length=1000, log_level=1):
 
407
    def __init__(self, max_log_length=1000):
405
408
        DBusGMainLoop(set_as_default=True)
406
409
        
407
410
        self.screen = urwid.curses_display.Screen()
445
448
        self.log = []
446
449
        self.max_log_length = max_log_length
447
450
        
448
 
        self.log_level = log_level
449
 
        
450
451
        # We keep a reference to the log widget so we can remove it
451
452
        # from the ListWalker without it getting destroyed
452
453
        self.logbox = ConstrainedListBox(self.log)
466
467
        self.main_loop = gobject.MainLoop()
467
468
    
468
469
    def client_not_found(self, fingerprint, address):
469
 
        self.log_message("Client with address {} and fingerprint {}"
470
 
                         " could not be found"
 
470
        self.log_message("Client with address {0} and fingerprint"
 
471
                         " {1} could not be found"
471
472
                         .format(address, fingerprint))
472
473
    
473
474
    def rebuild(self):
486
487
            self.uilist.append(self.logbox)
487
488
        self.topwidget = urwid.Pile(self.uilist)
488
489
    
489
 
    def log_message(self, message, level=1):
 
490
    def log_message(self, message):
490
491
        """Log message formatted with timestamp"""
491
 
        if level < self.log_level:
492
 
            return
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
        #                 + str(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()
658
653
            elif key == "window resize":
659
654
                self.size = self.screen.get_cols_rows()
660
655
                self.refresh()
661
 
            elif key == "ctrl l":
662
 
                self.screen.clear()
 
656
            elif key == "\f":  # Ctrl-L
663
657
                self.refresh()
664
658
            elif key == "l" or key == "D":
665
659
                self.toggle_log_display()
677
671
                                            "?: Help",
678
672
                                            "l: Log window toggle",
679
673
                                            "TAB: Switch window",
680
 
                                            "w: Wrap (log lines)",
681
 
                                            "v: Toggle verbose log",
682
 
                                            ))))
 
674
                                            "w: Wrap (log)"))))
683
675
                self.log_message_raw(("bold",
684
676
                                      "  "
685
677
                                      .join(("Clients:",
698
690
                else:
699
691
                    self.topwidget.set_focus(self.logbox)
700
692
                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
693
            #elif (key == "end" or key == "meta >" or key == "G"
709
694
            #      or key == ">"):
710
695
            #    pass            # xxx end-of-buffer