/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

* mandos-monitor: Speedup: Use properties from D-Bus
                  GetAllClientsWithProperties() call.  Also use
                  super() properly - only use keyword arguments and
                  strip them off as "kwargs" is passed on.
  (MandosClientPropertyCache.__init__): Take new "properties"
                                        argument; use it to skip
                                        calling D-Bus GetAll() method.
                                        Call super().  Bind self._
  (MandosClientPropertyCache._property_changed): New helper function.
  (MandosClientPropertyCache.property_changed): Changed to take
                                                keyword arguments.
  (MandosClientPropertyCache.delete): Bug fix: Don't call
                                      super().__init__().
  (MandosClientWidget.__init__): Don't take *args.  Strip used keyword
                                 arguments before calling super().
  (MandosClientWidget.property_changed): Removed dead code.
  (MandosClientWidget.delete): Don't take *args.
  (MandosClientWidget.property_changed): Don't take "value" argument,
                                         since it is not used.
  (ConstrainedListBox.keypress): Take *args, **kwargs and pass them on
                                 to super().

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-2011 Teddy Hogeborn
7
 
# Copyright © 2009-2011 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
17
17
#     GNU General Public License for more details.
18
18
# 
19
19
# You should have received a copy of the GNU General Public License
20
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
20
# along with this program.  If not, see
 
21
# <http://www.gnu.org/licenses/>.
21
22
# 
22
23
# Contact the authors at <mandos@recompile.se>.
23
24
# 
25
26
from __future__ import (division, absolute_import, print_function,
26
27
                        unicode_literals)
27
28
 
 
29
from future_builtins import *
 
30
 
28
31
import sys
29
32
import os
30
33
import signal
52
55
domain = 'se.recompile'
53
56
server_interface = domain + '.Mandos'
54
57
client_interface = domain + '.Mandos.Client'
55
 
version = "1.4.1"
 
58
version = "1.5.3"
56
59
 
57
60
# Always run in monochrome mode
58
61
urwid.curses_display.curses.has_colors = lambda : False
83
86
    properties and calls a hook function when any of them are
84
87
    changed.
85
88
    """
86
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
89
    def __init__(self, proxy_object=None, properties=None, **kwargs):
87
90
        self.proxy = proxy_object # Mandos Client proxy object
88
 
        
89
 
        self.properties = dict()
 
91
        self.properties = dict() if properties is None else properties
90
92
        self.property_changed_match = (
91
93
            self.proxy.connect_to_signal("PropertyChanged",
92
 
                                         self.property_changed,
 
94
                                         self._property_changed,
93
95
                                         client_interface,
94
96
                                         byte_arrays=True))
95
97
        
96
 
        self.properties.update(
97
 
            self.proxy.GetAll(client_interface,
98
 
                              dbus_interface = dbus.PROPERTIES_IFACE))
99
 
 
100
 
        #XXX This breaks good super behaviour
101
 
#        super(MandosClientPropertyCache, self).__init__(
102
 
#            *args, **kwargs)
 
98
        if properties is None:
 
99
            self.properties.update(
 
100
                self.proxy.GetAll(client_interface,
 
101
                                  dbus_interface
 
102
                                  = dbus.PROPERTIES_IFACE))
 
103
        
 
104
        super(MandosClientPropertyCache, self).__init__(**kwargs)
 
105
    
 
106
    def _property_changed(self, property, value):
 
107
        """Helper which takes positional arguments"""
 
108
        return self.property_changed(property=property, value=value)
103
109
    
104
110
    def property_changed(self, property=None, value=None):
105
111
        """This is called whenever we get a PropertyChanged signal
108
114
        # Update properties dict with new value
109
115
        self.properties[property] = value
110
116
    
111
 
    def delete(self, *args, **kwargs):
 
117
    def delete(self):
112
118
        self.property_changed_match.remove()
113
 
        super(MandosClientPropertyCache, self).__init__(
114
 
            *args, **kwargs)
115
119
 
116
120
 
117
121
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
119
123
    """
120
124
    
121
125
    def __init__(self, server_proxy_object=None, update_hook=None,
122
 
                 delete_hook=None, logger=None, *args, **kwargs):
 
126
                 delete_hook=None, logger=None, **kwargs):
123
127
        # Called on update
124
128
        self.update_hook = update_hook
125
129
        # Called on delete
131
135
        
132
136
        self._update_timer_callback_tag = None
133
137
        self._update_timer_callback_lock = 0
134
 
        self.last_checker_failed = False
135
138
        
136
139
        # The widget shown normally
137
140
        self._text_widget = urwid.Text("")
138
141
        # The widget shown when we have focus
139
142
        self._focus_text_widget = urwid.Text("")
140
 
        super(MandosClientWidget, self).__init__(
141
 
            update_hook=update_hook, delete_hook=delete_hook,
142
 
            *args, **kwargs)
 
143
        super(MandosClientWidget, self).__init__(**kwargs)
143
144
        self.update()
144
145
        self.opened = False
145
146
        
146
147
        last_checked_ok = isoformat_to_datetime(self.properties
147
148
                                                ["LastCheckedOK"])
148
 
        if last_checked_ok is None:
149
 
            self.last_checker_failed = True
150
 
        else:
151
 
            self.last_checker_failed = ((datetime.datetime.utcnow()
152
 
                                         - last_checked_ok)
153
 
                                        > datetime.timedelta
154
 
                                        (milliseconds=
155
 
                                         self.properties
156
 
                                         ["Interval"]))
157
149
        
158
 
        if self.last_checker_failed:
 
150
        if self.properties ["LastCheckerStatus"] != 0:
159
151
            self.using_timer(True)
160
152
        
161
153
        if self.need_approval:
182
174
                                         self.rejected,
183
175
                                         client_interface,
184
176
                                         byte_arrays=True))
185
 
        #self.logger('Created client %s' % (self.properties["Name"]))
 
177
        #self.logger('Created client {0}'
 
178
        #            .format(self.properties["Name"]))
186
179
    
187
180
    def property_changed(self, property=None, value=None):
188
181
        super(self, MandosClientWidget).property_changed(property,
189
182
                                                         value)
190
183
        if property == "ApprovalPending":
191
184
            using_timer(bool(value))
192
 
        
 
185
        if property == "LastCheckerStatus":
 
186
            using_timer(value != 0)
 
187
            #self.logger('Checker for client {0} (command "{1}") was '
 
188
            #            ' successful'.format(self.properties["Name"],
 
189
            #                                 command))
 
190
    
193
191
    def using_timer(self, flag):
194
192
        """Call this method with True or False when timer should be
195
193
        activated or deactivated.
210
208
    
211
209
    def checker_completed(self, exitstatus, condition, command):
212
210
        if exitstatus == 0:
213
 
            if self.last_checker_failed:
214
 
                self.last_checker_failed = False
215
 
                self.using_timer(False)
216
 
            #self.logger('Checker for client %s (command "%s")'
217
 
            #            ' was successful'
218
 
            #            % (self.properties["Name"], command))
219
211
            self.update()
220
212
            return
221
213
        # Checker failed
222
 
        if not self.last_checker_failed:
223
 
            self.last_checker_failed = True
224
 
            self.using_timer(True)
225
214
        if os.WIFEXITED(condition):
226
 
            self.logger('Checker for client %s (command "%s")'
227
 
                        ' failed with exit code %s'
228
 
                        % (self.properties["Name"], command,
229
 
                           os.WEXITSTATUS(condition)))
 
215
            self.logger('Checker for client {0} (command "{1}")'
 
216
                        ' failed with exit code {2}'
 
217
                        .format(self.properties["Name"], command,
 
218
                                os.WEXITSTATUS(condition)))
230
219
        elif os.WIFSIGNALED(condition):
231
 
            self.logger('Checker for client %s (command "%s")'
232
 
                        ' was killed by signal %s'
233
 
                        % (self.properties["Name"], command,
234
 
                           os.WTERMSIG(condition)))
 
220
            self.logger('Checker for client {0} (command "{1}") was'
 
221
                        ' killed by signal {2}'
 
222
                        .format(self.properties["Name"], command,
 
223
                                os.WTERMSIG(condition)))
235
224
        elif os.WCOREDUMP(condition):
236
 
            self.logger('Checker for client %s (command "%s")'
 
225
            self.logger('Checker for client {0} (command "{1}")'
237
226
                        ' dumped core'
238
 
                        % (self.properties["Name"], command))
 
227
                        .format(self.properties["Name"], command))
239
228
        else:
240
 
            self.logger('Checker for client %s completed'
241
 
                        ' mysteriously')
 
229
            self.logger('Checker for client {0} completed'
 
230
                        ' mysteriously'
 
231
                        .format(self.properties["Name"]))
242
232
        self.update()
243
233
    
244
234
    def checker_started(self, command):
245
235
        """Server signals that a checker started. This could be useful
246
236
           to log in the future. """
247
 
        #self.logger('Client %s started checker "%s"'
248
 
        #            % (self.properties["Name"], unicode(command)))
 
237
        #self.logger('Client {0} started checker "{1}"'
 
238
        #            .format(self.properties["Name"],
 
239
        #                    unicode(command)))
249
240
        pass
250
241
    
251
242
    def got_secret(self):
252
 
        self.last_checker_failed = False
253
 
        self.logger('Client %s received its secret'
254
 
                    % self.properties["Name"])
 
243
        self.logger('Client {0} received its secret'
 
244
                    .format(self.properties["Name"]))
255
245
    
256
246
    def need_approval(self, timeout, default):
257
247
        if not default:
258
 
            message = 'Client %s needs approval within %s seconds'
 
248
            message = 'Client {0} needs approval within {1} seconds'
259
249
        else:
260
 
            message = 'Client %s will get its secret in %s seconds'
261
 
        self.logger(message
262
 
                    % (self.properties["Name"], timeout/1000))
 
250
            message = 'Client {0} will get its secret in {1} seconds'
 
251
        self.logger(message.format(self.properties["Name"],
 
252
                                   timeout/1000))
263
253
        self.using_timer(True)
264
254
    
265
255
    def rejected(self, reason):
266
 
        self.logger('Client %s was rejected; reason: %s'
267
 
                    % (self.properties["Name"], reason))
 
256
        self.logger('Client {0} was rejected; reason: {1}'
 
257
                    .format(self.properties["Name"], reason))
268
258
    
269
259
    def selectable(self):
270
260
        """Make this a "selectable" widget.
296
286
        # Rebuild focus and non-focus widgets using current properties
297
287
 
298
288
        # Base part of a client. Name!
299
 
        base = ('%(name)s: '
300
 
                      % {"name": self.properties["Name"]})
 
289
        base = '{name}: '.format(name=self.properties["Name"])
301
290
        if not self.properties["Enabled"]:
302
291
            message = "DISABLED"
303
292
        elif self.properties["ApprovalPending"]:
312
301
            else:
313
302
                timer = datetime.timedelta()
314
303
            if self.properties["ApprovedByDefault"]:
315
 
                message = "Approval in %s. (d)eny?"
 
304
                message = "Approval in {0}. (d)eny?"
316
305
            else:
317
 
                message = "Denial in %s. (a)pprove?"
318
 
            message = message % unicode(timer).rsplit(".", 1)[0]
319
 
        elif self.last_checker_failed:
320
 
            # When checker has failed, print a timer until client expires
 
306
                message = "Denial in {0}. (a)pprove?"
 
307
            message = message.format(unicode(timer).rsplit(".", 1)[0])
 
308
        elif self.properties["LastCheckerStatus"] != 0:
 
309
            # When checker has failed, show timer until client expires
321
310
            expires = self.properties["Expires"]
322
311
            if expires == "":
323
312
                timer = datetime.timedelta(0)
324
313
            else:
325
 
                expires = datetime.datetime.strptime(expires,
326
 
                                                     '%Y-%m-%dT%H:%M:%S.%f')
 
314
                expires = (datetime.datetime.strptime
 
315
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
327
316
                timer = expires - datetime.datetime.utcnow()
328
317
            message = ('A checker has failed! Time until client'
329
 
                       ' gets disabled: %s'
330
 
                           % unicode(timer).rsplit(".", 1)[0])
 
318
                       ' gets disabled: {0}'
 
319
                       .format(unicode(timer).rsplit(".", 1)[0]))
331
320
        else:
332
321
            message = "enabled"
333
 
        self._text = "%s%s" % (base, message)
 
322
        self._text = "{0}{1}".format(base, message)
334
323
            
335
324
        if not urwid.supports_unicode():
336
325
            self._text = self._text.encode("ascii", "replace")
354
343
        self.update()
355
344
        return True             # Keep calling this
356
345
    
357
 
    def delete(self, *args, **kwargs):
 
346
    def delete(self, **kwargs):
358
347
        if self._update_timer_callback_tag is not None:
359
348
            gobject.source_remove(self._update_timer_callback_tag)
360
349
            self._update_timer_callback_tag = None
363
352
        self.match_objects = ()
364
353
        if self.delete_hook is not None:
365
354
            self.delete_hook(self)
366
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
 
355
        return super(MandosClientWidget, self).delete(**kwargs)
367
356
    
368
357
    def render(self, maxcolrow, focus=False):
369
358
        """Render differently if we have focus.
411
400
        else:
412
401
            return key
413
402
    
414
 
    def property_changed(self, property=None, value=None,
415
 
                         *args, **kwargs):
 
403
    def property_changed(self, property=None, **kwargs):
416
404
        """Call self.update() if old value is not new value.
417
405
        This overrides the method from MandosClientPropertyCache"""
418
406
        property_name = unicode(property)
419
407
        old_value = self.properties.get(property_name)
420
408
        super(MandosClientWidget, self).property_changed(
421
 
            property=property, value=value, *args, **kwargs)
 
409
            property=property, **kwargs)
422
410
        if self.properties.get(property_name) != old_value:
423
411
            self.update()
424
412
 
428
416
    "down" key presses, thus not allowing any containing widgets to
429
417
    use them as an excuse to shift focus away from this widget.
430
418
    """
431
 
    def keypress(self, maxcolrow, key):
432
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
419
    def keypress(self, *args, **kwargs):
 
420
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
433
421
        if ret in ("up", "down"):
434
422
            return
435
423
        return ret
501
489
        self.main_loop = gobject.MainLoop()
502
490
    
503
491
    def client_not_found(self, fingerprint, address):
504
 
        self.log_message(("Client with address %s and fingerprint %s"
505
 
                          " could not be found" % (address,
506
 
                                                    fingerprint)))
 
492
        self.log_message("Client with address {0} and fingerprint"
 
493
                         " {1} could not be found"
 
494
                         .format(address, fingerprint))
507
495
    
508
496
    def rebuild(self):
509
497
        """This rebuilds the User Interface.
562
550
            client = self.clients_dict[path]
563
551
        except KeyError:
564
552
            # not found?
565
 
            self.log_message("Unknown client %r (%r) removed", name,
566
 
                             path)
 
553
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
554
                             .format(name, path))
567
555
            return
568
556
        client.delete()
569
557
    
650
638
                                               logger
651
639
                                               =self.log_message),
652
640
                            path=path)
653
 
 
 
641
        
654
642
        self.refresh()
655
643
        self._input_callback_tag = (gobject.io_add_watch
656
644
                                    (sys.stdin.fileno(),