Merge pull request #28454 from nextcloud/backport/28303/stable22

nextcloud · Aug 19, 2021 · cae51a0 · cae51a0
2 parents e2a4dc8 + 55fcffd
commit cae51a0
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/core/Controller/UnifiedSearchController.php b/core/Controller/UnifiedSearchController.php
@@ -33,6 +33,7 @@
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
+use OCP\IURLGenerator;
 use OCP\IUserSession;
 use OCP\Route\IRouter;
 use OCP\Search\ISearchQuery;
@@ -49,15 +50,20 @@ class UnifiedSearchController extends OCSController {
 	/** @var IRouter */
 	private $router;
 
+	/** @var IURLGenerator */
+	private $urlGenerator;
+
 	public function __construct(IRequest $request,
 								IUserSession $userSession,
 								SearchComposer $composer,
-								IRouter $router) {
+								IRouter $router,
+								IURLGenerator $urlGenerator) {
 		parent::__construct('core', $request);
 
 		$this->composer = $composer;
 		$this->userSession = $userSession;
 		$this->router = $router;
+		$this->urlGenerator = $urlGenerator;
 	}
 
 	/**
@@ -123,9 +129,17 @@ protected function getRouteInformation(string $url): array {
 
 		if ($url !== '') {
 			$urlParts = parse_url($url);
+			$urlPath = $urlParts['path'];
+
+			// Optionally strip webroot from URL. Required for route matching on setups
+			// with Nextcloud in a webserver subfolder (webroot).
+			$webroot = $this->urlGenerator->getWebroot();
+			if ($webroot !== '' && substr($urlPath, 0, strlen($webroot)) === $webroot) {
+				$urlPath = substr($urlPath, strlen($webroot));
+			}
 
 			try {
-				$parameters = $this->router->findMatchingRoute($urlParts['path']);
+				$parameters = $this->router->findMatchingRoute($urlPath);
 
 				// contacts.PageController.index => contacts.Page.index
 				$route = $parameters['caller'];

diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php
@@ -276,4 +276,11 @@ public function getBaseUrl(): string {
 		}
 		return $this->baseUrl;
 	}
+
+	/**
+	 * @return string webroot part of the base url
+	 */
+	public function getWebroot(): string {
+		return \OC::$WEBROOT;
+	}
 }
diff --git a/lib/public/IURLGenerator.php b/lib/public/IURLGenerator.php
@@ -102,4 +102,10 @@ public function linkToDocs(string $key): string;
 	 * @since 13.0.0
 	 */
 	public function getBaseUrl(): string;
+
+	/**
+	 * @return string webroot part of the base url
+	 * @since 23.0.0
+	 */
+	public function getWebroot(): string;
 }
diff --git a/tests/lib/UrlGeneratorTest.php b/tests/lib/UrlGeneratorTest.php
@@ -179,6 +179,12 @@ public function testGetBaseUrl() {
 		$this->assertEquals($expected, $actual);
 	}
 
+	public function testGetWebroot() {
+		\OC::$WEBROOT = '/nextcloud';
+		$actual = $this->urlGenerator->getWebroot();
+		$this->assertEquals(\OC::$WEBROOT, $actual);
+	}
+
 	/**
 	 * @dataProvider provideOCSRoutes
 	 */