fix(SetupCheck): Properly check public access to data directory #46456
Conversation
This file contains 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
susnux
added
bug
3. to review
susnux
requested review from
nickvergessen,
marcelklehr,
ArtificialOwl,
sorbaugh and
come-nc
susnux
force-pushed
the
fix/check-datadir
branch
from
5415139
to
6f0b182
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -42,13 +42,21 @@ | |||
| public function run(): SetupResult { | |||
| $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 Note
Merged
susnux
force-pushed
the
fix/check-datadir
branch
from
6f0b182
to
9cecc20
Compare
5 tasks
Merged
susnux
force-pushed
the
fix/check-datadir
branch
from
9cecc20
to
b3e7a5e
Compare
AndyScherzinger
approved these changes
Aug 8, 2024
susnux
force-pushed
the
fix/check-datadir
branch
3 times, most recently
from
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 <opensource@fthiessen.de>
AndyScherzinger
force-pushed
the
fix/check-datadir
branch
from
0ad5aeb
to
0563757
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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