Skip to content

[stable32] fix(proxy): match the route verb like HaRP #1148

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
oleksandr-nc merged 1 commit into from
Oct 23, 2026
Merged

[stable32] fix(proxy): match the route verb like HaRP #1148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions lib/Controller/ExAppProxyController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ private function buildMultipartFormData(array $bodyParams, array $files): array
private function passesExAppProxyRoutesChecks(ExApp $exApp, string $exAppRoute): array {
// Route URL is a regex matched against the request path including its leading slash, mirroring HaRP's target_path semantics.
$canonicalSubject = '/' . $exAppRoute;
$method = strtoupper($this->request->getMethod());
foreach ($exApp->getRoutes() as $route) {
$pattern = '~^(?:' . str_replace('~', '\\~', $route['url']) . ')~i';
$matched = preg_match($pattern, $canonicalSubject) === 1;
Expand All @@ -330,16 +331,22 @@ private function passesExAppProxyRoutesChecks(ExApp $exApp, string $exAppRoute):
));
$matched = true;
}
if ($matched &&
str_contains(strtolower($route['verb']), strtolower($this->request->getMethod()))
) {
if ($matched && self::routeAcceptsMethod($route['verb'], $method)) {
// First match by path+verb wins. Apply its access level without falling through to broader routes.
return $this->passesExAppProxyRouteAccessLevelCheck($route['access_level']) ? $route : [];
}
}
return [];
}

/**
* As in HaRP: the verb lists methods separated by commas or whitespace, and HEAD is accepted wherever GET is.
*/
private static function routeAcceptsMethod(string $verb, string $method): bool {
$methods = array_map('strtoupper', preg_split('/[\s,]+/', $verb, -1, PREG_SPLIT_NO_EMPTY) ?: []);
return in_array($method, $methods, true) || ($method === 'HEAD' && in_array('GET', $methods, true));
}

private function passesExAppProxyRouteAccessLevelCheck(int $accessLevel): bool {
return match ($accessLevel) {
ExAppRouteAccessLevel::PUBLIC->value => true,
Expand Down
Loading