refactor(project honeypot): resolves #344, added additional check & debug info for ip type support

Author: bmarshall511

core/class-user.php

@@ -36,6 +36,8 @@ public static function get_ip() {
 				$ip = sanitize_text_field( wp_unslash( $_SERVER['HTTP_X_FORWARDED_FOR'] ) );
 			} elseif ( ! empty( $_SERVER['HTTP_X_FORWARDED'] ) ) {
 				$ip = sanitize_text_field( wp_unslash( $_SERVER['HTTP_X_FORWARDED'] ) );
+			}  elseif ( isset( $_SERVER['HTTP_X_CLUSTER_CLIENT_IP'] ) ) {
+				$ip = sanitize_text_field( wp_unslash( $_SERVER['HTTP_XHTTP_X_CLUSTER_CLIENT_IP_FORWARDED'] ) );
 			} elseif ( ! empty( $_SERVER['HTTP_FORWARDED_FOR'] ) ) {
 				$ip = sanitize_text_field( wp_unslash( $_SERVER['HTTP_FORWARDED_FOR'] ) );
 			} elseif ( ! empty( $_SERVER['HTTP_FORWARDED'] ) ) {

modules/class-projecthoneypot.php

@@ -95,12 +95,16 @@ public function query( $ip ) {
 			krsort( $octets );
 
 			$reversed_ip = implode( '.', $octets );
+			if ( strlen( $reversed_ip ) > 16) {
+				\ZeroSpam\Core\Utilities::log( 'Project Honeypot Warning: IPv6 ip addresses not supported: ' . $ip );
+				return false;
+			}
 
 			$endpoint  = $settings['project_honeypot_access_key']['value'] . '.' . $reversed_ip . '.dnsbl.httpbl.org';
 			$dns_array = dns_get_record( $endpoint, DNS_A );
 
 			if ( ! isset( $dns_array[0]['ip'] ) ) {
-				\ZeroSpam\Core\Utilities::log( 'Project Honeypot Error: could not query the IP' );
+				\ZeroSpam\Core\Utilities::log( 'Project Honeypot Error: could not get DNS information for ' . $endpoint . ': ' . wp_json_encode( $dns_array ) );
 				return false;
 			}
 

readme.txt

@@ -109,6 +109,7 @@ If hosting with Pantheon, see their [known issues page](https://pantheon.io/docs
 
 = v5.4.4 =
 
+* refactor(project honeypot): resolves #344, added additional check & debug info for ip type support
 * fix(wpforms): resolves #343, fix for jquery dependency
 * fix(registration): resolves #342, fix for failed registration output
 * fix(php8): resolves #341, fix for php8+ compatibility issue