Merge pull request #16 from patricknelson/issue-15-get-ip

FIX for #15 Ensuring we use the framework for determining client IP (security/bug fix)
dynamic · Oct 15, 2015 · d1c2a25 · d1c2a25
2 parents 5d550e7 + 223a9b1
commit d1c2a25
Showing 1 changed file with 1 addition and 16 deletions.
diff --git a/code/MaintenanceModeExtension.php b/code/MaintenanceModeExtension.php
@@ -84,22 +84,7 @@ public function hasAllowedIP() {
 	 * @return string
 	 */
 	public function getClientIP() {
-		if (isset($_SERVER['HTTP_CLIENT_IP'])) {
-			$ipaddress = $_SERVER['HTTP_CLIENT_IP'];
-		} elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-			$ipaddress = $_SERVER['HTTP_X_FORWARDED_FOR'];
-		} elseif (isset($_SERVER['HTTP_X_FORWARDED'])) {
-			$ipaddress = $_SERVER['HTTP_X_FORWARDED'];
-		} elseif (isset($_SERVER['HTTP_FORWARDED_FOR'])) {
-			$ipaddress = $_SERVER['HTTP_FORWARDED_FOR'];
-		} elseif (isset($_SERVER['HTTP_FORWARDED'])) {
-			$ipaddress = $_SERVER['HTTP_FORWARDED'];
-		} elseif (isset($_SERVER['REMOTE_ADDR'])) {
-			$ipaddress = $_SERVER['REMOTE_ADDR'];
-		} else {
-			$ipaddress = 'Unknown';
-		}
-		return $ipaddress;
+		return $this->owner->getRequest()->getIP();
 	}
 
 }//end class MaintenanceMode_Page_ControllerExtension