[stable28] fix: don't return null for SharedStorage::getWrapperStorage with share recursion#44323
Merged
AndyScherzinger merged 2 commits intostable28from Jul 11, 2024
Merged
Conversation
ec1c6f9 to
05d54cc
Compare
Contributor
|
@icewind1991 Have you managed to run into this code path? I do not understand in which case can initialized be false and storage null at the same time. |
Member
The process of getting the share source could lead to it recursing into the function if there (somehow) is a recursive share. This shouldn't happen but when it does this PR improves the error behavior |
Contributor
|
Oh, thank you, I think I get it now. My first thought was moving |
come-nc
approved these changes
Mar 25, 2024
come-nc
reviewed
Mar 25, 2024
Comment on lines
+145
to
+157
| if (!$this->storage) { | ||
| // marked as initialized but no storage set | ||
| // this is probably because some code path has caused recursion during the share setup | ||
| // we setup a "failed storage" so `getWrapperStorage` doesn't return null. | ||
| // If the share setup completes after this the "failed storage" will be overwritten by the correct one | ||
| $this->logger->warning('Possible share setup recursion detected'); | ||
| $this->storage = new FailedStorage(['exception' => new \Exception('Possible share setup recursion detected')]); | ||
| $this->cache = new FailedCache(); | ||
| $this->rootPath = ''; | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| if (!$this->storage) { | |
| // marked as initialized but no storage set | |
| // this is probably because some code path has caused recursion during the share setup | |
| // we setup a "failed storage" so `getWrapperStorage` doesn't return null. | |
| // If the share setup completes after this the "failed storage" will be overwritten by the correct one | |
| $this->logger->warning('Possible share setup recursion detected'); | |
| $this->storage = new FailedStorage(['exception' => new \Exception('Possible share setup recursion detected')]); | |
| $this->cache = new FailedCache(); | |
| $this->rootPath = ''; | |
| } | |
| if (!$this->storage) { | |
| // marked as initialized but no storage set | |
| // this is probably because some code path has caused recursion during the share setup | |
| // we setup a "failed storage" so `getWrapperStorage` doesn't return null. | |
| // If the share setup completes after this the "failed storage" will be overwritten by the correct one | |
| throw new \Exception('Possible share setup recursion detected')]); | |
| } |
This should work then, and it would be caught by the try/catch below?
Not sure if it’s cleaner because it would mean the function is now throwing.
Merged
Collaborator
|
There is a conflict on this one |
Merged
Merged
Merged
…e recursion Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
05d54cc to
e0f3de8
Compare
AndyScherzinger
approved these changes
Jul 11, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #44132
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.