/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.xml (CHECKING): Don't claim that a successful secret request
                         is equivalent to a successful checker.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
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
21
 
# <http://www.gnu.org/licenses/>.
 
20
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
21
# 
23
22
# Contact the authors at <mandos@recompile.se>.
24
23
# 
26
25
from __future__ import (division, absolute_import, print_function,
27
26
                        unicode_literals)
28
27
 
29
 
from future_builtins import *
30
 
 
31
28
import sys
32
29
import os
33
30
import signal
55
52
domain = 'se.recompile'
56
53
server_interface = domain + '.Mandos'
57
54
client_interface = domain + '.Mandos.Client'
58
 
version = "1.5.3"
 
55
version = "1.5.2"
59
56
 
60
57
# Always run in monochrome mode
61
58
urwid.curses_display.curses.has_colors = lambda : False
86
83
    properties and calls a hook function when any of them are
87
84
    changed.
88
85
    """
89
 
    def __init__(self, proxy_object=None, properties=None, **kwargs):
 
86
    def __init__(self, proxy_object=None, *args, **kwargs):
90
87
        self.proxy = proxy_object # Mandos Client proxy object
91
 
        self.properties = dict() if properties is None else properties
 
88
        
 
89
        self.properties = dict()
92
90
        self.property_changed_match = (
93
91
            self.proxy.connect_to_signal("PropertyChanged",
94
 
                                         self._property_changed,
 
92
                                         self.property_changed,
95
93
                                         client_interface,
96
94
                                         byte_arrays=True))
97
95
        
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)
 
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)
109
103
    
110
104
    def property_changed(self, property=None, value=None):
111
105
        """This is called whenever we get a PropertyChanged signal
114
108
        # Update properties dict with new value
115
109
        self.properties[property] = value
116
110
    
117
 
    def delete(self):
 
111
    def delete(self, *args, **kwargs):
118
112
        self.property_changed_match.remove()
 
113
        super(MandosClientPropertyCache, self).__init__(
 
114
            *args, **kwargs)
119
115
 
120
116
 
121
117
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
123
119
    """
124
120
    
125
121
    def __init__(self, server_proxy_object=None, update_hook=None,
126
 
                 delete_hook=None, logger=None, **kwargs):
 
122
                 delete_hook=None, logger=None, *args, **kwargs):
127
123
        # Called on update
128
124
        self.update_hook = update_hook
129
125
        # Called on delete
140
136
        self._text_widget = urwid.Text("")
141
137
        # The widget shown when we have focus
142
138
        self._focus_text_widget = urwid.Text("")
143
 
        super(MandosClientWidget, self).__init__(**kwargs)
 
139
        super(MandosClientWidget, self).__init__(
 
140
            update_hook=update_hook, delete_hook=delete_hook,
 
141
            *args, **kwargs)
144
142
        self.update()
145
143
        self.opened = False
146
144
        
174
172
                                         self.rejected,
175
173
                                         client_interface,
176
174
                                         byte_arrays=True))
177
 
        #self.logger('Created client {0}'
178
 
        #            .format(self.properties["Name"]))
 
175
        #self.logger('Created client %s' % (self.properties["Name"]))
179
176
    
180
177
    def property_changed(self, property=None, value=None):
181
178
        super(self, MandosClientWidget).property_changed(property,
184
181
            using_timer(bool(value))
185
182
        if property == "LastCheckerStatus":
186
183
            using_timer(value != 0)
187
 
            #self.logger('Checker for client {0} (command "{1}") was '
188
 
            #            ' successful'.format(self.properties["Name"],
189
 
            #                                 command))
 
184
            #self.logger('Checker for client %s (command "%s")'
 
185
            #            ' was successful'
 
186
            #            % (self.properties["Name"], command))
190
187
    
191
188
    def using_timer(self, flag):
192
189
        """Call this method with True or False when timer should be
212
209
            return
213
210
        # Checker failed
214
211
        if os.WIFEXITED(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)))
 
212
            self.logger('Checker for client %s (command "%s")'
 
213
                        ' failed with exit code %s'
 
214
                        % (self.properties["Name"], command,
 
215
                           os.WEXITSTATUS(condition)))
219
216
        elif os.WIFSIGNALED(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)))
 
217
            self.logger('Checker for client %s (command "%s")'
 
218
                        ' was killed by signal %s'
 
219
                        % (self.properties["Name"], command,
 
220
                           os.WTERMSIG(condition)))
224
221
        elif os.WCOREDUMP(condition):
225
 
            self.logger('Checker for client {0} (command "{1}")'
 
222
            self.logger('Checker for client %s (command "%s")'
226
223
                        ' dumped core'
227
 
                        .format(self.properties["Name"], command))
 
224
                        % (self.properties["Name"], command))
228
225
        else:
229
 
            self.logger('Checker for client {0} completed'
230
 
                        ' mysteriously'
231
 
                        .format(self.properties["Name"]))
 
226
            self.logger('Checker for client %s completed'
 
227
                        ' mysteriously')
232
228
        self.update()
233
229
    
234
230
    def checker_started(self, command):
235
231
        """Server signals that a checker started. This could be useful
236
232
           to log in the future. """
237
 
        #self.logger('Client {0} started checker "{1}"'
238
 
        #            .format(self.properties["Name"],
239
 
        #                    unicode(command)))
 
233
        #self.logger('Client %s started checker "%s"'
 
234
        #            % (self.properties["Name"], unicode(command)))
240
235
        pass
241
236
    
242
237
    def got_secret(self):
243
 
        self.logger('Client {0} received its secret'
244
 
                    .format(self.properties["Name"]))
 
238
        self.logger('Client %s received its secret'
 
239
                    % self.properties["Name"])
245
240
    
246
241
    def need_approval(self, timeout, default):
247
242
        if not default:
248
 
            message = 'Client {0} needs approval within {1} seconds'
 
243
            message = 'Client %s needs approval within %s seconds'
249
244
        else:
250
 
            message = 'Client {0} will get its secret in {1} seconds'
251
 
        self.logger(message.format(self.properties["Name"],
252
 
                                   timeout/1000))
 
245
            message = 'Client %s will get its secret in %s seconds'
 
246
        self.logger(message
 
247
                    % (self.properties["Name"], timeout/1000))
253
248
        self.using_timer(True)
254
249
    
255
250
    def rejected(self, reason):
256
 
        self.logger('Client {0} was rejected; reason: {1}'
257
 
                    .format(self.properties["Name"], reason))
 
251
        self.logger('Client %s was rejected; reason: %s'
 
252
                    % (self.properties["Name"], reason))
258
253
    
259
254
    def selectable(self):
260
255
        """Make this a "selectable" widget.
286
281
        # Rebuild focus and non-focus widgets using current properties
287
282
 
288
283
        # Base part of a client. Name!
289
 
        base = '{name}: '.format(name=self.properties["Name"])
 
284
        base = ('%(name)s: '
 
285
                      % {"name": self.properties["Name"]})
290
286
        if not self.properties["Enabled"]:
291
287
            message = "DISABLED"
292
288
        elif self.properties["ApprovalPending"]:
301
297
            else:
302
298
                timer = datetime.timedelta()
303
299
            if self.properties["ApprovedByDefault"]:
304
 
                message = "Approval in {0}. (d)eny?"
 
300
                message = "Approval in %s. (d)eny?"
305
301
            else:
306
 
                message = "Denial in {0}. (a)pprove?"
307
 
            message = message.format(unicode(timer).rsplit(".", 1)[0])
 
302
                message = "Denial in %s. (a)pprove?"
 
303
            message = message % unicode(timer).rsplit(".", 1)[0]
308
304
        elif self.properties["LastCheckerStatus"] != 0:
309
 
            # When checker has failed, show timer until client expires
 
305
            # When checker has failed, print a timer until client expires
310
306
            expires = self.properties["Expires"]
311
307
            if expires == "":
312
308
                timer = datetime.timedelta(0)
313
309
            else:
314
 
                expires = (datetime.datetime.strptime
315
 
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
 
310
                expires = datetime.datetime.strptime(expires,
 
311
                                                     '%Y-%m-%dT%H:%M:%S.%f')
316
312
                timer = expires - datetime.datetime.utcnow()
317
313
            message = ('A checker has failed! Time until client'
318
 
                       ' gets disabled: {0}'
319
 
                       .format(unicode(timer).rsplit(".", 1)[0]))
 
314
                       ' gets disabled: %s'
 
315
                           % unicode(timer).rsplit(".", 1)[0])
320
316
        else:
321
317
            message = "enabled"
322
 
        self._text = "{0}{1}".format(base, message)
 
318
        self._text = "%s%s" % (base, message)
323
319
            
324
320
        if not urwid.supports_unicode():
325
321
            self._text = self._text.encode("ascii", "replace")
343
339
        self.update()
344
340
        return True             # Keep calling this
345
341
    
346
 
    def delete(self, **kwargs):
 
342
    def delete(self, *args, **kwargs):
347
343
        if self._update_timer_callback_tag is not None:
348
344
            gobject.source_remove(self._update_timer_callback_tag)
349
345
            self._update_timer_callback_tag = None
352
348
        self.match_objects = ()
353
349
        if self.delete_hook is not None:
354
350
            self.delete_hook(self)
355
 
        return super(MandosClientWidget, self).delete(**kwargs)
 
351
        return super(MandosClientWidget, self).delete(*args, **kwargs)
356
352
    
357
353
    def render(self, maxcolrow, focus=False):
358
354
        """Render differently if we have focus.
400
396
        else:
401
397
            return key
402
398
    
403
 
    def property_changed(self, property=None, **kwargs):
 
399
    def property_changed(self, property=None, value=None,
 
400
                         *args, **kwargs):
404
401
        """Call self.update() if old value is not new value.
405
402
        This overrides the method from MandosClientPropertyCache"""
406
403
        property_name = unicode(property)
407
404
        old_value = self.properties.get(property_name)
408
405
        super(MandosClientWidget, self).property_changed(
409
 
            property=property, **kwargs)
 
406
            property=property, value=value, *args, **kwargs)
410
407
        if self.properties.get(property_name) != old_value:
411
408
            self.update()
412
409
 
416
413
    "down" key presses, thus not allowing any containing widgets to
417
414
    use them as an excuse to shift focus away from this widget.
418
415
    """
419
 
    def keypress(self, *args, **kwargs):
420
 
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
 
416
    def keypress(self, maxcolrow, key):
 
417
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
421
418
        if ret in ("up", "down"):
422
419
            return
423
420
        return ret
489
486
        self.main_loop = gobject.MainLoop()
490
487
    
491
488
    def client_not_found(self, fingerprint, address):
492
 
        self.log_message("Client with address {0} and fingerprint"
493
 
                         " {1} could not be found"
494
 
                         .format(address, fingerprint))
 
489
        self.log_message(("Client with address %s and fingerprint %s"
 
490
                          " could not be found" % (address,
 
491
                                                    fingerprint)))
495
492
    
496
493
    def rebuild(self):
497
494
        """This rebuilds the User Interface.
550
547
            client = self.clients_dict[path]
551
548
        except KeyError:
552
549
            # not found?
553
 
            self.log_message("Unknown client {0!r} ({1!r}) removed"
554
 
                             .format(name, path))
 
550
            self.log_message("Unknown client %r (%r) removed", name,
 
551
                             path)
555
552
            return
556
553
        client.delete()
557
554
    
638
635
                                               logger
639
636
                                               =self.log_message),
640
637
                            path=path)
641
 
        
 
638
 
642
639
        self.refresh()
643
640
        self._input_callback_tag = (gobject.io_add_watch
644
641
                                    (sys.stdin.fileno(),