dnrops
/
metasploit-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tasos-r7/bug/web-vuln-logging' into rapid7 

[Closes #1559]
This commit is contained in:
James Lee 2013-03-07 17:23:59 -06:00
parent 3b87ba8c6f 8131366b91
commit 43c076ed96
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/msf/core/auxiliary/web.rb
View File

@ -161,7 +161,6 @@ module Auxiliary::Web
map { |x| x.to_s }.join( '|' ).hash
return if parent.vulns.include?( vhash )
parent.vulns[vhash] = true
location = opts[:location] ?
page.url.merge( URI( opts[:location].to_s )) : page.url
@ -183,6 +182,7 @@ module Auxiliary::Web
}
info[:confidence] = calculate_confidence( info )
parent.vulns[vhash] = info
report_web_vuln( info )
@ -196,7 +196,6 @@ module Auxiliary::Web
map { |x| x.to_s }.join( '|' ).hash
return if parent.vulns.include?( vhash )
parent.vulns[vhash] = true
location = URI( opts[:location].to_s )
info = {
@ -216,6 +215,7 @@ module Auxiliary::Web
}
info[:confidence] = calculate_confidence( info )
parent.vulns[vhash] = info
report_web_vuln( info )

11
lib/msf/core/auxiliary/web/http.rb
View File

@ -67,6 +67,7 @@ class Auxiliary::Web::HTTP
attr_reader :opts
attr_reader :headers
attr_reader :framework
attr_reader :parent
attr_accessor :redirect_limit
attr_accessor :username , :password
@ -75,6 +76,7 @@ class Auxiliary::Web::HTTP
@opts = opts.dup
@framework = opts[:framework]
@parent = opts[:parent]
@headers = {
'Accept' => '*/*',
@ -130,8 +132,8 @@ class Auxiliary::Web::HTTP
begin
request.handle_response request( request.url, request.opts )
rescue => e
elog e.to_s
e.backtrace.each { |l| elog l }
print_error e.to_s
e.backtrace.each { |l| print_error l }
end
end
end
@ -250,6 +252,11 @@ class Auxiliary::Web::HTTP
private
def print_error( message )
return if !@parent
@parent.print_error message
end
def call_after_run_blocks
while block = @after_run_blocks.pop
block.call