Land rapid7#6089, @jvazquez-r7 Fix HTTP mixins namespaces

Author: dmohanty-r7

lib/msf/core.rb

@@ -67,11 +67,6 @@ module Msf
 require 'msf/core/payload'
 require 'msf/core/post'
 
-# Custom HTTP Modules
-require 'msf/http/wordpress'
-require 'msf/http/typo3'
-require 'msf/http/jboss'
-
 # Drivers
 require 'msf/core/exploit_driver'
 

lib/msf/core/exploit/http/jboss.rb

@@ -0,0 +1,36 @@
+# -*- coding: binary -*-
+
+module Msf
+  class Exploit
+    class Remote
+      module HTTP
+        # This module provides a way of interacting with JBoss installations
+        module JBoss
+          require 'msf/core/exploit/http/jboss/base'
+          require 'msf/core/exploit/http/jboss/bean_shell'
+          require 'msf/core/exploit/http/jboss/bean_shell_scripts'
+          require 'msf/core/exploit/http/jboss/deployment_file_repository'
+          require 'msf/core/exploit/http/jboss/deployment_file_repository_scripts'
+
+          include Msf::Exploit::Remote::HttpClient
+          include Msf::Exploit::Remote::HTTP::JBoss::Base
+          include Msf::Exploit::Remote::HTTP::JBoss::BeanShell
+          include Msf::Exploit::Remote::HTTP::JBoss::BeanShellScripts
+          include Msf::Exploit::Remote::HTTP::JBoss::DeploymentFileRepository
+          include Msf::Exploit::Remote::HTTP::JBoss::DeploymentFileRepositoryScripts
+
+          def initialize(info = {})
+            super
+
+            register_options(
+              [
+                OptString.new('TARGETURI', [true,  'The URI path of the JMX console', '/jmx-console']),
+                OptEnum.new('VERB',        [true,  'HTTP Method to use (for CVE-2010-0738)', 'POST', ['GET', 'POST', 'HEAD']]),
+                OptString.new('PACKAGE',   [false, 'The package containing the BSHDeployer service'])
+              ], Msf::Exploit::Remote::HTTP::JBoss)
+          end
+        end
+      end
+    end
+  end
+end

lib/msf/http/jboss/base.rb renamed to lib/msf/core/exploit/http/jboss/base.rb

@@ -1,6 +1,6 @@
 # -*- coding: binary -*-
 
-module Msf::HTTP::JBoss::Base
+module Msf::Exploit::Remote::HTTP::JBoss::Base
 
   # Deploys a WAR through HTTP uri invoke
   #

lib/msf/http/jboss/bean_shell.rb renamed to lib/msf/core/exploit/http/jboss/bean_shell.rb

@@ -1,6 +1,6 @@
 # -*- coding: binary -*-
 
-module Msf::HTTP::JBoss::BeanShell
+module Msf::Exploit::Remote::HTTP::JBoss::BeanShell
 
   DEFAULT_PACKAGES = %w{ deployer scripts }
 

lib/msf/http/jboss/bean_shell_scripts.rb renamed to lib/msf/core/exploit/http/jboss/bean_shell_scripts.rb

@@ -1,6 +1,6 @@
 # -*- coding: binary -*-
 
-module Msf::HTTP::JBoss::BeanShellScripts
+module Msf::Exploit::Remote::HTTP::JBoss::BeanShellScripts
 
   # Generates a Bean Shell Script.
   #

lib/msf/http/jboss/deployment_file_repository.rb renamed to lib/msf/core/exploit/http/jboss/deployment_file_repository.rb

@@ -1,6 +1,6 @@
 # -*- coding: binary -*-
 
-module Msf::HTTP::JBoss::DeploymentFileRepository
+module Msf::Exploit::Remote::HTTP::JBoss::DeploymentFileRepository
 
   # Upload a text file with DeploymentFileRepository.store()
   #

lib/msf/http/jboss/deployment_file_repository_scripts.rb renamed to lib/msf/core/exploit/http/jboss/deployment_file_repository_scripts.rb

@@ -1,6 +1,6 @@
 # -*- coding: binary -*-
 
-module Msf::HTTP::JBoss::DeploymentFileRepositoryScripts
+module Msf::Exploit::Remote::HTTP::JBoss::DeploymentFileRepositoryScripts
 
   # Generate a stager JSP to write the second stager to the
   # deploy/management directory. It is only used with HEAD/GET requests

lib/msf/core/exploit/http/typo3.rb

@@ -0,0 +1,29 @@
+# -*- coding: binary -*-
+
+module Msf
+  class Exploit
+    class Remote
+      module HTTP
+        # This module provides a way of interacting with typo3 installations
+        module Typo3
+          require 'msf/core/exploit/http/typo3/login'
+          require 'msf/core/exploit/http/typo3/uris'
+
+          include Msf::Exploit::Remote::HttpClient
+          include Msf::Exploit::Remote::HTTP::Typo3::Login
+          include Msf::Exploit::Remote::HTTP::Typo3::URIs
+
+          def initialize(info = {})
+            super
+
+            register_options(
+              [
+                Msf::OptString.new('TARGETURI', [true, 'The base path to the typo3 application', '/']),
+              ], Msf::Exploit::Remote::HTTP::Typo3
+            )
+          end
+        end
+      end
+    end
+  end
+end

lib/msf/http/typo3/login.rb renamed to lib/msf/core/exploit/http/typo3/login.rb

@@ -1,5 +1,5 @@
 # -*- coding: binary -*-
-module Msf::HTTP::Typo3::Login
+module Msf::Exploit::Remote::HTTP::Typo3::Login
 
   # performs a typo3 backend login
   #

lib/msf/http/typo3/uris.rb renamed to lib/msf/core/exploit/http/typo3/uris.rb

@@ -1,5 +1,5 @@
 # -*- coding: binary -*-
-module Msf::HTTP::Typo3::URIs
+module Msf::Exploit::Remote::HTTP::Typo3::URIs
 
   # Returns the Typo3 Login URL
   #