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

Some variables don't need to be in a double-quote.

This commit is contained in:
sinn3r 2012-03-17 20:37:42 -05:00
parent acac3fa38d
commit 7c77fe20cc
29 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/auxiliary/admin/http/tomcat_utf8_traversal.rb
View File

@ -106,7 +106,7 @@ class Metasploit3 < Msf::Auxiliary
print_good("File(s) found:")
@files_found.each do |f|
print_good("#{f}")
print_good(f)
end
else
print_good("No File(s) found")

2
modules/auxiliary/admin/http/trendmicro_dlp_traversal.rb
View File

@ -102,7 +102,7 @@ class Metasploit3 < Msf::Auxiliary
print_good("File(s) found:")
@files_found.each do |f|
print_good("#{f}")
print_good(f)
end
else
print_good("No File(s) found")

2
modules/auxiliary/admin/oracle/oraenum.rb
View File

@ -639,7 +639,7 @@ class Metasploit3 < Msf::Auxiliary
accts = {}
returnedstring.each do |record|
user,pass = record.split(",")
accts["#{pass.chomp}"] = "#{user}"
accts["#{pass.chomp}"] = user
end
::File.open(ordfltpss, "rb").each_line do |l|
accrcrd = l.split(",")

2
modules/auxiliary/admin/oracle/sid_brute.rb
View File

@ -55,7 +55,7 @@ class Metasploit3 < Msf::Auxiliary
begin
connect
rescue => e
print_error("#{e}")
print_error(e.to_s)
disconnect
return
end

4
modules/auxiliary/fuzzers/smtp/smtp_fuzzer.rb
View File

@ -55,11 +55,11 @@ class Metasploit3 < Msf::Auxiliary
connect
end
@connected=true
sock.put("#{data}")
sock.put(data)
@result=sock.get_once
@codresult=@result[0..2]
rescue ::Exception => e
print_error("Error #{e}")
print_error(e.to_s)
end
end

2
modules/auxiliary/gather/d20pass.rb
View File

@ -65,7 +65,7 @@ class Metasploit3 < Msf::Auxiliary
if (ip or rhost) and rport
[(ip || rhost),rport].map {|x| x.to_s}.join(":") << " "
elsif (ip or rhost)
"#{rhost}"
rhost
else
""
end

2
modules/auxiliary/scanner/http/axis_local_file_include.rb
View File

@ -56,7 +56,7 @@ class Metasploit3 < Msf::Auxiliary
begin
res = send_request_raw({
'method' => 'GET',
'uri' => "#{uri}",
'uri' => uri,
}, 25)
if (res and res.code == 200)

2
modules/auxiliary/scanner/http/backup_file.rb
View File

@ -77,7 +77,7 @@ class Metasploit3 < Msf::Auxiliary
:port => rport,
:vhost => vhost,
:ssl => ssl,
:path => "#{file}",
:path => file,
:method => 'GET',
:pname => "",
:proof => "Res code: #{res.code.to_s}",

8
modules/auxiliary/scanner/http/blind_sql_query.rb
View File

@ -236,9 +236,9 @@ class Metasploit3 < Msf::Auxiliary
:port => rport,
:vhost => vhost,
:ssl => ssl,
:path => "#{datastore['PATH']}",
:path => datastore['PATH'],
:method => http_method,
:pname => "#{key}",
:pname => key,
:proof => "blind sql inj.",
:risk => 2,
:confidence => 50,
@ -327,9 +327,9 @@ class Metasploit3 < Msf::Auxiliary
:port => rport,
:vhost => vhost,
:ssl => ssl,
:path => "#{datastore['PATH']}",
:path => datastore['PATH'],
:method => http_method,
:pname => "#{key}",
:pname => key,
:proof => "blind sql inj.",
:risk => 2,
:confidence => 50,

4
modules/auxiliary/scanner/http/error_sql_injection.rb
View File

@ -256,8 +256,8 @@ class Metasploit3 < Msf::Auxiliary
:ssl => ssl,
:path => datastore['PATH'],
:method => datastore['METHOD'],
:pname => "#{key}",
:proof => "#{istr}",
:pname => key,
:proof => istr,
:risk => 2,
:confidence => 50,
:category => 'SQL injection',

2
modules/auxiliary/scanner/http/mod_negotiation_scanner.rb
View File

@ -64,7 +64,7 @@ class Metasploit3 < Msf::Auxiliary
# Sheck for alternates header
if(res.code == 406)
print_status("#{ip}")
print_status(ip.to_s)
end
rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout

2
modules/auxiliary/scanner/http/prev_dir_same_name_file.rb
View File

@ -99,7 +99,7 @@ class Metasploit3 < Msf::Auxiliary
:port => rport,
:vhost => vhost,
:ssl => ssl,
:path => "#{testf}",
:path => testf,
:method => 'GET',
:pname => "",
:proof => "Res code: #{res.code.to_s}",

2
modules/auxiliary/scanner/http/replace_ext.rb
View File

@ -166,7 +166,7 @@ class Metasploit3 < Msf::Auxiliary
:port => rport,
:vhost => vhost,
:ssl => ssl,
:path => "#{tpath}",
:path => tpath,
:method => 'GET',
:pname => "",
:proof => "Res code: #{res.code.to_s}",

2
modules/auxiliary/scanner/http/robots_txt.rb
View File

@ -82,7 +82,7 @@ class Metasploit3 < Msf::Auxiliary
:proto => 'tcp',
:sname => (ssl ? 'https' : 'http'),
:type => 'ROBOTS_TXT',
:data => "#{u}",
:data => u,
:update => :unique_data
)
end

4
modules/auxiliary/scanner/http/scraper.rb
View File

@ -74,10 +74,10 @@ class Metasploit3 < Msf::Auxiliary
:port => rport,
:vhost => vhost,
:ssl => ssl,
:path => "#{tpath}",
:path => tpath,
:method => 'GET',
:pname => "",
:proof => "#{u}",
:proof => u,
:risk => 0,
:confidence => 100,
:category => 'scraper',

10
modules/auxiliary/scanner/http/svn_scanner.rb
View File

@ -129,7 +129,7 @@ class Metasploit3 < Msf::Auxiliary
:port => rport,
:vhost => vhost,
:ssl => ssl,
:path => "#{turl}",
:path => turl,
:method => 'GET',
:pname => "",
:proof => "Res code: #{res.code.to_s}",
@ -176,7 +176,7 @@ class Metasploit3 < Msf::Auxiliary
:sname => (ssl ? 'https' : 'http'),
:port => rport,
:type => 'USERNAME',
:data => "#{slastauthor}",
:data => slastauthor,
:update => :unique_data
)
@ -190,7 +190,7 @@ class Metasploit3 < Msf::Auxiliary
:sname => (ssl ? 'https' : 'http'),
:port => rport,
:type => 'DIRECTORY',
:data => "#{sname}",
:data => sname,
:update => :unique_data
)
end
@ -202,7 +202,7 @@ class Metasploit3 < Msf::Auxiliary
:sname => (ssl ? 'https' : 'http'),
:port => rport,
:type => 'FILE',
:data => "#{sname}",
:data => sname,
:update => :unique_data
)
@ -221,7 +221,7 @@ class Metasploit3 < Msf::Auxiliary
if srcres and srcres.body.length > 0
if datastore['SHOW_SOURCE']
print_status("#{srcres.body}")
print_status(srcres.body)
end
report_note(

2
modules/auxiliary/scanner/http/vhost_scanner.rb
View File

@ -128,7 +128,7 @@ require 'cgi'
:sname => (ssl ? 'https' : 'http'),
:port => rport,
:type => 'VHOST',
:data => "#{thost}",
:data => thost,
:update => :unique_data
)

2
modules/auxiliary/scanner/http/webdav_internal_ip.rb
View File

@ -68,7 +68,7 @@ class Metasploit3 < Msf::Auxiliary
:sname => (ssl ? 'https' : 'http'),
:port => rport,
:type => 'INTERNAL_IP',
:data => "#{addr}"
:data => addr
)
end
end

2
modules/auxiliary/scanner/http/webdav_website_content.rb
View File

@ -67,7 +67,7 @@ class Metasploit3 < Msf::Auxiliary
:sname => (ssl ? 'https' : 'http'),
:port => rport,
:type => 'WEBDAV_FILE_DIRECTORY',
:data => "#{u}"
:data => u
)
end

2
modules/auxiliary/scanner/oracle/emc_sid.rb
View File

@ -51,7 +51,7 @@ class Metasploit3 < Msf::Auxiliary
:port => datastore['RPORT'],
:proto => 'tcp',
:type => 'oracle_sid',
:data => "#{sid}",
:data => sid,
:update => :unique_data
)
print_status("Discovered SID: '#{sid}' for host #{ip}")

2
modules/auxiliary/scanner/oracle/xdb_sid.rb
View File

@ -72,7 +72,7 @@ class Metasploit3 < Msf::Auxiliary
:port => datastore['RPORT'],
:proto => 'tcp',
:type => 'oracle_sid',
:data => "#{sid}",
:data => sid,
:update => :unique_data
)
print_status("Discovered SID: '#{sid}' for host #{ip}:#{datastore['RPORT']} with #{datastore['DBUSER']} / #{datastore['DBPASS']}")

4
modules/auxiliary/scanner/oracle/xdb_sid_brute.rb
View File

@ -93,7 +93,7 @@ class Metasploit3 < Msf::Auxiliary
:proto => 'tcp',
:port => datastore['RPORT'],
:type => 'SERVICE_NAME',
:data => "#{sid}",
:data => sid,
:update => :unique_data
)
print_good("Discovered SID: '#{sid[0]}' for host #{ip}:#{datastore['RPORT']} with #{datastore['DBUSER']} / #{datastore['DBPASS']}")
@ -224,7 +224,7 @@ class Metasploit3 < Msf::Auxiliary
:port => datastore['RPORT'],
:sname => 'xdb',
:type => 'oracle_sid',
:data => "#{sid}",
:data => sid,
:update => :unique_data
)
else

4
modules/auxiliary/scanner/pop3/pop3_login.rb
View File

@ -78,10 +78,10 @@ class Metasploit3 < Msf::Auxiliary
select(nil,nil,nil,0.4)
end
@connected=true
sock.put("#{data}")
sock.put(data)
@result=sock.get_once
rescue ::Exception => err
print_error("Error: #{err}")
print_error("Error: #{err.to_s}")
end
end

40
modules/auxiliary/scanner/sap/sap_mgmt_con_instanceproperties.rb
View File

@ -166,58 +166,58 @@ class Metasploit4 < Msf::Auxiliary
end
if sapsystem
print_good("#{rhost}:#{rport} [SAP] SAP System Number: #{sapsystem}")
report_note(:host => "#{rhost}",
report_note(:host => rhost,
:proto => 'tcp',
:port => "#{rport}",
:port => rport,
:type => 'sap.sapsystem',
:data => {:proto => "soap", :sapsystem => sapsystem})
end
if sapsystemname
print_good("#{rhost}:#{rport} [SAP] SAP System Name: #{sapsystemname}")
report_note(:host => "#{rhost}",
report_note(:host => rhost,
:proto => 'tcp',
:port => "#{rport}",
:port => rport,
:type => 'sap.systemname',
:data => {:proto => "soap", :sapsystemname => sapsystemname})
end
if saplocalhost
print_good("#{rhost}:#{rport} [SAP] SAP Localhost: #{saplocalhost}")
report_note(:host => "#{rhost}",
report_note(:host => rhost,
:proto => 'tcp',
:port => "#{rport}",
:port => rport,
:type => 'sap.localhost',
:data => {:proto => "soap", :saplocalhost => saplocalhost})
end
if instancename
print_good("#{rhost}:#{rport} [SAP] Instance Name: #{instancename}")
report_note(:host => "#{rhost}",
report_note(:host => rhost,
:proto => 'tcp',
:port => "#{rport}",
:port => rport,
:type => 'sap.instancename',
:data => {:proto => "soap", :instancename => instancename})
end
if icmurl
print_good("#{rhost}:#{rport} [SAP] ICM URL: #{icmurl}")
report_note(:host => "#{rhost}",
report_note(:host => rhost,
:proto => 'tcp',
:port => "#{rport}",
:port => rport,
:type => 'sap.icm.url',
:data => {:proto => "soap", :icmurl => icmurl})
end
if igsurl
print_good("#{rhost}:#{rport} [SAP] IGS URL: #{igsurl}")
report_note(:host => "#{rhost}",
report_note(:host => rhost,
:proto => 'tcp',
:port => "#{rport}",
:port => rport,
:type => 'sap.igs.url',
:data => {:proto => "soap", :igsurl => igsurl})
end
if dbstring
dbstring = CGI.unescapeHTML(dbstring)
print_good("#{rhost}:#{rport} [SAP] ABAP DATABASE: #{dbstring}")
report_note(:host => "#{rhost}",
report_note(:host => rhost,
:proto => 'tcp',
:port => "#{rport}",
:port => rport,
:type => 'sap.dbstring',
:data => {:proto => "soap", :dbstring => dbstring},
:update => :unique_data )
@ -225,9 +225,9 @@ class Metasploit4 < Msf::Auxiliary
if j2eedbstring
j2eedbstring = CGI.unescapeHTML(j2eedbstring)
print_good("#{rhost}:#{rport} [SAP] J2EE DATABASE: #{j2eedbstring}")
report_note(:host => "#{rhost}",
report_note(:host => rhost,
:proto => 'tcp',
:port => "#{rport}",
:port => rport,
:type => 'sap.j2eedbstring',
:data => {:proto => "soap", :j2eedbstring => j2eedbstring},
:update => :unique_data )
@ -238,9 +238,9 @@ class Metasploit4 < Msf::Auxiliary
protectedweb_arr.each do | pweb |
print_status("#{pweb}")
end
report_note(:host => "#{rhost}",
report_note(:host => rhost,
:proto => 'tcp',
:port => "#{rport}",
:port => rport,
:type => 'sap.protected.web.methods',
:data => {:proto => "soap", :protectedweb => protectedweb},
:update => :unique_data )
@ -252,9 +252,9 @@ class Metasploit4 < Msf::Auxiliary
# Only print webmethods not found in protectedweb_arr
print_status("#{webm}") if not protectedweb_arr.include?(webm)
end
report_note(:host => "#{rhost}",
report_note(:host => rhost,
:proto => 'tcp',
:port => "#{rport}",
:port => rport,
:type => 'sap.web.methods',
:data => {:proto => "soap", :webmethods => webmethods},
:update => :unique_data )

14
modules/auxiliary/scanner/sap/sap_mgmt_con_version.rb
View File

@ -101,11 +101,11 @@ class Metasploit4 < Msf::Auxiliary
if res.code == 200
body = res.body
if body.match(/<VersionInfo>([^<]+)<\/VersionInfo>/)
version = "#{$1}"
version = $1
success = true
end
if body.match(/[\\\/]sap[\\\/](\w{3})/i)
sapsid = "#{$1}"
sapsid = $1
success = true
else
sapsid = "Unknown"
@ -113,7 +113,7 @@ class Metasploit4 < Msf::Auxiliary
elsif res.code == 500
case res.body
when /<faultstring>(.*)<\/faultstring>/i
faultcode = "#{$1}"
faultcode = $1
fault = true
end
end
@ -129,17 +129,17 @@ class Metasploit4 < Msf::Auxiliary
print_good("[SAP] SID: #{sapsid.upcase}")
report_note(
:host => "#{rhost}",
:host => rhost,
:proto => 'SOAP',
:port => "#{rport}",
:port => rport,
:type => 'SAP Version',
:data => "SAP Version: #{version}"
)
report_note(
:host => "#{rhost}",
:host => rhost,
:proto => 'SOAP',
:port => "#{rport}",
:port => rport,
:type => 'SAP SID',
:data => "SAP SID: #{sapsid.upcase}"
)

2
modules/exploits/freebsd/samba/trans2open.rb
View File

@ -134,7 +134,7 @@ class Metasploit3 < Msf::Exploit::Remote
rescue EOFError
rescue => e
print_error("#{e}")
print_error(e.to_s)
end
end

2
modules/exploits/multi/http/vbseo_proc_deutf.rb
View File

@ -63,7 +63,7 @@ class Metasploit3 < Msf::Exploit::Remote
response = send_request_cgi({
'method' => "POST",
'uri' => uri,
'data' => "#{data}"
'data' => data
})
if response.code == 200 and response.body =~ /#{flag}/

2
modules/exploits/multi/misc/veritas_netbackup_cmdexec.rb
View File

@ -88,7 +88,7 @@ class Metasploit3 < Msf::Exploit::Remote
sock.put(buf)
res = sock.get(-1,3)
print_status("#{res}")
print_status(res.to_s)
handler
disconnect

2
modules/exploits/osx/samba/trans2open.rb
View File

@ -107,7 +107,7 @@ class Metasploit3 < Msf::Exploit::Remote
rescue EOFError
rescue => e
print_error("#{e}")
print_error(e.to_s)
end
end