diff options
Diffstat (limited to 'apps/sharebymail/lib/ShareByMailProvider.php')
| -rw-r--r-- | apps/sharebymail/lib/ShareByMailProvider.php | 403 |
1 files changed, 266 insertions, 137 deletions
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index 6b37f99df79..d28f7c51327 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -1,10 +1,12 @@ <?php + /** * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later */ namespace OCA\ShareByMail; +use OC\Share20\DefaultShareProvider; use OC\Share20\Exception\InvalidShare; use OC\Share20\Share; use OC\User\NoUserException; @@ -27,11 +29,14 @@ use OCP\Mail\IMailer; use OCP\Security\Events\GenerateSecurePasswordEvent; use OCP\Security\IHasher; use OCP\Security\ISecureRandom; +use OCP\Security\PasswordContext; use OCP\Share\Exceptions\GenericShareException; use OCP\Share\Exceptions\ShareNotFound; +use OCP\Share\IAttributes; use OCP\Share\IManager as IShareManager; use OCP\Share\IShare; -use OCP\Share\IShareProvider; +use OCP\Share\IShareProviderWithNotification; +use OCP\Util; use Psr\Log\LoggerInterface; /** @@ -39,7 +44,7 @@ use Psr\Log\LoggerInterface; * * @package OCA\ShareByMail */ -class ShareByMailProvider implements IShareProvider { +class ShareByMailProvider extends DefaultShareProvider implements IShareProviderWithNotification { /** * Return the identifier of this provider. * @@ -76,11 +81,10 @@ class ShareByMailProvider implements IShareProvider { */ public function create(IShare $share): IShare { $shareWith = $share->getSharedWith(); - /* - * Check if file is not already shared with the remote user - */ + // Check if file is not already shared with the given email, + // if we have an email at all. $alreadyShared = $this->getSharedWith($shareWith, IShare::TYPE_EMAIL, $share->getNode(), 1, 0); - if (!empty($alreadyShared)) { + if ($shareWith !== '' && !empty($alreadyShared)) { $message = 'Sharing %1$s failed, because this item is already shared with the account %2$s'; $message_t = $this->l->t('Sharing %1$s failed, because this item is already shared with the account %2$s', [$share->getNode()->getName(), $shareWith]); $this->logger->debug(sprintf($message, $share->getNode()->getName(), $shareWith), ['app' => 'Federated File Sharing']); @@ -101,18 +105,16 @@ class ShareByMailProvider implements IShareProvider { $shareId = $this->createMailShare($share); - // Sends share password to receiver when it's a permanent one (otherwise she will have to request it via the showShare UI) - // or to owner when the password shall be given during a Talk session - if ($this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false) === false || $share->getSendPasswordByTalk()) { - $send = $this->sendPassword($share, $password); - if ($passwordEnforced && $send === false) { - $this->sendPasswordToOwner($share, $password); - } - } - $this->createShareActivity($share); $data = $this->getRawShare($shareId); + // 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; + } + return $this->createShareObject($data); } @@ -128,11 +130,11 @@ class ShareByMailProvider implements IShareProvider { if ($initiatorEMailAddress === null && !$allowPasswordByMail) { throw new \Exception( - $this->l->t("We cannot send you the auto-generated password. Please set a valid email address in your personal settings and try again.") + $this->l->t('We cannot send you the auto-generated password. Please set a valid email address in your personal settings and try again.') ); } - $passwordEvent = new GenerateSecurePasswordEvent(); + $passwordEvent = new GenerateSecurePasswordEvent(PasswordContext::SHARING); $this->eventDispatcher->dispatchTyped($passwordEvent); $password = $passwordEvent->getPassword(); @@ -154,7 +156,7 @@ class ShareByMailProvider implements IShareProvider { [$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()], $share->getSharedBy(), $share->getNode()->getId(), - (string) $userFolder->getRelativePath($share->getNode()->getPath()) + (string)$userFolder->getRelativePath($share->getNode()->getPath()) ); if ($share->getShareOwner() !== $share->getSharedBy()) { @@ -167,7 +169,7 @@ class ShareByMailProvider implements IShareProvider { [$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()], $share->getShareOwner(), $fileId, - (string) $ownerFolder->getRelativePath($ownerPath) + (string)$ownerFolder->getRelativePath($ownerPath) ); } } @@ -184,7 +186,7 @@ class ShareByMailProvider implements IShareProvider { [$userFolder->getRelativePath($share->getNode()->getPath())], $share->getSharedBy(), $share->getNode()->getId(), - (string) $userFolder->getRelativePath($share->getNode()->getPath()) + (string)$userFolder->getRelativePath($share->getNode()->getPath()) ); } else { $this->publishActivity( @@ -192,7 +194,7 @@ class ShareByMailProvider implements IShareProvider { [$userFolder->getRelativePath($share->getNode()->getPath()), $sharedWith], $share->getSharedBy(), $share->getNode()->getId(), - (string) $userFolder->getRelativePath($share->getNode()->getPath()) + (string)$userFolder->getRelativePath($share->getNode()->getPath()) ); } } @@ -216,7 +218,7 @@ class ShareByMailProvider implements IShareProvider { */ protected function createMailShare(IShare $share): int { $share->setToken($this->generateToken()); - $shareId = $this->addShareToDB( + return $this->addShareToDB( $share->getNodeId(), $share->getNodeType(), $share->getSharedWith(), @@ -230,61 +232,92 @@ class ShareByMailProvider implements IShareProvider { $share->getHideDownload(), $share->getLabel(), $share->getExpirationDate(), - $share->getNote() + $share->getNote(), + $share->getAttributes(), + $share->getMailSend(), ); + } + + /** + * @inheritDoc + */ + public function sendMailNotification(IShare $share): bool { + $shareId = $share->getId(); - if (!$this->mailer->validateMailAddress($share->getSharedWith())) { - $this->removeShareFromTable($shareId); - $e = new HintException('Failed to send share by mail. Got an invalid email address: ' . $share->getSharedWith(), + $emails = $this->getSharedWithEmails($share); + $validEmails = array_filter($emails, function (string $email) { + return $this->mailer->validateMailAddress($email); + }); + + if (count($validEmails) === 0) { + $this->removeShareFromTable((int)$shareId); + $e = new HintException('Failed to send share by mail. Could not find a valid email address: ' . join(', ', $emails), $this->l->t('Failed to send share by email. Got an invalid email address')); - $this->logger->error('Failed to send share by mail. Got an invalid email address ' . $share->getSharedWith(), [ + $this->logger->error('Failed to send share by mail. Could not find a valid email address ' . join(', ', $emails), [ 'app' => 'sharebymail', 'exception' => $e, ]); } try { - $link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', - ['token' => $share->getToken()]); - $this->sendMailNotification( - $share->getNode()->getName(), - $link, - $share->getSharedBy(), - $share->getSharedWith(), - $share->getExpirationDate(), - $share->getNote() - ); + $this->sendEmail($share, $validEmails); + + // If we have a password set, we send it to the recipient + if ($share->getPassword() !== null) { + // If share-by-talk password is enabled, we do not send the notification + // to the recipient. They will have to request it to the owner after opening the link. + // Secondly, if the password expiration is disabled, we send the notification to the recipient + // Lastly, if the mail to recipient failed, we send the password to the owner as a fallback. + // If a password expires, the recipient will still be able to request a new one via talk. + $passwordExpire = $this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false); + $passwordEnforced = $this->shareManager->shareApiLinkEnforcePassword(); + if ($passwordExpire === false || $share->getSendPasswordByTalk()) { + $send = $this->sendPassword($share, $share->getPassword(), $validEmails); + if ($passwordEnforced && $send === false) { + $this->sendPasswordToOwner($share, $share->getPassword()); + } + } + } + + return true; } catch (HintException $hintException) { $this->logger->error('Failed to send share by mail.', [ 'app' => 'sharebymail', 'exception' => $hintException, ]); - $this->removeShareFromTable($shareId); + $this->removeShareFromTable((int)$shareId); throw $hintException; } catch (\Exception $e) { $this->logger->error('Failed to send share by mail.', [ 'app' => 'sharebymail', 'exception' => $e, ]); - $this->removeShareFromTable($shareId); - throw new HintException('Failed to send share by mail', - $this->l->t('Failed to send share by email')); + $this->removeShareFromTable((int)$shareId); + throw new HintException( + 'Failed to send share by mail', + $this->l->t('Failed to send share by email'), + 0, + $e, + ); } - - return $shareId; + return false; } /** - * @throws \Exception If mail couldn't be sent + * @param IShare $share The share to send the email for + * @param array $emails The email addresses to send the email to */ - protected function sendMailNotification( - string $filename, - string $link, - string $initiator, - string $shareWith, - ?\DateTime $expiration = null, - string $note = '', - ): void { + protected function sendEmail(IShare $share, array $emails): void { + $link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', [ + 'token' => $share->getToken() + ]); + + $expiration = $share->getExpirationDate(); + $filename = $share->getNode()->getName(); + $initiator = $share->getSharedBy(); + $note = $share->getNote(); + $shareWith = $share->getSharedWith(); + $initiatorUser = $this->userManager->get($initiator); $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator; $message = $this->mailer->createMessage(); @@ -298,24 +331,40 @@ class ShareByMailProvider implements IShareProvider { 'note' => $note ]); - $emailTemplate->setSubject($this->l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename])); + $emailTemplate->setSubject($this->l->t('%1$s shared %2$s with you', [$initiatorDisplayName, $filename])); $emailTemplate->addHeader(); - $emailTemplate->addHeading($this->l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]), false); - $text = $this->l->t('%1$s shared »%2$s« with you.', [$initiatorDisplayName, $filename]); + $emailTemplate->addHeading($this->l->t('%1$s shared %2$s with you', [$initiatorDisplayName, $filename]), false); if ($note !== '') { - $emailTemplate->addBodyText(htmlspecialchars($note), $note); + $emailTemplate->addBodyListItem( + htmlspecialchars($note), + $this->l->t('Note:'), + $this->getAbsoluteImagePath('caldav/description.png'), + $note + ); } - $emailTemplate->addBodyText( - htmlspecialchars($text . ' ' . $this->l->t('Click the button below to open it.')), - $text - ); + + if ($expiration !== null) { + $dateString = (string)$this->l->l('date', $expiration, ['width' => 'medium']); + $emailTemplate->addBodyListItem( + $this->l->t('This share is valid until %s at midnight', [$dateString]), + $this->l->t('Expiration:'), + $this->getAbsoluteImagePath('caldav/time.png'), + ); + } + $emailTemplate->addBodyButton( - $this->l->t('Open »%s«', [$filename]), + $this->l->t('Open %s', [$filename]), $link ); - $message->setTo([$shareWith]); + // If multiple recipients are given, we send the mail to all of them + if (count($emails) > 1) { + // We do not want to expose the email addresses of the other recipients + $message->setBcc($emails); + } else { + $message->setTo($emails); + } // The "From" contains the sharers name $instanceName = $this->defaults->getName(); @@ -329,26 +378,43 @@ class ShareByMailProvider implements IShareProvider { ] ); } - $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]); + $message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]); // The "Reply-To" is set to the sharer if an mail address is configured // also the default footer contains a "Do not reply" which needs to be adjusted. - $initiatorEmail = $initiatorUser->getEMailAddress(); - if ($this->settingsManager->replyToInitiator() && $initiatorEmail !== null) { - $message->setReplyTo([$initiatorEmail => $initiatorDisplayName]); - $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : '')); + if ($initiatorUser && $this->settingsManager->replyToInitiator()) { + $initiatorEmail = $initiatorUser->getEMailAddress(); + if ($initiatorEmail !== null) { + $message->setReplyTo([$initiatorEmail => $initiatorDisplayName]); + $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : '')); + } else { + $emailTemplate->addFooter(); + } } else { $emailTemplate->addFooter(); } $message->useTemplate($emailTemplate); - $this->mailer->send($message); + $failedRecipients = $this->mailer->send($message); + if (!empty($failedRecipients)) { + $this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients)); + return; + } } /** - * send password to recipient of a mail share + * Send password to recipient of a mail share + * Will return false if + * 1. the password is empty + * 2. the setting to send the password by mail is disabled + * 3. the share is set to send the password by talk + * + * @param IShare $share + * @param string $password + * @param array $emails + * @return bool */ - protected function sendPassword(IShare $share, string $password): bool { + protected function sendPassword(IShare $share, string $password, array $emails): bool { $filename = $share->getNode()->getName(); $initiator = $share->getSharedBy(); $shareWith = $share->getSharedWith(); @@ -361,8 +427,8 @@ class ShareByMailProvider implements IShareProvider { $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator; $initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null; - $plainBodyPart = $this->l->t("%1\$s shared »%2\$s« with you.\nYou should have already received a separate mail with a link to access it.\n", [$initiatorDisplayName, $filename]); - $htmlBodyPart = $this->l->t('%1$s shared »%2$s« with you. You should have already received a separate mail with a link to access it.', [$initiatorDisplayName, $filename]); + $plainBodyPart = $this->l->t('%1$s shared %2$s with you. You should have already received a separate mail with a link to access it.', [$initiatorDisplayName, $filename]); + $htmlBodyPart = $this->l->t('%1$s shared %2$s with you. You should have already received a separate mail with a link to access it.', [$initiatorDisplayName, $filename]); $message = $this->mailer->createMessage(); @@ -374,9 +440,9 @@ class ShareByMailProvider implements IShareProvider { 'shareWith' => $shareWith, ]); - $emailTemplate->setSubject($this->l->t('Password to access »%1$s« shared to you by %2$s', [$filename, $initiatorDisplayName])); + $emailTemplate->setSubject($this->l->t('Password to access %1$s shared to you by %2$s', [$filename, $initiatorDisplayName])); $emailTemplate->addHeader(); - $emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false); + $emailTemplate->addHeading($this->l->t('Password to access %s', [$filename]), false); $emailTemplate->addBodyText(htmlspecialchars($htmlBodyPart), $plainBodyPart); $emailTemplate->addBodyText($this->l->t('It is protected with the following password:')); $emailTemplate->addBodyText($password); @@ -388,6 +454,14 @@ class ShareByMailProvider implements IShareProvider { $emailTemplate->addBodyText($this->l->t('This password will expire at %s', [$expirationTime->format('r')])); } + // If multiple recipients are given, we send the mail to all of them + if (count($emails) > 1) { + // We do not want to expose the email addresses of the other recipients + $message->setBcc($emails); + } else { + $message->setTo($emails); + } + // The "From" contains the sharers name $instanceName = $this->defaults->getName(); $senderName = $instanceName; @@ -400,20 +474,30 @@ class ShareByMailProvider implements IShareProvider { ] ); } - $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]); - if ($this->settingsManager->replyToInitiator() && $initiatorEmailAddress !== null) { - $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]); - $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan()); + $message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]); + + // The "Reply-To" is set to the sharer if an mail address is configured + // also the default footer contains a "Do not reply" which needs to be adjusted. + if ($initiatorUser && $this->settingsManager->replyToInitiator()) { + $initiatorEmail = $initiatorUser->getEMailAddress(); + if ($initiatorEmail !== null) { + $message->setReplyTo([$initiatorEmail => $initiatorDisplayName]); + $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : '')); + } else { + $emailTemplate->addFooter(); + } } else { $emailTemplate->addFooter(); } - $message->setTo([$shareWith]); $message->useTemplate($emailTemplate); - $this->mailer->send($message); + $failedRecipients = $this->mailer->send($message); + if (!empty($failedRecipients)) { + $this->logger->error('Share password mail could not be sent to: ' . implode(', ', $failedRecipients)); + return false; + } $this->createPasswordSendActivity($share, $shareWith, false); - return true; } @@ -429,14 +513,14 @@ class ShareByMailProvider implements IShareProvider { $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator; $initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null; - $plainHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add:', [$initiatorDisplayName, $filename]); - $htmlHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add', [$initiatorDisplayName, $filename]); + $plainHeading = $this->l->t('%1$s shared %2$s with you and wants to add:', [$initiatorDisplayName, $filename]); + $htmlHeading = $this->l->t('%1$s shared %2$s with you and wants to add', [$initiatorDisplayName, $filename]); $message = $this->mailer->createMessage(); $emailTemplate = $this->mailer->createEMailTemplate('shareByMail.sendNote'); - $emailTemplate->setSubject($this->l->t('»%s« added a note to a file shared with you', [$initiatorDisplayName])); + $emailTemplate->setSubject($this->l->t('%s added a note to a file shared with you', [$initiatorDisplayName])); $emailTemplate->addHeader(); $emailTemplate->addHeading(htmlspecialchars($htmlHeading), $plainHeading); $emailTemplate->addBodyText(htmlspecialchars($note), $note); @@ -444,7 +528,7 @@ class ShareByMailProvider implements IShareProvider { $link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]); $emailTemplate->addBodyButton( - $this->l->t('Open »%s«', [$filename]), + $this->l->t('Open %s', [$filename]), $link ); @@ -460,7 +544,7 @@ class ShareByMailProvider implements IShareProvider { ] ); } - $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]); + $message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]); if ($this->settingsManager->replyToInitiator() && $initiatorEmailAddress !== null) { $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]); $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan()); @@ -484,15 +568,15 @@ class ShareByMailProvider implements IShareProvider { $initiator = $this->userManager->get($share->getSharedBy()); $initiatorEMailAddress = ($initiator instanceof IUser) ? $initiator->getEMailAddress() : null; $initiatorDisplayName = ($initiator instanceof IUser) ? $initiator->getDisplayName() : $share->getSharedBy(); - $shareWith = $share->getSharedWith(); + $shareWith = implode(', ', $this->getSharedWithEmails($share)); if ($initiatorEMailAddress === null) { throw new \Exception( - $this->l->t("We cannot send you the auto-generated password. Please set a valid email address in your personal settings and try again.") + $this->l->t('We cannot send you the auto-generated password. Please set a valid email address in your personal settings and try again.') ); } - $bodyPart = $this->l->t('You just shared »%1$s« with %2$s. The share was already sent to the recipient. Due to the security policies defined by the administrator of %3$s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.', [$filename, $shareWith, $this->defaults->getName()]); + $bodyPart = $this->l->t('You just shared %1$s with %2$s. The share was already sent to the recipient. Due to the security policies defined by the administrator of %3$s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.', [$filename, $shareWith, $this->defaults->getName()]); $message = $this->mailer->createMessage(); $emailTemplate = $this->mailer->createEMailTemplate('sharebymail.OwnerPasswordNotification', [ @@ -503,9 +587,9 @@ class ShareByMailProvider implements IShareProvider { 'shareWith' => $shareWith, ]); - $emailTemplate->setSubject($this->l->t('Password to access »%1$s« shared by you with %2$s', [$filename, $shareWith])); + $emailTemplate->setSubject($this->l->t('Password to access %1$s shared by you with %2$s', [$filename, $shareWith])); $emailTemplate->addHeader(); - $emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false); + $emailTemplate->addHeading($this->l->t('Password to access %s', [$filename]), false); $emailTemplate->addBodyText($bodyPart); $emailTemplate->addBodyText($this->l->t('This is the password:')); $emailTemplate->addBodyText($password); @@ -529,7 +613,7 @@ class ShareByMailProvider implements IShareProvider { $instanceName ] ); - $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]); + $message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]); $message->setTo([$initiatorEMailAddress => $initiatorDisplayName]); $message->useTemplate($emailTemplate); $this->mailer->send($message); @@ -539,6 +623,12 @@ class ShareByMailProvider implements IShareProvider { return true; } + private function getAbsoluteImagePath(string $path):string { + return $this->urlGenerator->getAbsoluteURL( + $this->urlGenerator->imagePath('core', $path) + ); + } + /** * generate share token */ @@ -547,11 +637,6 @@ class ShareByMailProvider implements IShareProvider { return $token; } - /** - * Get all children of this share - * - * @return IShare[] - */ public function getChildren(IShare $parent): array { $children = []; @@ -588,7 +673,9 @@ class ShareByMailProvider implements IShareProvider { ?bool $hideDownload, ?string $label, ?\DateTimeInterface $expirationTime, - ?string $note = '' + ?string $note = '', + ?IAttributes $attributes = null, + ?bool $mailSend = true, ): int { $qb = $this->dbConnection->getQueryBuilder(); $qb->insert('share') @@ -602,23 +689,22 @@ class ShareByMailProvider implements IShareProvider { ->setValue('permissions', $qb->createNamedParameter($permissions)) ->setValue('token', $qb->createNamedParameter($token)) ->setValue('password', $qb->createNamedParameter($password)) - ->setValue('password_expiration_time', $qb->createNamedParameter($passwordExpirationTime, IQueryBuilder::PARAM_DATE)) + ->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('hide_download', $qb->createNamedParameter((int)$hideDownload, IQueryBuilder::PARAM_INT)) ->setValue('label', $qb->createNamedParameter($label)) - ->setValue('note', $qb->createNamedParameter($note)); + ->setValue('note', $qb->createNamedParameter($note)) + ->setValue('mail_send', $qb->createNamedParameter((int)$mailSend, IQueryBuilder::PARAM_INT)); + + // set share attributes + $shareAttributes = $this->formatShareAttributes($attributes); + $qb->setValue('attributes', $qb->createNamedParameter($shareAttributes)); if ($expirationTime !== null) { - $qb->setValue('expiration', $qb->createNamedParameter($expirationTime, IQueryBuilder::PARAM_DATE)); + $qb->setValue('expiration', $qb->createNamedParameter($expirationTime, IQueryBuilder::PARAM_DATETIME_MUTABLE)); } - /* - * Added to fix https://github.com/owncloud/core/issues/22215 - * Can be removed once we get rid of ajax/share.php - */ - $qb->setValue('file_target', $qb->createNamedParameter('')); - $qb->executeStatement(); return $qb->getLastInsertId(); } @@ -632,27 +718,39 @@ class ShareByMailProvider implements IShareProvider { // a real password was given $validPassword = $plainTextPassword !== null && $plainTextPassword !== ''; - if ($validPassword && ($originalShare->getPassword() !== $share->getPassword() || - ($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()))) { - $this->sendPassword($share, $plainTextPassword); + if ($validPassword && ($originalShare->getPassword() !== $share->getPassword() + || ($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()))) { + $emails = $this->getSharedWithEmails($share); + $validEmails = array_filter($emails, function ($email) { + return $this->mailer->validateMailAddress($email); + }); + $this->sendPassword($share, $plainTextPassword, $validEmails); } + $shareAttributes = $this->formatShareAttributes($share->getAttributes()); + /* - * We allow updating the permissions and password of mail shares + * We allow updating mail shares */ $qb = $this->dbConnection->getQueryBuilder(); $qb->update('share') ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId()))) + ->set('item_source', $qb->createNamedParameter($share->getNodeId())) + ->set('file_source', $qb->createNamedParameter($share->getNodeId())) + ->set('share_with', $qb->createNamedParameter($share->getSharedWith())) ->set('permissions', $qb->createNamedParameter($share->getPermissions())) ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner())) ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy())) ->set('password', $qb->createNamedParameter($share->getPassword())) - ->set('password_expiration_time', $qb->createNamedParameter($share->getPasswordExpirationTime(), IQueryBuilder::PARAM_DATE)) + ->set('password_expiration_time', $qb->createNamedParameter($share->getPasswordExpirationTime(), IQueryBuilder::PARAM_DATETIME_MUTABLE)) ->set('label', $qb->createNamedParameter($share->getLabel())) ->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL)) - ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE)) + ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATETIME_MUTABLE)) ->set('note', $qb->createNamedParameter($share->getNote())) ->set('hide_download', $qb->createNamedParameter((int)$share->getHideDownload(), IQueryBuilder::PARAM_INT)) + ->set('attributes', $qb->createNamedParameter($shareAttributes)) + ->set('mail_send', $qb->createNamedParameter((int)$share->getMailSend(), IQueryBuilder::PARAM_INT)) + ->set('reminder_sent', $qb->createNamedParameter($share->getReminderSent(), IQueryBuilder::PARAM_BOOL)) ->executeStatement(); if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') { @@ -884,7 +982,7 @@ class ShareByMailProvider implements IShareProvider { } /** - * Create a share object from an database row + * Create a share object from a database row * * @throws InvalidShare * @throws ShareNotFound @@ -902,13 +1000,14 @@ class ShareByMailProvider implements IShareProvider { $shareTime = new \DateTime(); $shareTime->setTimestamp((int)$data['stime']); $share->setShareTime($shareTime); - $share->setSharedWith($data['share_with']); + $share->setSharedWith($data['share_with'] ?? ''); $share->setPassword($data['password']); $passwordExpirationTime = \DateTime::createFromFormat('Y-m-d H:i:s', $data['password_expiration_time'] ?? ''); $share->setPasswordExpirationTime($passwordExpirationTime !== false ? $passwordExpirationTime : null); - $share->setLabel($data['label']); + $share->setLabel($data['label'] ?? ''); $share->setSendPasswordByTalk((bool)$data['password_by_talk']); $share->setHideDownload((bool)$data['hide_download']); + $share->setReminderSent((bool)$data['reminder_sent']); if ($data['uid_initiator'] !== null) { $share->setShareOwner($data['uid_owner']); @@ -929,6 +1028,8 @@ class ShareByMailProvider implements IShareProvider { } } + $share = $this->updateShareAttributes($share, $data['attributes']); + $share->setNodeId((int)$data['file_source']); $share->setNodeType($data['item_type']); @@ -1007,29 +1108,39 @@ class ShareByMailProvider implements IShareProvider { } public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true): array { + return $this->getSharesInFolderInternal($userId, $node, $reshares); + } + + public function getAllSharesInFolder(Folder $node): array { + return $this->getSharesInFolderInternal(null, $node, null); + } + + /** + * @return array<int, list<IShare>> + */ + private function getSharesInFolderInternal(?string $userId, Folder $node, ?bool $reshares): array { $qb = $this->dbConnection->getQueryBuilder(); $qb->select('*') ->from('share', 's') - ->andWhere($qb->expr()->orX( - $qb->expr()->eq('item_type', $qb->createNamedParameter('file')), - $qb->expr()->eq('item_type', $qb->createNamedParameter('folder')) - )) + ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY))) ->andWhere( $qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)) ); - /** - * Reshares for this user are shares where they are the owner. - */ - if ($reshares === false) { - $qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))); - } else { - $qb->andWhere( - $qb->expr()->orX( - $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)), - $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)) - ) - ); + if ($userId !== null) { + /** + * Reshares for this user are shares where they are the owner. + */ + if ($reshares !== true) { + $qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))); + } else { + $qb->andWhere( + $qb->expr()->orX( + $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)), + $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)) + ) + ); + } } $qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid')); @@ -1062,10 +1173,7 @@ class ShareByMailProvider implements IShareProvider { ->from('share') ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))) ->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY))) - ->andWhere($qb->expr()->orX( - $qb->expr()->eq('item_type', $qb->createNamedParameter('file')), - $qb->expr()->eq('item_type', $qb->createNamedParameter('folder')) - )); + ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY))); $cursor = $qb->executeQuery(); $public = false; @@ -1093,7 +1201,7 @@ class ShareByMailProvider implements IShareProvider { ->from('share') ->where( $qb->expr()->orX( - $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_EMAIL)) + $qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)) ) ); @@ -1111,4 +1219,25 @@ class ShareByMailProvider implements IShareProvider { } $cursor->closeCursor(); } + + /** + * Extract the emails from the share + * It can be a single email, from the share_with field + * or a list of emails from the emails attributes field. + * @param IShare $share + * @return string[] + */ + protected function getSharedWithEmails(IShare $share): array { + $attributes = $share->getAttributes(); + + if ($attributes === null) { + return [$share->getSharedWith()]; + } + + $emails = $attributes->getAttribute('shareWith', 'emails'); + if (isset($emails) && is_array($emails) && !empty($emails)) { + return $emails; + } + return [$share->getSharedWith()]; + } } |