infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Land #2255 - Fix fail_with()

bug/bundler_fix
sinn3r 2013-08-20 01:28:21 -05:00
parent 7e1a14ff08 491ea81acf
commit f148eb4715
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/msf/core/exploit/http/client.rb
View File

@ -126,7 +126,7 @@ module Exploit::Remote::HttpClient
opts[:pattern].each do |re| opts[:pattern].each do |re|
if not re.match(info) if not re.match(info)
err = "The target server fingerprint \"#{info}\" does not match \"#{re.to_s}\", use 'set FingerprintCheck false' to disable this check." err = "The target server fingerprint \"#{info}\" does not match \"#{re.to_s}\", use 'set FingerprintCheck false' to disable this check."
fail_with(Msf::Exploit::Failure::NotFound, err) fail_with(Failure::NotFound, err)
end end
end end
end end

4
lib/msf/core/exploit/mssql_sqli.rb
View File

@ -144,7 +144,7 @@ module Exploit::Remote::MSSQL_SQLI
if (datastore['METHOD'] == 'GET') if (datastore['METHOD'] == 'GET')
unless datastore['GET_PATH'].index("[SQLi]") unless datastore['GET_PATH'].index("[SQLi]")
fail_with(Exploit::Failure::NoTarget, "The SQL injection parameter was not specified in the GET path") fail_with(Failure::NoTarget, "The SQL injection parameter was not specified in the GET path")
end end
uri = datastore['GET_PATH'].gsub("[SQLi]", Rex::Text.uri_encode(sqla)) uri = datastore['GET_PATH'].gsub("[SQLi]", Rex::Text.uri_encode(sqla))
@ -160,7 +160,7 @@ module Exploit::Remote::MSSQL_SQLI
else else
unless datastore['DATA'].index("[SQLi]") unless datastore['DATA'].index("[SQLi]")
fail_with(Exploit::Failure::NoTarget, "The SQL injection parameter was not specified in the POST data") fail_with(Failure::NoTarget, "The SQL injection parameter was not specified in the POST data")
end end
post_data = datastore['DATA'].gsub("[SQLi]", Rex::Text.uri_encode(sqla)) post_data = datastore['DATA'].gsub("[SQLi]", Rex::Text.uri_encode(sqla))