Land #14696, Further Zeitwerk lands to improve boot speed

Zeitwerk rex folder

lib/metasploit/framework/data_service/proxy/core.rb

@@ -1,6 +1,4 @@
 require 'open3'
-require 'rex/ui'
-require 'rex/logging'
 require 'metasploit/framework/data_service/proxy/data_proxy_auto_loader'
 
 #

lib/metasploit/framework/login_scanner/acpp.rb

@@ -1,5 +1,4 @@
 require 'metasploit/framework/tcp/client'
-require 'rex/proto/acpp'
 require 'metasploit/framework/login_scanner/base'
 require 'metasploit/framework/login_scanner/rex_socket'
 

lib/metasploit/framework/login_scanner/http.rb

@@ -1,4 +1,4 @@
-require 'rex/proto/http'
+
 require 'metasploit/framework/login_scanner/base'
 require 'metasploit/framework/login_scanner/rex_socket'
 

lib/metasploit/framework/login_scanner/mqtt.rb

@@ -1,5 +1,4 @@
 require 'metasploit/framework/tcp/client'
-require 'rex/proto/mqtt'
 require 'metasploit/framework/login_scanner/base'
 require 'metasploit/framework/login_scanner/rex_socket'
 

lib/metasploit/framework/login_scanner/vnc.rb

@@ -1,5 +1,4 @@
 require 'metasploit/framework/tcp/client'
-require 'rex/proto/rfb'
 require 'metasploit/framework/login_scanner/base'
 require 'metasploit/framework/login_scanner/rex_socket'
 

lib/msf.rb

@@ -1,12 +1,8 @@
-require 'rex/proto/ntlm'
 require 'rex/arch'
-include Rex::Arch
+require 'rex/logging'
 
-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
+include Rex::Arch
+include Rex::Logging
 
 module Msf
 
@@ -14,4 +10,11 @@ module Msf
 end
 
 require 'msf/core/exception' # TODO: temporary require until we can split up the exceptions file and namespace properly
+require 'msf/core/constants'
 require 'msf_autoload'
+
+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

lib/msf/base/sessions/command_shell.rb

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

lib/msf/base/sessions/meterpreter.rb

@@ -1,6 +1,6 @@
 # -*- coding: binary -*-
-
-require 'rex/post/meterpreter'
+require 'rex/post/meterpreter/client'
+require 'rex/post/meterpreter/ui/console'
 
 module Msf
 module Sessions

lib/msf/base/sessions/vncinject.rb

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

lib/msf/core/auxiliary/iax2.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/iax2/client'
 
 module Msf
 

lib/msf/core/auxiliary/kademlia.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'rex/proto/kademlia'
 
 module Msf
 

lib/msf/core/auxiliary/mqtt.rb

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

lib/msf/core/auxiliary/natpmp.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/natpmp'
 
 module Msf
 

lib/msf/core/auxiliary/nmap.rb

@@ -1,6 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/parser/nmap_nokogiri'
-require 'rex/parser/nmap_xml'
 require 'open3'
 
 module Msf

lib/msf/core/auxiliary/ntp.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/ntp'
 module Msf
 
 ###

lib/msf/core/auxiliary/password_cracker.rb

@@ -1,7 +1,6 @@
 # -*- coding: binary -*-
 require 'open3'
 require 'fileutils'
-require 'rex/proto/ntlm/crypt'
 require 'metasploit/framework/password_crackers/cracker'
 require 'metasploit/framework/password_crackers/wordlist'
 require 'metasploit/framework/password_crackers/jtr/formatter'

lib/msf/core/auxiliary/report.rb

@@ -1,4 +1,7 @@
 # -*- coding: binary -*-
+
+require 'metasploit/framework/require'
+
 module Msf
 
 ###

lib/msf/core/db_manager/import/acunetix.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/acunetix_nokogiri'
 
 module Msf::DBManager::Import::Acunetix
   def import_acunetix_noko_stream(args={},&block)

lib/msf/core/db_manager/import/appscan.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/appscan_nokogiri'
 
 module Msf::DBManager::Import::Appscan
   def import_appscan_noko_stream(args={},&block)

lib/msf/core/db_manager/import/burp_issue.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/burp_issue_nokogiri'
 
 module Msf::DBManager::Import::BurpIssue
   def import_burp_issue_xml(args={}, &block)

lib/msf/core/db_manager/import/burp_session.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/burp_session_nokogiri'
 
 module Msf::DBManager::Import::BurpSession
   def import_burp_session_noko_stream(args={},&block)
@@ -15,7 +14,6 @@ module Msf::DBManager::Import::BurpSession
     bl = validate_ips(args[:blacklist]) ? args[:blacklist].split : []
     wspace = Msf::Util::DBManager.process_opts_workspace(args, framework).name
     if Rex::Parser.nokogiri_loaded
-      # Rex::Parser.reload("burp_session_nokogiri.rb")
       parser = "Nokogiri v#{::Nokogiri::VERSION}"
       noko_args = args.dup
       noko_args[:blacklist] = bl

lib/msf/core/db_manager/import/ci.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/ci_nokogiri'
 
 module Msf::DBManager::Import::CI
   def import_ci_noko_stream(args, &block)

lib/msf/core/db_manager/import/foundstone.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/foundstone_nokogiri'
 
 module Msf::DBManager::Import::Foundstone
   def import_foundstone_noko_stream(args={},&block)

lib/msf/core/db_manager/import/fusion_vm.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/fusionvm_nokogiri'
 
 module Msf::DBManager::Import::FusionVM
   def import_fusionvm_xml(args={})

lib/msf/core/db_manager/import/gpp.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/group_policy_preferences'
 
 module Msf::DBManager::Import::GPP
   def import_gpp_xml(args = {}, &block)

lib/msf/core/db_manager/import/ip360.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/ip360_aspl_xml'
 
 module Msf::DBManager::Import::IP360
   autoload :ASPL, 'msf/core/db_manager/import/ip360/aspl'
@@ -6,4 +5,4 @@ module Msf::DBManager::Import::IP360
 
   include Msf::DBManager::Import::IP360::ASPL
   include Msf::DBManager::Import::IP360::V3
-end
+end

lib/msf/core/db_manager/import/ip360/aspl.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/ip360_aspl_xml'
 
 module Msf::DBManager::Import::IP360::ASPL
   #

lib/msf/core/db_manager/import/ip360/v3.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/ip360_xml'
 
 module Msf::DBManager::Import::IP360::V3
   #

lib/msf/core/db_manager/import/mbsa.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/mbsa_nokogiri'
 
 module Msf::DBManager::Import::MBSA
   def import_mbsa_noko_stream(args={},&block)

lib/msf/core/db_manager/import/nessus/xml/v2.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/nessus_xml'
 
 module Msf::DBManager::Import::Nessus::XML::V2
   def import_nessus_xml_v2(args={}, &block)

lib/msf/core/db_manager/import/netsparker.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/netsparker_xml'
 
 module Msf::DBManager::Import::Netsparker
   # Process NetSparker XML

lib/msf/core/db_manager/import/nexpose/raw.rb

@@ -1,5 +1,3 @@
-require 'rex/parser/nexpose_raw_nokogiri'
-require 'rex/parser/nexpose_xml'
 
 module Msf::DBManager::Import::Nexpose::Raw
   def import_nexpose_raw_noko_stream(args, &block)

lib/msf/core/db_manager/import/nexpose/simple.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/nexpose_simple_nokogiri'
 
 module Msf::DBManager::Import::Nexpose::Simple
   def import_nexpose_noko_stream(args, &block)

lib/msf/core/db_manager/import/nmap.rb

@@ -1,5 +1,3 @@
-require 'rex/parser/nmap_nokogiri'
-require 'rex/parser/nmap_xml'
 
 module Msf::DBManager::Import::Nmap
   def import_nmap_noko_stream(args, &block)

lib/msf/core/db_manager/import/open_vas.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/openvas_nokogiri'
 
 module Msf::DBManager::Import::OpenVAS
   def import_openvas_noko_stream(args={}, &block)

lib/msf/core/db_manager/import/outpost24.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/outpost24_nokogiri'
 
 module Msf::DBManager::Import::Outpost24
   def import_outpost24_noko_stream(args={},&block)

lib/msf/core/db_manager/import/retina.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'rex/parser/retina_xml'
 
 module Msf::DBManager::Import::Retina
   # Process Retina XML

lib/msf/core/db_manager/import/wapiti.rb

@@ -1,4 +1,3 @@
-require 'rex/parser/wapiti_nokogiri'
 
 module Msf::DBManager::Import::Wapiti
   def import_wapiti_xml(args={}, &block)

lib/msf/core/exploit/cmd_stager.rb

@@ -1,5 +1,6 @@
 # -*- coding: binary -*-
 
+require 'rex/exploitation'
 require 'rex/exploitation/cmdstager'
 
 module Msf

lib/msf/core/exploit/dhcp_server.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'rex/proto/dhcp'
 
 module Msf
 

lib/msf/core/exploit/kernel_mode.rb

@@ -1,7 +1,6 @@
 # -*- coding: binary -*-
 module Msf
 
-require 'rex/payloads/win32/kernel'
 
 module Exploit::KernelMode
 

lib/msf/core/exploit/remote/dcerpc.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/dcerpc'
 require 'rex/encoder/ndr'
 module Msf
 

lib/msf/core/exploit/remote/dns.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/dns'
 
 
 module Msf

lib/msf/core/exploit/remote/dns/client.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/dns'
 
 
 module Msf

lib/msf/core/exploit/remote/dns/common.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/dns'
 
 
 module Msf

lib/msf/core/exploit/remote/dns/server.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/dns'
 
 module Msf
 

lib/msf/core/exploit/remote/firefox_addon_generator.rb

@@ -7,6 +7,8 @@
 #
 ###
 
+require 'rex/zip'
+
 module Msf
 module Exploit::Remote::FirefoxAddonGenerator
   include Msf::Exploit::Remote::FirefoxPrivilegeEscalation

lib/msf/core/exploit/remote/http/wordpress/admin.rb

@@ -1,4 +1,5 @@
 # -*- coding: binary -*-
+require 'rex/mime/message'
 
 module Msf::Exploit::Remote::HTTP::Wordpress::Admin
   # Uploads a plugin using a valid admin session.

lib/msf/core/exploit/remote/http_server.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/service_manager'
 require 'rex/exploitation/obfuscatejs'
 require 'rex/exploitation/encryptjs'
 require 'rex/exploitation/heaplib'

lib/msf/core/exploit/remote/java/rmi/client.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/rmi'
 require 'rex/java/serialization'
 require 'stringio'
 module Msf

lib/msf/core/exploit/remote/kerberos/client.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/kerberos'
 
 module Msf
   class Exploit

lib/msf/core/exploit/remote/kerberos/client/as_request.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/kerberos'
 
 module Msf
   class Exploit

lib/msf/core/exploit/remote/kerberos/client/as_response.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/kerberos'
 
 module Msf
   class Exploit

lib/msf/core/exploit/remote/kerberos/client/cache_credential.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/kerberos'
 
 module Msf
   class Exploit

lib/msf/core/exploit/remote/kerberos/client/pac.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/kerberos'
 
 module Msf
   class Exploit

lib/msf/core/exploit/remote/kerberos/client/tgs_request.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/kerberos'
 
 module Msf
   class Exploit

lib/msf/core/exploit/remote/kerberos/client/tgs_response.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/kerberos'
 
 module Msf
   class Exploit

lib/msf/core/exploit/remote/nuuo.rb

@@ -1,4 +1,3 @@
-require 'rex/proto/nuuo'
 
 ###
 #

lib/msf/core/exploit/remote/sip.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'rex/proto/sip/response'
 
 module Msf
   # SIP protocol support

lib/msf/core/exploit/remote/smb/client.rb

@@ -1,7 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/smb'
-require 'rex/proto/ntlm'
-require 'rex/proto/dcerpc'
 require 'rex/encoder/ndr'
 require 'recog'
 

lib/msf/core/exploit/remote/smb/client/psexec.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/dcerpc/svcctl'
 require 'windows_error'
 require 'windows_error/win32'
 include WindowsError::Win32

lib/msf/core/exploit/remote/smb/client/web_exec.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/dcerpc/svcctl'
 require 'windows_error'
 require 'windows_error/win32'
 include WindowsError::Win32

lib/msf/core/exploit/remote/smb/server/share.rb

@@ -1,12 +1,7 @@
 # -*- coding: binary -*-
 require 'rex/socket'
-require 'rex/proto/smb'
 require 'rex/text'
-require 'rex/logging'
 require 'rex/struct2'
-require 'rex/proto/smb/constants'
-require 'rex/proto/smb/utils'
-require 'rex/proto/dcerpc'
 
 module Msf
   module Exploit::Remote::SMB::Server

lib/msf/core/exploit/remote/sunrpc.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/sunrpc'
 
 module Msf
 

lib/msf/core/exploit/remote/winrm.rb

@@ -1,10 +1,6 @@
 # -*- coding: binary -*-
 require 'uri'
 require 'digest'
-require 'rex/proto/ntlm/crypt'
-require 'rex/proto/ntlm/constants'
-require 'rex/proto/ntlm/utils'
-require 'rex/proto/ntlm/exceptions'
 
 module Msf
 module Exploit::Remote::WinRM

lib/msf/core/exploit/tftp_server.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'rex/proto/tftp'
 
 module Msf
 

lib/msf/core/framework.rb

@@ -13,8 +13,6 @@ require 'monitor'
 require 'metasploit/framework/version'
 require 'rex/socket/ssl'
 require 'metasploit/framework/thread_factory_provider'
-require 'rex/job_container'
-require 'rex/thread_factory'
 module Msf
 
 ###
@@ -52,7 +50,6 @@ class Framework
   end
 
   require 'metasploit/framework/data_service/proxy/core'
-  require 'rex/json_hash_file'
 
   #
   # Creates an instance of the framework context.

lib/msf/core/handler/bind_named_pipe.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 require 'thread'
-require 'rex/proto/smb/simpleclient'
 
 #
 # KNOWN ISSUES

lib/msf/core/handler/reverse_http.rb

@@ -1,13 +1,10 @@
 # -*- coding: binary -*-
 require 'rex/io/stream_abstraction'
 require 'rex/sync/ref'
-require 'rex/payloads/meterpreter/uri_checksum'
-require 'rex/post/meterpreter'
+
 require 'rex/post/meterpreter/core_ids'
 require 'rex/socket/x509_certificate'
-require 'rex/user_agent'
 require 'uri'
-require 'rex/service_manager'
 
 module Msf
 module Handler

lib/msf/core/handler/reverse_ssh.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/proto/ssh'
 
 module Msf
 module Handler

lib/msf/core/module/ui.rb

@@ -1,4 +1,3 @@
-require 'rex/ui/subscriber'
 
 module Msf::Module::UI
   autoload :Line, 'msf/core/module/ui/line'

lib/msf/core/module/uuid.rb

@@ -1,3 +1,5 @@
+require 'rex/text'
+
 module Msf::Module::UUID
   #
   # Attributes
@@ -24,4 +26,4 @@ module Msf::Module::UUID
   def generate_uuid
     self.uuid = Rex::Text.rand_text_alphanumeric(8).downcase
   end
-end
+end

lib/msf/core/modules/loader/directory.rb

@@ -1,4 +1,5 @@
 # -*- coding: binary -*-
+require 'rex/file'
 
 # Concerns loading Ruby modules from a directory
 class Msf::Modules::Loader::Directory < Msf::Modules::Loader::Base

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

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

lib/msf/core/opt.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/payloads/meterpreter/config'
 module Msf
   #
   # Builtin framework options with shortcut methods

lib/msf/core/payload.rb

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

lib/msf/core/payload/android.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/payloads/meterpreter/config'
 
 module Msf::Payload::Android
 

lib/msf/core/payload/uuid/options.rb

@@ -1,6 +1,5 @@
 # -*- coding => binary -*-
 
-require 'rex/payloads/meterpreter/uri_checksum'
 
 #
 # This module provides datastore option definitions and helper methods for payload modules that support UUIDs

lib/msf/core/payload/windows/block_api.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'rex/payloads/shuffle'
 
 module Msf
 

lib/msf/core/payload/windows/encrypted_reverse_tcp.rb

@@ -2,7 +2,6 @@
 
 require 'rex/peparsey'
 require 'metasploit/framework/compiler/mingw'
-require 'rex/crypto/chacha20'
 
 module Msf
 

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

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'rex/payloads/meterpreter/config'
 
 module Msf
 

lib/msf/core/payload/windows/reverse_win_https.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'rex/payloads/meterpreter/uri_checksum'
 
 module Msf
 

lib/msf/core/payload/windows/x64/block_api_x64.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'rex/payloads/shuffle'
 
 module Msf
 

lib/msf/core/payload/windows/x64/meterpreter_loader_x64.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'rex/payloads/meterpreter/config'
 
 module Msf
 

lib/msf/core/payload/windows/x64/reverse_win_http_x64.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'rex/payloads/meterpreter/config'
 
 module Msf
 

lib/msf/core/payload/windows/x64/reverse_win_https_x64.rb

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 
-require 'rex/payloads/meterpreter/uri_checksum'
 
 module Msf
 

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

@@ -6,7 +6,6 @@ module Windows
 
 module CliParse
 
-  require 'rex/logging'
   require 'rex/exceptions'
 
   #Msf::Post::Windows::CliParse::ParseError

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

@@ -3,7 +3,7 @@ require 'xmlrpc/client'
 require 'msgpack'
 
 require 'rex'
-require 'rex/proto/http'
+
 
 
 module Msf

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

@@ -1,6 +1,5 @@
 # -*- coding: binary -*-
 require 'rex'
-require 'rex/ui/text/output/buffer'
 
 module Msf
 module RPC

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

@@ -2,7 +2,6 @@
 require 'msgpack'
 
 require 'rex'
-require 'rex/service_manager'
 
 module Msf
 module RPC

lib/msf/core/session/interactive.rb

@@ -1,5 +1,4 @@
 # -*- coding: binary -*-
-require 'rex/ui'
 
 module Msf
 module Session

lib/msf/core/web_services/http_db_manager_service.rb

@@ -1,6 +1,5 @@
 require 'rack'
 require 'metasploit/framework/parsed_options/remote_db'
-require 'rex/ui/text/output/stdio'
 
 class Msf::WebServices::HttpDBManagerService
 

lib/msf/core/web_services/servlet_helper.rb

@@ -1,6 +1,5 @@
 require 'json'
 require 'metasploit/framework/data_service/remote/http/response_data_helper'
-require 'rex/ui/text/output/stdio'
 
 module Msf::WebServices::ServletHelper
   include ResponseDataHelper

lib/msf/ui/console/command_dispatcher.rb

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

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

@@ -1,7 +1,6 @@
 # -*- coding: binary -*-
 
 require 'rexml/document'
-require 'rex/parser/nmap_xml'
 
 module Msf
 module Ui

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

@@ -4,7 +4,6 @@
 # Rex
 #
 
-require 'rex/ui/text/output/buffer/stdout'
 
 #
 # Project

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

@@ -1,7 +1,6 @@
 # -*- coding: binary -*-
 
 require 'rexml/document'
-require 'rex/parser/nmap_xml'
 require 'metasploit/framework/password_crackers/hashcat/formatter'
 require 'metasploit/framework/password_crackers/jtr/formatter'
 

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

@@ -2,7 +2,6 @@
 
 require 'json'
 require 'rexml/document'
-require 'rex/parser/nmap_xml'
 require 'metasploit/framework/data_service'
 require 'metasploit/framework/data_service/remote/http/core'
 

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

@@ -5,7 +5,6 @@
 # Rex
 #
 
-require 'rex/ui/text/output/buffer/stdout'
 
 module Msf
   module Ui

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

@@ -1,7 +1,5 @@
 # -*- coding: binary -*-
 
-require 'rex/ui/text/output/buffer/stdout'
-require 'rex/parser/arguments'
 
 module Msf
   module Ui