Merge pull request #27002 from nextcloud/backport/26946/stable19

[stable19] Respect default share permissions for federated reshares

Author: MorrisJobke

apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php

@@ -45,6 +45,7 @@
 use OCP\Federation\ICloudFederationShare;
 use OCP\Federation\ICloudIdManager;
 use OCP\Files\NotFoundException;
+use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\ILogger;
@@ -101,6 +102,9 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
 	/** @var IGroupManager */
 	private $groupManager;
 
+	/** @var IConfig */
+	private $config;
+
 	/**
 	 * CloudFederationProvider constructor.
 	 *
@@ -132,7 +136,8 @@ public function __construct(IAppManager $appManager,
 								ICloudFederationFactory $cloudFederationFactory,
 								ICloudFederationProviderManager $cloudFederationProviderManager,
 								IDBConnection $connection,
-								IGroupManager $groupManager
+								IGroupManager $groupManager,
+								IConfig $config
 	) {
 		$this->appManager = $appManager;
 		$this->federatedShareProvider = $federatedShareProvider;
@@ -148,6 +153,7 @@ public function __construct(IAppManager $appManager,
 		$this->cloudFederationProviderManager = $cloudFederationProviderManager;
 		$this->connection = $connection;
 		$this->groupManager = $groupManager;
+		$this->config = $config;
 	}
 
 
@@ -636,6 +642,11 @@ protected function reshareRequested($id, array $notification) {
 		$senderId = $notification['senderId'];
 
 		$share = $this->federatedShareProvider->getShareById($id);
+
+		// We have to respect the default share permissions
+		$permissions = $share->getPermissions() & (int)$this->config->getAppValue('core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL);
+		$share->setPermissions($permissions);
+
 		// don't allow to share a file back to the owner
 		try {
 			list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);