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 <jus@bitgrid.net>

1 files changed, 13 insertions, 0 deletions

diff --git a/apps/workflowengine/lib/Check/FileMimeType.php b/apps/workflowengine/lib/Check/FileMimeType.php
index 0e02c405126..4e61e5693b9 100644
--- a/apps/workflowengine/lib/Check/FileMimeType.php
+++ b/apps/workflowengine/lib/Check/FileMimeType.php
@@ -94,6 +94,19 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
 	}
 
 	/**
+	 * 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
 	 */
 	protected function getActualValue() {