fixes bad file refs for cmdstagers
when moving to the rex-exploitation gem some of the file references were missed, partially due to silly differences between how each file was referenced Fixes #7466bug/bundler_fix
parent
de87fccf85
commit
6b77f509ba
|
@ -26,10 +26,10 @@ module Exploit::CmdStager
|
|||
|
||||
# Constant for decoders - used when checking the default flavor decoder.
|
||||
DECODERS = {
|
||||
:debug_asm => File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "debug_asm"),
|
||||
:debug_write => File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "debug_write"),
|
||||
:vbs => File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "vbs_b64"),
|
||||
:vbs_adodb => File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "vbs_b64_adodb")
|
||||
:debug_asm => File.join(Rex::Exploitation::DATA_DIR, "exploits", "cmdstager", "debug_asm"),
|
||||
:debug_write => File.join(Rex::Exploitation::DATA_DIR, "exploits", "cmdstager", "debug_write"),
|
||||
:vbs => File.join(Rex::Exploitation::DATA_DIR, "exploits", "cmdstager", "vbs_b64"),
|
||||
:vbs_adodb => File.join(Rex::Exploitation::DATA_DIR, "exploits", "cmdstager", "vbs_b64_adodb")
|
||||
}
|
||||
|
||||
attr_accessor :stager_instance
|
||||
|
|
|
@ -201,7 +201,7 @@ SH
|
|||
end
|
||||
|
||||
def generate_decoder_vbs(opts = {})
|
||||
decoder_path = File.join(Msf::Config.data_directory, "exploits", "cmdstager", "vbs_b64")
|
||||
decoder_path = File.join(Rex::Exploitation::DATA_DIR, "exploits", "cmdstager", "vbs_b64")
|
||||
|
||||
f = File.new(decoder_path, "rb")
|
||||
decoder = f.read(f.stat.size)
|
||||
|
|
|
@ -50,7 +50,7 @@ class MetasploitModule < Msf::Exploit::Remote
|
|||
'DefaultTarget' => 0,
|
||||
'DefaultOptions' =>
|
||||
{
|
||||
'CMDSTAGER::DECODER' => File.join(Msf::Config.data_directory, "exploits", "cmdstager", "vbs_b64_noquot")
|
||||
'CMDSTAGER::DECODER' => File.join(Rex::Exploitation::DATA_DIR, "exploits", "cmdstager", "vbs_b64_noquot")
|
||||
},
|
||||
'DisclosureDate' => 'Jul 29 2013'))
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ class MetasploitModule < Msf::Exploit::Remote
|
|||
},
|
||||
'DefaultOptions' =>
|
||||
{
|
||||
'CMDSTAGER::DECODER' => File.join(Msf::Config.data_directory, "exploits", "cmdstager", "vbs_b64_noquot")
|
||||
'CMDSTAGER::DECODER' => File.join(Rex::Exploitation::DATA_DIR, "exploits", "cmdstager", "vbs_b64_noquot")
|
||||
},
|
||||
'Platform' => 'win',
|
||||
'Targets' =>
|
||||
|
|
|
@ -41,7 +41,7 @@ class MetasploitModule < Msf::Exploit::Remote
|
|||
'WfsDelay' => 30,
|
||||
'EXITFUNC' => 'thread',
|
||||
'InitialAutoRunScript' => 'post/windows/manage/priv_migrate',
|
||||
'CMDSTAGER::DECODER' => File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "vbs_b64_sleep")
|
||||
'CMDSTAGER::DECODER' => File.join(Rex::Exploitation::DATA_DIR, "exploits", "cmdstager", "vbs_b64_sleep")
|
||||
},
|
||||
'Platform' => 'win',
|
||||
'Arch' => [ ARCH_X86, ARCH_X86_64 ],
|
||||
|
|
|
@ -201,7 +201,7 @@ class MetasploitModule < Msf::Post
|
|||
#:nodelete => true # keep temp files (for debugging)
|
||||
}
|
||||
if session.platform =~ /win/i
|
||||
opts[:decoder] = File.join(Msf::Config.data_directory, 'exploits', 'cmdstager', 'vbs_b64')
|
||||
opts[:decoder] = File.join(Rex::Exploitation::DATA_DIR, "exploits", "cmdstager", 'vbs_b64')
|
||||
cmdstager = Rex::Exploitation::CmdStagerVBS.new(exe)
|
||||
else
|
||||
opts[:background] = true
|
||||
|
|
|
@ -601,7 +601,7 @@ RSpec.describe Msf::Exploit::CmdStager do
|
|||
context "when decoder set in the datastore" do
|
||||
|
||||
let(:decoder) do
|
||||
File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "vbs_b64")
|
||||
File.join(Rex::Exploitation::DATA_DIR, "exploits", "cmdstager", "vbs_b64")
|
||||
end
|
||||
|
||||
subject do
|
||||
|
@ -619,7 +619,7 @@ RSpec.describe Msf::Exploit::CmdStager do
|
|||
context "and decoder set in the opts" do
|
||||
|
||||
let(:decoder_opts) do
|
||||
File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "vbs_b64_adodb")
|
||||
File.join(Rex::Exploitation::DATA_DIR, "exploits", "cmdstager", "vbs_b64_adodb")
|
||||
end
|
||||
|
||||
it "returns the decoder_opts" do
|
||||
|
@ -637,7 +637,7 @@ RSpec.describe Msf::Exploit::CmdStager do
|
|||
context "with :decoder option" do
|
||||
|
||||
let(:decoder) do
|
||||
File.join(Msf::Config.install_root, "data", "exploits", "cmdstager", "vbs_b64")
|
||||
File.join(Rex::Exploitation::DATA_DIR, "exploits", "cmdstager", "vbs_b64")
|
||||
end
|
||||
|
||||
it "returns the :decoder option" do
|
||||
|
|
Loading…
Reference in New Issue