Correct check, reinstate print

Corrected JSON check (response is empty, but valid JSON on check success)
Reinstated print to warn user (not only in VERBOSE)
bug/bundler_fix
kicks4kittens 2014-02-05 21:56:56 +01:00
parent 60cf68f899
commit 4c0c9101aa
1 changed files with 2 additions and 5 deletions

View File

@ -82,7 +82,7 @@ class Metasploit3 < Msf::Auxiliary
if datastore['DICT'].blank? and datastore['MAXDEPTH'] > 2 if datastore['DICT'].blank? and datastore['MAXDEPTH'] > 2
# warn user on long runs # warn user on long runs
vprint_status("#{peer} - Depth level #{datastore['MAXDEPTH']} selected... this may take some time!") print_status("#{peer} - Depth level #{datastore['MAXDEPTH']} selected... this may take some time!")
end end
# create initial test queue and populate # create initial test queue and populate
@ -126,10 +126,7 @@ class Metasploit3 < Msf::Auxiliary
print_error("#{peer} - Unexpected response from server (Response code: #{res.code})") print_error("#{peer} - Unexpected response from server (Response code: #{res.code})")
return return
elsif JSON.parse(res.body).blank? elsif JSON.parse(res.body).blank?
# empty JSON element # empty JSON element - valid response for check
print_error("#{peer} - Received invalid response from server")
return
else
print_good("#{peer} - Response received, continuing to enumeration phase") print_good("#{peer} - Response received, continuing to enumeration phase")
end end
rescue JSON::ParserError, rescue JSON::ParserError,