101
101
        super(MandosClientPropertyCache, self).__init__(**kwargs)
 
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.
 
 
103
    def _property_changed(self, property, value):
 
 
104
        """Helper which takes positional arguments"""
 
 
105
        return self.property_changed(property=property, value=value)
 
 
107
    def property_changed(self, property=None, value=None):
 
 
108
        """This is called whenever we get a PropertyChanged signal
 
 
109
        It updates the changed property in the "properties" dict.
 
107
111
        # Update properties dict with new value
 
108
 
        self.properties.update(properties)
 
 
112
        self.properties[property] = value
 
110
114
    def delete(self):
 
111
115
        self.property_changed_match.remove()
 
 
173
177
            gobject.source_remove(self._update_timer_callback_tag)
 
174
178
            self._update_timer_callback_tag = None
 
176
 
    def checker_completed(self, exitstatus, signal, command):
 
 
180
    def checker_completed(self, exitstatus, condition, command):
 
177
181
        if exitstatus == 0:
 
178
 
            self.logger('Checker for client {} (command "{}")'
 
179
 
                        ' succeeded'.format(self.properties["Name"],
 
185
 
            self.logger('Checker for client {} (command "{}") failed'
 
187
 
                        .format(self.properties["Name"], command,
 
190
 
            self.logger('Checker for client {} (command "{}") was'
 
191
 
                        ' killed by signal {}'
 
192
 
                        .format(self.properties["Name"], command,
 
 
185
        if os.WIFEXITED(condition):
 
 
186
            self.logger('Checker for client {0} (command "{1}")'
 
 
187
                        ' failed with exit code {2}'
 
 
188
                        .format(self.properties["Name"], command,
 
 
189
                                os.WEXITSTATUS(condition)))
 
 
190
        elif os.WIFSIGNALED(condition):
 
 
191
            self.logger('Checker for client {0} (command "{1}") was'
 
 
192
                        ' killed by signal {2}'
 
 
193
                        .format(self.properties["Name"], command,
 
 
194
                                os.WTERMSIG(condition)))
 
 
195
        elif os.WCOREDUMP(condition):
 
 
196
            self.logger('Checker for client {0} (command "{1}")'
 
 
198
                        .format(self.properties["Name"], command))
 
195
 
            self.logger('Checker for client {} completed'
 
 
200
            self.logger('Checker for client {0} completed'
 
197
202
                        .format(self.properties["Name"]))
 
200
205
    def checker_started(self, command):
 
201
 
        """Server signals that a checker started."""
 
202
 
        self.logger('Client {} started checker "{}"'
 
203
 
                    .format(self.properties["Name"],
 
 
206
        """Server signals that a checker started. This could be useful
 
 
207
           to log in the future. """
 
 
208
        #self.logger('Client {0} started checker "{1}"'
 
 
209
        #            .format(self.properties["Name"],
 
206
213
    def got_secret(self):
 
207
 
        self.logger('Client {} received its secret'
 
 
214
        self.logger('Client {0} received its secret'
 
208
215
                    .format(self.properties["Name"]))
 
210
217
    def need_approval(self, timeout, default):
 
212
 
            message = 'Client {} needs approval within {} seconds'
 
 
219
            message = 'Client {0} needs approval within {1} seconds'
 
214
 
            message = 'Client {} will get its secret in {} seconds'
 
 
221
            message = 'Client {0} will get its secret in {1} seconds'
 
215
222
        self.logger(message.format(self.properties["Name"],
 
218
225
    def rejected(self, reason):
 
219
 
        self.logger('Client {} was rejected; reason: {}'
 
 
226
        self.logger('Client {0} was rejected; reason: {1}'
 
220
227
                    .format(self.properties["Name"], reason))
 
222
229
    def selectable(self):
 
 
267
274
                timer = datetime.timedelta()
 
268
275
            if self.properties["ApprovedByDefault"]:
 
269
 
                message = "Approval in {}. (d)eny?"
 
 
276
                message = "Approval in {0}. (d)eny?"
 
271
 
                message = "Denial in {}. (a)pprove?"
 
 
278
                message = "Denial in {0}. (a)pprove?"
 
272
279
            message = message.format(str(timer).rsplit(".", 1)[0])
 
273
280
            self.using_timer(True)
 
274
281
        elif self.properties["LastCheckerStatus"] != 0:
 
 
282
289
                timer = max(expires - datetime.datetime.utcnow(),
 
283
290
                            datetime.timedelta())
 
284
291
            message = ('A checker has failed! Time until client'
 
 
292
                       ' gets disabled: {0}'
 
286
293
                       .format(str(timer).rsplit(".", 1)[0]))
 
287
294
            self.using_timer(True)
 
289
296
            message = "enabled"
 
290
297
            self.using_timer(False)
 
291
 
        self._text = "{}{}".format(base, message)
 
 
298
        self._text = "{0}{1}".format(base, message)
 
293
300
        if not urwid.supports_unicode():
 
294
301
            self._text = self._text.encode("ascii", "replace")
 
 
372
 
    def properties_changed(self, interface, properties, invalidated):
 
373
 
        """Call self.update() if any properties changed.
 
 
379
    def property_changed(self, property=None, **kwargs):
 
 
380
        """Call self.update() if old value is not new value.
 
374
381
        This overrides the method from MandosClientPropertyCache"""
 
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):
 
 
382
        property_name = str(property)
 
 
383
        old_value = self.properties.get(property_name)
 
 
384
        super(MandosClientWidget, self).property_changed(
 
 
385
            property=property, **kwargs)
 
 
386
        if self.properties.get(property_name) != old_value:
 
 
397
403
    """This is the entire user interface - the whole screen
 
398
404
    with boxes, lists of client widgets, etc.
 
400
 
    def __init__(self, max_log_length=1000, log_level=1):
 
 
406
    def __init__(self, max_log_length=1000):
 
401
407
        DBusGMainLoop(set_as_default=True)
 
403
409
        self.screen = urwid.curses_display.Screen()
 
 
482
486
            self.uilist.append(self.logbox)
 
483
487
        self.topwidget = urwid.Pile(self.uilist)
 
485
 
    def log_message(self, message, level=1):
 
 
489
    def log_message(self, message):
 
486
490
        """Log message formatted with timestamp"""
 
487
 
        if level < self.log_level:
 
489
491
        timestamp = datetime.datetime.now().isoformat()
 
490
 
        self.log_message_raw("{}: {}".format(timestamp, message),
 
 
492
        self.log_message_raw(timestamp + ": " + message)
 
493
 
    def log_message_raw(self, markup, level=1):
 
 
494
    def log_message_raw(self, markup):
 
494
495
        """Add a log message to the log buffer."""
 
495
 
        if level < self.log_level:
 
497
496
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
 
498
497
        if (self.max_log_length
 
499
498
            and len(self.log) > self.max_log_length):
 
 
506
505
        """Toggle visibility of the log buffer."""
 
507
506
        self.log_visible = not self.log_visible
 
509
 
        self.log_message("Log visibility changed to: {}"
 
510
 
                         .format(self.log_visible), level=0)
 
 
508
        #self.log_message("Log visibility changed to: "
 
 
509
        #                 + str(self.log_visible))
 
512
511
    def change_log_display(self):
 
513
512
        """Change type of log display.