Skip to content

Fix Leaf\Router base path validation to enforce exact match #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mychidarko merged 2 commits into from
Apr 14, 2025
Merged

Fix Leaf\Router base path validation to enforce exact match #290

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec843d4
Fix Leaf\Router base path validation to enforce exact match
terrybr Apr 12, 2025
70145de
chore: fix styling
terrybr Apr 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/Router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,11 +686,23 @@ public static function setBasePath($serverBasePath)
*/
public static function getCurrentUri(): string
{
// Get the current Request URI and remove rewrite base path from it (= allows one to run the router in a sub folder)
$uri = substr(rawurldecode($_SERVER['REQUEST_URI']), strlen(static::getBasePath()));
$basePath = static::getBasePath();
$requestUri = rawurldecode($_SERVER['REQUEST_URI']);

// Early exit If base path doesn't match
if (strncmp($requestUri, $basePath, strlen($basePath)) !== 0) {
if (!static::$notFoundHandler) {
static::$notFoundHandler = function () {
\Leaf\Exception\General::default404();
};
}
static::invoke(static::$notFoundHandler);
}

if (strstr($uri, '?')) {
$uri = substr($uri, 0, strpos($uri, '?'));
// Get the current Request URI and remove rewrite base path from it (= allows one to run the router in a sub folder)
$uri = substr($requestUri, strlen($basePath)) ?: '/';
if (($queryPos = strpos($uri, '?')) !== false) {
$uri = substr($uri, 0, $queryPos);
}

return '/' . trim($uri, '/');
Expand Down