mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23212 from nextcloud/backport/23096/stable19 

[stable19] Also check the path based mimetype for flow rule checks
This commit is contained in:
Roeland Jago Douma 2020-10-08 11:52:09 +02:00 committed by GitHub
parent 60cb077942 9e3bdcd63c
commit 759f47cba3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/workflowengine/lib/Check/FileMimeType.php
View File

@ -93,6 +93,19 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
return $mimeType; 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 * @return string
*/ */