Skip to content

[stable19] Also check the path based mimetype for flow rule checks #23212

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 1 commit into from
Oct 8, 2020
Merged

[stable19] Also check the path based mimetype for flow rule checks #23212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Make sure to check the mimetype on the path if a secure one could not… 
… be detemined though the content

Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr @backportbot
juliusknorr authored and backportbot[bot] committed Oct 6, 2020
commit 9e3bdcd63c037e0104f2a5bcb0f30ff0f4a88c75
13 changes: 13 additions & 0 deletions apps/workflowengine/lib/Check/FileMimeType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,19 @@ protected function cacheAndReturnMimeType(string $storageId, ?string $path, stri
return $mimeType;
}

/**
* Make sure that even though the content based check returns an application/octet-stream can still be checked based on mimetypemappings of their extension
*
* @param string $operator
* @param string $value
* @return bool
*/
public function executeCheck($operator, $value) {
$actualValue = $this->getActualValue();
return $this->executeStringCheck($operator, $value, $actualValue) ||
$this->executeStringCheck($operator, $value, $this->mimeTypeDetector->detectPath($this->path));
}

/**
* @return string
*/
Expand Down