fix for #749

mevdschee · mevdschee · commit de1bf0487632 · 2021-02-12T10:43:17.000+01:00
diff --git a/api.include.php b/api.include.php
@@ -7467,7 +7467,7 @@ private function isOriginAllowed(string $origin, string $allowedOrigins): bool
         {
             $found = false;
             foreach (explode(',', $allowedOrigins) as $allowedOrigin) {
-                $hostname = preg_quote(strtolower(trim($allowedOrigin)));
+                $hostname = preg_quote(strtolower(trim($allowedOrigin)),'/');
                 $regex = '/^' . str_replace('\*', '.*', $hostname) . '$/';
                 if (preg_match($regex, $origin)) {
                     $found = true;
diff --git a/api.php b/api.php
@@ -7467,7 +7467,7 @@ private function isOriginAllowed(string $origin, string $allowedOrigins): bool
         {
             $found = false;
             foreach (explode(',', $allowedOrigins) as $allowedOrigin) {
-                $hostname = preg_quote(strtolower(trim($allowedOrigin)));
+                $hostname = preg_quote(strtolower(trim($allowedOrigin)),'/');
                 $regex = '/^' . str_replace('\*', '.*', $hostname) . '$/';
                 if (preg_match($regex, $origin)) {
                     $found = true;
diff --git a/src/Tqdev/PhpCrudApi/Middleware/CorsMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/CorsMiddleware.php
@@ -26,7 +26,7 @@ private function isOriginAllowed(string $origin, string $allowedOrigins): bool
     {
         $found = false;
         foreach (explode(',', $allowedOrigins) as $allowedOrigin) {
-            $hostname = preg_quote(strtolower(trim($allowedOrigin)));
+            $hostname = preg_quote(strtolower(trim($allowedOrigin)),'/');
             $regex = '/^' . str_replace('\*', '.*', $hostname) . '$/';
             if (preg_match($regex, $origin)) {
                 $found = true;

Original file line number	Diff line number	Diff line change
`@@ -7467,7 +7467,7 @@ private function isOriginAllowed(string $origin, string $allowedOrigins): bool`
`7467`	`7467`	`{`
`7468`	`7468`	`$found = false;`
`7469`	`7469`	`foreach (explode(',', $allowedOrigins) as $allowedOrigin) {`
`7470`		`- $hostname = preg_quote(strtolower(trim($allowedOrigin)));`
	`7470`	`+ $hostname = preg_quote(strtolower(trim($allowedOrigin)),'/');`
`7471`	`7471`	`$regex = '/^' . str_replace('\', '.', $hostname) . '$/';`
`7472`	`7472`	`if (preg_match($regex, $origin)) {`
`7473`	`7473`	`$found = true;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ private function isOriginAllowed(string $origin, string $allowedOrigins): bool`
`26`	`26`	`{`
`27`	`27`	`$found = false;`
`28`	`28`	`foreach (explode(',', $allowedOrigins) as $allowedOrigin) {`
`29`		`- $hostname = preg_quote(strtolower(trim($allowedOrigin)));`
	`29`	`+ $hostname = preg_quote(strtolower(trim($allowedOrigin)),'/');`
`30`	`30`	`$regex = '/^' . str_replace('\', '.', $hostname) . '$/';`
`31`	`31`	`if (preg_match($regex, $origin)) {`
`32`	`32`	`$found = true;`