summaryrefslogtreecommitdiffstats
path: root/apps/workflowengine/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2019-11-29 11:06:04 +0100
committerJoas Schilling <coding@schilljs.com>2019-12-10 09:11:43 +0100
commit511a4ba66fdf27f7ab48c37fd3faf12b4f2ef089 (patch)
tree5df982a95bb681ca86f3d0a5d0f59490de11ddae /apps/workflowengine/lib
parentda44c2a414129047c256e5e86c1aa3f0dddb22ef (diff)
downloadnextcloud-server-511a4ba66fdf27f7ab48c37fd3faf12b4f2ef089.tar.gz
nextcloud-server-511a4ba66fdf27f7ab48c37fd3faf12b4f2ef089.zip
Improve mimetype detection in workflow components
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/workflowengine/lib')
-rw-r--r--apps/workflowengine/lib/Check/FileMimeType.php95
1 files changed, 13 insertions, 82 deletions
diff --git a/apps/workflowengine/lib/Check/FileMimeType.php b/apps/workflowengine/lib/Check/FileMimeType.php
index feecd0997fa..25c4ed28b47 100644
--- a/apps/workflowengine/lib/Check/FileMimeType.php
+++ b/apps/workflowengine/lib/Check/FileMimeType.php
@@ -101,93 +101,24 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, 'httpd/unix-directory');
}
- if ($this->isWebDAVRequest()) {
- // Creating a folder
- if ($this->request->getMethod() === 'MKCOL') {
- return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, 'httpd/unix-directory');
- }
-
- if ($this->request->getMethod() === 'PUT' || $this->request->getMethod() === 'MOVE') {
- if ($this->request->getMethod() === 'MOVE') {
- $mimeType = $this->mimeTypeDetector->detectPath($this->path);
- } else {
- $path = $this->request->getPathInfo();
- $mimeType = $this->mimeTypeDetector->detectPath($path);
- }
- return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $mimeType);
- }
- } else if ($this->isPublicWebDAVRequest()) {
- if ($this->request->getMethod() === 'PUT') {
- $path = $this->request->getPathInfo();
- if (strpos($path, '/webdav/') === 0) {
- $path = substr($path, strlen('/webdav'));
- }
- $path = $this->path . $path;
- $mimeType = $this->mimeTypeDetector->detectPath($path);
- return $this->cacheAndReturnMimeType($this->storage->getId(), $path, $mimeType);
- }
+ if ($this->storage->file_exists($this->path)) {
+ $path = $this->storage->getLocalFile($this->path);
+ $mimeType = $this->mimeTypeDetector->detectContent($path);
+ return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $mimeType);
}
- if (in_array($this->request->getMethod(), ['POST', 'PUT'])) {
- $files = $this->request->getUploadedFile('files');
- if (isset($files['type'][0])) {
- $mimeType = $files['type'][0];
- if ($mimeType === 'application/octet-stream') {
- // Maybe not...
- $mimeTypeTest = $this->mimeTypeDetector->detectPath($files['name'][0]);
- if ($mimeTypeTest !== 'application/octet-stream' && $mimeTypeTest !== false) {
- $mimeType = $mimeTypeTest;
- } else {
- $mimeTypeTest = $this->mimeTypeDetector->detect($files['tmp_name'][0]);
- if ($mimeTypeTest !== 'application/octet-stream' && $mimeTypeTest !== false) {
- $mimeType = $mimeTypeTest;
- }
- }
- }
- return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $mimeType);
+ if ($this->isWebDAVRequest() || $this->isPublicWebDAVRequest()) {
+ // Creating a folder
+ if ($this->request->getMethod() === 'MKCOL') {
+ return 'httpd/unix-directory';
}
}
- $mimeType = $this->storage->getMimeType($this->path);
- if ($mimeType === 'application/octet-stream') {
- $mimeType = $this->detectMimetypeFromPath();
- }
-
- return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $mimeType);
- }
-
- /**
- * @return string
- */
- protected function detectMimetypeFromPath() {
- $mimeType = $this->mimeTypeDetector->detectPath($this->path);
- if ($mimeType !== 'application/octet-stream' && $mimeType !== false) {
- return $mimeType;
- }
-
- if ($this->storage->instanceOfStorage('\OC\Files\Storage\Local')
- || $this->storage->instanceOfStorage('\OC\Files\Storage\Home')
- || $this->storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')) {
- $localFile = $this->storage->getLocalFile($this->path);
- if ($localFile !== false) {
- $mimeType = $this->mimeTypeDetector->detect($localFile);
- if ($mimeType !== false) {
- return $mimeType;
- }
- }
-
- return 'application/octet-stream';
- } else {
- $handle = $this->storage->fopen($this->path, 'r');
- $data = fread($handle, 8024);
- fclose($handle);
- $mimeType = $this->mimeTypeDetector->detectString($data);
- if ($mimeType !== false) {
- return $mimeType;
- }
-
- return 'application/octet-stream';
- }
+ // We do not cache this, as the file did not exist yet.
+ // In case it does in the future, we will check with detectContent()
+ // again to get the real mimetype of the content, rather than
+ // guessing it from the path.
+ return $this->mimeTypeDetector->detectPath($this->path);
}
/**