Skip to content

fix: try to find non-recursive share source #46881

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

Jump to bottom
Merged
sorbaugh merged 1 commit into from
Aug 1, 2024
Merged

fix: try to find non-recursive share source #46881

sorbaugh merged 1 commit into from
Aug 1, 2024

Conversation

@icewind1991
Copy link
Member

@icewind1991 icewind1991 commented Jul 30, 2024

instead of always picking the first one, try to find one that won't blow up.

To test:

  • user A, B both in G1 and G2 and admin
  • create groupfolder GF1 for groups G1 and G2
  • Create a file GF1/test.txt
  • as A share GF1 to G1
  • as B share GF1 with G2
  • As A or B, try to enter "GF1 (2)"

@icewind1991
fix: try to find non-recursive share source
7343da4 
instead of always picking the first one, try to find one that won't blow up

Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Jul 30, 2024
@icewind1991 icewind1991 added this to the Nextcloud 30 milestone Jul 30, 2024
@icewind1991 icewind1991 requested review from a team, Altahrim, ArtificialOwl and yemkareems and removed request for a team July 30, 2024 13:34
@icewind1991 icewind1991 mentioned this pull request Jul 30, 2024
Closed
@blizzz blizzz mentioned this pull request Jul 30, 2024
Merged
github-advanced-security[bot]
github-advanced-security bot found potential problems Jul 30, 2024
View reviewed changes
apps/files_sharing/lib/SharedStorage.php
$this->cache = null;
break;
}
if (!$this->nonMaskedStorage) {

Check notice

Code scanning / Psalm

DocblockTypeContradiction

Operand of type false is always falsy
apps/files_sharing/lib/SharedStorage.php
$this->cache = null;
break;
}
if (!$this->nonMaskedStorage) {

Check notice

Code scanning / Psalm

DocblockTypeContradiction

Docblock-defined type OCP\Files\Storage\IStorage for $this->nonMaskedStorage is never falsy
@blizzz blizzz mentioned this pull request Aug 1, 2024
Merged
@icewind1991 icewind1991 requested a review from come-nc August 1, 2024 11:50
@sorbaugh sorbaugh merged commit 5faa903 into master Aug 1, 2024
@sorbaugh sorbaugh deleted the try-non-recursive-source branch August 1, 2024 14:56
@icewind1991
Copy link
Member Author

icewind1991 commented Aug 16, 2024

/backport to stable29

@icewind1991
Copy link
Member Author

icewind1991 commented Aug 16, 2024

/backport to stable28

@icewind1991
Copy link
Member Author

icewind1991 commented Aug 16, 2024

/backport to stable27

@backportbot backportbot bot mentioned this pull request Aug 16, 2024
Merged
This was referenced Aug 16, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

@come-nc come-nc come-nc approved these changes

@ArtificialOwl ArtificialOwl Awaiting requested review from ArtificialOwl ArtificialOwl is a code owner automatically assigned from nextcloud/server-backend

@Altahrim Altahrim Awaiting requested review from Altahrim Altahrim is a code owner automatically assigned from nextcloud/server-backend

@yemkareems yemkareems Awaiting requested review from yemkareems yemkareems is a code owner automatically assigned from nextcloud/server-backend

Assignees

No one assigned

Labels

3. to review Waiting for reviews bug high

Projects

None yet

Milestone

Nextcloud 30

Development

Successfully merging this pull request may close these issues.

5 participants

@icewind1991 @AndyScherzinger @come-nc @sorbaugh