To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos-monitor
- browse files at revision 561
- compare with another revision
- download diff
- download tarball
- view history from revision 561
- Committer: Teddy Hogeborn
- Date: 2012-02-26 11:49:48 UTC
- mfrom: (560.1.2 deprecate-dbus)
- Revision ID: teddy@recompile.se-20120226114948-eho4a6wn5ock5h7g
Merge D-Bus interface annotations and D-Bus interface deprecations.
added
removed
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
#
173
172
self.rejected,
174
173
client_interface,
175
174
byte_arrays=True))
176
#self.logger('Created client {0}'
177
# .format(self.properties["Name"]))
175
#self.logger('Created client %s' % (self.properties["Name"]))
178
176
179
177
def property_changed(self, property=None, value=None):
180
178
super(self, MandosClientWidget).property_changed(property,
183
181
using_timer(bool(value))
184
182
if property == "LastCheckerStatus":
185
183
using_timer(value != 0)
186
#self.logger('Checker for client {0} (command "{1}") was '
187
# ' successful'.format(self.properties["Name"],
188
# command))
184
#self.logger('Checker for client %s (command "%s")'
185
# ' was successful'
186
# % (self.properties["Name"], command))
189
187
190
188
def using_timer(self, flag):
191
189
"""Call this method with True or False when timer should be
211
209
return
212
210
# Checker failed
213
211
if os.WIFEXITED(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)))
212
self.logger('Checker for client %s (command "%s")'
213
' failed with exit code %s'
214
% (self.properties["Name"], command,
215
os.WEXITSTATUS(condition)))
218
216
elif os.WIFSIGNALED(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)))
217
self.logger('Checker for client %s (command "%s")'
218
' was killed by signal %s'
219
% (self.properties["Name"], command,
220
os.WTERMSIG(condition)))
223
221
elif os.WCOREDUMP(condition):
224
self.logger('Checker for client {0} (command "{1}")'
222
self.logger('Checker for client %s (command "%s")'
225
223
' dumped core'
226
.format(self.properties["Name"], command))
224
% (self.properties["Name"], command))
227
225
else:
228
self.logger('Checker for client {0} completed'
229
' mysteriously'
230
.format(self.properties["Name"]))
226
self.logger('Checker for client %s completed'
227
' mysteriously')
231
228
self.update()
232
229
233
230
def checker_started(self, command):
234
231
"""Server signals that a checker started. This could be useful
235
232
to log in the future. """
236
#self.logger('Client {0} started checker "{1}"'
237
# .format(self.properties["Name"],
238
# unicode(command)))
233
#self.logger('Client %s started checker "%s"'
234
# % (self.properties["Name"], unicode(command)))
239
235
pass
240
236
241
237
def got_secret(self):
242
self.logger('Client {0} received its secret'
243
.format(self.properties["Name"]))
238
self.logger('Client %s received its secret'
239
% self.properties["Name"])
244
240
245
241
def need_approval(self, timeout, default):
246
242
if not default:
247
message = 'Client {0} needs approval within {1} seconds'
243
message = 'Client %s needs approval within %s seconds'
248
244
else:
249
message = 'Client {0} will get its secret in {1} seconds'
250
self.logger(message.format(self.properties["Name"],
251
timeout/1000))
245
message = 'Client %s will get its secret in %s seconds'
246
self.logger(message
247
% (self.properties["Name"], timeout/1000))
252
248
self.using_timer(True)
253
249
254
250
def rejected(self, reason):
255
self.logger('Client {0} was rejected; reason: {1}'
256
.format(self.properties["Name"], reason))
251
self.logger('Client %s was rejected; reason: %s'
252
% (self.properties["Name"], reason))
257
253
258
254
def selectable(self):
259
255
"""Make this a "selectable" widget.
285
281
# Rebuild focus and non-focus widgets using current properties
286
282
287
283
# Base part of a client. Name!
288
base = '{name}: '.format(name=self.properties["Name"])
284
base = ('%(name)s: '
285
% {"name": self.properties["Name"]})
289
286
if not self.properties["Enabled"]:
290
287
message = "DISABLED"
291
288
elif self.properties["ApprovalPending"]:
300
297
else:
301
298
timer = datetime.timedelta()
302
299
if self.properties["ApprovedByDefault"]:
303
message = "Approval in {0}. (d)eny?"
300
message = "Approval in %s. (d)eny?"
304
301
else:
305
message = "Denial in {0}. (a)pprove?"
306
message = message.format(unicode(timer).rsplit(".", 1)[0])
302
message = "Denial in %s. (a)pprove?"
303
message = message % unicode(timer).rsplit(".", 1)[0]
307
304
elif self.properties["LastCheckerStatus"] != 0:
308
# When checker has failed, show timer until client expires
305
# When checker has failed, print a timer until client expires
309
306
expires = self.properties["Expires"]
310
307
if expires == "":
311
308
timer = datetime.timedelta(0)
312
309
else:
313
expires = (datetime.datetime.strptime
314
(expires, '%Y-%m-%dT%H:%M:%S.%f'))
310
expires = datetime.datetime.strptime(expires,
311
'%Y-%m-%dT%H:%M:%S.%f')
315
312
timer = expires - datetime.datetime.utcnow()
316
313
message = ('A checker has failed! Time until client'
317
' gets disabled: {0}'
318
.format(unicode(timer).rsplit(".", 1)[0]))
314
' gets disabled: %s'
315
% unicode(timer).rsplit(".", 1)[0])
319
316
else:
320
317
message = "enabled"
321
self._text = "{0}{1}".format(base, message)
318
self._text = "%s%s" % (base, message)
322
319
323
320
if not urwid.supports_unicode():
324
321
self._text = self._text.encode("ascii", "replace")
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
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0