Merge pull request #58593 from nextcloud/carl/share-spring-cleaning

Author: provokateurin

apps/files_sharing/composer/composer/autoload_classmap.php

@@ -96,8 +96,6 @@
     'OCA\\Files_Sharing\\ResponseDefinitions' => $baseDir . '/../lib/ResponseDefinitions.php',
     'OCA\\Files_Sharing\\Scanner' => $baseDir . '/../lib/Scanner.php',
     'OCA\\Files_Sharing\\Settings\\Personal' => $baseDir . '/../lib/Settings/Personal.php',
-    'OCA\\Files_Sharing\\ShareBackend\\File' => $baseDir . '/../lib/ShareBackend/File.php',
-    'OCA\\Files_Sharing\\ShareBackend\\Folder' => $baseDir . '/../lib/ShareBackend/Folder.php',
     'OCA\\Files_Sharing\\ShareTargetValidator' => $baseDir . '/../lib/ShareTargetValidator.php',
     'OCA\\Files_Sharing\\SharedMount' => $baseDir . '/../lib/SharedMount.php',
     'OCA\\Files_Sharing\\SharedStorage' => $baseDir . '/../lib/SharedStorage.php',

apps/files_sharing/composer/composer/autoload_static.php

@@ -111,8 +111,6 @@ class ComposerStaticInitFiles_Sharing
         'OCA\\Files_Sharing\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php',
         'OCA\\Files_Sharing\\Scanner' => __DIR__ . '/..' . '/../lib/Scanner.php',
         'OCA\\Files_Sharing\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
-        'OCA\\Files_Sharing\\ShareBackend\\File' => __DIR__ . '/..' . '/../lib/ShareBackend/File.php',
-        'OCA\\Files_Sharing\\ShareBackend\\Folder' => __DIR__ . '/..' . '/../lib/ShareBackend/Folder.php',
         'OCA\\Files_Sharing\\ShareTargetValidator' => __DIR__ . '/..' . '/../lib/ShareTargetValidator.php',
         'OCA\\Files_Sharing\\SharedMount' => __DIR__ . '/..' . '/../lib/SharedMount.php',
         'OCA\\Files_Sharing\\SharedStorage' => __DIR__ . '/..' . '/../lib/SharedStorage.php',

apps/files_sharing/lib/AppInfo/Application.php

@@ -8,7 +8,6 @@
 namespace OCA\Files_Sharing\AppInfo;
 
 use OC\Group\DisplayNameCache as GroupDisplayNameCache;
-use OC\Share\Share;
 use OC\User\DisplayNameCache;
 use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCA\Files\Event\LoadSidebar;
@@ -34,8 +33,6 @@
 use OCA\Files_Sharing\MountProvider;
 use OCA\Files_Sharing\Notification\Listener;
 use OCA\Files_Sharing\Notification\Notifier;
-use OCA\Files_Sharing\ShareBackend\File;
-use OCA\Files_Sharing\ShareBackend\Folder;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
@@ -132,9 +129,6 @@ public function boot(IBootContext $context): void {
 		$context->injectFn([$this, 'registerEventsScripts']);
 
 		Helper::registerHooks();
-
-		Share::registerBackend('file', File::class);
-		Share::registerBackend('folder', Folder::class, 'file');
 	}
 
 

apps/files_sharing/lib/Controller/ShareesAPIController.php

@@ -128,11 +128,11 @@ public function search(string $search = '', ?string $itemType = null, int $page
 				$shareTypes[] = IShare::TYPE_GROUP;
 			}
 
-			if ($this->isRemoteSharingAllowed($itemType)) {
+			if ($this->isRemoteSharingAllowed()) {
 				$shareTypes[] = IShare::TYPE_REMOTE;
 			}
 
-			if ($this->isRemoteGroupSharingAllowed($itemType)) {
+			if ($this->isRemoteGroupSharingAllowed()) {
 				$shareTypes[] = IShare::TYPE_REMOTE_GROUP;
 			}
 
@@ -309,11 +309,11 @@ public function findRecommended(string $itemType, $shareType = null): DataRespon
 				$shareTypes[] = IShare::TYPE_GROUP;
 			}
 
-			if ($this->isRemoteSharingAllowed($itemType)) {
+			if ($this->isRemoteSharingAllowed()) {
 				$shareTypes[] = IShare::TYPE_REMOTE;
 			}
 
-			if ($this->isRemoteGroupSharingAllowed($itemType)) {
+			if ($this->isRemoteGroupSharingAllowed()) {
 				$shareTypes[] = IShare::TYPE_REMOTE_GROUP;
 			}
 
@@ -353,24 +353,12 @@ public function findRecommended(string $itemType, $shareType = null): DataRespon
 	 * @param string $itemType
 	 * @return bool
 	 */
-	protected function isRemoteSharingAllowed(string $itemType): bool {
-		try {
-			// FIXME: static foo makes unit testing unnecessarily difficult
-			$backend = Share::getBackend($itemType);
-			return $backend->isShareTypeAllowed(IShare::TYPE_REMOTE);
-		} catch (\Exception $e) {
-			return false;
-		}
+	protected function isRemoteSharingAllowed(): bool {
+		return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
 	}
 
-	protected function isRemoteGroupSharingAllowed(string $itemType): bool {
-		try {
-			// FIXME: static foo makes unit testing unnecessarily difficult
-			$backend = Share::getBackend($itemType);
-			return $backend->isShareTypeAllowed(IShare::TYPE_REMOTE_GROUP);
-		} catch (\Exception $e) {
-			return false;
-		}
+	protected function isRemoteGroupSharingAllowed(): bool {
+		return $this->federatedShareProvider->isOutgoingServer2serverGroupShareEnabled();
 	}
 
 

apps/files_sharing/lib/External/Storage.php

@@ -30,13 +30,15 @@
 use OCP\Files\StorageNotAvailableException;
 use OCP\Http\Client\IClientService;
 use OCP\Http\Client\LocalServerException;
+use OCP\IAppConfig;
 use OCP\ICacheFactory;
 use OCP\IConfig;
+use OCP\IUserSession;
 use OCP\OCM\Exceptions\OCMArgumentException;
 use OCP\OCM\Exceptions\OCMProviderException;
 use OCP\OCM\IOCMDiscoveryService;
 use OCP\Server;
-use OCP\Util;
+use OCP\Share\IManager as IShareManager;
 use Psr\Log\LoggerInterface;
 
 class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage, IReliableEtagStorage {
@@ -48,6 +50,8 @@ class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage,
 	private bool $updateChecked = false;
 	private ExternalShareManager $manager;
 	private IConfig $config;
+	private IAppConfig $appConfig;
+	private IShareManager $shareManager;
 
 	/**
 	 * @param array{HttpClientService: IClientService, manager: ExternalShareManager, cloudId: ICloudId, mountpoint: string, token: string, password: ?string}|array $options
@@ -60,6 +64,8 @@ public function __construct($options) {
 		$this->logger = Server::get(LoggerInterface::class);
 		$discoveryService = Server::get(IOCMDiscoveryService::class);
 		$this->config = Server::get(IConfig::class);
+		$this->appConfig = Server::get(IAppConfig::class);
+		$this->shareManager = Server::get(IShareManager::class);
 
 		// use default path to webdav if not found on discovery
 		try {
@@ -330,7 +336,8 @@ public function getOwner(string $path): string|false {
 	}
 
 	public function isSharable(string $path): bool {
-		if (Util::isSharingDisabledForUser() || !Share::isResharingAllowed()) {
+		if ($this->shareManager->sharingDisabledForUser(Server::get(IUserSession::class)->getUser()?->getUID())
+			|| !$this->appConfig->getValueBool('core', 'shareapi_allow_resharing', true)) {
 			return false;
 		}
 		return (bool)($this->getPermissions($path) & Constants::PERMISSION_SHARE);

apps/files_sharing/lib/Helper.php

@@ -29,7 +29,7 @@ public static function registerHooks() {
 	 * @param View $view
 	 * @return string $path
 	 */
-	public static function generateUniqueTarget($path, $view) {
+	public static function generateUniqueTarget(string $path, View $view): string {
 		$pathinfo = pathinfo($path);
 		$ext = isset($pathinfo['extension']) ? '.' . $pathinfo['extension'] : '';
 		$name = $pathinfo['filename'];
@@ -82,13 +82,4 @@ public static function getShareFolder(?View $view = null, ?string $userId = null
 
 		return $shareFolder;
 	}
-
-	/**
-	 * set default share folder
-	 *
-	 * @param string $shareFolder
-	 */
-	public static function setShareFolder($shareFolder) {
-		Server::get(IConfig::class)->setSystemValue('share_folder', $shareFolder);
-	}
 }