From 1f4ee19c05166bc355b15d72ea773a1dad22f9c3 Mon Sep 17 00:00:00 2001 From: dwelch-r7 Date: Wed, 4 May 2022 14:43:05 +0100 Subject: [PATCH] Expose options for logging to a file in mettle --- .../osx/browser/osx_gatekeeper_bypass.md | 2 -- lib/msf/base/sessions/meterpreter_options.rb | 18 +++++++++++++++++- lib/msf/base/sessions/mettle_config.rb | 8 -------- lib/msf/core/payload/linux.rb | 14 -------------- .../aarch64/meterpreter_reverse_http.rb | 3 ++- .../aarch64/meterpreter_reverse_https.rb | 3 ++- .../aarch64/meterpreter_reverse_tcp.rb | 3 ++- .../armle/meterpreter_reverse_http.rb | 3 ++- .../armle/meterpreter_reverse_https.rb | 3 ++- .../apple_ios/armle/meterpreter_reverse_tcp.rb | 3 ++- .../linux/aarch64/meterpreter_reverse_http.rb | 3 ++- .../linux/aarch64/meterpreter_reverse_https.rb | 3 ++- .../linux/aarch64/meterpreter_reverse_tcp.rb | 3 ++- .../linux/armbe/meterpreter_reverse_http.rb | 3 ++- .../linux/armbe/meterpreter_reverse_https.rb | 3 ++- .../linux/armbe/meterpreter_reverse_tcp.rb | 3 ++- .../linux/armle/meterpreter_reverse_http.rb | 3 ++- .../linux/armle/meterpreter_reverse_https.rb | 3 ++- .../linux/armle/meterpreter_reverse_tcp.rb | 3 ++- .../linux/mips64/meterpreter_reverse_http.rb | 3 ++- .../linux/mips64/meterpreter_reverse_https.rb | 3 ++- .../linux/mips64/meterpreter_reverse_tcp.rb | 3 ++- .../linux/mipsbe/meterpreter_reverse_http.rb | 3 ++- .../linux/mipsbe/meterpreter_reverse_https.rb | 3 ++- .../linux/mipsbe/meterpreter_reverse_tcp.rb | 3 ++- .../linux/mipsle/meterpreter_reverse_http.rb | 3 ++- .../linux/mipsle/meterpreter_reverse_https.rb | 3 ++- .../linux/mipsle/meterpreter_reverse_tcp.rb | 3 ++- .../linux/ppc/meterpreter_reverse_http.rb | 3 ++- .../linux/ppc/meterpreter_reverse_https.rb | 3 ++- .../linux/ppc/meterpreter_reverse_tcp.rb | 3 ++- .../linux/ppc64le/meterpreter_reverse_http.rb | 3 ++- .../linux/ppc64le/meterpreter_reverse_https.rb | 3 ++- .../linux/ppc64le/meterpreter_reverse_tcp.rb | 3 ++- .../ppce500v2/meterpreter_reverse_http.rb | 3 ++- .../ppce500v2/meterpreter_reverse_https.rb | 3 ++- .../linux/ppce500v2/meterpreter_reverse_tcp.rb | 3 ++- .../linux/x64/meterpreter_reverse_http.rb | 3 ++- .../linux/x64/meterpreter_reverse_https.rb | 3 ++- .../linux/x64/meterpreter_reverse_tcp.rb | 3 ++- .../linux/x86/meterpreter_reverse_http.rb | 3 ++- .../linux/x86/meterpreter_reverse_https.rb | 3 ++- .../linux/x86/meterpreter_reverse_tcp.rb | 3 ++- .../linux/zarch/meterpreter_reverse_http.rb | 3 ++- .../linux/zarch/meterpreter_reverse_https.rb | 3 ++- .../linux/zarch/meterpreter_reverse_tcp.rb | 3 ++- .../osx/x64/meterpreter_reverse_http.rb | 3 ++- .../osx/x64/meterpreter_reverse_https.rb | 3 ++- .../singles/osx/x64/meterpreter_reverse_tcp.rb | 3 ++- .../payloads/stagers/osx/x64/reverse_tcp.rb | 3 --- .../stages/linux/aarch64/meterpreter.rb | 3 ++- .../payloads/stages/linux/armle/meterpreter.rb | 3 ++- .../stages/linux/mipsbe/meterpreter.rb | 3 ++- .../stages/linux/mipsle/meterpreter.rb | 4 ++-- .../payloads/stages/linux/x64/meterpreter.rb | 3 ++- .../payloads/stages/linux/x86/meterpreter.rb | 3 ++- modules/payloads/stages/osx/x64/meterpreter.rb | 3 ++- tools/modules/meterpreter_reverse.erb | 7 ++----- 58 files changed, 123 insertions(+), 86 deletions(-) diff --git a/documentation/modules/exploit/osx/browser/osx_gatekeeper_bypass.md b/documentation/modules/exploit/osx/browser/osx_gatekeeper_bypass.md index ae141bae22..b07f2c69e9 100644 --- a/documentation/modules/exploit/osx/browser/osx_gatekeeper_bypass.md +++ b/documentation/modules/exploit/osx/browser/osx_gatekeeper_bypass.md @@ -68,8 +68,6 @@ Payload options (osx/x64/meterpreter/reverse_tcp): ---- --------------- -------- ----------- LHOST 192.168.37.1 yes The listen address (an interface may be specified) LPORT 4444 yes The listen port - MeterpreterDebugLevel 0 yes Set debug level for meterpreter 0-3 (Default output is - strerr) Exploit target: diff --git a/lib/msf/base/sessions/meterpreter_options.rb b/lib/msf/base/sessions/meterpreter_options.rb index 240627ff24..af2d184cde 100644 --- a/lib/msf/base/sessions/meterpreter_options.rb +++ b/lib/msf/base/sessions/meterpreter_options.rb @@ -88,9 +88,25 @@ module Msf ds = opts[:datastore] || datastore { debug_build: (ds[:debug_build] || datastore['MeterpreterDebugBuild']), - log_path: (ds[:log_path] || Msf::OptMeterpreterDebugLogging.parse_logging_options(datastore['MeterpreterDebugLogging'])[:rpath]) + log_path: (ds[:log_path] || parse_rpath) } end + + def mettle_logging_config(opts = {}) + ds = opts[:datastore] || datastore + debug_build = ds[:debug_build] || datastore['MeterpreterDebugBuild'] + log_path = ds[:log_path] || parse_rpath + { + debug: debug_build ? 3 : 0, + log_file: log_path + } + end + + private + + def parse_rpath + Msf::OptMeterpreterDebugLogging.parse_logging_options(datastore['MeterpreterDebugLogging'])[:rpath] + end end end end diff --git a/lib/msf/base/sessions/mettle_config.rb b/lib/msf/base/sessions/mettle_config.rb index 3d3b009338..6f710b942f 100644 --- a/lib/msf/base/sessions/mettle_config.rb +++ b/lib/msf/base/sessions/mettle_config.rb @@ -85,14 +85,6 @@ module Msf opts[:name] ||= ds['PayloadProcessCommandLine'] end - if ds['RemoteMeterpreterDebugFile'] != '' - opts[:log_file] ||= ds['RemoteMeterpreterDebugFile'] - end - - log_level = ds['MeterpreterDebugLevel'].to_i - log_level = 0 if log_level < 0 - log_level = 3 if log_level > 3 - opts[:debug] = log_level opts[:uuid] ||= generate_payload_uuid case opts[:scheme] diff --git a/lib/msf/core/payload/linux.rb b/lib/msf/core/payload/linux.rb index 892b7a378e..55216e622e 100644 --- a/lib/msf/core/payload/linux.rb +++ b/lib/msf/core/payload/linux.rb @@ -81,20 +81,6 @@ module Msf::Payload::Linux "false" ] ), - Msf::OptInt.new('MeterpreterDebugLevel', - [ - true, - "Set debug level for meterpreter 0-3 (Default output is strerr)", - 0 - ] - ), - Msf::OptString.new('RemoteMeterpreterDebugFile', - [ - false, - "Redirect Debug Info to a Log File", - "" - ] - ), ], Msf::Payload::Linux) ret 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 1848c78807..7a6f0eb26e 100644 --- a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 796536 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('aarch64-iphone-darwin', generate_config(opts)).to_binary :exec end end 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 fcae1cc277..0bbf4510f1 100644 --- a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 796536 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('aarch64-iphone-darwin', generate_config(opts)).to_binary :exec end end 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 ad85a3d534..656d03ffdb 100644 --- a/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 796536 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('aarch64-iphone-darwin', generate_config(opts)).to_binary :exec end end 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 afb0c70cd8..2b2a3e26c8 100644 --- a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 643472 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('arm-iphone-darwin', generate_config(opts)).to_binary :exec end end 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 5ad40498b4..ffb69d057a 100644 --- a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 643472 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('arm-iphone-darwin', generate_config(opts)).to_binary :exec end end 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 f1840c1262..3019f7feeb 100644 --- a/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/apple_ios/armle/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 643472 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('arm-iphone-darwin', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb index a0543316be..6705b3424a 100644 --- a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1108688 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('aarch64-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb index 94da782a92..89bbe20487 100644 --- a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1108688 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('aarch64-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb index 98b70856ca..5665d4e97d 100644 --- a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1108688 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('aarch64-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb index 97cd669823..8ff238bb57 100644 --- a/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1030256 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('armv5b-linux-musleabi', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb index 73ce2327ec..8bfa1fdda7 100644 --- a/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1030256 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('armv5b-linux-musleabi', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb index 65a7bfada3..212bf86609 100644 --- a/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1030256 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('armv5b-linux-musleabi', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb index e63a414d7b..53d8347a25 100644 --- a/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1030384 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('armv5l-linux-musleabi', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb index 7202355797..feef6e3839 100644 --- a/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1030384 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('armv5l-linux-musleabi', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb index 7eb9c3b365..102a3d581d 100644 --- a/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1030384 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('armv5l-linux-musleabi', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb index 269d694c05..4d28053ba2 100644 --- a/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1579320 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('mips64-linux-muslsf', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb index a1be44f2a8..56ab54859e 100644 --- a/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1579320 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('mips64-linux-muslsf', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb index 2d3b75a564..e2fb078481 100644 --- a/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1579320 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('mips64-linux-muslsf', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb index a801f07c76..4ff1a42ea5 100644 --- a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1473456 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('mips-linux-muslsf', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb index 4cb6f39122..fbf75ab8f7 100644 --- a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1473456 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('mips-linux-muslsf', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb index a322488076..6145495d4a 100644 --- a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1473456 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('mips-linux-muslsf', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb index c7cdb8c6fb..cec2cbbb4f 100644 --- a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1476408 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('mipsel-linux-muslsf', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb index 29ade8a87c..313fa8a612 100644 --- a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1476408 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('mipsel-linux-muslsf', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb index 822e8cab49..232db3c1b9 100644 --- a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1476408 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('mipsel-linux-muslsf', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb index d2206df29c..d4a079c17f 100644 --- a/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1212188 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('powerpc-linux-muslsf', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb index 96f8997e91..23e6854548 100644 --- a/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1212188 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('powerpc-linux-muslsf', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb index d01297b37c..a23793b809 100644 --- a/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1212188 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('powerpc-linux-muslsf', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb index 1af2d37348..dd60f9509c 100644 --- a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1170808 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('powerpc64le-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb index 502a28688d..b767005ebc 100644 --- a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1170808 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('powerpc64le-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb index 15648e0624..3ee016ac6e 100644 --- a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1170808 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('powerpc64le-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_http.rb index 6c40b8be1b..d6ddee4f2b 100644 --- a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1164868 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('powerpc-e500v2-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_https.rb index 0afe786c54..181f86607d 100644 --- a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1164868 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('powerpc-e500v2-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_tcp.rb index 8893a302ee..14fd08714b 100644 --- a/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/ppce500v2/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1164868 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('powerpc-e500v2-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb index 014e0b795f..0b8957bae6 100644 --- a/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1042160 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('x86_64-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb index 6d6e47a31d..e645912289 100644 --- a/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1042160 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('x86_64-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb index f6f648ba76..591f691e95 100644 --- a/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1042160 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('x86_64-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb index 27d093078b..eb3efb4210 100644 --- a/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1106792 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('i486-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb index 67e2fccf93..3ae96420df 100644 --- a/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1106792 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('i486-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb index 26c1d00a5b..edcf8e053c 100644 --- a/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1106792 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('i486-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb index d6e06a47c0..4a8e4c8b3d 100644 --- a/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1236320 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('s390x-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb index da353c1f29..7a5ac1759c 100644 --- a/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1236320 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('s390x-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb index a7c8efa0e9..275d71d40c 100644 --- a/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 1236320 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('s390x-linux-musl', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb index f8b27410e2..d81ac3364a 100644 --- a/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb +++ b/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 810576 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'http', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('x86_64-apple-darwin', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb index 73429743e0..2201cba6f9 100644 --- a/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb +++ b/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 810576 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'https', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('x86_64-apple-darwin', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb index 6ddca95ff6..580f4354ec 100644 --- a/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb +++ b/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb @@ -4,6 +4,7 @@ ## +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule CachedSize = 810576 @@ -36,7 +37,7 @@ module MetasploitModule opts = { scheme: 'tcp', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('x86_64-apple-darwin', generate_config(opts)).to_binary :exec end end diff --git a/modules/payloads/stagers/osx/x64/reverse_tcp.rb b/modules/payloads/stagers/osx/x64/reverse_tcp.rb index 3384e19bfb..9d575264cd 100644 --- a/modules/payloads/stagers/osx/x64/reverse_tcp.rb +++ b/modules/payloads/stagers/osx/x64/reverse_tcp.rb @@ -23,9 +23,6 @@ module MetasploitModule 'Stager' => { 'RequiresMidstager' => false }, # Originally set to true, but only Linux payloads use this at the moment, not OSX. 'Convention' => 'sockedi', )) - register_options([ - OptInt.new('MeterpreterDebugLevel', [ true, "Set debug level for meterpreter 0-3 (Default output is strerr)", 0]) - ]) end def generate(opts = {}) diff --git a/modules/payloads/stages/linux/aarch64/meterpreter.rb b/modules/payloads/stages/linux/aarch64/meterpreter.rb index fb237f49f2..b306b1fc30 100644 --- a/modules/payloads/stages/linux/aarch64/meterpreter.rb +++ b/modules/payloads/stages/linux/aarch64/meterpreter.rb @@ -109,7 +109,8 @@ module MetasploitModule end def generate_stage(opts = {}) + config_opts = {scheme: 'tcp'}.merge(mettle_logging_config(opts)) MetasploitPayloads::Mettle.new('aarch64-linux-musl', - generate_config(opts.merge({scheme: 'tcp'}))).to_binary :process_image + generate_config(opts.merge(config_opts))).to_binary :process_image end end diff --git a/modules/payloads/stages/linux/armle/meterpreter.rb b/modules/payloads/stages/linux/armle/meterpreter.rb index 4e7be4e498..289987f972 100644 --- a/modules/payloads/stages/linux/armle/meterpreter.rb +++ b/modules/payloads/stages/linux/armle/meterpreter.rb @@ -78,7 +78,8 @@ module MetasploitModule end def generate_stage(opts = {}) + config_opts = {scheme: 'tcp'}.merge(mettle_logging_config(opts)) MetasploitPayloads::Mettle.new('armv5l-linux-musleabi', - generate_config(opts.merge({scheme: 'tcp'}))).to_binary :process_image + generate_config(opts.merge(config_opts))).to_binary :process_image end end diff --git a/modules/payloads/stages/linux/mipsbe/meterpreter.rb b/modules/payloads/stages/linux/mipsbe/meterpreter.rb index 32a6fd2718..f57bdf35a9 100644 --- a/modules/payloads/stages/linux/mipsbe/meterpreter.rb +++ b/modules/payloads/stages/linux/mipsbe/meterpreter.rb @@ -89,7 +89,8 @@ module MetasploitModule end def generate_stage(opts = {}) + config_opts = {scheme: 'tcp'}.merge(mettle_logging_config(opts)) MetasploitPayloads::Mettle.new('mips-linux-muslsf', - generate_config(opts.merge({scheme: 'tcp'}))).to_binary :process_image + generate_config(opts.merge(config_opts))).to_binary :process_image end end diff --git a/modules/payloads/stages/linux/mipsle/meterpreter.rb b/modules/payloads/stages/linux/mipsle/meterpreter.rb index 50e0ebe61e..8bf019aaec 100644 --- a/modules/payloads/stages/linux/mipsle/meterpreter.rb +++ b/modules/payloads/stages/linux/mipsle/meterpreter.rb @@ -89,8 +89,8 @@ module MetasploitModule end def generate_stage(opts = {}) - opts = {scheme: 'tcp'} + config_opts = {scheme: 'tcp'}.merge(mettle_logging_config(opts)) MetasploitPayloads::Mettle.new('mipsel-linux-muslsf', - generate_config(opts.merge({scheme: 'tcp'}))).to_binary :process_image + generate_config(opts.merge(config_opts))).to_binary :process_image end end diff --git a/modules/payloads/stages/linux/x64/meterpreter.rb b/modules/payloads/stages/linux/x64/meterpreter.rb index 14d46797ec..4aa85e75d0 100644 --- a/modules/payloads/stages/linux/x64/meterpreter.rb +++ b/modules/payloads/stages/linux/x64/meterpreter.rb @@ -92,7 +92,8 @@ module MetasploitModule end def generate_stage(opts = {}) + config_opts = {scheme: 'tcp'}.merge(mettle_logging_config(opts)) MetasploitPayloads::Mettle.new('x86_64-linux-musl', - generate_config(opts.merge({scheme: 'tcp'}))).to_binary :process_image + generate_config(opts.merge(config_opts))).to_binary :process_image end end diff --git a/modules/payloads/stages/linux/x86/meterpreter.rb b/modules/payloads/stages/linux/x86/meterpreter.rb index 7f8a3f9c48..a4d6453255 100644 --- a/modules/payloads/stages/linux/x86/meterpreter.rb +++ b/modules/payloads/stages/linux/x86/meterpreter.rb @@ -95,7 +95,8 @@ module MetasploitModule end def generate_stage(opts = {}) + config_opts = {scheme: 'tcp'}.merge(mettle_logging_config(opts)) MetasploitPayloads::Mettle.new('i486-linux-musl', - generate_config(opts.merge({scheme: 'tcp'}))).to_binary :process_image + generate_config(opts.merge(config_opts))).to_binary :process_image end end diff --git a/modules/payloads/stages/osx/x64/meterpreter.rb b/modules/payloads/stages/osx/x64/meterpreter.rb index c81b8d84ee..bc3814ca96 100644 --- a/modules/payloads/stages/osx/x64/meterpreter.rb +++ b/modules/payloads/stages/osx/x64/meterpreter.rb @@ -119,8 +119,9 @@ module MetasploitModule end def generate_stage(opts = {}) + config_opts = {scheme: 'tcp'}.merge(mettle_logging_config(opts)) mettle_macho = MetasploitPayloads::Mettle.new('x86_64-apple-darwin', - generate_config(opts.merge({scheme: 'tcp'}))).to_binary :exec + generate_config(opts.merge(config_opts))).to_binary :exec mettle_macho[0] = 'b' mettle_macho end diff --git a/tools/modules/meterpreter_reverse.erb b/tools/modules/meterpreter_reverse.erb index c8488e2803..cc859059cc 100644 --- a/tools/modules/meterpreter_reverse.erb +++ b/tools/modules/meterpreter_reverse.erb @@ -3,11 +3,8 @@ # Current source: https://github.com/rapid7/metasploit-framework ## -require 'msf/core/handler/reverse_<%= scheme %>' -require 'msf/base/sessions/meterpreter_options' -require 'msf/base/sessions/mettle_config' -require 'msf/base/sessions/meterpreter_<%= arch %>_<%= platform.downcase %>' +# Module generated by tools/modules/generate_mettle_payloads.rb module MetasploitModule include Msf::Payload::Single @@ -38,7 +35,7 @@ module MetasploitModule opts = { scheme: '<%= scheme %>', stageless: true - } + }.merge(mettle_logging_config) MetasploitPayloads::Mettle.new('<%= payload %>', generate_config(opts)).to_binary :exec end end