Small code refactoring, added verbose output

GSoC/Meterpreter_Web_Console
Mzack9999 2017-05-22 13:53:32 +02:00 committed by Jacob Robles
parent fe89e2d391
commit 7b781d53c9
No known key found for this signature in database
GPG Key ID: 3EC9F18F2B12401C
1 changed files with 5 additions and 7 deletions

View File

@ -127,6 +127,7 @@ class MetasploitModule < Msf::Auxiliary
end end
def blind_size(field, table, condition, size, charset, patterns = {}) def blind_size(field, table, condition, size, charset, patterns = {})
vprint_status("Retrieving field '#{field}' string (#{size} bytes) ...")
str = "" str = ""
for position in 0..size for position in 0..size
for char in charset.split('') for char in charset.split('')
@ -178,16 +179,13 @@ class MetasploitModule < Msf::Auxiliary
end end
pattern1 = defined?(news[0]) ? news[0].search('span[@itemprop="headline"]').text : '' pattern1 = defined?(news[0]) ? news[0].search('span[@itemprop="headline"]').text : ''
pattern2 = defined?(news[1]) ? news[1].search('span[@itemprop="headline"]').text : '' pattern2 = defined?(news[1]) ? news[1].search('span[@itemprop="headline"]').text : ''
if pattern1 != '' and pattern2 != '' if pattern1.to_s.eql?('') || pattern2.to_s.eql?('')
print_status("Pattern1: #{pattern1}") print_status("Couldn't determine Pattern1 and Pattern2 automatically, switching to user specified values...")
print_status("Pattern2: #{pattern2}")
else
print_status("Couldn't determine Pattern1 and Pattern2 automatically, switching to user speficied values...")
pattern1 = datastore['PATTERN1'] pattern1 = datastore['PATTERN1']
pattern2 = datastore['PATTERN2'] pattern2 = datastore['PATTERN2']
print_status("Pattern1: #{pattern1}")
print_status("Pattern2: #{pattern2}")
end end
print_status("Pattern #1: #{pattern1}")
print_status("Pattern #2: #{pattern2}")
return pattern1, pattern2 return pattern1, pattern2
end end