From: provokateurin <kate@provokateurin.de>
Date: Thu, 26 Sep 2024 07:41:49 +0000 (+0200)
Subject: refactor(files_sharing): Make permissions prop checks less error prone
X-Git-Tag: v30.0.1rc~23^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=93b634f49795b32b6df8a59bbbf5297ec3e26d05;p=nextcloud-server.git

refactor(files_sharing): Make permissions prop checks less error prone

Signed-off-by: provokateurin <kate@provokateurin.de>
---

diff --git a/apps/files_sharing/lib/External/Storage.php b/apps/files_sharing/lib/External/Storage.php
index 020bbe2fbf9..a85e32f7619 100644
--- a/apps/files_sharing/lib/External/Storage.php
+++ b/apps/files_sharing/lib/External/Storage.php
@@ -357,14 +357,17 @@ class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage,
 
 	public function getPermissions($path): int {
 		$response = $this->propfind($path);
+		$ocsPermissions = $response['{http://open-collaboration-services.org/ns}share-permissions'] ?? null;
+		$ocmPermissions = $response['{http://open-cloud-mesh.org/ns}share-permissions'] ?? null;
+		$ocPermissions = $response['{http://owncloud.org/ns}permissions'] ?? null;
 		// old federated sharing permissions
-		if (isset($response['{http://open-collaboration-services.org/ns}share-permissions'])) {
-			$permissions = (int)$response['{http://open-collaboration-services.org/ns}share-permissions'];
-		} elseif (isset($response['{http://open-cloud-mesh.org/ns}share-permissions'])) {
+		if ($ocsPermissions !== null) {
+			$permissions = (int)$ocsPermissions;
+		} elseif ($ocmPermissions !== null) {
 			// permissions provided by the OCM API
-			$permissions = $this->ocmPermissions2ncPermissions($response['{http://open-cloud-mesh.org/ns}share-permissions'], $path);
-		} elseif (isset($response['{http://owncloud.org/ns}permissions'])) {
-			return $this->parsePermissions($response['{http://owncloud.org/ns}permissions']);
+			$permissions = $this->ocmPermissions2ncPermissions($ocmPermissions, $path);
+		} elseif ($ocPermissions !== null) {
+			return $this->parsePermissions($ocPermissions);
 		} else {
 			// use default permission if remote server doesn't provide the share permissions
 			$permissions = $this->getDefaultPermissions($path);