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

No need to check if version is 'unknown' if nothing else (other than default) is assigned to it 

git-svn-id: file:///home/svn/framework3/trunk@13799 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
Wei Chen 2011-09-27 19:12:31 +00:00
parent 99d86fc9b7
commit 612cdc8c73
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/auxiliary/scanner/http/glassfish_login.rb
View File

@ -66,11 +66,11 @@ class Metasploit3 < Msf::Auxiliary
#Set version. Some GlassFish servers return banner "GlassFish v3".
if banner =~ /(GlassFish Server|Open Source Edition) (\d\.\d)/
version = $2
elsif banner =~ /GlassFish v(\d)/ and (version == 'Unknown' or version.nil?)
elsif banner =~ /GlassFish v(\d)/ and version.nil?
version = $1
elsif banner =~ /Sun GlassFish Enterprise Server v2/ and (version.nil? or version == 'Unknown')
elsif banner =~ /Sun GlassFish Enterprise Server v2/ and version.nil?
version = '2.x'
elsif banner =~ /Sun Java System Application Server 9/ and (version.nil? or version == 'Unknown')
elsif banner =~ /Sun Java System Application Server 9/ and version.nil?
version = '9.x'
end

6
modules/exploits/multi/http/glassfish_deployer.rb
View File

@ -317,11 +317,11 @@ class Metasploit3 < Msf::Exploit::Remote
#Set version. Some GlassFish servers return banner "GlassFish v3".
if banner =~ /(GlassFish Server|Open Source Edition) (\d\.\d)/
version = $2
elsif banner =~ /GlassFish v(\d)/ and (version == 'Unknown' or version.nil?)
elsif banner =~ /GlassFish v(\d)/ and version.nil?
version = $1
elsif banner =~ /Sun GlassFish Enterprise Server v2/ and (version.nil? or version == 'Unknown')
elsif banner =~ /Sun GlassFish Enterprise Server v2/ and version.nil?
version = '2.x'
elsif banner =~ /Sun Java System Application Server 9/ and (version.nil? or version == 'Unknown')
elsif banner =~ /Sun Java System Application Server 9/ and version.nil?
version = '9.x'
end