Zeitwerk msf folder

lib/metasploit/framework/command/console.rb

@@ -56,8 +56,6 @@ def start
   # @return [Msf::Ui::Console::Driver]
   def driver
     unless @driver
-      # require here so minimum loading is done before {start} is called.
-      require 'msf/ui'
 
       @driver = Msf::Ui::Console::Driver.new(
           Msf::Ui::Console::Driver::DefaultPrompt,

lib/metasploit/framework/compiler/mingw.rb

@@ -1,4 +1,3 @@
-require 'msf/util/helper'
 require 'open3'
 
 module Metasploit

lib/msf.rb

@@ -1,5 +1,17 @@
+require 'rex/proto/ntlm'
+require 'rex/arch'
+include Rex::Arch
+
+NTLM_CONST   ||= ::Rex::Proto::NTLM::Constants
+NTLM_CRYPT   ||= ::Rex::Proto::NTLM::Crypt
+NTLM_UTILS   ||= ::Rex::Proto::NTLM::Utils
+NTLM_BASE    ||= ::Rex::Proto::NTLM::Base
+NTLM_MESSAGE ||= ::Rex::Proto::NTLM::Message
+
 module Msf
 
+  LogSource = "core"
 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

@@ -1,5 +1,3 @@
-# -*- coding: binary -*-
-
-# Utilities
-require 'msf/util'
-
+# This file is only needed for compatibility with pro
+# Once pro removes the explicit require this file can be deleted
+require 'msf'

lib/msf/base/README.md

@@ -0,0 +1,13 @@
+# 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

lib/msf/base/logging.rb

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

lib/msf/base/sessions/command_shell.rb

@@ -2,7 +2,7 @@
 require 'shellwords'
 require 'rex/text/table'
 require "base64"
-
+require 'rex/parser/arguments'
 module Msf
 module Sessions
 

lib/msf/base/sessions/meterpreter_python.rb

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

lib/msf/base/sessions/meterpreter_x64_win.rb

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

lib/msf/base/sessions/meterpreter_x86_win.rb

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

lib/msf/core.rb

@@ -1,41 +1,3 @@
-# -*- coding: binary -*-
-###
-#
-# framework-core
-# --------------
-#
-# The core library provides all of the means by which to interact
-# with the framework insofar as manipulating encoders, nops,
-# payloads, exploits, auxiliary, and sessions.
-#
-###
-
-# The framework-core depends on Rex
-require 'rex'
-require 'rex/ui'
-require 'rex/arch'
-
-include Rex::Arch
-
-NTLM_CONST   ||= ::Rex::Proto::NTLM::Constants
-NTLM_CRYPT   ||= ::Rex::Proto::NTLM::Crypt
-NTLM_UTILS   ||= ::Rex::Proto::NTLM::Utils
-NTLM_BASE    ||= ::Rex::Proto::NTLM::Base
-NTLM_MESSAGE ||= ::Rex::Proto::NTLM::Message
-
-module Msf
-  autoload :Author, 'msf/core/author'
-  autoload :Platform, 'msf/core/platform'
-  autoload :Reference, 'msf/core/reference'
-  autoload :SiteReference, 'msf/core/site_reference'
-  autoload :Target, 'msf/core/target'
-
-  #
-  # Constants
-  #
-
-  LogSource = "core"
-end
-
-# Event subscriber interfaces
-require 'msf/events'
+# This file is only needed for compatibility with pro
+# Once pro removes the explicit require this file can be deleted
+require 'msf'

lib/msf/core/README.md

@@ -0,0 +1,6 @@
+
+# framework-core
+
+The core library provides all of the means by which to interact
+with the framework insofar as manipulating encoders, nops,
+payloads, exploits, auxiliary, and sessions.

lib/msf/core/framework.rb

@@ -11,10 +11,10 @@
 #
 
 require 'metasploit/framework/version'
-require 'msf/util'
-require 'msf/events'
 require 'rex/socket/ssl'
 require 'metasploit/framework/thread_factory_provider'
+require 'rex/job_container'
+require 'rex/thread_factory'
 module Msf
 
 ###

lib/msf/core/modules/metadata/cache.rb

@@ -1,5 +1,4 @@
 require 'singleton'
-require 'msf/events'
 require 'rex/ui/text/output/stdio'
 #
 # Core service class that provides storage of module metadata as well as operations on the metadata.

lib/msf/core/payload.rb

@@ -12,7 +12,7 @@ module Msf
 ###
 class Payload < Msf::Module
 
-  require 'rex/payloads'
+  require 'rex/payloads/win32'
 
   # Platform specific includes
   require 'metasploit/framework/compiler/mingw'

lib/msf/core/post/windows/cli_parse.rb

@@ -6,7 +6,6 @@ module Windows
 
 module CliParse
 
-  require 'msf/windows_error'
   require 'rex/logging'
   require 'rex/exceptions'
 

lib/msf/core/reflective_dll_loader.rb

@@ -8,6 +8,8 @@
 #
 ###
 
+require 'rex/peparsey'
+
 module Msf::ReflectiveDLLLoader
 
   # This is the ordinal of the reflective loader by default

lib/msf/core/rpc/v10/rpc_console.rb

@@ -1,7 +1,6 @@
 # -*- coding: binary -*-
 require 'pp'
 require 'rex'
-require 'msf/ui/web/driver'
 
 module Msf
 module RPC

lib/msf/core/rpc/v10/rpc_module.rb

@@ -1,7 +1,6 @@
 # -*- coding: binary -*-
 
 require 'json'
-require 'msf/util/document_generator'
 
 module Msf
 module RPC

lib/msf/ui/console.rb

@@ -8,4 +8,3 @@ module Console
 end
 end
 
-require 'msf/ui/console/driver'

lib/msf/ui/console/command_dispatcher.rb

@@ -1,5 +1,7 @@
 # -*- coding: binary -*-
-require 'msf/ui/console/command_dispatcher/common'
+
+require 'rex/ui'
+
 module Msf
 module Ui
 module Console
@@ -133,8 +135,3 @@ def remove_lines(text, to_match)
 
 end
 end end end
-
-require 'msf/ui/console/module_action_commands'
-require 'msf/ui/console/module_command_dispatcher'
-require 'msf/ui/console/module_option_tab_completion'
-require 'msf/ui/console/command_dispatcher/core'

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

@@ -10,18 +10,6 @@
 # Project
 #
 
-require 'msf/ui/console/command_dispatcher/encoder'
-require 'msf/ui/console/command_dispatcher/exploit'
-require 'msf/ui/console/command_dispatcher/nop'
-require 'msf/ui/console/command_dispatcher/payload'
-require 'msf/ui/console/command_dispatcher/auxiliary'
-require 'msf/ui/console/command_dispatcher/post'
-require 'msf/ui/console/command_dispatcher/evasion'
-require 'msf/ui/console/command_dispatcher/jobs'
-require 'msf/ui/console/command_dispatcher/resource'
-require 'msf/ui/console/command_dispatcher/modules'
-require 'msf/ui/console/command_dispatcher/developer'
-require 'msf/util/document_generator'
 
 require 'msf/core/opt_condition'
 

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

@@ -3,7 +3,6 @@
 require 'json'
 require 'rexml/document'
 require 'rex/parser/nmap_xml'
-require 'msf/ui/console/command_dispatcher/db/analyze'
 require 'metasploit/framework/data_service'
 require 'metasploit/framework/data_service/remote/http/core'
 

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

@@ -1,10 +1,7 @@
 # -*- coding: binary -*-
 
 require 'rex/ui/text/output/buffer/stdout'
-require 'msf/ui/console/table_print/rank_styler'
-require 'msf/ui/console/table_print/rank_formatter'
-require 'msf/ui/console/table_print/highlight_substring_styler'
-
+require 'rex/parser/arguments'
 
 module Msf
   module Ui

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

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

lib/msf/ui/console/driver.rb

@@ -1,10 +1,4 @@
 # -*- coding: binary -*-
-require 'msf/ui'
-require 'msf/ui/console/framework_event_manager'
-require 'msf/ui/console/command_dispatcher'
-require 'msf/ui/console/command_dispatcher/db'
-require 'msf/ui/console/command_dispatcher/creds'
-require 'msf/ui/console/table'
 require 'find'
 require 'erb'
 require 'rexml/document'

lib/msf/ui/console/module_command_dispatcher.rb

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