Use zeitwerk for lib/msf/core folder

Author: dwelch-r7

Gemfile.lock

@@ -84,6 +84,7 @@ PATH
       windows_error
       xdr
       xmlrpc
+      zeitwerk
 
 GEM
   remote: https://rubygems.org/
@@ -439,6 +440,7 @@ GEM
       activesupport (>= 4.2, < 7.0)
     xmlrpc (0.3.1)
     yard (0.9.25)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

Rakefile

@@ -1,5 +1,6 @@
 #!/usr/bin/env rake
 require File.expand_path('../config/application', __FILE__)
+require 'msfenv'
 require 'metasploit/framework/require'
 require 'metasploit/framework/spec/untested_payloads'
 

config/application.rb

@@ -29,7 +29,6 @@
 
 require 'metasploit/framework/common_engine'
 require 'metasploit/framework/database'
-
 module Metasploit
   module Framework
     class Application < Rails::Application
@@ -52,3 +51,4 @@ class Application < Rails::Application
 
 # Silence warnings about this defaulting to true
 I18n.enforce_available_locales = true
+require 'msfenv'

config/environment.rb

@@ -1,5 +1,4 @@
 # Load the rails application
 require File.expand_path('../application', __FILE__)
-
 # Initialize the rails application
 Metasploit::Framework::Application.initialize!

lib/metasploit/framework.rb

@@ -17,12 +17,11 @@
 require 'rkelly'
 require 'robots'
 require 'zip'
-
+require 'msf'
 #
 # Project
 #
 
-require 'msf/core'
 
 # Top-level namespace that is shared between {Metasploit::Framework
 # metasploit-framework} and pro, which uses Metasploit::Pro.

lib/metasploit/framework/afp/client.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/core'
-require 'msf/core/exploit/tcp'
-
 module Metasploit
   module Framework
     module AFP

lib/metasploit/framework/common_engine.rb

@@ -10,6 +10,8 @@
 
 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}.
@@ -27,8 +29,8 @@ module Metasploit::Framework::CommonEngine
     # @see http://rubydoc.info/stdlib/core/IO:read
     config.before_initialize do
       encoding = 'binary'
-      Encoding.default_external = encoding
-      Encoding.default_internal = encoding
+      ::Encoding.default_external = encoding
+      ::Encoding.default_internal = encoding
     end
 
     config.root = Msf::Config::install_root

lib/metasploit/framework/spec/constants.rb

@@ -1,4 +1,3 @@
-require 'msf/core/modules'
 
 # Monitor constants created by module loading to ensure that the loads in one example don't interfere with the
 # assertions in another example.

lib/metasploit/framework/thread_factory_provider.rb

@@ -6,6 +6,7 @@
 #   # framework.threads created here
 #   Rex::ThreadFactory.spawn("name", false) { ... }
 #
+require 'metasploit_data_models'
 class Metasploit::Framework::ThreadFactoryProvider < Metasploit::Model::Base
   #
   # Attributes

lib/metasploit/framework/varnish/client.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/core'
-require 'msf/core/exploit/tcp'
-
 module Metasploit
   module Framework
     module Varnish

lib/msf.rb

@@ -0,0 +1,5 @@
+module Msf
+
+end
+require 'msf/core/exception' # TODO: temporary require until we can split up the exceptions file and namespace properly
+require 'msf_autoload'

lib/msf/base.rb

@@ -14,7 +14,6 @@
 # such as exploitation, into easier to manage functions.
 
 # framework-base depends on framework-core
-require 'msf/core'
 
 # Configuration
 require 'msf/base/config'

lib/msf/base/logging.rb

@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 require 'rex'
 require 'msf/base'
-
+require 'msf/core'
 module Msf
 
 # This module provides an initialization interface for logging.

lib/msf/base/serializer/readable_text.rb

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

lib/msf/base/sessions/encrypted_shell.rb

@@ -1,7 +1,6 @@
 # -*- coding: binary -*-
 require 'msf/base'
 require 'securerandom'
-require 'msf/core/payload/windows/payload_db_conf'
 
 module Msf
 module Sessions

lib/msf/base/sessions/mettle_config.rb

@@ -1,7 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/core/payload/transport_config'
-require 'msf/core/payload/uuid/options'
 require 'base64'
 require 'securerandom'
 

lib/msf/base/simple/framework.rb

@@ -2,7 +2,7 @@
 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/framework/module_paths.rb

@@ -1,4 +1,5 @@
 # -*- coding: binary -*-
+require 'rails'
 module Msf
   module Simple
     module Framework

lib/msf/core.rb

@@ -30,46 +30,5 @@ module Msf
   LogSource = "core"
 end
 
-# General
-require 'msf/core/constants'
-require 'msf/core/exceptions'
-require 'msf/core/data_store'
-require 'msf/core/option_container'
-
 # Event subscriber interfaces
 require 'msf/events'
-
-# Framework context and core classes
-require 'msf/core/framework'
-require 'msf/core/feature_manager'
-require 'msf/core/db_manager'
-require 'msf/core/event_dispatcher'
-require 'msf/core/module_manager'
-require 'msf/core/module_set'
-require 'msf/core/plugin_manager'
-require 'msf/core/session'
-require 'msf/core/session_manager'
-require 'msf/core/analyze'
-
-
-
-# Wrappers
-require 'msf/core/encoded_payload'
-
-# Pseudo-modules
-require 'msf/core/handler'
-
-# Modules
-require 'msf/core/module'
-require 'msf/core/encoder'
-require 'msf/core/auxiliary'
-require 'msf/core/exploit'
-require 'msf/core/nop'
-require 'msf/core/payload'
-require 'msf/core/post'
-require 'msf/core/evasion'
-
-# Drivers
-require 'msf/core/exploit_driver'
-require 'msf/core/evasion_driver'
-

lib/msf/core/author.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/core'
 
 ###
 #

lib/msf/core/auxiliary.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/core/module'
 
 module Msf
 
@@ -19,7 +18,6 @@ class Complete < RuntimeError
   class Failed < RuntimeError
   end
 
-  require 'msf/core/auxiliary/mixins'
 
   include HasActions
 

lib/msf/core/auxiliary/commandshell.rb renamed to lib/msf/core/auxiliary/command_shell.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'msf/core/exploit'
 
 module Msf
   module Auxiliary::Etcd

lib/msf/core/auxiliary/etcd.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/core/auxiliary/mdns'
 
 module Msf
   # This module provides methods for working with LLMNR

lib/msf/core/auxiliary/crawler.rb renamed to lib/msf/core/auxiliary/http_crawler.rb

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

lib/msf/core/auxiliary/llmnr.rb

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

lib/msf/core/auxiliary/mixins.rb

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

lib/msf/core/auxiliary/mqtt.rb

@@ -11,12 +11,6 @@ module Auxiliary::Web
     module Analysis
     end
 
-    require 'msf/core/auxiliary/web/http'
-    require 'msf/core/auxiliary/web/fuzzable'
-    require 'msf/core/auxiliary/web/form'
-    require 'msf/core/auxiliary/web/path'
-    require 'msf/core/auxiliary/web/target'
-
     include Auxiliary::Report
 
     attr_reader :target

lib/msf/core/auxiliary/ntp.rb

@@ -0,0 +1,15 @@
+module Msf
+  ###
+  #
+  # This module provides methods for WMAP Crawler modules
+  #
+  ###
+
+  module Auxiliary::WmapCrawler
+    include Auxiliary::WmapModule
+
+    def wmap_type
+      :wmap_crawler
+    end
+  end
+end