Merge pull request #1784 from nextcloud/backport/1744/stable29

[stable29] fix duplicate name on fedcircle
nextcloud · Nov 28, 2024 · 5e6562e · 5e6562e
2 parents a40d561 + a9041a8
commit 5e6562e
Show file tree

Hide file tree

Showing 13 changed files with 381 additions and 186 deletions.
diff --git a/lib/Db/CoreQueryBuilder.php b/lib/Db/CoreQueryBuilder.php
@@ -1584,7 +1584,7 @@ public function limitToShareOwner(
 	 *
 	 * @throws RequestBuilderException
 	 */
-	public function leftJoinMountpoint(string $aliasMount, string $aliasMountMemberships = '') {
+	public function leftJoinMountpoint(string $aliasMount, IFederatedUser $federatedUser, string $aliasMountMemberships = '') {
 		$expr = $this->expr();
 
 		$aliasMountpoint = $this->generateAlias($aliasMount, self::MOUNTPOINT);
@@ -1596,7 +1596,7 @@ public function leftJoinMountpoint(string $aliasMount, string $aliasMountMembers
 			$aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint,
 			$expr->andX(
 				$expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'),
-				$expr->eq($aliasMountpoint . '.single_id', $aliasMountMemberships . '.single_id')
+				$expr->eq($aliasMountpoint . '.single_id', $this->createNamedParameter($federatedUser->getSingleId()))
 			)
 		);
 

diff --git a/lib/Db/MountPointRequest.php b/lib/Db/MountPointRequest.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Circles\Db;
+
+use OCA\Circles\Exceptions\MountNotFoundException;
+use OCA\Circles\Model\Mountpoint;
+use OCA\Circles\Tools\Traits\TStringTools;
+
+class MountPointRequest extends MountPointRequestBuilder {
+	use TStringTools;
+
+	/**
+	 * @param Mountpoint $mountpoint
+	 */
+	public function insert(Mountpoint $mountpoint): void {
+		$qb = $this->getMountPointInsertSql();
+
+		$hash = ($mountpoint->getMountPoint() === '-') ? '' : md5($mountpoint->getMountPoint());
+		$qb->setValue('mountpoint', $qb->createNamedParameter($mountpoint->getMountPoint()))
+			->setValue('mountpoint_hash', $qb->createNamedParameter($hash))
+			->setValue('mount_id', $qb->createNamedParameter($mountpoint->getMountId()))
+			->setValue('single_id', $qb->createNamedParameter($mountpoint->getSingleId()));
+		$qb->executeStatement();
+	}
+
+	/**
+	 * @param Mountpoint $mountpoint
+	 * @throws MountNotFoundException
+	 */
+	public function update(Mountpoint $mountpoint): void {
+		$qb = $this->getMountPointUpdateSql();
+
+		$hash = ($mountpoint->getMountPoint() === '-') ? '' : md5($mountpoint->getMountPoint());
+
+		$qb->set('mountpoint', $qb->createNamedParameter($mountpoint->getMountPoint()))
+			->set('mountpoint_hash', $qb->createNamedParameter($hash));
+		$qb->limit('mount_id', $mountpoint->getMountId());
+		$qb->limitToSingleId($mountpoint->getSingleId());
+		$nb = $qb->executeStatement();
+
+		if ($nb === 0) {
+			throw new MountNotFoundException('Mount not found');
+		}
+	}
+}
diff --git a/lib/Db/MountPointRequestBuilder.php b/lib/Db/MountPointRequestBuilder.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\Circles\Db;
+
+use OCA\Circles\Exceptions\MountNotFoundException;
+use OCA\Circles\Model\Mount;
+use OCA\Circles\Model\Mountpoint;
+use OCA\Circles\Tools\Exceptions\RowNotFoundException;
+
+class MountPointRequestBuilder extends CoreRequestBuilder {
+	protected function getMountPointInsertSql(): CoreQueryBuilder {
+		$qb = $this->getQueryBuilder();
+		$qb->insert(self::TABLE_MOUNTPOINT);
+
+		return $qb;
+	}
+
+	protected function getMountPointUpdateSql(): CoreQueryBuilder {
+		$qb = $this->getQueryBuilder();
+		$qb->update(self::TABLE_MOUNTPOINT);
+
+		return $qb;
+	}
+
+	protected function getMountPointSelectSql(string $alias = CoreQueryBuilder::MOUNTPOINT): CoreQueryBuilder {
+		$qb = $this->getQueryBuilder();
+		$qb->generateSelect(self::TABLE_MOUNTPOINT, self::$tables[self::TABLE_MOUNTPOINT], $alias);
+
+		return $qb;
+	}
+
+	protected function getMountPointDeleteSql(): CoreQueryBuilder {
+		$qb = $this->getQueryBuilder();
+		$qb->delete(self::TABLE_MOUNTPOINT);
+
+		return $qb;
+	}
+
+	public function getItemFromRequest(CoreQueryBuilder $qb): MountPoint {
+		/** @var MountPoint $mountpoint */
+		try {
+			$mountpoint = $qb->asItem(MountPoint::class);
+		} catch (RowNotFoundException $e) {
+			throw new MountNotFoundException('Mount not found');
+		}
+
+		return $mountpoint;
+	}
+
+	/**
+	 * @param CoreQueryBuilder $qb
+	 *
+	 * @return Mount[]
+	 */
+	public function getItemsFromRequest(CoreQueryBuilder $qb): array {
+		/** @var MountPoint[] $result */
+		return $qb->asItems(MountPoint::class);
+	}
+}
diff --git a/lib/Db/MountRequest.php b/lib/Db/MountRequest.php
@@ -55,8 +55,8 @@ public function save(Mount $mount): void {
 		   ->setValue('single_id', $qb->createNamedParameter($mount->getOwner()->getSingleId()))
 		   ->setValue('token', $qb->createNamedParameter($mount->getToken()))
 		   ->setValue('parent', $qb->createNamedParameter($mount->getParent()))
-		   ->setValue('mountpoint', $qb->createNamedParameter($mount->getMountPoint()))
-		   ->setValue('mountpoint_hash', $qb->createNamedParameter(md5($mount->getMountPoint())));
+		   ->setValue('mountpoint', $qb->createNamedParameter($mount->getOriginalMountPoint()))
+		   ->setValue('mountpoint_hash', $qb->createNamedParameter(md5($mount->getOriginalMountPoint())));
 
 		$qb->execute();
 	}
@@ -83,7 +83,7 @@ public function getForUser(IFederatedUser $federatedUser): array {
 		$qb = $this->getMountSelectSql();
 		$qb->setOptions([CoreQueryBuilder::MOUNT], ['getData' => true]);
 		$qb->leftJoinMember(CoreQueryBuilder::MOUNT);
-		$qb->leftJoinMountpoint(CoreQueryBuilder::MOUNT);
+		$qb->leftJoinMountpoint(CoreQueryBuilder::MOUNT, $federatedUser);
 		$qb->limitToInitiator(CoreQueryBuilder::MOUNT, $federatedUser, 'circle_id');
 
 		return $this->getItemsFromRequest($qb);

diff --git a/lib/Exceptions/MountPointNotFoundException.php b/lib/Exceptions/MountPointNotFoundException.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Circles\Exceptions;
+
+class MountPointNotFoundException extends FederatedItemNotFoundException {
+}
diff --git a/lib/Migration/Version0031Date20241105133904.php b/lib/Migration/Version0031Date20241105133904.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+
+namespace OCA\Circles\Migration;
+
+use Closure;
+use Doctrine\DBAL\Schema\SchemaException;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+use Psr\Log\LoggerInterface;
+
+class Version0031Date20241105133904 extends SimpleMigrationStep {
+	public function __construct(
+		private LoggerInterface $logger,
+	) {
+	}
+
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		try {
+			$table = $schema->getTable('circles_mountpoint');
+			if (!$table->hasIndex('mp_sid_hash')) {
+				$table->addUniqueIndex(['single_id', 'mountpoint_hash'], 'mp_sid_hash');
+			}
+		} catch (SchemaException $e) {
+			$this->logger->warning('Could not find circles_mountpoint', ['exception' => $e]);
+		}
+
+		return $schema;
+	}
+}
diff --git a/lib/Model/ModelManager.php b/lib/Model/ModelManager.php
@@ -42,6 +42,7 @@
 use OCA\Circles\Exceptions\FileCacheNotFoundException;
 use OCA\Circles\Exceptions\MemberNotFoundException;
 use OCA\Circles\Exceptions\MembershipNotFoundException;
+use OCA\Circles\Exceptions\MountPointNotFoundException;
 use OCA\Circles\Exceptions\OwnerNotFoundException;
 use OCA\Circles\Exceptions\RemoteInstanceException;
 use OCA\Circles\Exceptions\RemoteNotFoundException;
@@ -482,7 +483,7 @@ private function importIntoMount(
 					$member = new Member();
 					$member->importFromDatabase($data, $prefix);
 					$mount->setOwner($member);
-				} catch (MemberNotFoundException $e) {
+				} catch (MemberNotFoundException) {
 				}
 				break;
 
@@ -491,7 +492,16 @@ private function importIntoMount(
 					$initiator = new Member();
 					$initiator->importFromDatabase($data, $prefix);
 					$mount->setInitiator($initiator);
-				} catch (MemberNotFoundException $e) {
+				} catch (MemberNotFoundException) {
+				}
+				break;
+
+			case CoreQueryBuilder::MOUNTPOINT:
+				try {
+					$mountPoint = new Mountpoint();
+					$mountPoint->importFromDatabase($data, $prefix);
+					$mount->setAlternateMountPoint($mountPoint);
+				} catch (MountPointNotFoundException) {
 				}
 				break;
 		}