Merge branch 'useragent_cleanup' of git://github.com/ChrisJohnRiley/metasploit-framework into ChrisJohnRiley-useragent_cleanup

unstable
sinn3r 2012-12-21 11:14:06 -06:00
commit 2c4d517e75
14 changed files with 16 additions and 64 deletions

View File

@ -48,11 +48,7 @@ class Metasploit3 < Msf::Auxiliary
def run_host(ip)
res = send_request_cgi({
'uri' => "/dswsbobje/services/listServices",
'method' => 'GET',
'headers' => {
'User-Agent' => datastore['UserAgent']
}
'method' => 'GET'
}, 25)
return if not res

View File

@ -44,11 +44,7 @@ class Metasploit3 < Msf::Auxiliary
def run_host(ip)
res = send_request_cgi({
'uri' => "/PlatformServices/service/app/logon.object",
'method' => 'GET',
'headers' => {
'User-Agent' => datastore['UserAgent']
}
'method' => 'GET'
}, 25)
return if not res

View File

@ -50,11 +50,7 @@ class Metasploit3 < Msf::Auxiliary
def run_host(ip)
res = send_request_cgi({
'uri' => normalize_uri(datastore['URI']) + "/services/listServices",
'method' => 'GET',
'headers' => {
'User-Agent' => datastore['UserAgent']
}
'method' => 'GET'
}, 25)
return if not res

View File

@ -49,11 +49,7 @@ class Metasploit3 < Msf::Auxiliary
def run_host(ip)
res = send_request_cgi({
'uri' => normalize_uri(datastore['URI']) + "/services/listServices",
'method' => 'GET',
'headers' => {
'User-Agent' => datastore['UserAgent']
}
'method' => 'GET'
}, 25)
return if not res or res.code != 200

View File

@ -47,8 +47,7 @@ class Metasploit4 < Msf::Auxiliary
def run_host(ip)
res = send_request_cgi({
'uri' => normalize_uri(datastore['URI']),
'method' => 'GET',
'headers' => {'User-Agent' => datastore['UserAgent']}
'method' => 'GET'
}, 25)
if not res

View File

@ -52,11 +52,7 @@ class Metasploit4 < Msf::Auxiliary
def run_host(ip)
res = send_request_cgi({
'uri' => normalize_uri(datastore['URI']),
'method' => 'GET',
'headers' =>
{
'User-Agent' => datastore['UserAgent']
}
'method' => 'GET'
}, 25)
if not res

View File

@ -50,12 +50,7 @@ class Metasploit4 < Msf::Auxiliary
def run_host(ip)
res = send_request_cgi({
'uri' => normalize_uri(datastore['URI']),
'method' => 'GET',
'headers' =>
{
'User-Agent' => datastore['UserAgent']
}
'method' => 'GET'
}, 25)
if not res

View File

@ -50,11 +50,7 @@ class Metasploit4 < Msf::Auxiliary
def run_host(ip)
res = send_request_cgi({
'uri' => normalize_uri(datastore['URI']),
'method' => 'GET',
'headers' =>
{
'User-Agent' => datastore['UserAgent']
}
'method' => 'GET'
}, 25)
if not res

View File

@ -50,11 +50,7 @@ class Metasploit4 < Msf::Auxiliary
def run_host(ip)
res = send_request_cgi({
'uri' => normalize_uri(datastore['URI']),
'method' => 'GET',
'headers' =>
{
'User-Agent' => datastore['UserAgent']
}
'method' => 'GET'
}, 25)
if not res

View File

@ -41,8 +41,8 @@ class Metasploit4 < Msf::Auxiliary
Opt::RPORT(50013),
OptString.new('URI', [false, 'Path to the SAP Management Console ', '/']),
OptString.new('RFILE', [ true, 'The name of the file to download ', 'sapstart.log']),
OptString.new('FILETYPE', [true, 'Specify LOGFILE or TRACEFILE', 'TRACEFILE']),
OptBool.new('GETALL', [ false, 'Download all available files (WARNING: may take long!)', false]),
OptEnum.new('FILETYPE', [true, 'Specify LOGFILE or TRACEFILE', 'TRACEFILE', ['TRACEFILE','LOGFILE']]),
OptBool.new('GETALL', [ false, 'Download all available files (WARNING: may take a long time!)', false])
], self.class)
register_autofilter_ports([ 50013 ])
deregister_options('RHOST')

View File

@ -51,11 +51,7 @@ class Metasploit4 < Msf::Auxiliary
def run_host(ip)
res = send_request_cgi({
'uri' => normalize_uri(datastore['URI']),
'method' => 'GET',
'headers' =>
{
'User-Agent' => datastore['UserAgent']
}
'method' => 'GET'
}, 25)
if not res

View File

@ -39,7 +39,7 @@ class Metasploit4 < Msf::Auxiliary
[
Opt::RPORT(50013),
OptString.new('URI', [false, 'Path to the SAP Management Console ', '/']),
OptString.new('FILETYPE', [true, 'Specify LOGFILE or TRACEFILE', 'TRACEFILE']),
OptEnum.new('FILETYPE', [true, 'Specify LOGFILE or TRACEFILE', 'TRACEFILE', ['TRACEFILE','LOGFILE']])
], self.class)
register_autofilter_ports([ 50013 ])
deregister_options('RHOST')
@ -52,11 +52,7 @@ class Metasploit4 < Msf::Auxiliary
def run_host(ip)
res = send_request_cgi({
'uri' => normalize_uri(datastore['URI']),
'method' => 'GET',
'headers' =>
{
'User-Agent' => datastore['UserAgent']
}
'method' => 'GET'
}, 25)
if not res

View File

@ -50,10 +50,7 @@ class Metasploit4 < Msf::Auxiliary
def run_host(ip)
res = send_request_cgi({
'uri' => normalize_uri(datastore['URI']),
'method' => 'GET',
'headers' => {
'User-Agent' => datastore['UserAgent']
}
'method' => 'GET'
}, 25)
if not res

View File

@ -50,10 +50,7 @@ class Metasploit4 < Msf::Auxiliary
def run_host(ip)
res = send_request_cgi({
'uri' => normalize_uri(datastore['URI']),
'method' => 'GET',
'headers' => {
'User-Agent' => datastore['UserAgent']
}
'method' => 'GET'
}, 25)
if not res