Skip to content

Commit

Permalink
Make sure to check the mimetype on the path if a secure one could not…
Browse files Browse the repository at this point in the history
… be detemined though the content

Signed-off-by: Julius Härtl <jus@bitgrid.net>
  • Loading branch information
juliusknorr committed Sep 29, 2020
1 parent 7d06027 commit 6347968
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions apps/workflowengine/lib/Check/FileMimeType.php
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

0 comments on commit 6347968

Please sign in to comment.