Fix report calls, thanks Minga!

git-svn-id: file:///home/svn/framework3/trunk@12457 4d416f70-5f16-0410-b530-b9f4589650da
unstable
HD Moore 2011-04-27 19:39:28 +00:00
parent f59db11f0e
commit 77328e7327
3 changed files with 20 additions and 20 deletions

View File

@ -149,50 +149,50 @@ class Metasploit3 < 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 dbstring
print_good("#{rhost}:#{rport} [SAP] 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 )
@ -200,9 +200,9 @@ class Metasploit3 < Msf::Auxiliary
if protectedweb
print_good("#{rhost}:#{rport} [SAP] protectedweb Webmethods: #{protectedweb}")
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 )

View File

@ -123,14 +123,14 @@ class Metasploit3 < Msf::Auxiliary
print_good("[SAP] Version Number Extracted - #{rhost}:#{rport}")
print_good("[SAP] Version: #{version}")
print_good("[SAP] SID: #{sapsid.upcase}")
report_note(:host => '#{rhost}',
report_note(:host => "#{rhost}",
:proto => 'SOAP',
:port => '#{rport}',
:port => "#{rport}",
:type => 'SAP Version',
:data => "SAP Version: #{version}")
report_note(:host => '#{rhost}',
report_note(:host => "#{rhost}",
:proto => 'SOAP',
:port => '#{rport}',
:port => "#{rport}",
:type => 'SAP SID',
:data => "SAP SID: #{sapsid.upcase}")

View File

@ -230,9 +230,9 @@ class Metasploit3 < Msf::Auxiliary
end
print_good("#{ip}:#{port}\t - #{service} OPEN")
report_note(:host => '#{ip}',
report_note(:host => "#{ip}",
:proto => 'TCP',
:port => '#{port}',
:port => "#{port}",
:type => 'SAP',
:data => "#{service}")