Proxy: check all routes until we find allowing route (#366)

Yes, it changes the algorithm, but otherwise it does not work in PGSQL in production. And so it is a little simpler, since the order of routes in `info.xml` is not important Signed-off-by: Alexander Piskun <[email protected]>
nextcloud · Aug 22, 2024 · 5e907e8 · 5e907e8
1 parent 685ca63
commit 5e907e8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/Controller/ExAppProxyController.php b/lib/Controller/ExAppProxyController.php
@@ -252,10 +252,11 @@ private function buildMultipartFormData(array $bodyParams, array $files): array
 
 	private function passesExAppProxyRoutesChecks(ExApp $exApp, string $exAppRoute): bool {
 		foreach ($exApp->getRoutes() as $route) {
-			$matchesUrlPattern = preg_match('/' . $route['url'] . '/i', $exAppRoute) === 1;
-			$matchesVerb = str_contains(strtolower($route['verb']), strtolower($this->request->getMethod()));
-			if ($matchesUrlPattern && $matchesVerb) {
-				return $this->passesExAppProxyRouteAccessLevelCheck($route['access_level']);
+			if (preg_match('/' . $route['url'] . '/i', $exAppRoute) === 1 &&
+				str_contains(strtolower($route['verb']), strtolower($this->request->getMethod())) &&
+				$this->passesExAppProxyRouteAccessLevelCheck($route['access_level'])
+			) {
+				return true;
 			}
 		}
 		return false;