Merge pull request #51616 from nextcloud/backport/50542/stable31

[stable31] fix(files_sharing): skip expiration notify for invalid share record
This commit is contained in:
Kate 2025-03-21 07:41:18 +01:00 committed by GitHub
commit d7903b1630
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -8,6 +8,7 @@ declare(strict_types=1);
*/
namespace OCA\Files_Sharing\Command;
use OCA\Files_Sharing\OrphanHelper;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IDBConnection;
use OCP\Notification\IManager as NotificationManager;
@ -23,6 +24,7 @@ class ExiprationNotification extends Command {
private NotificationManager $notificationManager,
private IDBConnection $connection,
private ShareManager $shareManager,
private OrphanHelper $orphanHelper,
) {
parent::__construct();
}
@ -50,7 +52,8 @@ class ExiprationNotification extends Command {
foreach ($shares as $share) {
if ($share->getExpirationDate() === null
|| $share->getExpirationDate()->getTimestamp() < $minTime->getTimestamp()
|| $share->getExpirationDate()->getTimestamp() > $maxTime->getTimestamp()) {
|| $share->getExpirationDate()->getTimestamp() > $maxTime->getTimestamp()
|| !$this->orphanHelper->isShareValid($share->getSharedBy(), $share->getNodeId())) {
continue;
}