trigger url if backslash in the end

nextcloud · Dec 1, 2023 · 6b7a0d0 · 6b7a0d0
1 parent 383a4cb
commit 6b7a0d0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -8,7 +8,9 @@
 		['name' => 'Config#setAdminConfig', 'url' => '/admin-config', 'verb' => 'PUT'],
 
 		// Menu Entries
-		['name' => 'TopMenu#viewExAppPage', 'url' => '/embedded/{appId}/{name}', 'verb' => 'GET' , 'root' => '/embedded'],
+		['name' => 'TopMenu#viewExAppPage',
+			'url' => '/embedded/{appId}/{name}', 'verb' => 'GET' , 'root' => '/embedded',
+			'requirements' => array('name' => '.+')],
 		['name' => 'TopMenu#ExAppIcon', 'url' => '/embedded/{appId}/{name}/icon', 'verb' => 'GET' , 'root' => '/embedded'],
 
 		// Proxy

diff --git a/lib/Controller/TopMenuController.php b/lib/Controller/TopMenuController.php
@@ -42,11 +42,17 @@ public function __construct(
 	/**
 	 * @NoCSRFRequired
 	 * @NoAdminRequired
+	 * @param string $appId
+	 * @param string $name
+	 * @return TemplateResponse
 	 * @throws Exception
 	 */
 	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	public function viewExAppPage(string $appId, string $name): TemplateResponse {
+		if (str_ends_with($name, '/')) {
+			$name = substr($name, 0, -1);
+		}
 		$exApp = $this->service->getExApp($appId);
 		if ($exApp === null) {
 			return new NotFoundResponse();