Land #14584, implement the zeitwerk autoloader within lib/msf/base

lib/metasploit/framework/common_engine.rb

@@ -11,7 +11,6 @@ require 'fileutils'
 require 'metasploit/model/engine'
 require 'metasploit/concern/engine'
 require 'metasploit/framework/require'
-require 'msf/base/config'
 Metasploit::Framework::Require.optionally_require_metasploit_db_gem_engines
 
 # `Rails::Engine` behavior common to both {Metasploit::Framework::Application} and {Metasploit::Framework::Engine}.

lib/metasploit/framework/database.rb

@@ -1,5 +1,4 @@
 require 'metasploit/framework'
-require 'msf/base/config'
 
 module Metasploit
   module Framework

lib/msf/base.rb

@@ -1,37 +1,4 @@
 # -*- coding: binary -*-
-#
-# framework-base
-# --------------
-#
-# The base library provides implementations for some of the default
-# sessions, such as Shell, Meterpreter, DispatchNinja, and VNC.  These
-# sessions are used by modules that come pre-packaged with the default
-# module distribution of Metasploit and are depended on by their
-# respective payloads.
-#
-# Beyond providing the default sessions, framework-base also provides
-# a wrapper interface to framework-core that makes some of the tasks,
-# such as exploitation, into easier to manage functions.
-
-# framework-base depends on framework-core
-
-# Configuration
-require 'msf/base/config'
-require 'msf/base/logging'
-
-# Simple wrapper
-require 'msf/base/simple'
-
-# Sessions
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/tty'
-
-# Serialization
-require 'msf/base/serializer/readable_text'
-require 'msf/base/serializer/json'
-
-# Persistent Storage
-require 'msf/base/persistent_storage'
 
 # Utilities
 require 'msf/util'

lib/msf/base/logging.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 require 'rex'
-require 'msf/base'
 require 'msf/core'
 module Msf
 

lib/msf/base/persistent_storage.rb

@@ -74,4 +74,3 @@ end
 
 end
 
-require 'msf/base/persistent_storage/flatfile'

lib/msf/base/sessions/command_shell.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/base'
-require 'msf/base/sessions/scriptable'
-require 'msf/base/sessions/command_shell_options'
 require 'shellwords'
 require 'rex/text/table'
 require "base64"
@@ -28,7 +25,7 @@ class CommandShell
   #
   include Msf::Session::Provider::SingleCommandShell
 
-  include Msf::Session::Scriptable
+  include Msf::Sessions::Scriptable
 
   include Rex::Ui::Text::Resource
 
@@ -762,25 +759,5 @@ protected
   end
 end
 
-class CommandShellWindows < CommandShell
-  def initialize(*args)
-    self.platform = "windows"
-    super
-  end
-  def shell_command_token(cmd,timeout = 10)
-    shell_command_token_win32(cmd,timeout)
-  end
-end
-
-class CommandShellUnix < CommandShell
-  def initialize(*args)
-    self.platform = "unix"
-    super
-  end
-  def shell_command_token(cmd,timeout = 10)
-    shell_command_token_unix(cmd,timeout)
-  end
-end
-
 end
 end

lib/msf/base/sessions/command_shell_unix.rb

@@ -0,0 +1,13 @@
+module Msf::Sessions
+
+  class CommandShellUnix < CommandShell
+    def initialize(*args)
+      self.platform = "unix"
+      super
+    end
+    def shell_command_token(cmd,timeout = 10)
+      shell_command_token_unix(cmd,timeout)
+    end
+  end
+
+end

lib/msf/base/sessions/command_shell_windows.rb

@@ -0,0 +1,14 @@
+
+module Msf::Sessions
+
+  class CommandShellWindows < CommandShell
+    def initialize(*args)
+      self.platform = "windows"
+      super
+    end
+    def shell_command_token(cmd,timeout = 10)
+      shell_command_token_win32(cmd,timeout)
+    end
+  end
+
+end

lib/msf/base/sessions/encrypted_shell.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/base'
 require 'securerandom'
 
 module Msf

lib/msf/base/sessions/hwbridge.rb

@@ -1,7 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base'
-require 'msf/base/sessions/scriptable'
 require 'rex/post/hwbridge'
 
 module Msf
@@ -24,7 +22,7 @@ class HWBridge  < Rex::Post::HWBridge::Client
   # This interface supports interactive commands.
   #
   include Msf::Session::Interactive
-  include Msf::Session::Scriptable
+  include Msf::Sessions::Scriptable
 
   #
   # Initialize the HWBridge console

lib/msf/base/sessions/mainframe_shell.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/command_shell'
 
 module Msf::Sessions
 

lib/msf/base/sessions/meterpreter.rb

@@ -1,7 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base'
-require 'msf/base/sessions/scriptable'
 require 'rex/post/meterpreter'
 
 module Msf
@@ -29,7 +27,7 @@ class Meterpreter < Rex::Post::Meterpreter::Client
   #
   include Msf::Session::Provider::SingleCommandShell
 
-  include Msf::Session::Scriptable
+  include Msf::Sessions::Scriptable
 
   # Override for server implementations that can't do SSL
   def supports_ssl?

lib/msf/base/sessions/meterpreter_aarch64_apple_ios.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_aarch64_linux.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_android.rb

@@ -1,8 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
-require 'msf/base/sessions/meterpreter_java'
-require 'msf/base/sessions/meterpreter_options'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_armbe_linux.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_armle_apple_ios.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_armle_linux.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_java.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_mips64_linux.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_mipsbe_linux.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_mipsle_linux.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_multi.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions
@@ -21,23 +20,17 @@ class Meterpreter_Multi < Msf::Sessions::Meterpreter
     # TODO: fill in more cases here
     case opts[:payload_uuid].platform
     when 'python'
-      require 'msf/base/sessions/meterpreter_python'
       return Msf::Sessions::Meterpreter_Python_Python.new(rstream, opts)
     when 'java'
-      require 'msf/base/sessions/meterpreter_java'
       return Msf::Sessions::Meterpreter_Java_Java.new(rstream, opts)
     when 'android'
-      require 'msf/base/sessions/meterpreter_android'
       return Msf::Sessions::Meterpreter_Java_Android.new(rstream, opts)
     when 'php'
-      require 'msf/base/sessions/meterpreter_php'
       return Msf::Sessions::Meterpreter_Php_Php.new(rstream, opts)
     when 'windows'
       if opts[:payload_uuid].arch == ARCH_X86
-        require 'msf/base/sessions/meterpreter_x86_win'
         return Msf::Sessions::Meterpreter_x86_Win.new(rstream, opts)
       end
-      require 'msf/base/sessions/meterpreter_x64_win'
       return Msf::Sessions::Meterpreter_x64_Win.new(rstream, opts)
     end
 

lib/msf/base/sessions/meterpreter_php.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_ppc64le_linux.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_ppc_linux.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_ppce500v2_linux.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_python.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 require 'msf/windows_error'
 
 module Msf

lib/msf/base/sessions/meterpreter_x64_linux.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_x64_osx.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_x64_win.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 require 'msf/windows_error'
 
 module Msf

lib/msf/base/sessions/meterpreter_x86_bsd.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_x86_linux.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_x86_osx.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/meterpreter_x86_win.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 require 'msf/windows_error'
 
 module Msf

lib/msf/base/sessions/meterpreter_zarch_linux.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter'
 
 module Msf
 module Sessions

lib/msf/base/sessions/pingback.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/base'
 
 module Msf
 module Sessions

lib/msf/base/sessions/powershell.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/base/sessions/command_shell'
 
 class Msf::Sessions::PowerShell < Msf::Sessions::CommandShell
   #

lib/msf/base/sessions/scriptable.rb

@@ -1,6 +1,6 @@
 # -*- coding: binary -*-
 
-module Msf::Session
+module Msf::Sessions
 
 module Scriptable
 

lib/msf/base/sessions/ssh_command_shell.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/command_shell'
 
 module Msf::Sessions
 

lib/msf/base/sessions/tty.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base'
 
 module Msf
 module Sessions

lib/msf/base/sessions/vncinject.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/base'
 require 'rex/services/local_relay'
 
 module Msf

lib/msf/base/simple.rb

@@ -1,17 +1,5 @@
 # -*- coding: binary -*-
-# Buffer management
-require 'msf/base/simple/buffer'
-require 'msf/base/simple/statistics'
 
-# Simplified module interfaces
-require 'msf/base/simple/module'
-require 'msf/base/simple/encoder'
-require 'msf/base/simple/exploit'
-require 'msf/base/simple/nop'
-require 'msf/base/simple/payload'
-require 'msf/base/simple/auxiliary'
-require 'msf/base/simple/post'
-require 'msf/base/simple/evasion'
+module Msf::Simple
 
-# Simplified framework interface
-require 'msf/base/simple/framework'
+end

lib/msf/base/simple/buffer.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base'
 
 module Msf
 module Simple

lib/msf/base/simple/evasion.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/base'
 
 module Msf
 module Simple

lib/msf/base/simple/exploit.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/base'
 
 module Msf
 module Simple

lib/msf/base/simple/framework.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/base/simple'
-require 'msf/base/simple/framework/module_paths'
-require 'msf/base/simple/noop_job_listener'
 require 'msf/core/constants'
 module Msf
 module Simple

lib/msf/base/simple/module.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/base'
 
 module Msf
 module Simple

lib/msf/base/simple/nop.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/base'
 
 module Msf
 module Simple

lib/msf/base/simple/payload.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base'
 
 module Msf
 module Simple

lib/msf/core/auxiliary/command_shell.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/command_shell_options'
 
 module Msf
 

lib/msf/core/db_manager.rb

@@ -10,7 +10,6 @@ require 'rex/socket'
 # Project
 #
 require 'metasploit/framework/require'
-require 'msf/base/config'
 require 'metasploit/framework/data_service'
 
 

lib/msf/core/framework.rb

@@ -11,7 +11,6 @@ require 'monitor'
 #
 
 require 'metasploit/framework/version'
-require 'msf/base/config'
 require 'msf/util'
 require 'msf/events'
 require 'rex/socket/ssl'

lib/msf/core/handler/reverse_ssh.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 require 'rex/proto/ssh'
-require 'msf/base/sessions/ssh_command_shell'
 
 module Msf
 module Handler

lib/msf/core/payload/android/meterpreter_loader.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter_options'
 
 module Msf
 

lib/msf/core/payload/java/meterpreter_loader.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter_options'
 
 module Msf
 

lib/msf/core/payload/python/meterpreter_loader.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/base/sessions/meterpreter_options'
 
 module Msf
 

lib/msf/core/web_services/framework_extension.rb

@@ -2,7 +2,6 @@ require 'sinatra/base'
 require 'uri'
 
 require 'metasploit/framework/data_service/remote/http/core'
-require 'msf/base/simple/framework'
 
 module Msf::WebServices
   # Extension provides a Metasploit Framework instance to a Sinatra application.

lib/msf/ui/console/command_dispatcher/payload.rb

@@ -1,6 +1,7 @@
 # -*- coding: binary -*-
 
 require 'rex/parser/arguments'
+require 'msf/util/exe'
 
 module Msf
   module Ui

lib/msf/ui/console/driver.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/base'
 require 'msf/ui'
 require 'msf/ui/console/framework_event_manager'
 require 'msf/ui/console/command_dispatcher'

lib/msf/ui/console/module_command_dispatcher.rb

@@ -1,5 +1,6 @@
 # -*- coding: binary -*-
 require 'msf/ui/console/command_dispatcher'
+require 'rex/parser/arguments'
 
 module Msf
 module Ui

lib/msf/ui/web/driver.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 require 'rex/proto/http'
-require 'msf/base'
 require 'msf/ui'
 
 module Msf

lib/msf_autoload.rb

@@ -15,6 +15,10 @@ class TempInflector < Zeitwerk::Inflector
       'Osx'
     elsif basename == 'exe' && abspath.end_with?('lib/msf/core/exe', 'lib/msf/core/exe.rb')
       'Exe'
+    elsif basename == 'json' && abspath.end_with?('lib/msf/base/serializer/json.rb')
+      'Json'
+    elsif basename == 'powershell' && abspath.end_with?('lib/msf/base/sessions/powershell.rb')
+      'PowerShell'
     else
       super
     end
@@ -24,6 +28,8 @@ end
 loader = Zeitwerk::Loader.new
 loader.push_dir("#{__dir__}/msf/core/", namespace: Msf)
 loader.push_dir("#{__dir__}/../app/validators/")
+loader.push_dir("#{__dir__}/msf/base/", namespace: Msf)
+
 
 loader.ignore(
   "#{__dir__}/msf/core/constants.rb",
@@ -40,7 +46,8 @@ loader.collapse(
   "#{__dir__}/msf/core/payload/osx/x64",
   "#{__dir__}/msf/core/payload/windows/x64",
   "#{__dir__}/msf/core/payload/linux/x64",
-  "#{__dir__}/msf/core/web_services/servlet"
+  "#{__dir__}/msf/core/web_services/servlet",
+  "#{__dir__}/msf/base",
 )
 
 loader.inflector = TempInflector.new
@@ -187,7 +194,35 @@ loader.inflector.inflect(
   'wmap_scan_ssl' => 'WmapScanSSL',
   'http_db_manager_service' => 'HttpDBManagerService',
   'vyos' => 'VYOS',
-  'windows_constants' => 'Windows_Constants'
-)
+  'windows_constants' => 'Windows_Constants',
+  'tty' => 'TTY',
+  'meterpreter_java' => 'Meterpreter_Java_Java',
+  'meterpreter_android' => 'Meterpreter_Java_Android',
+  'meterpreter_zarch_linux' => 'Meterpreter_zarch_Linux',
+  'meterpreter_python' => 'Meterpreter_Python_Python',
+  'meterpreter_ppce500v2_linux' => 'Meterpreter_ppce500v2_Linux',
+  'meterpreter_x86_osx' => 'Meterpreter_x86_OSX',
+  'meterpreter_armbe_linux' => 'Meterpreter_armbe_Linux',
+  'meterpreter_ppc64le_linux' => 'Meterpreter_ppc64le_Linux',
+  'meterpreter_x64_linux' => 'Meterpreter_x64_Linux',
+  'meterpreter_armle_linux' => 'Meterpreter_armle_Linux',
+  'meterpreter_aarch64_linux' => 'Meterpreter_aarch64_Linux',
+  'meterpreter_x86_win' => 'Meterpreter_x86_Win',
+  'meterpreter_armle_apple_ios' => 'Meterpreter_armle_Apple_iOS',
+  'meterpreter_mipsle_linux' => 'Meterpreter_mipsle_Linux',
+  'meterpreter_x86_bsd' => 'Meterpreter_x86_BSD',
+  'meterpreter_mips64_linux' => 'Meterpreter_mips64_Linux',
+  'meterpreter_x86_linux' => 'Meterpreter_x86_Linux',
+  'meterpreter_mipsbe_linux' => 'Meterpreter_mipsbe_Linux',
+  'meterpreter_aarch64_apple_ios' => 'Meterpreter_aarch64_Apple_iOS',
+  'meterpreter_x64_osx' => 'Meterpreter_x64_OSX',
+  'meterpreter_ppc_linux' => 'Meterpreter_ppc_Linux',
+  'meterpreter_x64_win' => 'Meterpreter_x64_Win',
+  'meterpreter_php' => 'Meterpreter_Php_Php',
+  'meterpreter_multi' => 'Meterpreter_Multi',
+  'hwbridge' => 'HWBridge',
+  'vncinject_options' => 'VncInjectOptions',
+  'vncinject' => 'VncInject',
+  )
 
 loader.setup # ready!

lib/msfenv.rb

@@ -16,4 +16,5 @@ require config.join('boot')
 unless defined?(Rails) && !Rails.application.nil?
   require config.join('environment')
 end
+require 'msf/core'
 require 'msf_autoload'

lib/rex/logging/log_dispatcher.rb

@@ -1,5 +1,6 @@
 # -*- coding: binary -*-
 require 'rex/sync'
+require 'rex/logging'
 require 'rex/logging/log_sink'
 require 'rex/logging/log_sink_factory'
 

lib/rex/logging/sinks/stdout_without_timestamps.rb

@@ -1,4 +1,7 @@
 # -*- coding: binary -*-
+
+require 'rex/logging'
+
 module Rex
 module Logging
 module Sinks

lib/rex/logging/sinks/stream.rb

@@ -1,4 +1,7 @@
 # -*- coding: binary -*-
+
+require 'rex/logging'
+
 module Rex
 module Logging
 module Sinks

lib/rex/logging/sinks/timestamp_colorless_flatfile.rb

@@ -1,4 +1,7 @@
 # -*- coding: binary -*-
+
+require 'rex/logging'
+
 module Rex
 module Logging
 module Sinks

lib/rex/post/hwbridge/ui/console/command_dispatcher.rb

@@ -58,11 +58,6 @@ module Console::CommandDispatcher
     return @msf_loaded unless @msf_loaded.nil?
     # if we get here we must not have initialized yet
 
-    if client.framework
-      # We have a framework instance so the msf libraries should be
-      # available.  Load up the ones we're going to use
-      require 'msf/base/serializer/readable_text'
-    end
     @msf_loaded = !!(client.framework)
     @msf_loaded
   end

lib/rex/post/meterpreter/ui/console/command_dispatcher.rb

@@ -75,11 +75,6 @@ module Console::CommandDispatcher
     return @msf_loaded unless @msf_loaded.nil?
     # if we get here we must not have initialized yet
 
-    if client.framework
-      # We have a framework instance so the msf libraries should be
-      # available.  Load up the ones we're going to use
-      require 'msf/base/serializer/readable_text'
-    end
     @msf_loaded = !!(client.framework)
     @msf_loaded
   end

modules/auxiliary/client/hwbridge/connect.rb

@@ -3,7 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/hwbridge'
 
 class MetasploitModule < Msf::Auxiliary
   include Msf::Auxiliary::Report

modules/payloads/singles/aix/ppc/shell_bind_tcp.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/aix/ppc/shell_find_port.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/aix/ppc/shell_interact.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/aix/ppc/shell_reverse_tcp.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/android/meterpreter_reverse_http.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/meterpreter_android'
-require 'msf/base/sessions/meterpreter_options'
 require 'rex/payloads/meterpreter/config'
 
 module MetasploitModule

modules/payloads/singles/android/meterpreter_reverse_https.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/meterpreter_android'
-require 'msf/base/sessions/meterpreter_options'
 require 'rex/payloads/meterpreter/config'
 
 module MetasploitModule

modules/payloads/singles/android/meterpreter_reverse_tcp.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/meterpreter_android'
-require 'msf/base/sessions/meterpreter_options'
 require 'rex/payloads/meterpreter/config'
 
 module MetasploitModule

modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_http.rb

@@ -3,9 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/meterpreter_options'
-require 'msf/base/sessions/mettle_config'
-require 'msf/base/sessions/meterpreter_aarch64_apple_ios'
 
 module MetasploitModule
 

modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_https.rb

@@ -3,9 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/meterpreter_options'
-require 'msf/base/sessions/mettle_config'
-require 'msf/base/sessions/meterpreter_aarch64_apple_ios'
 
 module MetasploitModule
 

modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_tcp.rb

@@ -3,9 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/meterpreter_options'
-require 'msf/base/sessions/mettle_config'
-require 'msf/base/sessions/meterpreter_aarch64_apple_ios'
 
 module MetasploitModule
 

modules/payloads/singles/apple_ios/aarch64/shell_reverse_tcp.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/apple_ios/armle/meterpreter_reverse_http.rb

@@ -3,9 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/meterpreter_options'
-require 'msf/base/sessions/mettle_config'
-require 'msf/base/sessions/meterpreter_armle_apple_ios'
 
 module MetasploitModule
 

modules/payloads/singles/apple_ios/armle/meterpreter_reverse_https.rb

@@ -3,9 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/meterpreter_options'
-require 'msf/base/sessions/mettle_config'
-require 'msf/base/sessions/meterpreter_armle_apple_ios'
 
 module MetasploitModule
 

modules/payloads/singles/apple_ios/armle/meterpreter_reverse_tcp.rb

@@ -3,9 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/meterpreter_options'
-require 'msf/base/sessions/mettle_config'
-require 'msf/base/sessions/meterpreter_armle_apple_ios'
 
 module MetasploitModule
 

modules/payloads/singles/bsd/sparc/shell_bind_tcp.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/bsd/sparc/shell_reverse_tcp.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/bsd/x64/shell_bind_ipv6_tcp.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/bsd/x64/shell_bind_tcp_small.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/bsd/x64/shell_reverse_ipv6_tcp.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/bsd/x64/shell_reverse_tcp_small.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/bsd/x86/metsvc_bind_tcp.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/meterpreter_x86_bsd'
-require 'msf/base/sessions/meterpreter_options'
 
 module MetasploitModule
 

modules/payloads/singles/bsd/x86/metsvc_reverse_tcp.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/meterpreter_x86_bsd'
-require 'msf/base/sessions/meterpreter_options'
 
 module MetasploitModule
 

modules/payloads/singles/bsd/x86/shell_bind_tcp.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/bsd/x86/shell_bind_tcp_ipv6.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/bsd/x86/shell_find_port.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/bsd/x86/shell_find_tag.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/bsd/x86/shell_reverse_tcp.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/bsd/x86/shell_reverse_tcp_ipv6.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 

modules/payloads/singles/bsdi/x86/shell_bind_tcp.rb

@@ -3,8 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule