Merge pull request #46060 from nextcloud/backport/45938/stable28

[stable28] fix: Do not log an error when connecting to SFTP without a logged in user
nextcloud · Jul 11, 2024 · 1135d77 · 1135d77
2 parents 52718fe + c360c20
commit 1135d77
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/apps/files_external/lib/Lib/Storage/SFTP.php b/apps/files_external/lib/Lib/Storage/SFTP.php
@@ -224,12 +224,14 @@ private function absPath($path) {
 	 */
 	private function hostKeysPath() {
 		try {
-			$storage_view = \OCP\Files::getStorage('files_external');
-			if ($storage_view) {
-				return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') .
-					$storage_view->getAbsolutePath('') .
-					'ssh_hostKeys';
+			$userId = \OC_User::getUser();
+			if ($userId === false) {
+				return false;
 			}
+
+			$view = new \OC\Files\View('/' . $userId . '/files_external');
+
+			return $view->getLocalFile('ssh_hostKeys');
 		} catch (\Exception $e) {
 		}
 		return false;