-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
fix(SetupCheck): Properly check public access to data directory #46456
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.
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
Conversation
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
5415139 to
6f0b182
Compare
| $datadir = str_replace(\OC::$SERVERROOT . '/', '', $this->config->getSystemValue('datadirectory', '')); | ||
|
|
||
| $dataUrl = $this->urlGenerator->getWebroot() . '/' . $datadir . '/.ocdata'; | ||
| $dataUrl = $this->urlGenerator->getWebroot() . '/' . $datadir . '/.ncdata'; |
Check notice
Code scanning / Psalm
PossiblyInvalidOperand
Cannot concatenate with a array<array-key, string>|string
Merged
6f0b182 to
9cecc20
Compare
5 tasks
come-nc
approved these changes
Aug 1, 2024
Contributor
come-nc
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice!
Merged
9cecc20 to
b3e7a5e
Compare
AndyScherzinger
approved these changes
Aug 8, 2024
e396b90 to
0ad5aeb
Compare
When checking for public (web) access to the data directory the status is not enough as you might have a webserver that forwards to e.g. a login page. So instead check that the content of the file matches. For this the `.ncdata` file (renamed from `.ocdata`¹) has minimal text content to allow checking. ¹The file was renamed from the legacy `.ocdata`, there is a repair step to remove the old one. Signed-off-by: Ferdinand Thiessen <[email protected]>
0ad5aeb to
0563757
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
3. to review
Waiting for reviews
bug
♻️ refactor
Refactor code (not a bug fix, not a feature just refactoring)
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.
Summary
When checking for public (web) access to the data directory the status is not enough as you might have a webserver that forwards to e.g. a login page. So instead check that the content of the file matches.
For this the
.ncdatafile (renamed from.ocdata¹) has minimal text content to allow checking.¹The file was renamed from the legacy
.ocdata, there is a repair step to remove the old one.Checklist