Merge pull request #121 from CarltonSoftware/valid-uri-check

GuilhemN · web-flow · commit 034720efa88d · 2020-03-14T11:49:06.000+01:00
Update OAuth2.php
diff --git a/lib/OAuth2.php b/lib/OAuth2.php
@@ -1433,8 +1433,11 @@ protected function validateRedirectUri($inputUri, $storedUris)
 
         foreach ($storedUris as $storedUri) {
             if (strcasecmp(substr($inputUri, 0, strlen($storedUri)), $storedUri) === 0) {
-                return parse_url($inputUri, PHP_URL_HOST) === parse_url($storedUri, PHP_URL_HOST) &&
-                    parse_url($inputUri, PHP_URL_PORT) === parse_url($storedUri, PHP_URL_PORT);
+                if (parse_url($inputUri, PHP_URL_HOST) === parse_url($storedUri, PHP_URL_HOST) 
+                    && parse_url($inputUri, PHP_URL_PORT) === parse_url($storedUri, PHP_URL_PORT)
+                ) {
+                    return true;   
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1433,8 +1433,11 @@ protected function validateRedirectUri($inputUri, $storedUris)`
`1433`	`1433`
`1434`	`1434`	`foreach ($storedUris as $storedUri) {`
`1435`	`1435`	`if (strcasecmp(substr($inputUri, 0, strlen($storedUri)), $storedUri) === 0) {`
`1436`		`- return parse_url($inputUri, PHP_URL_HOST) === parse_url($storedUri, PHP_URL_HOST) &&`
`1437`		`- parse_url($inputUri, PHP_URL_PORT) === parse_url($storedUri, PHP_URL_PORT);`
	`1436`	`+ if (parse_url($inputUri, PHP_URL_HOST) === parse_url($storedUri, PHP_URL_HOST)`
	`1437`	`+ && parse_url($inputUri, PHP_URL_PORT) === parse_url($storedUri, PHP_URL_PORT)`
	`1438`	`+ ) {`
	`1439`	`+ return true;`
	`1440`	`+ }`
`1438`	`1441`	`}`
`1439`	`1442`	`}`
`1440`	`1443`