/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 (Client.start_checker): Reworded comment.
 (MandosServer.handle_ipc): Removed dead code.

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
# 
52
53
domain = 'se.recompile'
53
54
server_interface = domain + '.Mandos'
54
55
client_interface = domain + '.Mandos.Client'
55
 
version = "1.5.1"
 
56
version = "1.5.3"
56
57
 
57
58
# Always run in monochrome mode
58
59
urwid.curses_display.curses.has_colors = lambda : False
131
132
        
132
133
        self._update_timer_callback_tag = None
133
134
        self._update_timer_callback_lock = 0
134
 
        self.last_checker_failed = False
135
135
        
136
136
        # The widget shown normally
137
137
        self._text_widget = urwid.Text("")
145
145
        
146
146
        last_checked_ok = isoformat_to_datetime(self.properties
147
147
                                                ["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
148
        
158
 
        if self.last_checker_failed:
 
149
        if self.properties ["LastCheckerStatus"] != 0:
159
150
            self.using_timer(True)
160
151
        
161
152
        if self.need_approval:
182
173
                                         self.rejected,
183
174
                                         client_interface,
184
175
                                         byte_arrays=True))
185
 
        #self.logger('Created client %s' % (self.properties["Name"]))
 
176
        #self.logger('Created client {0}'
 
177
        #            .format(self.properties["Name"]))
186
178
    
187
179
    def property_changed(self, property=None, value=None):
188
180
        super(self, MandosClientWidget).property_changed(property,
189
181
                                                         value)
190
182
        if property == "ApprovalPending":
191
183
            using_timer(bool(value))
192
 
        
 
184
        if property == "LastCheckerStatus":
 
185
            using_timer(value != 0)
 
186
            #self.logger('Checker for client {0} (command "{1}") was '
 
187
            #            ' successful'.format(self.properties["Name"],
 
188
            #                                 command))
 
189
    
193
190
    def using_timer(self, flag):
194
191
        """Call this method with True or False when timer should be
195
192
        activated or deactivated.
210
207
    
211
208
    def checker_completed(self, exitstatus, condition, command):
212
209
        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
210
            self.update()
220
211
            return
221
212
        # Checker failed
222
 
        if not self.last_checker_failed:
223
 
            self.last_checker_failed = True
224
 
            self.using_timer(True)
225
213
        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)))
 
214
            self.logger('Checker for client {0} (command "{1}")'
 
215
                        ' failed with exit code {2}'
 
216
                        .format(self.properties["Name"], command,
 
217
                                os.WEXITSTATUS(condition)))
230
218
        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)))
 
219
            self.logger('Checker for client {0} (command "{1}") was'
 
220
                        ' killed by signal {2}'
 
221
                        .format(self.properties["Name"], command,
 
222
                                os.WTERMSIG(condition)))
235
223
        elif os.WCOREDUMP(condition):
236
 
            self.logger('Checker for client %s (command "%s")'
 
224
            self.logger('Checker for client {0} (command "{1}")'
237
225
                        ' dumped core'
238
 
                        % (self.properties["Name"], command))
 
226
                        .format(self.properties["Name"], command))
239
227
        else:
240
 
            self.logger('Checker for client %s completed'
241
 
                        ' mysteriously')
 
228
            self.logger('Checker for client {0} completed'
 
229
                        ' mysteriously'
 
230
                        .format(self.properties["Name"]))
242
231
        self.update()
243
232
    
244
233
    def checker_started(self, command):
245
234
        """Server signals that a checker started. This could be useful
246
235
           to log in the future. """
247
 
        #self.logger('Client %s started checker "%s"'
248
 
        #            % (self.properties["Name"], unicode(command)))
 
236
        #self.logger('Client {0} started checker "{1}"'
 
237
        #            .format(self.properties["Name"],
 
238
        #                    unicode(command)))
249
239
        pass
250
240
    
251
241
    def got_secret(self):
252
 
        self.last_checker_failed = False
253
 
        self.logger('Client %s received its secret'
254
 
                    % self.properties["Name"])
 
242
        self.logger('Client {0} received its secret'
 
243
                    .format(self.properties["Name"]))
255
244
    
256
245
    def need_approval(self, timeout, default):
257
246
        if not default:
258
 
            message = 'Client %s needs approval within %s seconds'
 
247
            message = 'Client {0} needs approval within {1} seconds'
259
248
        else:
260
 
            message = 'Client %s will get its secret in %s seconds'
261
 
        self.logger(message
262
 
                    % (self.properties["Name"], timeout/1000))
 
249
            message = 'Client {0} will get its secret in {1} seconds'
 
250
        self.logger(message.format(self.properties["Name"],
 
251
                                   timeout/1000))
263
252
        self.using_timer(True)
264
253
    
265
254
    def rejected(self, reason):
266
 
        self.logger('Client %s was rejected; reason: %s'
267
 
                    % (self.properties["Name"], reason))
 
255
        self.logger('Client {0} was rejected; reason: {1}'
 
256
                    .format(self.properties["Name"], reason))
268
257
    
269
258
    def selectable(self):
270
259
        """Make this a "selectable" widget.
296
285
        # Rebuild focus and non-focus widgets using current properties
297
286
 
298
287
        # Base part of a client. Name!
299
 
        base = ('%(name)s: '
300
 
                      % {"name": self.properties["Name"]})
 
288
        base = '{name}: '.format(name=self.properties["Name"])
301
289
        if not self.properties["Enabled"]:
302
290
            message = "DISABLED"
303
291
        elif self.properties["ApprovalPending"]:
312
300
            else:
313
301
                timer = datetime.timedelta()
314
302
            if self.properties["ApprovedByDefault"]:
315
 
                message = "Approval in %s. (d)eny?"
 
303
                message = "Approval in {0}. (d)eny?"
316
304
            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
 
305
                message = "Denial in {0}. (a)pprove?"
 
306
            message = message.format(unicode(timer).rsplit(".", 1)[0])
 
307
        elif self.properties["LastCheckerStatus"] != 0:
 
308
            # When checker has failed, show timer until client expires
321
309
            expires = self.properties["Expires"]
322
310
            if expires == "":
323
311
                timer = datetime.timedelta(0)
324
312
            else:
325
 
                expires = datetime.datetime.strptime(expires,
326
 
                                                     '%Y-%m-%dT%H:%M:%S.%f')
 
313
                expires = (datetime.datetime.strptime
 
314
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
327
315
                timer = expires - datetime.datetime.utcnow()
328
316
            message = ('A checker has failed! Time until client'
329
 
                       ' gets disabled: %s'
330
 
                           % unicode(timer).rsplit(".", 1)[0])
 
317
                       ' gets disabled: {0}'
 
318
                       .format(unicode(timer).rsplit(".", 1)[0]))
331
319
        else:
332
320
            message = "enabled"
333
 
        self._text = "%s%s" % (base, message)
 
321
        self._text = "{0}{1}".format(base, message)
334
322
            
335
323
        if not urwid.supports_unicode():
336
324
            self._text = self._text.encode("ascii", "replace")
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