diff --git a/src/Pecee/Http/Middleware/BaseCsrfVerifier.php b/src/Pecee/Http/Middleware/BaseCsrfVerifier.php index edfbd84..dc60b06 100644 --- a/src/Pecee/Http/Middleware/BaseCsrfVerifier.php +++ b/src/Pecee/Http/Middleware/BaseCsrfVerifier.php @@ -50,7 +50,7 @@ class BaseCsrfVerifier implements IMiddleware $url = rtrim($url, '*'); $skip = $request->getUrl()->contains($url); } else { - $skip = ($url === $request->getUrl()->getRelativeUrl(false)); + $skip = ($url === rtrim($request->getUrl()->getRelativeUrl(false), '/')); } if ($skip === true) { @@ -64,7 +64,7 @@ class BaseCsrfVerifier implements IMiddleware break; } - $skip = !($includeUrl === $request->getUrl()->getRelativeUrl(false)); + $skip = !($includeUrl === rtrim($request->getUrl()->getRelativeUrl(false), '/')); } } diff --git a/src/Pecee/Http/Url.php b/src/Pecee/Http/Url.php index 92be2c7..bd767a7 100644 --- a/src/Pecee/Http/Url.php +++ b/src/Pecee/Http/Url.php @@ -432,14 +432,13 @@ class Url implements JsonSerializable */ public function getRelativeUrl($includeParams = true): string { + $path = $this->path ?? '/'; + if($includeParams === false) { - return rtrim($this->path, '/'); + return $path; } - $params = $this->getQueryString(); - - $path = $this->path ?? ''; - $query = $params !== '' ? '?' . $params : ''; + $query = $this->getQueryString() !== '' ? '?' . $this->getQueryString() : ''; $fragment = $this->fragment !== null ? '#' . $this->fragment : ''; return $path . $query . $fragment;