diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index b96a61288517f..d306177c85557 100644
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/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 @@ public function create(IShare $share): IShare {
// 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 @@ public function create(IShare $share): IShare {
// 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 @@ protected function createMailShare(IShare $share): string {
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 @@ protected function createMailShare(IShare $share): string {
$share->getHideDownload(),
$share->getLabel(),
$share->getExpirationDate(),
+ $share->getShareTime(),
$share->getNote(),
$share->getAttributes(),
$share->getMailSend(),
@@ -699,6 +700,7 @@ protected function addShareToDB(
?bool $hideDownload,
?string $label,
?\DateTimeInterface $expirationTime,
+ ?DateTime $shareTime,
?string $note = '',
?IAttributes $attributes = null,
?bool $mailSend = true,
@@ -717,7 +719,7 @@ protected function addShareToDB(
->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 @@ public function update(IShare $share, ?string $plainTextPassword = null): IShare
$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 @@ protected function createShareObject(array $data): IShare {
$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'] ?? '');
diff --git a/apps/sharing/appinfo/info.xml b/apps/sharing/appinfo/info.xml
index cd653bf56fa09..b46cd273f56f8 100644
--- a/apps/sharing/appinfo/info.xml
+++ b/apps/sharing/appinfo/info.xml
@@ -7,8 +7,8 @@
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
sharing
Sharing
- TODO
- TODO
+ This app provides APIs and occ commands to manage shares.
+ This app provides APIs and occ commands to manage shares.
2.0.0-dev.3
AGPL-3.0-or-later
Kate Döen
diff --git a/apps/sharing/lib/Command/AddShareRecipient.php b/apps/sharing/lib/Command/AddShareRecipient.php
index 5742b0816087b..e45a347943a1d 100644
--- a/apps/sharing/lib/Command/AddShareRecipient.php
+++ b/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 {
diff --git a/apps/sharing/openapi.json b/apps/sharing/openapi.json
index 1073b158e7ac6..0a70734e06617 100644
--- a/apps/sharing/openapi.json
+++ b/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"
}
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index b6da12c8b93f5..ce4e99120819d 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -20,7 +20,6 @@
CLASS]]>
- CLASS]]>
CLASS]]>
DTEND]]>
DTEND]]>
- DTEND]]>
- DTSTART]]>
DTSTART]]>
- DTSTART]]>
- DUE]]>
DUE]]>
DUE]]>
DURATION]]>
DURATION]]>
- DURATION]]>
- RDATE]]>
- RDATE]]>
RDATE]]>
RDATE]]>
- RDATE]]>
- RDATE]]>
- RRULE]]>
RRULE]]>
- RRULE]]>
- UID]]>
- UID]]>
UID]]>
@@ -2423,9 +2407,6 @@