Only execute plain mimetype check for directories and do the fallback… #24459
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
… only for non-directories Ref #23096 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
MorrisJobke
requested review from
rullzer,
ChristophWurst,
blizzz and
juliusknorr
|
/backport to stable20 |
|
/backport to stable19 |
juliusknorr
approved these changes
Nov 30, 2020
blizzz
reviewed
Nov 30, 2020
| return $this->executeStringCheck($operator, $value, $actualValue) || | ||
| $this->executeStringCheck($operator, $value, $this->mimeTypeDetector->detectPath($this->path)); | ||
| $plainMimetypeResult = $this->executeStringCheck($operator, $value, $actualValue); | ||
| if ($actualValue === 'httpd/unix-directory') { |
There was a problem hiding this comment.
without looking deeper into detectPath method, it should be OK to or this against $plainMimetypeResult since it is returned anyway if true. Unless detectPath must run for a reason?
There was a problem hiding this comment.
This then would always lead to the check to be true.
Check for !is MIMETYPE means that either httpd/unix-directory or application/octet-stream does not match and therefore the check is useless, because it can't check for both.
There was a problem hiding this comment.
To make it short: detectPath never returns the folder mimetype, because it uses the extension to determine the mime type and if there is none, it returns application/octet-stream.
rullzer
approved these changes
Dec 2, 2020
MorrisJobke
deleted the
fix/23096/workflow-fix-mimetype-check-for-directories
branch
This was referenced Dec 2, 2020
4 tasks
1 task
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.
… only for non-directories
Introduced with #23096
Fixes nextcloud/files_accesscontrol#182
@juliushaertl I'm open for other approaches, but this seems to be useful here.