From d437a32374bbe429c20482cba7f0299a3a73d985 Mon Sep 17 00:00:00 2001 From: dwelch-r7 Date: Wed, 13 Jan 2021 11:06:01 +0000 Subject: [PATCH] remove `msf/util` requires --- lib/metasploit/framework/compiler/mingw.rb | 1 - lib/msf/base/sessions/command_shell.rb | 2 +- lib/msf/core/framework.rb | 3 ++- lib/msf/core/rpc/v10/rpc_module.rb | 1 - lib/msf/ui/console/command_dispatcher/core.rb | 1 - lib/msf/ui/console/command_dispatcher/payload.rb | 1 - lib/msf/util.rb | 6 ------ lib/msf/util/document_generator.rb | 1 - lib/msf/util/dot_net_deserialization.rb | 5 ----- lib/msf/util/dot_net_deserialization/formatters.rb | 3 --- lib/msf/util/dot_net_deserialization/gadget_chains.rb | 3 --- .../post/meterpreter/ui/console/command_dispatcher/core.rb | 1 + modules/auxiliary/gather/windows_secrets_dump.rb | 1 - modules/exploits/windows/browser/ie_unsafe_scripting.rb | 1 - spec/lib/msf/util/document_generator/normalizer_spec.rb | 2 -- .../msf/util/document_generator/pull_request_finder_spec.rb | 1 - spec/lib/msf/util/dot_net_deserialization_spec.rb | 1 - spec/lib/msf/util/java_deserialization_spec.rb | 1 - tools/modules/update_payload_cached_sizes.rb | 1 - 19 files changed, 4 insertions(+), 32 deletions(-) diff --git a/lib/metasploit/framework/compiler/mingw.rb b/lib/metasploit/framework/compiler/mingw.rb index b7ec40c10b..3dd4128013 100644 --- a/lib/metasploit/framework/compiler/mingw.rb +++ b/lib/metasploit/framework/compiler/mingw.rb @@ -1,4 +1,3 @@ -require 'msf/util/helper' require 'open3' module Metasploit diff --git a/lib/msf/base/sessions/command_shell.rb b/lib/msf/base/sessions/command_shell.rb index 4ef4462a68..5c37fed513 100644 --- a/lib/msf/base/sessions/command_shell.rb +++ b/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 diff --git a/lib/msf/core/framework.rb b/lib/msf/core/framework.rb index 51ab635221..d7feb88fc8 100644 --- a/lib/msf/core/framework.rb +++ b/lib/msf/core/framework.rb @@ -11,9 +11,10 @@ require 'monitor' # require 'metasploit/framework/version' -require 'msf/util' require 'rex/socket/ssl' require 'metasploit/framework/thread_factory_provider' +require 'rex/job_container' +require 'rex/thread_factory' module Msf ### diff --git a/lib/msf/core/rpc/v10/rpc_module.rb b/lib/msf/core/rpc/v10/rpc_module.rb index a8d1294517..beb4266cd8 100644 --- a/lib/msf/core/rpc/v10/rpc_module.rb +++ b/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 diff --git a/lib/msf/ui/console/command_dispatcher/core.rb b/lib/msf/ui/console/command_dispatcher/core.rb index 5fe7f86290..729bdcaca4 100644 --- a/lib/msf/ui/console/command_dispatcher/core.rb +++ b/lib/msf/ui/console/command_dispatcher/core.rb @@ -10,7 +10,6 @@ require 'rex/ui/text/output/buffer/stdout' # Project # -require 'msf/util/document_generator' require 'msf/core/opt_condition' diff --git a/lib/msf/ui/console/command_dispatcher/payload.rb b/lib/msf/ui/console/command_dispatcher/payload.rb index 556b7e7f52..ff9ec13fe5 100644 --- a/lib/msf/ui/console/command_dispatcher/payload.rb +++ b/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 diff --git a/lib/msf/util.rb b/lib/msf/util.rb index 7ecdcf30ce..1a089dfac6 100644 --- a/lib/msf/util.rb +++ b/lib/msf/util.rb @@ -19,17 +19,11 @@ end end # Executable generation and encoding -require 'msf/util/exe' -require 'msf/util/helper' # Host helpers -require 'msf/util/host' # DBManager helpers -require 'msf/util/db_manager' # Java deserialization payload generators -require 'msf/util/java_deserialization' # .NET deserialization payload generators -require 'msf/util/dot_net_deserialization' diff --git a/lib/msf/util/document_generator.rb b/lib/msf/util/document_generator.rb index ec473e31aa..b1e69b7908 100644 --- a/lib/msf/util/document_generator.rb +++ b/lib/msf/util/document_generator.rb @@ -4,7 +4,6 @@ # ### -require 'msf/util/document_generator/pull_request_finder' module Msf module Util diff --git a/lib/msf/util/dot_net_deserialization.rb b/lib/msf/util/dot_net_deserialization.rb index 7f705cc032..2f53119e6b 100644 --- a/lib/msf/util/dot_net_deserialization.rb +++ b/lib/msf/util/dot_net_deserialization.rb @@ -1,9 +1,4 @@ require 'bindata' -require 'msf/util/dot_net_deserialization/assemblies' -require 'msf/util/dot_net_deserialization/enums' -require 'msf/util/dot_net_deserialization/types' -require 'msf/util/dot_net_deserialization/gadget_chains' -require 'msf/util/dot_net_deserialization/formatters' module Msf module Util diff --git a/lib/msf/util/dot_net_deserialization/formatters.rb b/lib/msf/util/dot_net_deserialization/formatters.rb index 48e451fdf7..bde1787c66 100644 --- a/lib/msf/util/dot_net_deserialization/formatters.rb +++ b/lib/msf/util/dot_net_deserialization/formatters.rb @@ -3,9 +3,6 @@ module Util module DotNetDeserialization module Formatters -require 'msf/util/dot_net_deserialization/formatters/binary_formatter' -require 'msf/util/dot_net_deserialization/formatters/los_formatter' -require 'msf/util/dot_net_deserialization/formatters/soap_formatter' NAMES = [ :BinaryFormatter, diff --git a/lib/msf/util/dot_net_deserialization/gadget_chains.rb b/lib/msf/util/dot_net_deserialization/gadget_chains.rb index 5ea0ffeff6..af1263dc45 100644 --- a/lib/msf/util/dot_net_deserialization/gadget_chains.rb +++ b/lib/msf/util/dot_net_deserialization/gadget_chains.rb @@ -3,9 +3,6 @@ module Util module DotNetDeserialization module GadgetChains -require 'msf/util/dot_net_deserialization/gadget_chains/text_formatting_run_properties' -require 'msf/util/dot_net_deserialization/gadget_chains/type_confuse_delegate' -require 'msf/util/dot_net_deserialization/gadget_chains/windows_identity' NAMES = [ :TextFormattingRunProperties, diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb index 5a113d691a..3f2a7038dd 100644 --- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb +++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb @@ -2,6 +2,7 @@ require 'set' require 'rex/post/meterpreter' require 'rex/parser/arguments' +require 'rex' module Rex module Post diff --git a/modules/auxiliary/gather/windows_secrets_dump.rb b/modules/auxiliary/gather/windows_secrets_dump.rb index e87c1197a2..931eeb4c66 100644 --- a/modules/auxiliary/gather/windows_secrets_dump.rb +++ b/modules/auxiliary/gather/windows_secrets_dump.rb @@ -3,7 +3,6 @@ # Current source: https://github.com/rapid7/metasploit-framework ## -require 'msf/util/windows_registry_parser' require 'metasploit/framework/hashes/identify' class MetasploitModule < Msf::Auxiliary diff --git a/modules/exploits/windows/browser/ie_unsafe_scripting.rb b/modules/exploits/windows/browser/ie_unsafe_scripting.rb index 846afbadf2..fa37dc0318 100644 --- a/modules/exploits/windows/browser/ie_unsafe_scripting.rb +++ b/modules/exploits/windows/browser/ie_unsafe_scripting.rb @@ -3,7 +3,6 @@ # Current source: https://github.com/rapid7/metasploit-framework ## -require 'msf/util/exe' class MetasploitModule < Msf::Exploit::Remote Rank = ManualRanking diff --git a/spec/lib/msf/util/document_generator/normalizer_spec.rb b/spec/lib/msf/util/document_generator/normalizer_spec.rb index 30087284e2..803ee22e29 100644 --- a/spec/lib/msf/util/document_generator/normalizer_spec.rb +++ b/spec/lib/msf/util/document_generator/normalizer_spec.rb @@ -1,6 +1,4 @@ require 'rex' -require 'msf/util/document_generator' -require 'msf/util/document_generator/pull_request_finder' RSpec.describe Msf::Util::DocumentGenerator::DocumentNormalizer do diff --git a/spec/lib/msf/util/document_generator/pull_request_finder_spec.rb b/spec/lib/msf/util/document_generator/pull_request_finder_spec.rb index edd19163b8..f4d69920ef 100644 --- a/spec/lib/msf/util/document_generator/pull_request_finder_spec.rb +++ b/spec/lib/msf/util/document_generator/pull_request_finder_spec.rb @@ -1,5 +1,4 @@ require 'rex' -require 'msf/util/document_generator' require 'octokit' require 'net/http' diff --git a/spec/lib/msf/util/dot_net_deserialization_spec.rb b/spec/lib/msf/util/dot_net_deserialization_spec.rb index e678f7d93c..b86bfc9692 100644 --- a/spec/lib/msf/util/dot_net_deserialization_spec.rb +++ b/spec/lib/msf/util/dot_net_deserialization_spec.rb @@ -1,5 +1,4 @@ require 'rex' -require 'msf/util/dot_net_deserialization' RSpec.shared_examples 'a valid serialized stream' do |stream| it 'should start with a SerializedStreamHeader record' do diff --git a/spec/lib/msf/util/java_deserialization_spec.rb b/spec/lib/msf/util/java_deserialization_spec.rb index 4f888dd235..4266935997 100644 --- a/spec/lib/msf/util/java_deserialization_spec.rb +++ b/spec/lib/msf/util/java_deserialization_spec.rb @@ -1,5 +1,4 @@ require 'rex' -require 'msf/util/java_deserialization' RSpec.describe Msf::Util::JavaDeserialization do let(:payload_name) do diff --git a/tools/modules/update_payload_cached_sizes.rb b/tools/modules/update_payload_cached_sizes.rb index ae722e593b..a15bf7032d 100755 --- a/tools/modules/update_payload_cached_sizes.rb +++ b/tools/modules/update_payload_cached_sizes.rb @@ -22,7 +22,6 @@ $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB'] gem 'rex-text' require 'rex' -require 'msf/util/payload_cached_size' # Initialize the simplified framework instance. framework = Msf::Simple::Framework.create('DisableDatabase' => true)