Fix Ipv4 mapped Ipv6 issue (hestiacp#4606)

jaapmarcus · endrepavel · web-flow · commit ca6823bf2a4c · 2024-10-28T22:58:48.000+01:00
* Update index.php

* Update helpers.php

* Update index.php

* Run NPM format

---------

Co-authored-by: endrepavel &lt;46920973+endrepavel@users.noreply.github.com&gt;
diff --git a/web/inc/helpers.php b/web/inc/helpers.php
@@ -113,6 +113,11 @@ function get_real_user_ip() {
 			$ip = $_SERVER["HTTP_CF_CONNECTING_IP"];
 		}
 	}
+
+	// Handling IPv4-mapped IPv6 address
+	if (strpos($ip, ":") === 0 && strpos($ip, ".") > 0) {
+		$ip = substr($ip, strrpos($ip, ":") + 1); // Strip IPv4 Compatibility notation
+	}
 	return $ip;
 }
 
diff --git a/web/login/index.php b/web/login/index.php
@@ -120,6 +120,12 @@ function authenticate_user($user, $password, $twofa = "") {
 				$ip = $_SERVER["HTTP_CF_CONNECTING_IP"];
 			}
 		}
+
+		// Handling IPv4-mapped IPv6 address
+		if (strpos($ip, ":") === 0 && strpos($ip, ".") > 0) {
+			$ip = substr($ip, strrpos($ip, ":") + 1); // Strip IPv4 Compatibility notation
+		}
+
 		$v_ip = quoteshellarg($ip);
 		$v_user_agent = quoteshellarg($user_agent);
 

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,11 @@ function get_real_user_ip() {`
`113`	`113`	`$ip = $_SERVER["HTTP_CF_CONNECTING_IP"];`
`114`	`114`	`}`
`115`	`115`	`}`
	`116`	`+`
	`117`	`+ // Handling IPv4-mapped IPv6 address`
	`118`	`+ if (strpos($ip, ":") === 0 && strpos($ip, ".") > 0) {`
	`119`	`+ $ip = substr($ip, strrpos($ip, ":") + 1); // Strip IPv4 Compatibility notation`
	`120`	`+ }`
`116`	`121`	`return $ip;`
`117`	`122`	`}`
`118`	`123`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,12 @@ function authenticate_user($user, $password, $twofa = "") {`
`120`	`120`	`$ip = $_SERVER["HTTP_CF_CONNECTING_IP"];`
`121`	`121`	`}`
`122`	`122`	`}`
	`123`	`+`
	`124`	`+ // Handling IPv4-mapped IPv6 address`
	`125`	`+ if (strpos($ip, ":") === 0 && strpos($ip, ".") > 0) {`
	`126`	`+ $ip = substr($ip, strrpos($ip, ":") + 1); // Strip IPv4 Compatibility notation`
	`127`	`+ }`
	`128`	`+`
`123`	`129`	`$v_ip = quoteshellarg($ip);`
`124`	`130`	`$v_user_agent = quoteshellarg($user_agent);`
`125`	`131`