Skip to content

[stable29] fix(files_sharing): skip expiration notify for invalid share record #51613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2025
Merged

[stable29] fix(files_sharing): skip expiration notify for invalid share record #51613

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions apps/files_sharing/lib/Command/ExiprationNotification.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,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;
Expand All @@ -48,7 +49,9 @@
public function __construct(ITimeFactory $time,
NotificationManager $notificationManager,
IDBConnection $connection,
ShareManager $shareManager) {
ShareManager $shareManager,
private OrphanHelper $orphanHelper,
) {
parent::__construct();

$this->notificationManager = $notificationManager;
Expand Down Expand Up @@ -80,7 +83,8 @@
foreach ($shares as $share) {
if ($share->getExpirationDate() === null
|| $share->getExpirationDate()->getTimestamp() < $minTime->getTimestamp()
|| $share->getExpirationDate()->getTimestamp() > $maxTime->getTimestamp()) {
|| $share->getExpirationDate()->getTimestamp() > $maxTime->getTimestamp()

Check notice

Code scanning / Psalm

PossiblyNullReference Note

Cannot call method getTimestamp on possibly null value
|| !$this->orphanHelper->isShareValid($share->getSharedBy(), $share->getNodeId())) {
continue;
}

Expand Down
Loading