X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/c324ad928dbdd54ce5b09eb0dabe60ef9de1ea38..refs/pull/5239/head:/app/Util/SsrUrlValidator.php diff --git a/app/Util/SsrUrlValidator.php b/app/Util/SsrUrlValidator.php index 722a45f7b..0b3a6a31d 100644 --- a/app/Util/SsrUrlValidator.php +++ b/app/Util/SsrUrlValidator.php @@ -41,7 +41,7 @@ class SsrUrlValidator protected function urlMatchesPattern($url, $pattern): bool { - $pattern = trim($pattern); + $pattern = rtrim(trim($pattern), '/'); $url = trim($url); if (empty($pattern) || empty($url)) { @@ -51,7 +51,7 @@ class SsrUrlValidator $quoted = preg_quote($pattern, '/'); $regexPattern = str_replace('\*', '.*', $quoted); - return preg_match('/^' . $regexPattern . '.*$/i', $url); + return preg_match('/^' . $regexPattern . '($|\/.*$|#.*$)/i', $url); } /**