One more cleanup, everything loads cleanly now

git-svn-id: file:///home/svn/framework3/trunk@6930 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
HD Moore 2009-08-01 04:08:25 +00:00
parent f84cadd9ea
commit 02443b3721
5 changed files with 14 additions and 5 deletions

View File

@ -16,3 +16,6 @@ class Meterpreter_x86_BSD < Msf::Sessions::Meterpreter
'fso'
end
end
end
end

View File

@ -16,3 +16,6 @@ class Meterpreter_x86_Linux < Msf::Sessions::Meterpreter
'lso'
end
end
end
end

View File

@ -16,3 +16,6 @@ class Meterpreter_x86_Win < Msf::Sessions::Meterpreter
'dll'
end
end
end
end

View File

@ -98,7 +98,7 @@ class ClientCore < Extension
# path of the local and target so that it gets loaded with a random
# name
if (opts['Extension'])
library_path = "ext" + rand(1000000).to_s + ".dll"
library_path = "ext" + rand(1000000).to_s + ".#{client.binary_suffix}"
target_path = library_path
end
end
@ -141,7 +141,7 @@ class ClientCore < Extension
end
# Get us to the installation root and then into data/meterpreter, where
# the file is expected to be
path = ::File.join(Msf::Config.install_root, 'data', 'meterpreter', 'ext_server_' + mod.downcase + '.dll')
path = ::File.join(Msf::Config.install_root, 'data', 'meterpreter', 'ext_server_' + mod.downcase + ".#{client.binary_suffix}")
if (opts['ExtensionPath'])
path = opts['ExtensionPath']
@ -174,7 +174,7 @@ class ClientCore < Extension
# Create the migrate stager
migrate_stager = c.new()
migrate_stager.datastore['DLL'] = ::File.join( Msf::Config.install_root, "data", "meterpreter", "metsrv.dll" )
migrate_stager.datastore['DLL'] = ::File.join( Msf::Config.install_root, "data", "meterpreter", "metsrv.#{client.binary_suffix}" )
payload = migrate_stager.stage_payload
# Send the migration request

View File

@ -234,7 +234,7 @@ class Console::CommandDispatcher::Core
exts = []
path = ::File.join(Msf::Config.install_root, 'data', 'meterpreter')
::Dir.entries(path).each { |f|
if (::File.file?(::File.join(path, f)) && f =~ /ext_server_(.*)\.dll/ )
if (::File.file?(::File.join(path, f)) && f =~ /ext_server_(.*)\.#{client.binary_suffix}/ )
exts.push($1)
end
}
@ -281,7 +281,7 @@ class Console::CommandDispatcher::Core
tabs = []
path = ::File.join(Msf::Config.install_root, 'data', 'meterpreter')
::Dir.entries(path).each { |f|
if (::File.file?(::File.join(path, f)) && f =~ /ext_server_(.*)\.dll/ )
if (::File.file?(::File.join(path, f)) && f =~ /ext_server_(.*)\.#{client.binary_suffix}/ )
if (not extensions.include?($1))
tabs.push($1)
end