Merge pull request #50542 from nextcloud/fix-sharing-expiration-notify

fix(files_sharing): skip expiration notify for invalid share record

Author: provokateurin

apps/files_sharing/lib/Command/ExiprationNotification.php

@@ -8,6 +8,7 @@
  */
 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 @@ public function __construct(
 		private NotificationManager $notificationManager,
 		private IDBConnection $connection,
 		private ShareManager $shareManager,
+		private OrphanHelper $orphanHelper,
 	) {
 		parent::__construct();
 	}
@@ -50,7 +52,8 @@ public function execute(InputInterface $input, OutputInterface $output): int {
 		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;
 			}