Preparations for Unified Sharing Legacy Sync

apps/sharebymail/lib/ShareByMailProvider.php

@@ -7,6 +7,7 @@
 
 namespace OCA\ShareByMail;
 
+use DateTime;
 use OC\Share20\DefaultShareProvider;
 use OC\Share20\Exception\InvalidShare;
 use OC\Share20\Share;
@@ -98,14 +99,10 @@
 
 		// if the admin enforces a password for all mail shares we create a
 		// random password and send it to the recipient
-		$password = $share->getPassword() ?: '';
-		$passwordEnforced = $this->shareManager->shareApiLinkEnforcePassword();
-		if ($passwordEnforced && empty($password)) {
+		$password = $share->getPassword();
+		if ($password === null && $this->shareManager->shareApiLinkEnforcePassword()) {
 			$password = $this->autoGeneratePassword($share);
-		}
-
-		if (!empty($password)) {
-			$share->setPassword($this->hasher->hash($password));
+			$share->setPasswordHash($this->hasher->hash($password));
 		}
 
 		$shareId = $this->createMailShare($share);
@@ -116,9 +113,7 @@
 		// Temporary set the clear password again to send it by mail
 		// This need to be done after the share was created in the database
 		// as the password is hashed in between.
-		if (!empty($password)) {
-			$data['password'] = $password;
-		}
+		$data['password'] = $password;
 
 		return $this->createShareObject($data);
 	}
@@ -227,6 +222,11 @@
 		if ($share->getToken() === '') {
 			$share->setToken($this->generateToken());
 		}
+
+		if ($share->getPassword() !== null && !$share->isPasswordHashed()) {
+			throw new RuntimeException('The password must be hashed already.');
+		}
+
 		return $this->addShareToDB(
 			$share->getNodeId(),
 			$share->getNodeType(),
@@ -241,6 +241,7 @@
 			$share->getHideDownload(),
 			$share->getLabel(),
 			$share->getExpirationDate(),
+			$share->getShareTime(),
 			$share->getNote(),
 			$share->getAttributes(),
 			$share->getMailSend(),
@@ -699,6 +700,7 @@
 		?bool $hideDownload,
 		?string $label,
 		?\DateTimeInterface $expirationTime,
+		?DateTime $shareTime,
 		?string $note = '',
 		?IAttributes $attributes = null,
 		?bool $mailSend = true,
@@ -717,7 +719,7 @@
 			->setValue('password', $qb->createNamedParameter($password))
 			->setValue('password_expiration_time', $qb->createNamedParameter($passwordExpirationTime, IQueryBuilder::PARAM_DATETIME_MUTABLE))
 			->setValue('password_by_talk', $qb->createNamedParameter($sendPasswordByTalk, IQueryBuilder::PARAM_BOOL))
-			->setValue('stime', $qb->createNamedParameter(time()))
+			->setValue('stime', $qb->createNamedParameter($shareTime?->getTimestamp() ?? time()))
 			->setValue('hide_download', $qb->createNamedParameter((int)$hideDownload, IQueryBuilder::PARAM_INT))
 			->setValue('label', $qb->createNamedParameter($label))
 			->setValue('note', $qb->createNamedParameter($note))
@@ -767,6 +769,11 @@
 			$expiration = \DateTime::createFromInterface($expiration);
 			$expiration->setTimezone(new \DateTimeZone(date_default_timezone_get()));
 		}
+
+		if ($share->getPassword() !== null && !$share->isPasswordHashed()) {
+			throw new RuntimeException('The password must be hashed already.');
+		}
+
 		$qb->update('share')
 			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
 			->set('item_source', $qb->createNamedParameter($share->getNodeId()))
@@ -1052,7 +1059,9 @@
 		$shareTime->setTimestamp((int)$data['stime']);
 		$share->setShareTime($shareTime);
 		$share->setSharedWith($data['share_with'] ?? '');
-		$share->setPassword($data['password']);
+		if (($password = $data['password']) !== null) {
+			$share->setPasswordHash($password);
+		}
 		$passwordExpirationTime = \DateTime::createFromFormat('Y-m-d H:i:s', $data['password_expiration_time'] ?? '');
 		$share->setPasswordExpirationTime($passwordExpirationTime !== false ? $passwordExpirationTime : null);
 		$share->setLabel($data['label'] ?? '');

apps/sharing/appinfo/info.xml

@@ -7,8 +7,8 @@
 	  xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
 	<id>sharing</id>
 	<name>Sharing</name>
-	<summary>TODO</summary>
-	<description>TODO</description>
+	<summary>This app provides APIs and occ commands to manage shares.</summary>
+	<description>This app provides APIs and occ commands to manage shares.</description>
 	<version>2.0.0-dev.3</version>
 	<licence>AGPL-3.0-or-later</licence>
 	<author>Kate Döen</author>

apps/sharing/lib/Command/AddShareRecipient.php

@@ -16,7 +16,6 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-// TODO: Initiator missing.
 final class AddShareRecipient extends SharingBase {
 	#[\Override]
 	public function configure(): void {

apps/sharing/openapi.json

@@ -3,7 +3,7 @@
     "info": {
         "title": "sharing",
         "version": "0.0.1",
-        "description": "TODO",
+        "description": "This app provides APIs and occ commands to manage shares.",
         "license": {
             "name": "AGPL-3.0-or-later"
         }

build/psalm-baseline.xml

@@ -20,7 +20,6 @@
   <file src="apps/cloud_federation_api/lib/Controller/RequestHandlerController.php">
     <DeprecatedMethod>
       <code><![CDATA[getFederationIdFromSharedSecret]]></code>
-      <code><![CDATA[getFederationIdFromSharedSecret]]></code>
     </DeprecatedMethod>
   </file>
   <file src="apps/comments/lib/Activity/Listener.php">
@@ -201,32 +200,17 @@
       <code><![CDATA[null]]></code>
     </NullableReturnStatement>
     <UndefinedMagicPropertyFetch>
-      <code><![CDATA[$component->CLASS]]></code>
-      <code><![CDATA[$component->CLASS]]></code>
       <code><![CDATA[$component->CLASS]]></code>
       <code><![CDATA[$component->DTEND]]></code>
       <code><![CDATA[$component->DTEND]]></code>
-      <code><![CDATA[$component->DTEND]]></code>
-      <code><![CDATA[$component->DTSTART]]></code>
       <code><![CDATA[$component->DTSTART]]></code>
-      <code><![CDATA[$component->DTSTART]]></code>
-      <code><![CDATA[$component->DUE]]></code>
       <code><![CDATA[$component->DUE]]></code>
       <code><![CDATA[$component->DUE]]></code>
       <code><![CDATA[$component->DURATION]]></code>
       <code><![CDATA[$component->DURATION]]></code>
-      <code><![CDATA[$component->DURATION]]></code>
-      <code><![CDATA[$component->RDATE]]></code>
-      <code><![CDATA[$component->RDATE]]></code>
       <code><![CDATA[$component->RDATE]]></code>
       <code><![CDATA[$component->RDATE]]></code>
-      <code><![CDATA[$component->RDATE]]></code>
-      <code><![CDATA[$component->RDATE]]></code>
-      <code><![CDATA[$component->RRULE]]></code>
       <code><![CDATA[$component->RRULE]]></code>
-      <code><![CDATA[$component->RRULE]]></code>
-      <code><![CDATA[$component->UID]]></code>
-      <code><![CDATA[$component->UID]]></code>
       <code><![CDATA[$component->UID]]></code>
     </UndefinedMagicPropertyFetch>
   </file>
@@ -2423,9 +2407,6 @@
       <code><![CDATA[deleteAppValue]]></code>
       <code><![CDATA[deleteAppValue]]></code>
       <code><![CDATA[getAppValue]]></code>
-      <code><![CDATA[getAppValue]]></code>
-      <code><![CDATA[getAppValue]]></code>
-      <code><![CDATA[getAppValue]]></code>
       <code><![CDATA[setAppValue]]></code>
       <code><![CDATA[setAppValue]]></code>
     </DeprecatedMethod>

core/Sharing/Recipient/GroupShareRecipientType.php

@@ -20,7 +20,7 @@
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\EventDispatcher\IEventListener;
-use OCP\Group\Events\GroupDeletedEvent;
+use OCP\Group\Events\BeforeGroupDeletedEvent;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\Interaction\InteractionReceiver;
@@ -30,7 +30,7 @@
 use OCP\Share\IShare;
 
 /**
- * @template-implements IEventListener<GroupDeletedEvent>
+ * @template-implements IEventListener<BeforeGroupDeletedEvent>
  */
 final class GroupShareRecipientType extends AShareRecipientTypeSearchCollaborator implements IEventListener {
 	public function __construct(
@@ -39,7 +39,7 @@ public function __construct(
 		private readonly IGroupManager $groupManager,
 		private readonly ISharingManager $manager,
 	) {
-		$eventDispatcher->addServiceListener(GroupDeletedEvent::class, self::class);
+		$eventDispatcher->addServiceListener(BeforeGroupDeletedEvent::class, self::class);
 	}
 
 	#[\Override]

core/Sharing/Recipient/UserShareRecipientType.php

@@ -26,10 +26,10 @@
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\Share\IShare;
-use OCP\User\Events\UserDeletedEvent;
+use OCP\User\Events\BeforeUserDeletedEvent;
 
 /**
- * @template-implements IEventListener<UserDeletedEvent>
+ * @template-implements IEventListener<BeforeUserDeletedEvent>
  */
 final class UserShareRecipientType extends AShareRecipientTypeSearchCollaborator implements IEventListener {
 
@@ -39,7 +39,7 @@ public function __construct(
 		private readonly IUserManager $userManager,
 		private readonly ISharingManager $manager,
 	) {
-		$eventDispatcher->addServiceListener(UserDeletedEvent::class, self::class);
+		$eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, self::class);
 	}
 
 	#[\Override]

lib/composer/composer/autoload_classmap.php

@@ -2366,7 +2366,6 @@
     'OC\\Share20\\UserRemovedListener' => $baseDir . '/lib/private/Share20/UserRemovedListener.php',
     'OC\\Share\\Constants' => $baseDir . '/lib/private/Share/Constants.php',
     'OC\\Sharing\\ClassMapper' => $baseDir . '/lib/private/Sharing/ClassMapper.php',
-    'OC\\Sharing\\ISharingLegacyBackend' => $baseDir . '/lib/private/Sharing/ISharingLegacyBackend.php',
     'OC\\Sharing\\SharingBackend' => $baseDir . '/lib/private/Sharing/SharingBackend.php',
     'OC\\Sharing\\SharingManager' => $baseDir . '/lib/private/Sharing/SharingManager.php',
     'OC\\Sharing\\SharingRegistry' => $baseDir . '/lib/private/Sharing/SharingRegistry.php',

lib/composer/composer/autoload_static.php

@@ -2407,7 +2407,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Share20\\UserRemovedListener' => __DIR__ . '/../../..' . '/lib/private/Share20/UserRemovedListener.php',
         'OC\\Share\\Constants' => __DIR__ . '/../../..' . '/lib/private/Share/Constants.php',
         'OC\\Sharing\\ClassMapper' => __DIR__ . '/../../..' . '/lib/private/Sharing/ClassMapper.php',
-        'OC\\Sharing\\ISharingLegacyBackend' => __DIR__ . '/../../..' . '/lib/private/Sharing/ISharingLegacyBackend.php',
         'OC\\Sharing\\SharingBackend' => __DIR__ . '/../../..' . '/lib/private/Sharing/SharingBackend.php',
         'OC\\Sharing\\SharingManager' => __DIR__ . '/../../..' . '/lib/private/Sharing/SharingManager.php',
         'OC\\Sharing\\SharingRegistry' => __DIR__ . '/../../..' . '/lib/private/Sharing/SharingRegistry.php',

lib/private/Group/Group.php

@@ -98,11 +98,6 @@ public function setDisplayName(string $displayName): bool {
 		return false;
 	}
 
-	/**
-	 * get all users in the group
-	 *
-	 * @return array<string, IUser>
-	 */
 	#[\Override]
 	public function getUsers(): array {
 		if ($this->usersLoaded) {

lib/private/Share20/DefaultShareProvider.php

@@ -46,6 +46,7 @@
 use OCP\Share\IShareProviderWithNotification;
 use OCP\Util;
 use Psr\Log\LoggerInterface;
+use RuntimeException;
 use function str_starts_with;
 use function strlen;
 
@@ -110,7 +111,10 @@ public function create(IShare $share) {
 		if ($share->getShareType() === IShare::TYPE_USER) {
 			//Set the UID of the user we share with
 			$qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
-			$qb->setValue('accepted', $qb->createNamedParameter(IShare::STATUS_PENDING));
+			if ($share->getStatus() === null) {
+				$share->setStatus(IShare::STATUS_PENDING);
+			}
+			$qb->setValue('accepted', $qb->createNamedParameter($share->getStatus()));
 
 			//If an expiration date is set store it
 			if ($expirationDate !== null) {
@@ -133,8 +137,11 @@ public function create(IShare $share) {
 			$qb->setValue('token', $qb->createNamedParameter($share->getToken()));
 
 			//If a password is set store it
-			if ($share->getPassword() !== null) {
-				$qb->setValue('password', $qb->createNamedParameter($share->getPassword()));
+			if (($password = $share->getPassword()) !== null) {
+				if (!$share->isPasswordHashed()) {
+					throw new RuntimeException('The password must be hashed already.');
+				}
+				$qb->setValue('password', $qb->createNamedParameter($password));
 			}
 
 			$qb->setValue('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL));
@@ -185,9 +192,9 @@ public function create(IShare $share) {
 			$qb->setValue('note', $qb->createNamedParameter($share->getNote()));
 		}
 
-		// Set the time this share was created
-		$shareTime = $this->timeFactory->now();
+		$shareTime = $share->getShareTime() ?? \DateTime::createFromImmutable($this->timeFactory->now());
 		$qb->setValue('stime', $qb->createNamedParameter($shareTime->getTimestamp()));
+		$share->setShareTime($shareTime);
 
 		// insert the data and fetch the id of the share
 		$qb->executeStatement();
@@ -197,8 +204,6 @@ public function create(IShare $share) {
 		$share->setId((string)$id);
 		$share->setProviderId($this->identifier());
 
-		$share->setShareTime(\DateTime::createFromImmutable($shareTime));
-
 		$mailSendValue = $share->getMailSend();
 		$share->setMailSend(($mailSendValue === null) ? true : $mailSendValue);
 
@@ -287,10 +292,15 @@ public function update(IShare $share) {
 				->set('attributes', $qb->createNamedParameter($shareAttributes))
 				->executeStatement();
 		} elseif ($share->getShareType() === IShare::TYPE_LINK) {
+			$password = $share->getPassword();
+			if ($password !== null && !$share->isPasswordHashed()) {
+				throw new RuntimeException('The password must be hashed already.');
+			}
+
 			$qb = $this->dbConn->getQueryBuilder();
 			$qb->update('share')
 				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->set('password', $qb->createNamedParameter($share->getPassword()))
+				->set('password', $qb->createNamedParameter($password))
 				->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
 				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
 				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
@@ -1129,7 +1139,9 @@ private function createShare($data): IShare {
 			$share->setSharedWith($data['share_with']);
 			$share->setSharedWithDisplayNameCallback(fn (IShare $share) => $this->groupManager->getDisplayName($share->getSharedWith()));
 		} elseif ($share->getShareType() === IShare::TYPE_LINK) {
-			$share->setPassword($data['password']);
+			if (($password = $data['password']) !== null) {
+				$share->setPasswordHash($password);
+			}
 			$share->setSendPasswordByTalk((bool)$data['password_by_talk']);
 			$share->setToken($data['token']);
 		}

lib/private/Share20/Manager.php

@@ -567,9 +567,8 @@ public function createShare(IShare $share): IShare {
 				$this->verifyPassword($share->getPassword());
 
 				// If a password is set. Hash it!
-				if ($share->getShareType() === IShare::TYPE_LINK
-					&& $share->getPassword() !== null) {
-					$share->setPassword($this->hasher->hash($share->getPassword()));
+				if (($share->getShareType() === IShare::TYPE_LINK || $share->getShareType() === IShare::TYPE_EMAIL) && $share->getPassword() !== null && !$share->isPasswordHashed()) {
+					$share->setPasswordHash($this->hasher->hash($share->getPassword()));
 				}
 			}
 
@@ -588,9 +587,11 @@ public function createShare(IShare $share): IShare {
 				}
 			}
 
-			$target = $shareFolder . '/' . $share->getNode()->getName();
-			$target = Filesystem::normalizePath($target);
-			$share->setTarget($target);
+			if ($share->getTarget() === null) {
+				$target = $shareFolder . '/' . $share->getNode()->getName();
+				$target = Filesystem::normalizePath($target);
+				$share->setTarget($target);
+			}
 
 			// Pre share event
 			$event = new BeforeShareCreatedEvent($share);
@@ -832,7 +833,7 @@ private function updateSharePasswordIfNeeded(IShare $share, IShare $originalShar
 
 			// If a password is set. Hash it!
 			if (!empty($share->getPassword())) {
-				$share->setPassword($this->hasher->hash($share->getPassword()));
+				$share->setPasswordHash($this->hasher->hash($share->getPassword()));
 				if ($share->getShareType() === IShare::TYPE_EMAIL) {
 					// Shares shared by email have temporary passwords
 					$this->setSharePasswordExpirationTime($share);
@@ -850,7 +851,12 @@ private function updateSharePasswordIfNeeded(IShare $share, IShare $originalShar
 		} else {
 			// Reset the password to the original one, as it is either the same
 			// as the "new" password or a hashed version of it.
-			$share->setPassword($originalShare->getPassword());
+			$password = $originalShare->getPassword();
+			if ($password !== null && $originalShare->isPasswordHashed()) {
+				$share->setPasswordHash($password);
+			} else {
+				$share->setPassword($password);
+			}
 		}
 
 		return false;