Fixing merge conflicts

bug/bundler_fix
Tasos Laskos 2013-03-01 20:21:02 +02:00
parent 7b8654a71d
commit 99a8ec593b
1 changed files with 5 additions and 3 deletions

View File

@ -179,10 +179,11 @@ module Auxiliary::Web
:blame => details[:blame],
:category => details[:category],
:description => details[:description],
:confidence => details[:category] || opts[:confidence] || 100,
:owner => self
}
info[:confidence] = calculate_confidence( info )
report_web_vuln( info )
print_good " FOUND(#{mode.to_s.upcase}) URL(#{location})"
@ -211,10 +212,11 @@ module Auxiliary::Web
:blame => details[:blame],
:category => details[:category],
:description => details[:description],
:confidence => details[:category] || opts[:confidence] || 100,
:owner => self
}
info[:confidence] = calculate_confidence( info )
report_web_vuln( info )
print_good " VULNERABLE(#{mode.to_s.upcase}) URL(#{target.to_url})"
@ -278,7 +280,7 @@ module Auxiliary::Web
report_web_vuln( info )
print_good " VULNERABLE(#{mode.to_s.upcase}) URL(#{target.to_url})" +
" PARAMETER(#{element.altered}) VALUES(#{element.params})"
" PARAMETER(#{element.altered}) VALUES(#{element.params})"
print_good " PROOF(#{proof})"
end