Skip to content

Fix detecting text/x-php mimetype and secure mimetype mapping #22646

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

Merged
rullzer merged 2 commits into from
Sep 8, 2020
Merged

Fix detecting text/x-php mimetype and secure mimetype mapping #22646

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e4303b
Properly add both mimetypes to secure mimetype mapping
juliusknorr Sep 7, 2020
16b9817
Add text/x-php as an alternative for application/x-php
juliusknorr Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Properly add both mimetypes to secure mimetype mapping 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Sep 7, 2020
commit 5e4303b1fe19d3effdf003a44a2f679bec67340a
8 changes: 7 additions & 1 deletion lib/private/Files/Type/Detection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,14 @@ public function registerTypeArray(array $types): void {
$this->mimetypes = array_merge($this->mimetypes, $types);

// Update the alternative mimetypes to avoid having to look them up each time.
foreach ($this->mimetypes as $mimeType) {
foreach ($this->mimetypes as $extension => $mimeType) {
if (strpos($extension, '_comment') === 0) {
continue;
}
$this->secureMimeTypes[$mimeType[0]] = $mimeType[1] ?? $mimeType[0];
if (isset($mimeType[1])) {
$this->secureMimeTypes[$mimeType[1]] = $mimeType[1];
}
}
}

Expand Down