# [HIGH] TransparentAuthentication fails on PHP 7.3.0 (backport from …

…FOF 4 branch) Close gh-679
akeeba · Jan 24, 2019 · 6a8973f · 6a8973f
1 parent 86a5fb6
commit 6a8973f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+FOF 3.4.1
+================================================================================
+# [HIGH] TransparentAuthentication fails on PHP 7.3.0 (backport from FOF 4 branch)
+
 FOF 3.4.0
 ================================================================================
 + Support for FEF Dark Mode in the FEF renderer class. Requires FEF 1.0.7 or later.

diff --git a/fof/TransparentAuthentication/TransparentAuthentication.php b/fof/TransparentAuthentication/TransparentAuthentication.php
@@ -340,27 +340,27 @@ public function getTransparentAuthenticationCredentials()
 				case self::Auth_HTTPBasicAuth_TOTP:
 					if (empty($this->totpKey))
 					{
-						continue;
+						continue 2;
 					}
 
 					if (empty($this->basicAuthUsername))
 					{
-						continue;
+						continue 2;
 					}
 
 					if (!isset($_SERVER['PHP_AUTH_USER']))
 					{
-						continue;
+						continue 2;
 					}
 
 					if (!isset($_SERVER['PHP_AUTH_PW']))
 					{
-						continue;
+						continue 2;
 					}
 
 					if ($_SERVER['PHP_AUTH_USER'] != $this->basicAuthUsername)
 					{
-						continue;
+						continue 2;
 					}
 
 					$encryptedData = $_SERVER['PHP_AUTH_PW'];
@@ -372,14 +372,14 @@ public function getTransparentAuthenticationCredentials()
 				case self::Auth_QueryString_TOTP:
 					if (empty($this->queryParam))
 					{
-						continue;
+						continue 2;
 					}
 
 					$encryptedData = $input->get($this->queryParam, '', 'raw');
 
 					if (empty($encryptedData))
 					{
-						continue;
+						continue 2;
 					}
 
 					$return = $this->decryptWithTOTP($encryptedData);
@@ -394,12 +394,12 @@ public function getTransparentAuthenticationCredentials()
 				case self::Auth_HTTPBasicAuth_Plaintext:
 					if (!isset($_SERVER['PHP_AUTH_USER']))
 					{
-						continue;
+						continue 2;
 					}
 
 					if (!isset($_SERVER['PHP_AUTH_PW']))
 					{
-						continue;
+						continue 2;
 					}
 
 					return array(
@@ -412,26 +412,26 @@ public function getTransparentAuthenticationCredentials()
 				case self::Auth_QueryString_Plaintext:
 					if (empty($this->queryParam))
 					{
-						continue;
+						continue 2;
 					}
 
 					$jsonEncoded = $input->get($this->queryParam, '', 'raw');
 
 					if (empty($jsonEncoded))
 					{
-						continue;
+						continue 2;
 					}
 
 					$authInfo = json_decode($jsonEncoded, true);
 
 					if (!is_array($authInfo))
 					{
-						continue;
+						continue 2;
 					}
 
 					if (!array_key_exists('username', $authInfo) || !array_key_exists('password', $authInfo))
 					{
-						continue;
+						continue 2;
 					}
 
 					return $authInfo;
@@ -441,25 +441,25 @@ public function getTransparentAuthenticationCredentials()
 				case self::Auth_SplitQueryString_Plaintext:
 					if (empty($this->queryParamUsername))
 					{
-						continue;
+						continue 2;
 					}
 
 					if (empty($this->queryParamPassword))
 					{
-						continue;
+						continue 2;
 					}
 
 					$username = $input->get($this->queryParamUsername, '', 'raw');
 					$password = $input->get($this->queryParamPassword, '', 'raw');
 
 					if (empty($username))
 					{
-						continue;
+						continue 2;
 					}
 
 					if (empty($password))
 					{
-						continue;
+						continue 2;
 					}
 
 					return array(