commit updates from Tyler Krpata

git-svn-id: file:///home/svn/framework3/trunk@9630 4d416f70-5f16-0410-b530-b9f4589650da

modules/auxiliary/scanner/http/jboss_vulnscan.rb

@@ -57,11 +57,31 @@ class Metasploit3 < Msf::Auxiliary
 			print_status("JBoss error message: #{$1}")
 		end
 
-		apps = [ '/jmx-console/HtmlAdaptor', '/status', '/web-console/ServerInfo.jsp' ]
+		apps = [ '/jmx-console/HtmlAdaptor',
+			'/status',
+			'/web-console/ServerInfo.jsp',
+			# apps added per Patrick Hof
+			'/web-console/Invoker',
+			'/invoker/JMXInvokerServlet'
+		]
+
+		print_status("Checking http...")
 		apps.each do |app|
 			check_app(app)
 		end
 
+		ports = {
+			# 1098i, 1099, and 4444 needed to use twiddle
+			1098 => 'Naming Service',
+			1099 => 'Naming Service',
+			4444 => 'RMI invoker'
+		}
+		print_status("Checking services...")
+		ports.each do |port,service|
+			status = test_connection(ip,port) == :up ? "open" : "closed";
+			print_status("#{service} tcp/#{port}: #{status}")
+		end
+
 	end
 
 	def check_app(app)
@@ -122,4 +142,19 @@ class Metasploit3 < Msf::Auxiliary
 
 	end
 
+	# function stole'd from mssql_ping
+	def test_connection(ip,port)
+		begin
+			sock = Rex::Socket::Tcp.create(
+				'PeerHost' => ip,
+				'PeerPort' => port,
+				'Timeout' => 1
+				)
+		rescue Rex::ConnectionError
+			return :down
+		end
+		sock.close
+		return :up
+	end
+
 end