Merge pull request #48854 from nextcloud/fix/proxy-app-screenshot

nextcloud · Oct 23, 2024 · b5ac989 · b5ac989
2 parents 1f17604 + 3b6915e
commit b5ac989
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/apps/settings/lib/Controller/AppSettingsController.php b/apps/settings/lib/Controller/AppSettingsController.php
@@ -230,11 +230,25 @@ private function getAllCategories() {
 		], $categories);
 	}
 
+	/**
+	 * Convert URL to proxied URL so CSP is no problem
+	 */
+	private function createProxyPreviewUrl(string $url): string {
+		if ($url === '') {
+			return '';
+		}
+		return 'https://usercontent.apps.nextcloud.com/' . base64_encode($url);
+	}
+
 	private function fetchApps() {
 		$appClass = new \OC_App();
 		$apps = $appClass->listAllApps();
 		foreach ($apps as $app) {
 			$app['installed'] = true;
+			// locally installed apps have a flatted screenshot property
+			if (isset($app['screenshot'][0])) {
+				$app['screenshot'] = $this->createProxyPreviewUrl($app['screenshot'][0]);
+			}
 			$this->allApps[$app['id']] = $app;
 		}
 
@@ -293,7 +307,7 @@ public function listApps(): JSONResponse {
 		$apps = array_map(function (array $appData) use ($dependencyAnalyzer, $ignoreMaxApps) {
 			if (isset($appData['appstoreData'])) {
 				$appstoreData = $appData['appstoreData'];
-				$appData['screenshot'] = isset($appstoreData['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/' . base64_encode($appstoreData['screenshots'][0]['url']) : '';
+				$appData['screenshot'] = $this->createProxyPreviewUrl($appstoreData['screenshots'][0]['url'] ?? '');
 				$appData['category'] = $appstoreData['categories'];
 				$appData['releases'] = $appstoreData['releases'];
 			}