diff --git a/lib/msf/base/sessions/meterpreter.rb b/lib/msf/base/sessions/meterpreter.rb index 8621f6af54..8711be1704 100644 --- a/lib/msf/base/sessions/meterpreter.rb +++ b/lib/msf/base/sessions/meterpreter.rb @@ -180,32 +180,30 @@ class Meterpreter < Rex::Post::Meterpreter::Client print_warning('Meterpreter start up operations have been aborted. Use the session at your own risk.') return nil end - # Unhook the process prior to loading stdapi to reduce logging/inspection by any AV/PSP - if datastore['AutoUnhookProcess'] == true - console.run_single('load unhook') - console.run_single('unhook_pe') - end - - unless datastore['AutoLoadStdapi'] == false - - session.load_stdapi - - unless datastore['AutoSystemInfo'] == false - session.load_session_info - end - - # only load priv on native windows - # TODO: abstract this too, to remove windows stuff - if session.platform == 'windows' && [ARCH_X86, ARCH_X64].include?(session.arch) - session.load_priv rescue nil - end - end + extensions = datastore['AutoLoadExtensions']&.delete(' ').split(',') || [] + # BEGIN: This should be removed on MSF 7 + # Unhook the process prior to loading stdapi to reduce logging/inspection by any AV/PSP (by default unhook is first, see meterpreter_options/windows.rb) + extensions.push('unhook') if datastore['AutoUnhookProcess'] && session.platform == 'windows' + extensions.push('stdapi') if datastore['AutoLoadStdapi'] + extensions.push('priv') if datastore['AutoLoadStdapi'] && session.platform == 'windows' + extensions.push('android') if session.platform == 'android' + extensions = extensions.uniq + # END + original = console.disable_output + console.disable_output = true # TODO: abstract this a little, perhaps a "post load" function that removes # platform-specific stuff? - if session.platform == 'android' - session.load_android + extensions.each do |extension| + begin + console.run_single("load #{extension}") + console.run_single('unhook_pe') if extension == 'unhook' + session.load_session_info if extension == 'stdapi' && datastore['AutoSystemInfo'] + rescue => e + print_warning("Failed loading extension #{extension}") + end end + console.disable_output = original ['InitialAutoRunScript', 'AutoRunScript'].each do |key| unless datastore[key].nil? || datastore[key].empty? diff --git a/lib/msf/base/sessions/meterpreter_options/android.rb b/lib/msf/base/sessions/meterpreter_options/android.rb new file mode 100644 index 0000000000..15f3fbd856 --- /dev/null +++ b/lib/msf/base/sessions/meterpreter_options/android.rb @@ -0,0 +1,27 @@ +# -*- coding: binary -*- + +require 'shellwords' + +module Msf + module Sessions + # + # Defines common options across all Meterpreter implementations + # + module MeterpreterOptions::Android + include Msf::Sessions::MeterpreterOptions::Common + def initialize(info = {}) + super(info) + + register_advanced_options( + [ + OptString.new( + 'AutoLoadExtensions', + [true, "Automatically load extensions on bootstrap, comma separated.", 'stdapi,android'] + ), + ], + self.class + ) + end + end + end +end diff --git a/lib/msf/base/sessions/meterpreter_options/apple_ios.rb b/lib/msf/base/sessions/meterpreter_options/apple_ios.rb new file mode 100644 index 0000000000..01f97a2f59 --- /dev/null +++ b/lib/msf/base/sessions/meterpreter_options/apple_ios.rb @@ -0,0 +1,31 @@ +# -*- coding: binary -*- + +require 'shellwords' + +module Msf + module Sessions + # + # Defines common options across all Meterpreter implementations + # + module MeterpreterOptions::AppleIos + include Msf::Sessions::MeterpreterOptions::Common + def initialize(info = {}) + super(info) + + register_advanced_options( + [ + OptString.new( + 'AutoLoadExtensions', + [true, "Automatically load extensions on bootstrap, comma separated.", 'stdapi'] + ), + OptString.new( + 'PayloadProcessCommandLine', + [ false, 'The displayed command line that will be used by the payload', ''] + ), + ], + self.class + ) + end + end + end +end diff --git a/lib/msf/base/sessions/meterpreter_options/bsd.rb b/lib/msf/base/sessions/meterpreter_options/bsd.rb new file mode 100644 index 0000000000..11574a7bfd --- /dev/null +++ b/lib/msf/base/sessions/meterpreter_options/bsd.rb @@ -0,0 +1,27 @@ +# -*- coding: binary -*- + +require 'shellwords' + +module Msf + module Sessions + # + # Defines common options across all Meterpreter implementations + # + module MeterpreterOptions::Bsd + include Msf::Sessions::MeterpreterOptions::Common + def initialize(info = {}) + super(info) + + register_advanced_options( + [ + OptString.new( + 'AutoLoadExtensions', + [true, "Automatically load extensions on bootstrap, comma separated.", 'stdapi'] + ), + ], + self.class + ) + end + end + end +end diff --git a/lib/msf/base/sessions/meterpreter_options.rb b/lib/msf/base/sessions/meterpreter_options/common.rb similarity index 90% rename from lib/msf/base/sessions/meterpreter_options.rb rename to lib/msf/base/sessions/meterpreter_options/common.rb index 0d1ad3ae45..6e547c3ef9 100644 --- a/lib/msf/base/sessions/meterpreter_options.rb +++ b/lib/msf/base/sessions/meterpreter_options/common.rb @@ -7,7 +7,7 @@ module Msf # # Defines common options across all Meterpreter implementations # - module MeterpreterOptions + module MeterpreterOptions::Common TIMEOUT_SESSION = 24 * 3600 * 7 # 1 week TIMEOUT_COMMS = 300 # 5 minutes @@ -63,14 +63,6 @@ module Msf 'SessionCommunicationTimeout', [ false, 'The number of seconds of no activity before this session should be killed', TIMEOUT_COMMS] ), - OptString.new( - 'PayloadProcessCommandLine', - [ false, 'The displayed command line that will be used by the payload', ''] - ), - OptBool.new( - 'AutoUnhookProcess', - [true, "Automatically load the unhook extension and unhook the process", false] - ), OptBool.new( 'MeterpreterDebugBuild', [false, 'Use a debug version of Meterpreter'] diff --git a/lib/msf/base/sessions/meterpreter_options/java.rb b/lib/msf/base/sessions/meterpreter_options/java.rb new file mode 100644 index 0000000000..cef2c0663c --- /dev/null +++ b/lib/msf/base/sessions/meterpreter_options/java.rb @@ -0,0 +1,27 @@ +# -*- coding: binary -*- + +require 'shellwords' + +module Msf + module Sessions + # + # Defines common options across all Meterpreter implementations + # + module MeterpreterOptions::Java + include Msf::Sessions::MeterpreterOptions::Common + def initialize(info = {}) + super(info) + + register_advanced_options( + [ + OptString.new( + 'AutoLoadExtensions', + [true, "Automatically load extensions on bootstrap, comma separated.", 'stdapi'] + ), + ], + self.class + ) + end + end + end +end diff --git a/lib/msf/base/sessions/meterpreter_options/linux.rb b/lib/msf/base/sessions/meterpreter_options/linux.rb new file mode 100644 index 0000000000..7fd9f23bbc --- /dev/null +++ b/lib/msf/base/sessions/meterpreter_options/linux.rb @@ -0,0 +1,31 @@ +# -*- coding: binary -*- + +require 'shellwords' + +module Msf + module Sessions + # + # Defines common options across all Meterpreter implementations + # + module MeterpreterOptions::Linux + include Msf::Sessions::MeterpreterOptions::Common + def initialize(info = {}) + super(info) + + register_advanced_options( + [ + OptString.new( + 'AutoLoadExtensions', + [true, "Automatically load extensions on bootstrap, comma separated.", 'stdapi'] + ), + OptString.new( + 'PayloadProcessCommandLine', + [ false, 'The displayed command line that will be used by the payload', ''] + ), + ], + self.class + ) + end + end + end +end diff --git a/lib/msf/base/sessions/meterpreter_options/osx.rb b/lib/msf/base/sessions/meterpreter_options/osx.rb new file mode 100644 index 0000000000..d6f5be451c --- /dev/null +++ b/lib/msf/base/sessions/meterpreter_options/osx.rb @@ -0,0 +1,31 @@ +# -*- coding: binary -*- + +require 'shellwords' + +module Msf + module Sessions + # + # Defines common options across all Meterpreter implementations + # + module MeterpreterOptions::OSX + include Msf::Sessions::MeterpreterOptions::Common + def initialize(info = {}) + super(info) + + register_advanced_options( + [ + OptString.new( + 'AutoLoadExtensions', + [true, 'Automatically load extensions on bootstrap, comma separated.', 'stdapi'] + ), + OptString.new( + 'PayloadProcessCommandLine', + [ false, 'The displayed command line that will be used by the payload', ''] + ), + ], + self.class + ) + end + end + end +end diff --git a/lib/msf/base/sessions/meterpreter_options/php.rb b/lib/msf/base/sessions/meterpreter_options/php.rb new file mode 100644 index 0000000000..ec5abff5e8 --- /dev/null +++ b/lib/msf/base/sessions/meterpreter_options/php.rb @@ -0,0 +1,27 @@ +# -*- coding: binary -*- + +require 'shellwords' + +module Msf + module Sessions + # + # Defines common options across all Meterpreter implementations + # + module MeterpreterOptions::Php + include Msf::Sessions::MeterpreterOptions::Common + def initialize(info = {}) + super(info) + + register_advanced_options( + [ + OptString.new( + 'AutoLoadExtensions', + [true, "Automatically load extensions on bootstrap, comma separated.", 'stdapi'] + ), + ], + self.class + ) + end + end + end +end diff --git a/lib/msf/base/sessions/meterpreter_options/python.rb b/lib/msf/base/sessions/meterpreter_options/python.rb new file mode 100644 index 0000000000..f2ddfd4035 --- /dev/null +++ b/lib/msf/base/sessions/meterpreter_options/python.rb @@ -0,0 +1,27 @@ +# -*- coding: binary -*- + +require 'shellwords' + +module Msf + module Sessions + # + # Defines common options across all Meterpreter implementations + # + module MeterpreterOptions::Python + include Msf::Sessions::MeterpreterOptions::Common + def initialize(info = {}) + super(info) + + register_advanced_options( + [ + OptString.new( + 'AutoLoadExtensions', + [true, "Automatically load extensions on bootstrap, comma separated.", 'stdapi'] + ), + ], + self.class + ) + end + end + end +end diff --git a/lib/msf/base/sessions/meterpreter_options/windows.rb b/lib/msf/base/sessions/meterpreter_options/windows.rb new file mode 100644 index 0000000000..391e2c309d --- /dev/null +++ b/lib/msf/base/sessions/meterpreter_options/windows.rb @@ -0,0 +1,31 @@ +# -*- coding: binary -*- + +require 'shellwords' + +module Msf + module Sessions + # + # Defines common options across all Meterpreter implementations + # + module MeterpreterOptions::Windows + include Msf::Sessions::MeterpreterOptions::Common + def initialize(info = {}) + super(info) + + register_advanced_options( + [ + OptString.new( + 'AutoLoadExtensions', + [true, "Automatically load extensions on bootstrap, comma separated.", 'unhook,priv,stdapi'] + ), + OptBool.new( + 'AutoUnhookProcess', + [true, "Automatically load the unhook extension and unhook the process", false] + ), + ], + self.class + ) + end + end + end +end diff --git a/lib/msf/core/payload/android/meterpreter_loader.rb b/lib/msf/core/payload/android/meterpreter_loader.rb index 10a5fa7015..197caed857 100644 --- a/lib/msf/core/payload/android/meterpreter_loader.rb +++ b/lib/msf/core/payload/android/meterpreter_loader.rb @@ -13,7 +13,7 @@ module Payload::Android::MeterpreterLoader include Msf::Payload::Android include Msf::Payload::UUID::Options - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Android def initialize(info={}) super(update_info(info, diff --git a/lib/msf/core/payload/java/meterpreter_loader.rb b/lib/msf/core/payload/java/meterpreter_loader.rb index b53e0b649e..e2654ba6c7 100644 --- a/lib/msf/core/payload/java/meterpreter_loader.rb +++ b/lib/msf/core/payload/java/meterpreter_loader.rb @@ -13,7 +13,7 @@ module Payload::Java::MeterpreterLoader include Msf::Payload::Java include Msf::Payload::UUID::Options - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Java def initialize(info = {}) super(update_info(info, diff --git a/lib/msf/core/payload/python/meterpreter_loader.rb b/lib/msf/core/payload/python/meterpreter_loader.rb index 2dfd080add..81ec869640 100644 --- a/lib/msf/core/payload/python/meterpreter_loader.rb +++ b/lib/msf/core/payload/python/meterpreter_loader.rb @@ -14,7 +14,7 @@ module Payload::Python::MeterpreterLoader include Msf::Payload::Python include Msf::Payload::UUID::Options include Msf::Payload::TransportConfig - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Python def initialize(info = {}) super(update_info(info, diff --git a/lib/rex/post/meterpreter/pivot.rb b/lib/rex/post/meterpreter/pivot.rb index 64d5c9278d..dc7c9f53ec 100644 --- a/lib/rex/post/meterpreter/pivot.rb +++ b/lib/rex/post/meterpreter/pivot.rb @@ -85,11 +85,11 @@ class Pivot c = Class.new(::Msf::Payload) c.include(::Msf::Payload::Stager) c.include(::Msf::Payload::TransportConfig) - c.include(::Msf::Sessions::MeterpreterOptions) # TODO: add more platforms case opts[:platform] when 'windows' + c.include(::Msf::Sessions::MeterpreterOptions::Windows) # Moved to be platform-specific # Include the appropriate reflective dll injection module for the target process architecture... if opts[:arch] == ARCH_X86 c.include(::Msf::Payload::Windows::MeterpreterLoader) diff --git a/modules/payloads/singles/android/meterpreter_reverse_http.rb b/modules/payloads/singles/android/meterpreter_reverse_http.rb index a56b2dd4b4..aa423db6a7 100644 --- a/modules/payloads/singles/android/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/android/meterpreter_reverse_http.rb @@ -10,7 +10,7 @@ module MetasploitModule include Msf::Payload::Single include Msf::Payload::Android include Msf::Payload::UUID::Options - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Android def initialize(info = {}) super( diff --git a/modules/payloads/singles/android/meterpreter_reverse_https.rb b/modules/payloads/singles/android/meterpreter_reverse_https.rb index e8160f8442..f24c6e001b 100644 --- a/modules/payloads/singles/android/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/android/meterpreter_reverse_https.rb @@ -10,7 +10,7 @@ module MetasploitModule include Msf::Payload::Single include Msf::Payload::Android include Msf::Payload::UUID::Options - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Android def initialize(info = {}) super( diff --git a/modules/payloads/singles/android/meterpreter_reverse_tcp.rb b/modules/payloads/singles/android/meterpreter_reverse_tcp.rb index c457db43fb..137bab0c25 100644 --- a/modules/payloads/singles/android/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/android/meterpreter_reverse_tcp.rb @@ -9,7 +9,7 @@ module MetasploitModule include Msf::Payload::TransportConfig include Msf::Payload::Single include Msf::Payload::Android - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Android def initialize(info = {}) super( diff --git a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_http.rb b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_http.rb index e333586c28..0936e2c41f 100644 --- a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 861968 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::AppleIos include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_https.rb b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_https.rb index 46eac57857..113ad80c20 100644 --- a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 861968 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::AppleIos include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_tcp.rb index 1449f1b315..1fe5da3e10 100644 --- a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 861968 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::AppleIos include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_http.rb b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_http.rb index 03afa2c7e7..844fe770be 100644 --- a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 673968 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::AppleIos include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_https.rb b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_https.rb index 25ca89c34d..748d3c5e1e 100644 --- a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 673968 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::AppleIos include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_tcp.rb b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_tcp.rb index 97b771d1ca..a211285914 100644 --- a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 673968 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::AppleIos include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/bsd/x86/metsvc_bind_tcp.rb b/modules/payloads/singles/bsd/x86/metsvc_bind_tcp.rb index ed46236b29..e4e3620792 100644 --- a/modules/payloads/singles/bsd/x86/metsvc_bind_tcp.rb +++ b/modules/payloads/singles/bsd/x86/metsvc_bind_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule include Msf::Payload::Bsd include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Bsd def initialize(info = {}) super( diff --git a/modules/payloads/singles/bsd/x86/metsvc_reverse_tcp.rb b/modules/payloads/singles/bsd/x86/metsvc_reverse_tcp.rb index d720975c50..1424a9db85 100644 --- a/modules/payloads/singles/bsd/x86/metsvc_reverse_tcp.rb +++ b/modules/payloads/singles/bsd/x86/metsvc_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule include Msf::Payload::Bsd include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Bsd def initialize(info = {}) super( diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb index 8725cc119a..8fc69c37be 100644 --- a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1184672 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb index 730bd5ba55..573b88819f 100644 --- a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1184672 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb index 4d9af30b5f..35a7fc84b7 100644 --- a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1184672 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb index 001bc09079..e0344f9817 100644 --- a/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1106544 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb index adf0d89364..fd3b4e53ca 100644 --- a/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1106544 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb index 043f4152f3..0631a1ea45 100644 --- a/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1106544 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb index 370be0ad6f..f3c9774bed 100644 --- a/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1106844 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb index 54a5910858..1af2703707 100644 --- a/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1106844 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb index ffa13e9323..0166ca2b4c 100644 --- a/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1106844 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb index 1e899a9f51..39740373e3 100644 --- a/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1685392 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb index c66ee78d6c..43d965b7ab 100644 --- a/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1685392 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb index 5b58c021a9..fcc0d9f842 100644 --- a/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1685392 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb index 447790e58c..4a5871ae8b 100644 --- a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1583440 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb index 55c59c6960..7b9a4f340f 100644 --- a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1583440 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb index 792ca9fec2..f20fcb4067 100644 --- a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1583440 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb index ce74fab211..be0d4e92e9 100644 --- a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1588440 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb index b764e0e140..a825280770 100644 --- a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1588440 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb index 12f8c5db6d..c1ea18a9ee 100644 --- a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1588440 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb index 9f2958b0d2..a67e1b9a37 100644 --- a/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1285752 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb index 6734bfd3f2..f92595f9b0 100644 --- a/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1285752 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb index 7102bdedca..6c3f71c0d3 100644 --- a/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1285752 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb index 01c96ef3a6..ea5dd3fd1e 100644 --- a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1311576 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb index 42532df732..04f84a4101 100644 --- a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1311576 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb index cea8efc105..8b3a3981fd 100644 --- a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1311576 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_http.rb index 7e8486f002..b0796c5b8a 100644 --- a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1238432 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_https.rb index 51d21050c8..adc64599ed 100644 --- a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1238432 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_tcp.rb index 11d81932d6..252681907b 100644 --- a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1238432 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb index 1775dc873a..0f13084748 100644 --- a/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1121480 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb index 6c5c953b43..092137b4e3 100644 --- a/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1121480 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb index d8f31d635a..a9cff770ee 100644 --- a/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1121480 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb index e480b4750b..f00fc17bae 100644 --- a/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1188612 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb index 3137109886..ca981dbf70 100644 --- a/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1188612 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb index 38c85a64b6..d05cc237e2 100644 --- a/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1188612 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/x86/metsvc_bind_tcp.rb b/modules/payloads/singles/linux/x86/metsvc_bind_tcp.rb index bfeeb144cd..ec3cac4c1e 100644 --- a/modules/payloads/singles/linux/x86/metsvc_bind_tcp.rb +++ b/modules/payloads/singles/linux/x86/metsvc_bind_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule include Msf::Payload::Linux::X86::Prepends include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux def initialize(info = {}) super( diff --git a/modules/payloads/singles/linux/x86/metsvc_reverse_tcp.rb b/modules/payloads/singles/linux/x86/metsvc_reverse_tcp.rb index 396c579db3..f038a5c6ab 100644 --- a/modules/payloads/singles/linux/x86/metsvc_reverse_tcp.rb +++ b/modules/payloads/singles/linux/x86/metsvc_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule include Msf::Payload::Linux::X86::Prepends include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux def initialize(info = {}) super( diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb index b2e28b4a03..cd64973d09 100644 --- a/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1332048 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb index 7907ea308b..9353c46bc9 100644 --- a/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1332048 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb index 7f7fbd7821..11bffa270d 100644 --- a/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 1332048 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/osx/aarch64/meterpreter_reverse_http.rb b/modules/payloads/singles/osx/aarch64/meterpreter_reverse_http.rb index ebbe83756c..b63261a821 100644 --- a/modules/payloads/singles/osx/aarch64/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/osx/aarch64/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 890904 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::OSX include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/osx/aarch64/meterpreter_reverse_https.rb b/modules/payloads/singles/osx/aarch64/meterpreter_reverse_https.rb index c5b417ea95..a1c8fb95a2 100644 --- a/modules/payloads/singles/osx/aarch64/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/osx/aarch64/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 890904 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::OSX include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/osx/aarch64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/osx/aarch64/meterpreter_reverse_tcp.rb index bb57fa6f3d..b6d7548a09 100644 --- a/modules/payloads/singles/osx/aarch64/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/osx/aarch64/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 890904 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::OSX include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb index b24528f0c2..b9a8247cd4 100644 --- a/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 857592 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::OSX include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb index 2043b03739..ff259e97b1 100644 --- a/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 857592 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::OSX include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb index ece276cf5e..70ea2e7bc7 100644 --- a/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule CachedSize = 857592 include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::OSX include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/singles/php/meterpreter_reverse_tcp.rb b/modules/payloads/singles/php/meterpreter_reverse_tcp.rb index f01e490073..48baa9ce9d 100644 --- a/modules/payloads/singles/php/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/php/meterpreter_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule include Msf::Payload::Single include Msf::Payload::Php::ReverseTcp - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Php def initialize(info = {}) super( diff --git a/modules/payloads/singles/windows/meterpreter_bind_named_pipe.rb b/modules/payloads/singles/windows/meterpreter_bind_named_pipe.rb index 5acfd75dab..5e22e14960 100644 --- a/modules/payloads/singles/windows/meterpreter_bind_named_pipe.rb +++ b/modules/payloads/singles/windows/meterpreter_bind_named_pipe.rb @@ -10,7 +10,7 @@ module MetasploitModule include Msf::Payload::Windows include Msf::Payload::Single include Msf::Payload::Windows::MeterpreterLoader - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/singles/windows/meterpreter_bind_tcp.rb b/modules/payloads/singles/windows/meterpreter_bind_tcp.rb index 2bf0be4f93..84d81da841 100644 --- a/modules/payloads/singles/windows/meterpreter_bind_tcp.rb +++ b/modules/payloads/singles/windows/meterpreter_bind_tcp.rb @@ -10,7 +10,7 @@ module MetasploitModule include Msf::Payload::Windows include Msf::Payload::Single include Msf::Payload::Windows::MeterpreterLoader - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/singles/windows/meterpreter_reverse_http.rb b/modules/payloads/singles/windows/meterpreter_reverse_http.rb index f0e6f51976..5b00b86224 100644 --- a/modules/payloads/singles/windows/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/windows/meterpreter_reverse_http.rb @@ -10,7 +10,7 @@ module MetasploitModule include Msf::Payload::Windows include Msf::Payload::Single include Msf::Payload::Windows::MeterpreterLoader - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/singles/windows/meterpreter_reverse_https.rb b/modules/payloads/singles/windows/meterpreter_reverse_https.rb index e382c41138..a832b5bd28 100644 --- a/modules/payloads/singles/windows/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/windows/meterpreter_reverse_https.rb @@ -10,7 +10,7 @@ module MetasploitModule include Msf::Payload::Windows include Msf::Payload::Single include Msf::Payload::Windows::MeterpreterLoader - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/singles/windows/meterpreter_reverse_ipv6_tcp.rb b/modules/payloads/singles/windows/meterpreter_reverse_ipv6_tcp.rb index dd79c1edc3..0e516147c0 100644 --- a/modules/payloads/singles/windows/meterpreter_reverse_ipv6_tcp.rb +++ b/modules/payloads/singles/windows/meterpreter_reverse_ipv6_tcp.rb @@ -10,7 +10,7 @@ module MetasploitModule include Msf::Payload::Windows include Msf::Payload::Single include Msf::Payload::Windows::MeterpreterLoader - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/singles/windows/meterpreter_reverse_tcp.rb b/modules/payloads/singles/windows/meterpreter_reverse_tcp.rb index 469882e3b6..8707e67ffd 100644 --- a/modules/payloads/singles/windows/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/windows/meterpreter_reverse_tcp.rb @@ -10,7 +10,7 @@ module MetasploitModule include Msf::Payload::Windows include Msf::Payload::Single include Msf::Payload::Windows::MeterpreterLoader - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/singles/windows/metsvc_bind_tcp.rb b/modules/payloads/singles/windows/metsvc_bind_tcp.rb index da7f92fe61..0fce0656ce 100644 --- a/modules/payloads/singles/windows/metsvc_bind_tcp.rb +++ b/modules/payloads/singles/windows/metsvc_bind_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule include Msf::Payload::Windows include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/singles/windows/metsvc_reverse_tcp.rb b/modules/payloads/singles/windows/metsvc_reverse_tcp.rb index 5a52e0b61a..ae2c0961ee 100644 --- a/modules/payloads/singles/windows/metsvc_reverse_tcp.rb +++ b/modules/payloads/singles/windows/metsvc_reverse_tcp.rb @@ -8,7 +8,7 @@ module MetasploitModule include Msf::Payload::Windows include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/singles/windows/x64/meterpreter_bind_named_pipe.rb b/modules/payloads/singles/windows/x64/meterpreter_bind_named_pipe.rb index c8fb3ba5d4..c1746a058b 100644 --- a/modules/payloads/singles/windows/x64/meterpreter_bind_named_pipe.rb +++ b/modules/payloads/singles/windows/x64/meterpreter_bind_named_pipe.rb @@ -10,7 +10,7 @@ module MetasploitModule include Msf::Payload::Windows include Msf::Payload::Single include Msf::Payload::Windows::MeterpreterLoader_x64 - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/singles/windows/x64/meterpreter_bind_tcp.rb b/modules/payloads/singles/windows/x64/meterpreter_bind_tcp.rb index 4c5bef91ea..6d0565914e 100644 --- a/modules/payloads/singles/windows/x64/meterpreter_bind_tcp.rb +++ b/modules/payloads/singles/windows/x64/meterpreter_bind_tcp.rb @@ -10,7 +10,7 @@ module MetasploitModule include Msf::Payload::Windows include Msf::Payload::Single include Msf::Payload::Windows::MeterpreterLoader_x64 - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/singles/windows/x64/meterpreter_reverse_http.rb b/modules/payloads/singles/windows/x64/meterpreter_reverse_http.rb index 7ce487c5e1..8995607f10 100644 --- a/modules/payloads/singles/windows/x64/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/windows/x64/meterpreter_reverse_http.rb @@ -10,7 +10,7 @@ module MetasploitModule include Msf::Payload::Windows include Msf::Payload::Single include Msf::Payload::Windows::MeterpreterLoader_x64 - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/singles/windows/x64/meterpreter_reverse_https.rb b/modules/payloads/singles/windows/x64/meterpreter_reverse_https.rb index 1ce20b3ff4..664500155f 100644 --- a/modules/payloads/singles/windows/x64/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/windows/x64/meterpreter_reverse_https.rb @@ -10,7 +10,7 @@ module MetasploitModule include Msf::Payload::Windows include Msf::Payload::Single include Msf::Payload::Windows::MeterpreterLoader_x64 - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/singles/windows/x64/meterpreter_reverse_ipv6_tcp.rb b/modules/payloads/singles/windows/x64/meterpreter_reverse_ipv6_tcp.rb index f08c0866a9..9b8959a4d6 100644 --- a/modules/payloads/singles/windows/x64/meterpreter_reverse_ipv6_tcp.rb +++ b/modules/payloads/singles/windows/x64/meterpreter_reverse_ipv6_tcp.rb @@ -10,7 +10,7 @@ module MetasploitModule include Msf::Payload::Windows include Msf::Payload::Single include Msf::Payload::Windows::MeterpreterLoader_x64 - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/singles/windows/x64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/windows/x64/meterpreter_reverse_tcp.rb index 4bc6fc3aa5..83702e270f 100644 --- a/modules/payloads/singles/windows/x64/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/windows/x64/meterpreter_reverse_tcp.rb @@ -10,7 +10,7 @@ module MetasploitModule include Msf::Payload::Windows include Msf::Payload::Single include Msf::Payload::Windows::MeterpreterLoader_x64 - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/stages/android/meterpreter.rb b/modules/payloads/stages/android/meterpreter.rb index 8deaedd91f..b688e68202 100644 --- a/modules/payloads/stages/android/meterpreter.rb +++ b/modules/payloads/stages/android/meterpreter.rb @@ -5,7 +5,7 @@ module MetasploitModule include Msf::Payload::Android::MeterpreterLoader - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Android def initialize(info = {}) super( diff --git a/modules/payloads/stages/java/meterpreter.rb b/modules/payloads/stages/java/meterpreter.rb index 15b2a8db5d..0db7455057 100644 --- a/modules/payloads/stages/java/meterpreter.rb +++ b/modules/payloads/stages/java/meterpreter.rb @@ -5,7 +5,7 @@ module MetasploitModule include Msf::Payload::Java::MeterpreterLoader - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Java def initialize(info = {}) super( diff --git a/modules/payloads/stages/linux/aarch64/meterpreter.rb b/modules/payloads/stages/linux/aarch64/meterpreter.rb index 1671ade5da..c6114b5f30 100644 --- a/modules/payloads/stages/linux/aarch64/meterpreter.rb +++ b/modules/payloads/stages/linux/aarch64/meterpreter.rb @@ -6,7 +6,7 @@ require 'rex/elfparsey' module MetasploitModule - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/stages/linux/armle/meterpreter.rb b/modules/payloads/stages/linux/armle/meterpreter.rb index 2e9f3b93ae..1d9eae8805 100644 --- a/modules/payloads/stages/linux/armle/meterpreter.rb +++ b/modules/payloads/stages/linux/armle/meterpreter.rb @@ -6,7 +6,7 @@ require 'rex/elfparsey' module MetasploitModule - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/stages/linux/mipsbe/meterpreter.rb b/modules/payloads/stages/linux/mipsbe/meterpreter.rb index a61cad1066..269d2df811 100644 --- a/modules/payloads/stages/linux/mipsbe/meterpreter.rb +++ b/modules/payloads/stages/linux/mipsbe/meterpreter.rb @@ -6,7 +6,7 @@ require 'rex/elfparsey' module MetasploitModule - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/stages/linux/mipsle/meterpreter.rb b/modules/payloads/stages/linux/mipsle/meterpreter.rb index a1326d9328..d38c2064d5 100644 --- a/modules/payloads/stages/linux/mipsle/meterpreter.rb +++ b/modules/payloads/stages/linux/mipsle/meterpreter.rb @@ -6,7 +6,7 @@ require 'rex/elfparsey' module MetasploitModule - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/stages/linux/x64/meterpreter.rb b/modules/payloads/stages/linux/x64/meterpreter.rb index 1b38969e2b..39b3f94b3a 100644 --- a/modules/payloads/stages/linux/x64/meterpreter.rb +++ b/modules/payloads/stages/linux/x64/meterpreter.rb @@ -6,7 +6,7 @@ require 'rex/elfparsey' module MetasploitModule - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/stages/linux/x86/meterpreter.rb b/modules/payloads/stages/linux/x86/meterpreter.rb index bc8d7a5138..8f11c712ca 100644 --- a/modules/payloads/stages/linux/x86/meterpreter.rb +++ b/modules/payloads/stages/linux/x86/meterpreter.rb @@ -6,7 +6,7 @@ require 'rex/elfparsey' module MetasploitModule - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Linux include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/stages/osx/aarch64/meterpreter.rb b/modules/payloads/stages/osx/aarch64/meterpreter.rb index a894e170ba..10f89fa3cf 100644 --- a/modules/payloads/stages/osx/aarch64/meterpreter.rb +++ b/modules/payloads/stages/osx/aarch64/meterpreter.rb @@ -4,7 +4,7 @@ ## module MetasploitModule - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::OSX include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/stages/osx/x64/meterpreter.rb b/modules/payloads/stages/osx/x64/meterpreter.rb index 6ff787f618..584c2271a2 100644 --- a/modules/payloads/stages/osx/x64/meterpreter.rb +++ b/modules/payloads/stages/osx/x64/meterpreter.rb @@ -4,7 +4,7 @@ ## module MetasploitModule - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::OSX include Msf::Sessions::MettleConfig def initialize(info = {}) diff --git a/modules/payloads/stages/php/meterpreter.rb b/modules/payloads/stages/php/meterpreter.rb index 38a84ae9d5..e8723f3a09 100644 --- a/modules/payloads/stages/php/meterpreter.rb +++ b/modules/payloads/stages/php/meterpreter.rb @@ -6,7 +6,7 @@ require 'securerandom' module MetasploitModule - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Php def initialize(info = {}) super( diff --git a/modules/payloads/stages/windows/meterpreter.rb b/modules/payloads/stages/windows/meterpreter.rb index 3682773912..c727ac1b94 100644 --- a/modules/payloads/stages/windows/meterpreter.rb +++ b/modules/payloads/stages/windows/meterpreter.rb @@ -12,7 +12,7 @@ module MetasploitModule include Msf::Payload::Windows::MeterpreterLoader - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/stages/windows/patchupmeterpreter.rb b/modules/payloads/stages/windows/patchupmeterpreter.rb index 43da4c07e0..0242fadf09 100644 --- a/modules/payloads/stages/windows/patchupmeterpreter.rb +++ b/modules/payloads/stages/windows/patchupmeterpreter.rb @@ -10,7 +10,7 @@ ### module MetasploitModule include Msf::Payload::Windows::DllInject - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/modules/payloads/stages/windows/x64/meterpreter.rb b/modules/payloads/stages/windows/x64/meterpreter.rb index a7009d722a..c0a97632ab 100644 --- a/modules/payloads/stages/windows/x64/meterpreter.rb +++ b/modules/payloads/stages/windows/x64/meterpreter.rb @@ -12,7 +12,7 @@ module MetasploitModule include Msf::Payload::Windows::MeterpreterLoader_x64 - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::Windows def initialize(info = {}) super( diff --git a/tools/modules/meterpreter_reverse.erb b/tools/modules/meterpreter_reverse.erb index cc859059cc..8e012f795f 100644 --- a/tools/modules/meterpreter_reverse.erb +++ b/tools/modules/meterpreter_reverse.erb @@ -8,7 +8,7 @@ module MetasploitModule include Msf::Payload::Single - include Msf::Sessions::MeterpreterOptions + include Msf::Sessions::MeterpreterOptions::<%= platform.split('_').each { |s| s.casecmp?('osx') ? 'OSX' : s.capitalize! }.join %> include Msf::Sessions::MettleConfig def initialize(info = {})