/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: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

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 <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.5.2"
 
58
version = "1.5.3"
56
59
 
57
60
# Always run in monochrome mode
58
61
urwid.curses_display.curses.has_colors = lambda : False
172
175
                                         self.rejected,
173
176
                                         client_interface,
174
177
                                         byte_arrays=True))
175
 
        #self.logger('Created client %s' % (self.properties["Name"]))
 
178
        #self.logger('Created client {0}'
 
179
        #            .format(self.properties["Name"]))
176
180
    
177
181
    def property_changed(self, property=None, value=None):
178
182
        super(self, MandosClientWidget).property_changed(property,
181
185
            using_timer(bool(value))
182
186
        if property == "LastCheckerStatus":
183
187
            using_timer(value != 0)
184
 
            #self.logger('Checker for client %s (command "%s")'
185
 
            #            ' was successful'
186
 
            #            % (self.properties["Name"], command))
 
188
            #self.logger('Checker for client {0} (command "{1}") was '
 
189
            #            ' successful'.format(self.properties["Name"],
 
190
            #                                 command))
187
191
    
188
192
    def using_timer(self, flag):
189
193
        """Call this method with True or False when timer should be
209
213
            return
210
214
        # Checker failed
211
215
        if os.WIFEXITED(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)))
 
216
            self.logger('Checker for client {0} (command "{1}")'
 
217
                        ' failed with exit code {2}'
 
218
                        .format(self.properties["Name"], command,
 
219
                                os.WEXITSTATUS(condition)))
216
220
        elif os.WIFSIGNALED(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)))
 
221
            self.logger('Checker for client {0} (command "{1}") was'
 
222
                        ' killed by signal {2}'
 
223
                        .format(self.properties["Name"], command,
 
224
                                os.WTERMSIG(condition)))
221
225
        elif os.WCOREDUMP(condition):
222
 
            self.logger('Checker for client %s (command "%s")'
 
226
            self.logger('Checker for client {0} (command "{1}")'
223
227
                        ' dumped core'
224
 
                        % (self.properties["Name"], command))
 
228
                        .format(self.properties["Name"], command))
225
229
        else:
226
 
            self.logger('Checker for client %s completed'
227
 
                        ' mysteriously')
 
230
            self.logger('Checker for client {0} completed'
 
231
                        ' mysteriously'
 
232
                        .format(self.properties["Name"]))
228
233
        self.update()
229
234
    
230
235
    def checker_started(self, command):
231
236
        """Server signals that a checker started. This could be useful
232
237
           to log in the future. """
233
 
        #self.logger('Client %s started checker "%s"'
234
 
        #            % (self.properties["Name"], unicode(command)))
 
238
        #self.logger('Client {0} started checker "{1}"'
 
239
        #            .format(self.properties["Name"],
 
240
        #                    unicode(command)))
235
241
        pass
236
242
    
237
243
    def got_secret(self):
238
 
        self.logger('Client %s received its secret'
239
 
                    % self.properties["Name"])
 
244
        self.logger('Client {0} received its secret'
 
245
                    .format(self.properties["Name"]))
240
246
    
241
247
    def need_approval(self, timeout, default):
242
248
        if not default:
243
 
            message = 'Client %s needs approval within %s seconds'
 
249
            message = 'Client {0} needs approval within {1} seconds'
244
250
        else:
245
 
            message = 'Client %s will get its secret in %s seconds'
246
 
        self.logger(message
247
 
                    % (self.properties["Name"], timeout/1000))
 
251
            message = 'Client {0} will get its secret in {1} seconds'
 
252
        self.logger(message.format(self.properties["Name"],
 
253
                                   timeout/1000))
248
254
        self.using_timer(True)
249
255
    
250
256
    def rejected(self, reason):
251
 
        self.logger('Client %s was rejected; reason: %s'
252
 
                    % (self.properties["Name"], reason))
 
257
        self.logger('Client {0} was rejected; reason: {1}'
 
258
                    .format(self.properties["Name"], reason))
253
259
    
254
260
    def selectable(self):
255
261
        """Make this a "selectable" widget.
281
287
        # Rebuild focus and non-focus widgets using current properties
282
288
 
283
289
        # Base part of a client. Name!
284
 
        base = ('%(name)s: '
285
 
                      % {"name": self.properties["Name"]})
 
290
        base = '{name}: '.format(name=self.properties["Name"])
286
291
        if not self.properties["Enabled"]:
287
292
            message = "DISABLED"
288
293
        elif self.properties["ApprovalPending"]:
297
302
            else:
298
303
                timer = datetime.timedelta()
299
304
            if self.properties["ApprovedByDefault"]:
300
 
                message = "Approval in %s. (d)eny?"
 
305
                message = "Approval in {0}. (d)eny?"
301
306
            else:
302
 
                message = "Denial in %s. (a)pprove?"
303
 
            message = message % unicode(timer).rsplit(".", 1)[0]
 
307
                message = "Denial in {0}. (a)pprove?"
 
308
            message = message.format(unicode(timer).rsplit(".", 1)[0])
304
309
        elif self.properties["LastCheckerStatus"] != 0:
305
 
            # When checker has failed, print a timer until client expires
 
310
            # When checker has failed, show timer until client expires
306
311
            expires = self.properties["Expires"]
307
312
            if expires == "":
308
313
                timer = datetime.timedelta(0)
309
314
            else:
310
 
                expires = datetime.datetime.strptime(expires,
311
 
                                                     '%Y-%m-%dT%H:%M:%S.%f')
 
315
                expires = (datetime.datetime.strptime
 
316
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
312
317
                timer = expires - datetime.datetime.utcnow()
313
318
            message = ('A checker has failed! Time until client'
314
 
                       ' gets disabled: %s'
315
 
                           % unicode(timer).rsplit(".", 1)[0])
 
319
                       ' gets disabled: {0}'
 
320
                       .format(unicode(timer).rsplit(".", 1)[0]))
316
321
        else:
317
322
            message = "enabled"
318
 
        self._text = "%s%s" % (base, message)
 
323
        self._text = "{0}{1}".format(base, message)
319
324
            
320
325
        if not urwid.supports_unicode():
321
326
            self._text = self._text.encode("ascii", "replace")
486
491
        self.main_loop = gobject.MainLoop()
487
492
    
488
493
    def client_not_found(self, fingerprint, address):
489
 
        self.log_message(("Client with address %s and fingerprint %s"
490
 
                          " could not be found" % (address,
491
 
                                                    fingerprint)))
 
494
        self.log_message("Client with address {0} and fingerprint"
 
495
                         " {1} could not be found"
 
496
                         .format(address, fingerprint))
492
497
    
493
498
    def rebuild(self):
494
499
        """This rebuilds the User Interface.
547
552
            client = self.clients_dict[path]
548
553
        except KeyError:
549
554
            # not found?
550
 
            self.log_message("Unknown client %r (%r) removed", name,
551
 
                             path)
 
555
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
556
                             .format(name, path))
552
557
            return
553
558
        client.delete()
554
559