From c11f6b61a3298e67b1c64aef7f2e8b68df7df732 Mon Sep 17 00:00:00 2001
From: dwelch-r7 <dean_welch@rapid7.com>
Date: Wed, 6 Jan 2021 10:22:51 +0000
Subject: [PATCH] Eagerly require `msf/core` for namespacing reasons

---
 lib/msf_autoload.rb        | 2 +-
 lib/msfenv.rb              | 1 +
 tools/exploit/egghunter.rb | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/msf_autoload.rb b/lib/msf_autoload.rb
index 7d00b9613f..93304180a1 100644
--- a/lib/msf_autoload.rb
+++ b/lib/msf_autoload.rb
@@ -47,7 +47,7 @@ loader.collapse(
   "#{__dir__}/msf/core/payload/windows/x64",
   "#{__dir__}/msf/core/payload/linux/x64",
   "#{__dir__}/msf/core/web_services/servlet",
-  # "#{__dir__}/msf/base",
+  "#{__dir__}/msf/base",
 )
 
 loader.inflector = TempInflector.new
diff --git a/lib/msfenv.rb b/lib/msfenv.rb
index 98632e456a..0ec9243105 100644
--- a/lib/msfenv.rb
+++ b/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'
diff --git a/tools/exploit/egghunter.rb b/tools/exploit/egghunter.rb
index c095435e58..1b2d6cc54d 100755
--- a/tools/exploit/egghunter.rb
+++ b/tools/exploit/egghunter.rb
@@ -13,6 +13,7 @@ $:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib'))
 require 'msfenv'
 require 'rex'
 require 'optparse'
+require 'rex/exploitation/egghunter'
 
 module Egghunter
   class OptsConsole
@@ -127,7 +128,6 @@ module Egghunter
         list_formats
         return
       end
-      require 'rex/exploitation/egghunter'
       egghunter = Rex::Exploitation::Egghunter.new(@opts[:platform], @opts[:arch])
       raw_code = egghunter.hunter_stub('', @opts[:badchars], @opts)
       output_stream = $stdout