aboutsummaryrefslogtreecommitdiffstats
path: root/apps/sharebymail/lib
diff options
context:
space:
mode:
Diffstat (limited to 'apps/sharebymail/lib')
-rw-r--r--apps/sharebymail/lib/Activity.php188
-rw-r--r--apps/sharebymail/lib/AppInfo/Application.php23
-rw-r--r--apps/sharebymail/lib/Capabilities.php90
-rw-r--r--apps/sharebymail/lib/Settings/Admin.php64
-rw-r--r--apps/sharebymail/lib/Settings/SettingsManager.php41
-rw-r--r--apps/sharebymail/lib/ShareByMailProvider.php811
6 files changed, 575 insertions, 642 deletions
diff --git a/apps/sharebymail/lib/Activity.php b/apps/sharebymail/lib/Activity.php
index 23f036c4700..2d8289affa4 100644
--- a/apps/sharebymail/lib/Activity.php
+++ b/apps/sharebymail/lib/Activity.php
@@ -1,63 +1,25 @@
<?php
+
/**
- * @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
namespace OCA\ShareByMail;
+use OCP\Activity\Exceptions\UnknownActivityException;
use OCP\Activity\IEvent;
use OCP\Activity\IManager;
use OCP\Activity\IProvider;
use OCP\Contacts\IManager as IContactsManager;
use OCP\IL10N;
use OCP\IURLGenerator;
-use OCP\IUser;
use OCP\IUserManager;
use OCP\L10N\IFactory;
class Activity implements IProvider {
-
- /** @var IFactory */
- protected $languageFactory;
-
/** @var IL10N */
protected $l;
- /** @var IURLGenerator */
- protected $url;
-
- /** @var IManager */
- protected $activityManager;
-
- /** @var IUserManager */
- protected $userManager;
- /** @var IContactsManager */
- protected $contactsManager;
-
- /** @var array */
- protected $displayNames = [];
-
/** @var array */
protected $contactNames = [];
@@ -75,12 +37,13 @@ class Activity implements IProvider {
* @param IUserManager $userManager
* @param IContactsManager $contactsManager
*/
- public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IContactsManager $contactsManager) {
- $this->languageFactory = $languageFactory;
- $this->url = $url;
- $this->activityManager = $activityManager;
- $this->userManager = $userManager;
- $this->contactsManager = $contactsManager;
+ public function __construct(
+ protected IFactory $languageFactory,
+ protected IURLGenerator $url,
+ protected IManager $activityManager,
+ protected IUserManager $userManager,
+ protected IContactsManager $contactsManager,
+ ) {
}
/**
@@ -88,12 +51,12 @@ class Activity implements IProvider {
* @param IEvent $event
* @param IEvent|null $previousEvent
* @return IEvent
- * @throws \InvalidArgumentException
+ * @throws UnknownActivityException
* @since 11.0.0
*/
- public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+ public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
if ($event->getApp() !== 'sharebymail') {
- throw new \InvalidArgumentException();
+ throw new UnknownActivityException();
}
$this->l = $this->languageFactory->get('sharebymail', $language);
@@ -119,72 +82,54 @@ class Activity implements IProvider {
$parsedParameters = $this->getParsedParameters($event);
if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
- $event->setParsedSubject($this->l->t('Shared with %1$s', [
- $parsedParameters['email']['name'],
- ]))
- ->setRichSubject($this->l->t('Shared with {email}'), [
- 'email' => $parsedParameters['email'],
- ]);
+ $event->setRichSubject($this->l->t('Shared with {email}'), [
+ 'email' => $parsedParameters['email'],
+ ]);
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
- $event->setParsedSubject($this->l->t('Shared with %1$s by %2$s', [
- $parsedParameters['email']['name'],
- $parsedParameters['actor']['name'],
- ]))
- ->setRichSubject($this->l->t('Shared with {email} by {actor}'), [
- 'email' => $parsedParameters['email'],
- 'actor' => $parsedParameters['actor'],
- ]);
+ $event->setRichSubject($this->l->t('Shared with {email} by {actor}'), [
+ 'email' => $parsedParameters['email'],
+ 'actor' => $parsedParameters['actor'],
+ ]);
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
} elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_SELF) {
- $event->setParsedSubject($this->l->t('Unshared from %1$s', [
- $parsedParameters['email']['name'],
- ]))
- ->setRichSubject($this->l->t('Unshared from {email}'), [
- 'email' => $parsedParameters['email'],
- ]);
+ $event->setRichSubject($this->l->t('Unshared from {email}'), [
+ 'email' => $parsedParameters['email'],
+ ]);
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
} elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_BY) {
- $event->setParsedSubject($this->l->t('Unshared from %1$s by %2$s', [
- $parsedParameters['email']['name'],
- $parsedParameters['actor']['name'],
- ]))
- ->setRichSubject($this->l->t('Unshared from {email} by {actor}'), [
- 'email' => $parsedParameters['email'],
- 'actor' => $parsedParameters['actor'],
- ]);
+ $event->setRichSubject($this->l->t('Unshared from {email} by {actor}'), [
+ 'email' => $parsedParameters['email'],
+ 'actor' => $parsedParameters['actor'],
+ ]);
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
- $event->setParsedSubject($this->l->t('Password for mail share sent to %1$s', [
- $parsedParameters['email']['name']
- ]))
- ->setRichSubject($this->l->t('Password for mail share sent to {email}'), [
- 'email' => $parsedParameters['email']
- ]);
+ $event->setRichSubject($this->l->t('Password for mail share sent to {email}'), [
+ 'email' => $parsedParameters['email']
+ ]);
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
- $event->setParsedSubject($this->l->t('Password for mail share sent to you'))
- ->setRichSubject($this->l->t('Password for mail share sent to you'));
+ $event->setRichSubject($this->l->t('Password for mail share sent to you'));
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
@@ -207,67 +152,42 @@ class Activity implements IProvider {
$parsedParameters = $this->getParsedParameters($event);
if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
- $event->setParsedSubject($this->l->t('You shared %1$s with %2$s by mail', [
- $parsedParameters['file']['path'],
- $parsedParameters['email']['name'],
- ]))
- ->setRichSubject($this->l->t('You shared {file} with {email} by mail'), $parsedParameters);
+ $event->setRichSubject($this->l->t('You shared {file} with {email} by mail'), $parsedParameters);
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
- $event->setParsedSubject($this->l->t('%3$s shared %1$s with %2$s by mail', [
- $parsedParameters['file']['path'],
- $parsedParameters['email']['name'],
- $parsedParameters['actor']['name'],
- ]))
- ->setRichSubject($this->l->t('{actor} shared {file} with {email} by mail'), $parsedParameters);
+ $event->setRichSubject($this->l->t('{actor} shared {file} with {email} by mail'), $parsedParameters);
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
} elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_SELF) {
- $event->setParsedSubject($this->l->t('You unshared %1$s from %2$s by mail', [
- $parsedParameters['file']['path'],
- $parsedParameters['email']['name'],
- ]))
- ->setRichSubject($this->l->t('You unshared {file} from {email} by mail'), $parsedParameters);
+ $event->setRichSubject($this->l->t('You unshared {file} from {email} by mail'), $parsedParameters);
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
} elseif ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_BY) {
- $event->setParsedSubject($this->l->t('%3$s unshared %1$s from %2$s by mail', [
- $parsedParameters['file']['path'],
- $parsedParameters['email']['name'],
- $parsedParameters['actor']['name'],
- ]))
- ->setRichSubject($this->l->t('{actor} unshared {file} from {email} by mail'), $parsedParameters);
+ $event->setRichSubject($this->l->t('{actor} unshared {file} from {email} by mail'), $parsedParameters);
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
- $event->setParsedSubject($this->l->t('Password to access %1$s was sent to %2s', [
- $parsedParameters['file']['path'],
- $parsedParameters['email']['name']
- ]))
- ->setRichSubject($this->l->t('Password to access {file} was sent to {email}'), $parsedParameters);
+ $event->setRichSubject($this->l->t('Password to access {file} was sent to {email}'), $parsedParameters);
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
}
} elseif ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
- $event->setParsedSubject(
- $this->l->t('Password to access %1$s was sent to you',
- [$parsedParameters['file']['path']]))
- ->setRichSubject($this->l->t('Password to access {file} was sent to you'), $parsedParameters);
+ $event->setRichSubject($this->l->t('Password to access {file} was sent to you'), $parsedParameters);
if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
} else {
@@ -314,12 +234,12 @@ class Activity implements IProvider {
/**
* @param int $id
* @param string $path
- * @return array
+ * @return array<string,string>
*/
- protected function generateFileParameter($id, $path) {
+ protected function generateFileParameter($id, $path): array {
return [
'type' => 'file',
- 'id' => $id,
+ 'id' => (string)$id,
'name' => basename($path),
'path' => trim($path, '/'),
'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
@@ -347,14 +267,10 @@ class Activity implements IProvider {
* @return array
*/
protected function generateUserParameter($uid) {
- if (!isset($this->displayNames[$uid])) {
- $this->displayNames[$uid] = $this->getDisplayName($uid);
- }
-
return [
'type' => 'user',
'id' => $uid,
- 'name' => $this->displayNames[$uid],
+ 'name' => $this->userManager->getDisplayName($uid) ?? $uid,
];
}
@@ -363,7 +279,12 @@ class Activity implements IProvider {
* @return string
*/
protected function getContactName($email) {
- $addressBookContacts = $this->contactsManager->search($email, ['EMAIL']);
+ $addressBookContacts = $this->contactsManager->search($email, ['EMAIL'], [
+ 'limit' => 1,
+ 'enumeration' => false,
+ 'fullmatch' => false,
+ 'strict_search' => true,
+ ]);
foreach ($addressBookContacts as $contact) {
if (isset($contact['isLocalSystemBook'])) {
@@ -377,17 +298,4 @@ class Activity implements IProvider {
return $email;
}
-
- /**
- * @param string $uid
- * @return string
- */
- protected function getDisplayName($uid) {
- $user = $this->userManager->get($uid);
- if ($user instanceof IUser) {
- return $user->getDisplayName();
- } else {
- return $uid;
- }
- }
}
diff --git a/apps/sharebymail/lib/AppInfo/Application.php b/apps/sharebymail/lib/AppInfo/Application.php
index 42e9f8e6a6d..792f7f31664 100644
--- a/apps/sharebymail/lib/AppInfo/Application.php
+++ b/apps/sharebymail/lib/AppInfo/Application.php
@@ -3,28 +3,9 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
namespace OCA\ShareByMail\AppInfo;
use OCA\ShareByMail\Capabilities;
diff --git a/apps/sharebymail/lib/Capabilities.php b/apps/sharebymail/lib/Capabilities.php
index c78215c0c54..425a695ff36 100644
--- a/apps/sharebymail/lib/Capabilities.php
+++ b/apps/sharebymail/lib/Capabilities.php
@@ -3,60 +3,68 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
namespace OCA\ShareByMail;
use OCA\ShareByMail\Settings\SettingsManager;
+use OCP\App\IAppManager;
use OCP\Capabilities\ICapability;
+use OCP\Share\IManager;
class Capabilities implements ICapability {
- /** @var SettingsManager */
- private $manager;
-
- public function __construct(SettingsManager $manager) {
- $this->manager = $manager;
+ public function __construct(
+ private IManager $manager,
+ private SettingsManager $settingsManager,
+ private IAppManager $appManager,
+ ) {
}
+ /**
+ * @return array{
+ * files_sharing?: array{
+ * sharebymail: array{
+ * enabled: bool,
+ * send_password_by_mail: bool,
+ * upload_files_drop: array{
+ * enabled: bool,
+ * },
+ * password: array{
+ * enabled: bool,
+ * enforced: bool,
+ * },
+ * expire_date: array{
+ * enabled: bool,
+ * enforced: bool,
+ * },
+ * }
+ * }
+ * }
+ */
public function getCapabilities(): array {
+ if (!$this->appManager->isEnabledForUser('files_sharing')) {
+ return [];
+ }
return [
- 'files_sharing' =>
- [
- 'sharebymail' =>
- [
+ 'files_sharing'
+ => [
+ 'sharebymail' => [
+ 'enabled' => $this->manager->shareApiAllowLinks(),
+ 'send_password_by_mail' => $this->settingsManager->sendPasswordByMail(),
+ 'upload_files_drop' => [
+ 'enabled' => true,
+ ],
+ 'password' => [
+ 'enabled' => true,
+ 'enforced' => $this->manager->shareApiLinkEnforcePassword(),
+ ],
+ 'expire_date' => [
'enabled' => true,
- 'upload_files_drop' => [
- 'enabled' => true,
- ],
- 'password' => [
- 'enabled' => true,
- 'enforced' => $this->manager->enforcePasswordProtection(),
- ],
- 'expire_date' => [
- 'enabled' => true,
- ],
- ]
+ 'enforced' => $this->manager->shareApiLinkDefaultExpireDateEnforced(),
+ ],
+ ]
]
];
}
diff --git a/apps/sharebymail/lib/Settings/Admin.php b/apps/sharebymail/lib/Settings/Admin.php
index 23881212692..8f27bbff6d6 100644
--- a/apps/sharebymail/lib/Settings/Admin.php
+++ b/apps/sharebymail/lib/Settings/Admin.php
@@ -1,50 +1,32 @@
<?php
+
/**
- * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
namespace OCA\ShareByMail\Settings;
use OCP\AppFramework\Http\TemplateResponse;
-use OCP\Settings\ISettings;
-
-class Admin implements ISettings {
-
- /** @var SettingsManager */
- private $settingsManager;
-
- public function __construct(SettingsManager $settingsManager) {
- $this->settingsManager = $settingsManager;
+use OCP\AppFramework\Services\IInitialState;
+use OCP\IL10N;
+use OCP\Settings\IDelegatedSettings;
+
+class Admin implements IDelegatedSettings {
+ public function __construct(
+ private SettingsManager $settingsManager,
+ private IL10N $l,
+ private IInitialState $initialState,
+ ) {
}
/**
* @return TemplateResponse
*/
public function getForm() {
- $parameters = [
- 'sendPasswordMail' => $this->settingsManager->sendPasswordByMail(),
- 'enforcePasswordProtection' => $this->settingsManager->enforcePasswordProtection()
- ];
+ $this->initialState->provideInitialState('sendPasswordMail', $this->settingsManager->sendPasswordByMail());
+ $this->initialState->provideInitialState('replyToInitiator', $this->settingsManager->replyToInitiator());
- return new TemplateResponse('sharebymail', 'settings-admin', $parameters, '');
+ return new TemplateResponse('sharebymail', 'settings-admin', [], '');
}
/**
@@ -56,12 +38,22 @@ class Admin implements ISettings {
/**
* @return int whether the form should be rather on the top or bottom of
- * the admin section. The forms are arranged in ascending order of the
- * priority values. It is required to return a value between 0 and 100.
+ * the admin section. The forms are arranged in ascending order of the
+ * priority values. It is required to return a value between 0 and 100.
*
* E.g.: 70
*/
public function getPriority() {
return 40;
}
+
+ public function getName(): ?string {
+ return $this->l->t('Share by mail');
+ }
+
+ public function getAuthorizedAppConfig(): array {
+ return [
+ 'sharebymail' => ['s/(sendpasswordmail|replyToInitiator)/'],
+ ];
+ }
}
diff --git a/apps/sharebymail/lib/Settings/SettingsManager.php b/apps/sharebymail/lib/Settings/SettingsManager.php
index e7937e4c60f..d487bd2ac43 100644
--- a/apps/sharebymail/lib/Settings/SettingsManager.php
+++ b/apps/sharebymail/lib/Settings/SettingsManager.php
@@ -3,43 +3,22 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
namespace OCA\ShareByMail\Settings;
use OCP\IConfig;
class SettingsManager {
- /** @var IConfig */
- private $config;
-
private $sendPasswordByMailDefault = 'yes';
- private $enforcePasswordProtectionDefault = 'no';
+ private $replyToInitiatorDefault = 'yes';
- public function __construct(IConfig $config) {
- $this->config = $config;
+ public function __construct(
+ private IConfig $config,
+ ) {
}
/**
@@ -53,12 +32,12 @@ class SettingsManager {
}
/**
- * do we require a share by mail to be password protected
+ * should add reply to with initiator mail
*
* @return bool
*/
- public function enforcePasswordProtection(): bool {
- $enforcePassword = $this->config->getAppValue('sharebymail', 'enforcePasswordProtection', $this->enforcePasswordProtectionDefault);
- return $enforcePassword === 'yes';
+ public function replyToInitiator(): bool {
+ $replyToInitiator = $this->config->getAppValue('sharebymail', 'replyToInitiator', $this->replyToInitiatorDefault);
+ return $replyToInitiator === 'yes';
}
}
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index 5977cbd18bb..d28f7c51327 100644
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -1,43 +1,12 @@
<?php
+
/**
- * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author comradekingu <epost@anotheragency.no>
- * @author Daniel Calviño Sánchez <danxuliu@gmail.com>
- * @author Daniel Kesselberg <mail@danielkesselberg.de>
- * @author exner104 <59639860+exner104@users.noreply.github.com>
- * @author Frederic Werner <frederic-github@werner-net.work>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author rubo77 <github@r.z11.de>
- * @author Stephan Müller <mail@stephanmueller.eu>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
namespace OCA\ShareByMail;
-use OC\HintException;
+use OC\Share20\DefaultShareProvider;
use OC\Share20\Exception\InvalidShare;
use OC\Share20\Share;
use OC\User\NoUserException;
@@ -49,9 +18,10 @@ use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\Files\Node;
+use OCP\HintException;
+use OCP\IConfig;
use OCP\IDBConnection;
use OCP\IL10N;
-use OCP\ILogger;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserManager;
@@ -59,113 +29,64 @@ 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;
/**
* Class ShareByMail
*
* @package OCA\ShareByMail
*/
-class ShareByMailProvider implements IShareProvider {
-
- /** @var IDBConnection */
- private $dbConnection;
-
- /** @var ILogger */
- private $logger;
-
- /** @var ISecureRandom */
- private $secureRandom;
-
- /** @var IUserManager */
- private $userManager;
-
- /** @var IRootFolder */
- private $rootFolder;
-
- /** @var IL10N */
- private $l;
-
- /** @var IMailer */
- private $mailer;
-
- /** @var IURLGenerator */
- private $urlGenerator;
-
- /** @var IManager */
- private $activityManager;
-
- /** @var SettingsManager */
- private $settingsManager;
-
- /** @var Defaults */
- private $defaults;
-
- /** @var IHasher */
- private $hasher;
-
- /** @var IEventDispatcher */
- private $eventDispatcher;
-
+class ShareByMailProvider extends DefaultShareProvider implements IShareProviderWithNotification {
/**
* Return the identifier of this provider.
*
* @return string Containing only [a-zA-Z0-9]
*/
- public function identifier() {
+ public function identifier(): string {
return 'ocMailShare';
}
public function __construct(
- IDBConnection $connection,
- ISecureRandom $secureRandom,
- IUserManager $userManager,
- IRootFolder $rootFolder,
- IL10N $l,
- ILogger $logger,
- IMailer $mailer,
- IURLGenerator $urlGenerator,
- IManager $activityManager,
- SettingsManager $settingsManager,
- Defaults $defaults,
- IHasher $hasher,
- IEventDispatcher $eventDispatcher
+ private IConfig $config,
+ private IDBConnection $dbConnection,
+ private ISecureRandom $secureRandom,
+ private IUserManager $userManager,
+ private IRootFolder $rootFolder,
+ private IL10N $l,
+ private LoggerInterface $logger,
+ private IMailer $mailer,
+ private IURLGenerator $urlGenerator,
+ private IManager $activityManager,
+ private SettingsManager $settingsManager,
+ private Defaults $defaults,
+ private IHasher $hasher,
+ private IEventDispatcher $eventDispatcher,
+ private IShareManager $shareManager,
) {
- $this->dbConnection = $connection;
- $this->secureRandom = $secureRandom;
- $this->userManager = $userManager;
- $this->rootFolder = $rootFolder;
- $this->l = $l;
- $this->logger = $logger;
- $this->mailer = $mailer;
- $this->urlGenerator = $urlGenerator;
- $this->activityManager = $activityManager;
- $this->settingsManager = $settingsManager;
- $this->defaults = $defaults;
- $this->hasher = $hasher;
- $this->eventDispatcher = $eventDispatcher;
}
/**
* Share a path
*
- * @param IShare $share
- * @return IShare The share object
* @throws ShareNotFound
* @throws \Exception
*/
- public function create(IShare $share) {
+ 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)) {
- $message = 'Sharing %1$s failed, this item is already shared with %2$s';
- $message_t = $this->l->t('Sharing %1$s failed, this item is already shared with %2$s', [$share->getNode()->getName(), $shareWith]);
+ 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']);
throw new \Exception($message_t);
}
@@ -173,7 +94,7 @@ class ShareByMailProvider implements IShareProvider {
// 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->settingsManager->enforcePasswordProtection();
+ $passwordEnforced = $this->shareManager->shareApiLinkEnforcePassword();
if ($passwordEnforced && empty($password)) {
$password = $this->autoGeneratePassword($share);
}
@@ -183,41 +104,42 @@ class ShareByMailProvider implements IShareProvider {
}
$shareId = $this->createMailShare($share);
- $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);
}
/**
* auto generate password in case of password enforcement on mail shares
*
- * @param IShare $share
- * @return string
* @throws \Exception
*/
- protected function autoGeneratePassword($share) {
+ protected function autoGeneratePassword(IShare $share): string {
$initiatorUser = $this->userManager->get($share->getSharedBy());
$initiatorEMailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
$allowPasswordByMail = $this->settingsManager->sendPasswordByMail();
if ($initiatorEMailAddress === null && !$allowPasswordByMail) {
throw new \Exception(
- $this->l->t("We can't 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();
if ($password === null) {
- $password = $this->secureRandom->generate(8, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+ $password = $this->secureRandom->generate(8, ISecureRandom::CHAR_HUMAN_READABLE);
}
return $password;
@@ -225,11 +147,8 @@ class ShareByMailProvider implements IShareProvider {
/**
* create activity if a file/folder was shared by mail
- *
- * @param IShare $share
- * @param string $type
*/
- protected function createShareActivity(IShare $share, string $type = 'share') {
+ protected function createShareActivity(IShare $share, string $type = 'share'): void {
$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
$this->publishActivity(
@@ -237,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()) {
@@ -250,19 +169,15 @@ class ShareByMailProvider implements IShareProvider {
[$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],
$share->getShareOwner(),
$fileId,
- (string) $ownerFolder->getRelativePath($ownerPath)
+ (string)$ownerFolder->getRelativePath($ownerPath)
);
}
}
/**
* create activity if a file/folder was shared by mail
- *
- * @param IShare $share
- * @param string $sharedWith
- * @param bool $sendToSelf
*/
- protected function createPasswordSendActivity(IShare $share, $sharedWith, $sendToSelf) {
+ protected function createPasswordSendActivity(IShare $share, string $sharedWith, bool $sendToSelf): void {
$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
if ($sendToSelf) {
@@ -271,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(
@@ -279,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())
);
}
}
@@ -287,14 +202,8 @@ class ShareByMailProvider implements IShareProvider {
/**
* publish activity if a file/folder was shared by mail
- *
- * @param string $subject
- * @param array $parameters
- * @param string $affectedUser
- * @param int $fileId
- * @param string $filePath
*/
- protected function publishActivity(string $subject, array $parameters, string $affectedUser, int $fileId, string $filePath) {
+ protected function publishActivity(string $subject, array $parameters, string $affectedUser, int $fileId, string $filePath): void {
$event = $this->activityManager->generateEvent();
$event->setApp('sharebymail')
->setType('shared')
@@ -305,13 +214,11 @@ class ShareByMailProvider implements IShareProvider {
}
/**
- * @param IShare $share
- * @return int
* @throws \Exception
*/
- protected function createMailShare(IShare $share) {
+ protected function createMailShare(IShare $share): int {
$share->setToken($this->generateToken());
- $shareId = $this->addShareToDB(
+ return $this->addShareToDB(
$share->getNodeId(),
$share->getNodeType(),
$share->getSharedWith(),
@@ -320,55 +227,97 @@ class ShareByMailProvider implements IShareProvider {
$share->getPermissions(),
$share->getToken(),
$share->getPassword(),
+ $share->getPasswordExpirationTime(),
$share->getSendPasswordByTalk(),
- $share->getHideDownload()
+ $share->getHideDownload(),
+ $share->getLabel(),
+ $share->getExpirationDate(),
+ $share->getNote(),
+ $share->getAttributes(),
+ $share->getMailSend(),
);
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function sendMailNotification(IShare $share): bool {
+ $shareId = $share->getId();
+
+ $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. 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()
- );
+ $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->logException($hintException, [
- 'message' => 'Failed to send share by mail.',
- 'level' => ILogger::ERROR,
+ $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->logException($e, [
- 'message' => 'Failed to send share by mail.',
- 'level' => ILogger::ERROR,
+ $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;
}
/**
- * @param string $filename
- * @param string $link
- * @param string $initiator
- * @param string $shareWith
- * @param \DateTime|null $expiration
- * @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($filename,
- $link,
- $initiator,
- $shareWith,
- \DateTime $expiration = null) {
+ 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();
@@ -379,57 +328,93 @@ class ShareByMailProvider implements IShareProvider {
'initiator' => $initiatorDisplayName,
'expiration' => $expiration,
'shareWith' => $shareWith,
+ '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->addBodyListItem(
+ htmlspecialchars($note),
+ $this->l->t('Note:'),
+ $this->getAbsoluteImagePath('caldav/description.png'),
+ $note
+ );
+ }
+
+ 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->addBodyText(
- htmlspecialchars($text . ' ' . $this->l->t('Click the button below to open it.')),
- $text
- );
$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();
- $senderName = $this->l->t(
- '%1$s via %2$s',
- [
- $initiatorDisplayName,
- $instanceName
- ]
- );
- $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+ $senderName = $instanceName;
+ if ($this->settingsManager->replyToInitiator()) {
+ $senderName = $this->l->t(
+ '%1$s via %2$s',
+ [
+ $initiatorDisplayName,
+ $instanceName
+ ]
+ );
+ }
+ $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 ($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, $password) {
+ protected function sendPassword(IShare $share, string $password, array $emails): bool {
$filename = $share->getNode()->getName();
$initiator = $share->getSharedBy();
$shareWith = $share->getSharedWith();
@@ -442,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();
@@ -455,40 +440,68 @@ 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);
+ if ($this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false) === true) {
+ $expirationTime = new \DateTime();
+ $expirationInterval = $this->config->getSystemValue('sharing.mail_link_password_expiration_interval', 3600);
+ $expirationTime = $expirationTime->add(new \DateInterval('PT' . $expirationInterval . 'S'));
+ $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 = $this->l->t(
- '%1$s via %2$s',
- [
- $initiatorDisplayName,
- $instanceName
- ]
- );
- $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
- if ($initiatorEmailAddress !== null) {
- $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
- $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+ $senderName = $instanceName;
+ if ($this->settingsManager->replyToInitiator()) {
+ $senderName = $this->l->t(
+ '%1$s via %2$s',
+ [
+ $initiatorDisplayName,
+ $instanceName
+ ]
+ );
+ }
+ $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;
}
- protected function sendNote(IShare $share) {
+ protected function sendNote(IShare $share): void {
$recipient = $share->getSharedWith();
@@ -500,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);
@@ -515,21 +528,24 @@ 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
);
// The "From" contains the sharers name
$instanceName = $this->defaults->getName();
- $senderName = $this->l->t(
- '%1$s via %2$s',
- [
- $initiatorDisplayName,
- $instanceName
- ]
- );
- $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
- if ($initiatorEmailAddress !== null) {
+ $senderName = $instanceName;
+ if ($this->settingsManager->replyToInitiator()) {
+ $senderName = $this->l->t(
+ '%1$s via %2$s',
+ [
+ $initiatorDisplayName,
+ $instanceName
+ ]
+ );
+ }
+ $message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
+ if ($this->settingsManager->replyToInitiator() && $initiatorEmailAddress !== null) {
$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
} else {
@@ -545,25 +561,22 @@ class ShareByMailProvider implements IShareProvider {
* send auto generated password to the owner. This happens if the admin enforces
* a password for mail shares and forbid to send the password by mail to the recipient
*
- * @param IShare $share
- * @param string $password
- * @return bool
* @throws \Exception
*/
- protected function sendPasswordToOwner(IShare $share, $password) {
+ protected function sendPasswordToOwner(IShare $share, string $password): bool {
$filename = $share->getNode()->getName();
$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 can't 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', [
@@ -574,13 +587,22 @@ 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);
+
+ if ($this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false) === true) {
+ $expirationTime = new \DateTime();
+ $expirationInterval = $this->config->getSystemValue('sharing.mail_link_password_expiration_interval', 3600);
+ $expirationTime = $expirationTime->add(new \DateInterval('PT' . $expirationInterval . 'S'));
+ $emailTemplate->addBodyText($this->l->t('This password will expire at %s', [$expirationTime->format('r')]));
+ }
+
$emailTemplate->addBodyText($this->l->t('You can choose a different password at any time in the share dialog.'));
+
$emailTemplate->addFooter();
$instanceName = $this->defaults->getName();
@@ -591,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);
@@ -601,23 +623,21 @@ class ShareByMailProvider implements IShareProvider {
return true;
}
+ private function getAbsoluteImagePath(string $path):string {
+ return $this->urlGenerator->getAbsoluteURL(
+ $this->urlGenerator->imagePath('core', $path)
+ );
+ }
+
/**
* generate share token
- *
- * @return string
*/
- protected function generateToken($size = 15) {
+ protected function generateToken(int $size = 15): string {
$token = $this->secureRandom->generate($size, ISecureRandom::CHAR_HUMAN_READABLE);
return $token;
}
- /**
- * Get all children of this share
- *
- * @param IShare $parent
- * @return IShare[]
- */
- public function getChildren(IShare $parent) {
+ public function getChildren(IShare $parent): array {
$children = [];
$qb = $this->dbConnection->getQueryBuilder();
@@ -627,7 +647,7 @@ class ShareByMailProvider implements IShareProvider {
->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
->orderBy('id');
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
$children[] = $this->createShareObject($data);
}
@@ -637,21 +657,26 @@ class ShareByMailProvider implements IShareProvider {
}
/**
- * add share to the database and return the ID
- *
- * @param int $itemSource
- * @param string $itemType
- * @param string $shareWith
- * @param string $sharedBy
- * @param string $uidOwner
- * @param int $permissions
- * @param string $token
- * @param string $password
- * @param bool $sendPasswordByTalk
- * @param bool $hideDownload
- * @return int
+ * Add share to the database and return the ID
*/
- protected function addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $password, $sendPasswordByTalk, $hideDownload) {
+ protected function addShareToDB(
+ ?int $itemSource,
+ ?string $itemType,
+ ?string $shareWith,
+ ?string $sharedBy,
+ ?string $uidOwner,
+ ?int $permissions,
+ ?string $token,
+ ?string $password,
+ ?\DateTimeInterface $passwordExpirationTime,
+ ?bool $sendPasswordByTalk,
+ ?bool $hideDownload,
+ ?string $label,
+ ?\DateTimeInterface $expirationTime,
+ ?string $note = '',
+ ?IAttributes $attributes = null,
+ ?bool $mailSend = true,
+ ): int {
$qb = $this->dbConnection->getQueryBuilder();
$qb->insert('share')
->setValue('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))
@@ -664,54 +689,69 @@ 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_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('hide_download', $qb->createNamedParameter((int)$hideDownload, IQueryBuilder::PARAM_INT))
+ ->setValue('label', $qb->createNamedParameter($label))
+ ->setValue('note', $qb->createNamedParameter($note))
+ ->setValue('mail_send', $qb->createNamedParameter((int)$mailSend, IQueryBuilder::PARAM_INT));
- /*
- * 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(''));
+ // set share attributes
+ $shareAttributes = $this->formatShareAttributes($attributes);
- $qb->execute();
- $id = $qb->getLastInsertId();
+ $qb->setValue('attributes', $qb->createNamedParameter($shareAttributes));
+ if ($expirationTime !== null) {
+ $qb->setValue('expiration', $qb->createNamedParameter($expirationTime, IQueryBuilder::PARAM_DATETIME_MUTABLE));
+ }
- return (int)$id;
+ $qb->executeStatement();
+ return $qb->getLastInsertId();
}
/**
* Update a share
- *
- * @param IShare $share
- * @param string|null $plainTextPassword
- * @return IShare The share object
*/
- public function update(IShare $share, $plainTextPassword = null) {
+ public function update(IShare $share, ?string $plainTextPassword = null): IShare {
$originalShare = $this->getShareById($share->getId());
// 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_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))
- ->execute();
+ ->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() !== '') {
$this->sendNote($share);
@@ -723,7 +763,7 @@ class ShareByMailProvider implements IShareProvider {
/**
* @inheritdoc
*/
- public function move(IShare $share, $recipient) {
+ public function move(IShare $share, $recipient): IShare {
/**
* nothing to do here, mail shares are only outgoing shares
*/
@@ -735,19 +775,19 @@ class ShareByMailProvider implements IShareProvider {
*
* @param IShare $share
*/
- public function delete(IShare $share) {
+ public function delete(IShare $share): void {
try {
$this->createShareActivity($share, 'unshare');
} catch (\Exception $e) {
}
- $this->removeShareFromTable($share->getId());
+ $this->removeShareFromTable((int)$share->getId());
}
/**
* @inheritdoc
*/
- public function deleteFromSelf(IShare $share, $recipient) {
+ public function deleteFromSelf(IShare $share, $recipient): void {
// nothing to do here, mail shares are only outgoing shares
}
@@ -758,7 +798,7 @@ class ShareByMailProvider implements IShareProvider {
/**
* @inheritdoc
*/
- public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
+ public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset): array {
$qb = $this->dbConnection->getQueryBuilder();
$qb->select('*')
->from('share');
@@ -781,7 +821,7 @@ class ShareByMailProvider implements IShareProvider {
$or1
)
);
- } else {
+ } elseif ($node === null) {
$qb->andWhere(
$qb->expr()->orX(
$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
@@ -801,7 +841,7 @@ class ShareByMailProvider implements IShareProvider {
$qb->setFirstResult($offset);
$qb->orderBy('id');
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
$shares = [];
while ($data = $cursor->fetch()) {
$shares[] = $this->createShareObject($data);
@@ -814,7 +854,7 @@ class ShareByMailProvider implements IShareProvider {
/**
* @inheritdoc
*/
- public function getShareById($id, $recipientId = null) {
+ public function getShareById($id, $recipientId = null): IShare {
$qb = $this->dbConnection->getQueryBuilder();
$qb->select('*')
@@ -822,7 +862,7 @@ class ShareByMailProvider implements IShareProvider {
->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)));
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@@ -842,17 +882,16 @@ class ShareByMailProvider implements IShareProvider {
/**
* Get shares for a given path
*
- * @param \OCP\Files\Node $path
* @return IShare[]
*/
- public function getSharesByPath(Node $path) {
+ public function getSharesByPath(Node $path): array {
$qb = $this->dbConnection->getQueryBuilder();
$cursor = $qb->select('*')
->from('share')
->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
- ->execute();
+ ->executeQuery();
$shares = [];
while ($data = $cursor->fetch()) {
@@ -866,7 +905,7 @@ class ShareByMailProvider implements IShareProvider {
/**
* @inheritdoc
*/
- public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
+ public function getSharedWith($userId, $shareType, $node, $limit, $offset): array {
/** @var IShare[] $shares */
$shares = [];
@@ -892,7 +931,7 @@ class ShareByMailProvider implements IShareProvider {
$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
}
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
$shares[] = $this->createShareObject($data);
@@ -906,18 +945,16 @@ class ShareByMailProvider implements IShareProvider {
/**
* Get a share by token
*
- * @param string $token
- * @return IShare
* @throws ShareNotFound
*/
- public function getShareByToken($token) {
+ public function getShareByToken($token): IShare {
$qb = $this->dbConnection->getQueryBuilder();
$cursor = $qb->select('*')
->from('share')
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
- ->execute();
+ ->executeQuery();
$data = $cursor->fetch();
@@ -936,25 +973,21 @@ class ShareByMailProvider implements IShareProvider {
/**
* remove share from table
- *
- * @param string $shareId
*/
- protected function removeShareFromTable($shareId) {
+ protected function removeShareFromTable(int $shareId): void {
$qb = $this->dbConnection->getQueryBuilder();
$qb->delete('share')
->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)));
- $qb->execute();
+ $qb->executeStatement();
}
/**
- * Create a share object from an database row
+ * Create a share object from a database row
*
- * @param array $data
- * @return IShare
* @throws InvalidShare
* @throws ShareNotFound
*/
- protected function createShareObject($data) {
+ protected function createShareObject(array $data): IShare {
$share = new Share($this->rootFolder, $this->userManager);
$share->setId((int)$data['id'])
->setShareType((int)$data['share_type'])
@@ -967,10 +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->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']);
@@ -991,6 +1028,8 @@ class ShareByMailProvider implements IShareProvider {
}
}
+ $share = $this->updateShareAttributes($share, $data['attributes']);
+
$share->setNodeId((int)$data['file_source']);
$share->setNodeType($data['item_type']);
@@ -1002,12 +1041,9 @@ class ShareByMailProvider implements IShareProvider {
/**
* Get the node with file $id for $user
*
- * @param string $userId
- * @param int $id
- * @return \OCP\Files\File|\OCP\Files\Folder
* @throws InvalidShare
*/
- private function getNode($userId, $id) {
+ private function getNode(string $userId, int $id): Node {
try {
$userFolder = $this->rootFolder->getUserFolder($userId);
} catch (NoUserException $e) {
@@ -1026,52 +1062,41 @@ class ShareByMailProvider implements IShareProvider {
/**
* A user is deleted from the system
* So clean up the relevant shares.
- *
- * @param string $uid
- * @param int $shareType
*/
- public function userDeleted($uid, $shareType) {
+ public function userDeleted($uid, $shareType): void {
$qb = $this->dbConnection->getQueryBuilder();
$qb->delete('share')
->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
->andWhere($qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)))
- ->execute();
+ ->executeStatement();
}
/**
* This provider does not support group shares
- *
- * @param string $gid
*/
- public function groupDeleted($gid) {
+ public function groupDeleted($gid): void {
}
/**
* This provider does not support group shares
- *
- * @param string $uid
- * @param string $gid
*/
- public function userDeletedFromGroup($uid, $gid) {
+ public function userDeletedFromGroup($uid, $gid): void {
}
/**
* get database row of a give share
*
- * @param $id
- * @return array
* @throws ShareNotFound
*/
- protected function getRawShare($id) {
-
+ protected function getRawShare(int $id): array {
// Now fetch the inserted share and create a complete share object
$qb = $this->dbConnection->getQueryBuilder();
$qb->select('*')
->from('share')
->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@@ -1082,38 +1107,49 @@ class ShareByMailProvider implements IShareProvider {
return $data;
}
- public function getSharesInFolder($userId, Folder $node, $reshares) {
+ 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'));
+ $qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
+
$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
$qb->orderBy('id');
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
$shares = [];
while ($data = $cursor->fetch()) {
$shares[$data['fileid']][] = $this->createShareObject($data);
@@ -1126,28 +1162,36 @@ class ShareByMailProvider implements IShareProvider {
/**
* @inheritdoc
*/
- public function getAccessList($nodes, $currentAccess) {
+ public function getAccessList($nodes, $currentAccess): array {
$ids = [];
foreach ($nodes as $node) {
$ids[] = $node->getId();
}
$qb = $this->dbConnection->getQueryBuilder();
- $qb->select('share_with')
+ $qb->select('share_with', 'file_source', 'token')
->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'))
- ))
- ->setMaxResults(1);
- $cursor = $qb->execute();
-
- $mail = $cursor->fetch() !== false;
+ ->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
+ $cursor = $qb->executeQuery();
+
+ $public = false;
+ $mail = [];
+ while ($row = $cursor->fetch()) {
+ $public = true;
+ if ($currentAccess === false) {
+ $mail[] = $row['share_with'];
+ } else {
+ $mail[$row['share_with']] = [
+ 'node_id' => $row['file_source'],
+ 'token' => $row['token']
+ ];
+ }
+ }
$cursor->closeCursor();
- return ['public' => $mail];
+ return ['public' => $public, 'mail' => $mail];
}
public function getAllShares(): iterable {
@@ -1157,11 +1201,11 @@ 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))
)
);
- $cursor = $qb->execute();
+ $cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
try {
$share = $this->createShareObject($data);
@@ -1175,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()];
+ }
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-16 05:00:52 +0000