geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-07-11 04:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BUGFIX] Fixed issue with BaseCsrfVerifier matching urls against urls with parameters.

Browse Source 
- Added optional $includeParams parameter to Url::getRelativeUrl method.
This commit is contained in:
Simon Sessingø
2021-04-01 03:04:32 +02:00
parent ca8fbf2b27
commit 52c6c226c0
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/Http/Middleware/BaseCsrfVerifier.php
+3 -3
View File
@@ -50,12 +50,12 @@ class BaseCsrfVerifier implements IMiddleware
$url = rtrim($url, '*');
$skip = $request->getUrl()->contains($url);
} else {
$skip = ($url === $request->getUrl()->getOriginalUrl());
$skip = ($url === $request->getUrl()->getRelativeUrl(false));
}
if ($skip === true) {
if($this->include !== null && count($this->include) > 0) {
if(is_array($this->include) === true && count($this->include) > 0) {
foreach($this->include as $includeUrl) {
$includeUrl = rtrim($includeUrl, '/');
if ($includeUrl[strlen($includeUrl) - 1] === '*') {
@@ -64,7 +64,7 @@ class BaseCsrfVerifier implements IMiddleware
break;
}
$skip = !($includeUrl === $request->getUrl()->getOriginalUrl());
$skip = !($includeUrl === $request->getUrl()->getRelativeUrl(false));
}
}
src/Pecee/Http/Middleware/IpRestrictAccess.php
+4
View File
@@ -34,6 +34,10 @@ abstract class IpRestrictAccess implements IMiddleware
return true;
}
/**
* @param Request $request
* @throws HttpException
*/
public function handle(Request $request): void
{
if($this->validate((string)$request->getIp()) === false) {