github/metasploit-payloads
1
Fork 0
mirror of https://github.com/rapid7/metasploit-payloads synced 2025-02-16 00:24:29 +01:00
Code Releases Activity

Fix AF_INET constants in PHP Meterpreter

Browse Source
This commit is contained in:
Tim W 2022-04-06 06:28:32 +01:00
parent cbae301876
commit 97b13d56ec
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
php/meterpreter/ext_server_stdapi.php
View File

@ -302,11 +302,6 @@ define("ERROR_CONNECTION_ERROR", 10000);
# eval'd twice
my_print("Evaling stdapi");
##
# Windows Constants
##
define("WIN_AF_INET", 2);
define("WIN_AF_INET6", 23);
##
# Search Helpers
@ -456,9 +451,9 @@ function add_stat_buf($path) {
if (!function_exists('resolve_host')) {
function resolve_host($hostname, $family) {
/* requires PHP >= 5 */
if ($family == AF_INET) {
if ($family == WIN_AF_INET) {
$dns_family = DNS_A;
} elseif ($family == AF_INET6) {
} elseif ($family == WIN_AF_INET6) {
$dns_family = DNS_AAAA;
} else {
my_print('invalid family, must be AF_INET or AF_INET6');
@ -1265,11 +1260,7 @@ function stdapi_net_resolve_host($req, &$pkt) {
$family_tlv = packet_get_tlv($req, TLV_TYPE_ADDR_TYPE);
$family = $family['value'];
if ($family == WIN_AF_INET) {
$family = AF_INET;
} elseif ($family == WIN_AF_INET6) {
$family = AF_INET6;
} else {
if ($family != WIN_AF_INET && $family != WIN_AF_INET6) {
my_print('invalid family, must be AF_INET or AF_INET6');
return ERROR_FAILURE;
}
@ -1292,11 +1283,7 @@ function stdapi_net_resolve_hosts($req, &$pkt) {
$family_tlv = packet_get_tlv($req, TLV_TYPE_ADDR_TYPE);
$family = $family_tlv['value'];
if ($family == WIN_AF_INET) {
$family = AF_INET;
} elseif ($family == WIN_AF_INET6) {
$family = AF_INET6;
} else {
if ($family != WIN_AF_INET && $family != WIN_AF_INET6) {
my_print('invalid family, must be AF_INET or AF_INET6');
return ERROR_FAILURE;
}

11
php/meterpreter/meterpreter.php
View File

@ -125,6 +125,13 @@ define("CHANNEL_CLASS_STREAM", 1);
define("CHANNEL_CLASS_DATAGRAM", 2);
define("CHANNEL_CLASS_POOL", 3);
##
# Windows Constants
##
define("WIN_AF_INET", 2);
define("WIN_AF_INET6", 23);
#
# TLV Meta Types
#
@ -1072,10 +1079,10 @@ function connect($ipaddr, $port, $proto='tcp') {
# IPv6 requires brackets around the address in some cases, but not all.
# Keep track of the un-bracketed address for the functions that don't like
# brackets, specifically socket_connect and socket_sendto.
$ipf = AF_INET;
$ipf = WIN_AF_INET;
$raw_ip = $ipaddr;
if (FALSE !== strpos($ipaddr, ":")) {
$ipf = AF_INET6;
$ipf = WIN_AF_INET6;
$ipaddr = "[". $raw_ip ."]";
}