Merge pull request #906 from anantk17/master

Added feature to intercept flows from within inline scripts
This commit is contained in:
Maximilian Hils 2016-02-01 20:24:06 +01:00
commit 417384d6f2
1 changed files with 5 additions and 1 deletions

View File

@ -702,6 +702,10 @@ class ConsoleMaster(flow.FlowMaster):
if self.state.intercept and f.match( if self.state.intercept and f.match(
self.state.intercept) and not f.request.is_replay: self.state.intercept) and not f.request.is_replay:
f.intercept(self) f.intercept(self)
else:
#check if flow was intercepted within an inline script by flow.intercept()
if f.intercepted:
f.intercept(self)
else: else:
f.reply() f.reply()
signals.flowlist_change.send(self) signals.flowlist_change.send(self)