summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2019-09-30 11:39:50 +0200
committerJoas Schilling <coding@schilljs.com>2019-10-14 10:05:45 +0200
commitd4d3725bfe8bebe05db71245ee9e59401cb739c8 (patch)
tree33e4ae06a2ac036c575a3b9dbc7f5faca5431bb3 /apps
parent9d6a58e6aef035dc99fd5dedddc8353b5d888491 (diff)
downloadnextcloud-server-d4d3725bfe8bebe05db71245ee9e59401cb739c8.tar.gz
nextcloud-server-d4d3725bfe8bebe05db71245ee9e59401cb739c8.zip
Only cache the mimetype if the file exists
Otherwise files access control will cache "application/octet-stream" for all the target node on: rename, move, copy and all other methods which create a new item To check this: 1. Add an automated tagging rule which tags on mimetype NOT "httpd/unix-directory" 2. Add an access control rule which checks for any mimetype 3. Create a folder and rename it, the folder should not be tagged, but it is Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/workflowengine/lib/Check/FileMimeType.php50
1 files changed, 35 insertions, 15 deletions
diff --git a/apps/workflowengine/lib/Check/FileMimeType.php b/apps/workflowengine/lib/Check/FileMimeType.php
index 092dd74502d..feecd0997fa 100644
--- a/apps/workflowengine/lib/Check/FileMimeType.php
+++ b/apps/workflowengine/lib/Check/FileMimeType.php
@@ -67,6 +67,29 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
}
/**
+ * The mimetype is only cached if the file exists. Otherwise files access
+ * control will cache "application/octet-stream" for all the target node on:
+ * rename, move, copy and all other methods which create a new item
+ *
+ * To check this:
+ * 1. Add an automated tagging rule which tags on mimetype NOT "httpd/unix-directory"
+ * 2. Add an access control rule which checks for any mimetype
+ * 3. Create a folder and rename it, the folder should not be tagged, but it is
+ *
+ * @param string $storageId
+ * @param string|null $path
+ * @param string $mimeType
+ * @return string
+ */
+ protected function cacheAndReturnMimeType(string $storageId, ?string $path, string $mimeType): string {
+ if ($path !== null && $this->storage->file_exists($path)) {
+ $this->mimeType[$storageId][$path] = $mimeType;
+ }
+
+ return $mimeType;
+ }
+
+ /**
* @return string
*/
protected function getActualValue() {
@@ -75,25 +98,23 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
}
if ($this->storage->is_dir($this->path)) {
- $this->mimeType[$this->storage->getId()][$this->path] = 'httpd/unix-directory';
- return $this->mimeType[$this->storage->getId()][$this->path];
+ return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, 'httpd/unix-directory');
}
if ($this->isWebDAVRequest()) {
// Creating a folder
if ($this->request->getMethod() === 'MKCOL') {
- $this->mimeType[$this->storage->getId()][$this->path] = 'httpd/unix-directory';
- return $this->mimeType[$this->storage->getId()][$this->path];
+ 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') {
- $this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($this->path);
+ $mimeType = $this->mimeTypeDetector->detectPath($this->path);
} else {
$path = $this->request->getPathInfo();
- $this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($path);
+ $mimeType = $this->mimeTypeDetector->detectPath($path);
}
- return $this->mimeType[$this->storage->getId()][$this->path];
+ return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $mimeType);
}
} else if ($this->isPublicWebDAVRequest()) {
if ($this->request->getMethod() === 'PUT') {
@@ -102,8 +123,8 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
$path = substr($path, strlen('/webdav'));
}
$path = $this->path . $path;
- $this->mimeType[$this->storage->getId()][$path] = $this->mimeTypeDetector->detectPath($path);
- return $this->mimeType[$this->storage->getId()][$path];
+ $mimeType = $this->mimeTypeDetector->detectPath($path);
+ return $this->cacheAndReturnMimeType($this->storage->getId(), $path, $mimeType);
}
}
@@ -123,17 +144,16 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
}
}
}
- $this->mimeType[$this->storage->getId()][$this->path] = $mimeType;
- return $mimeType;
+ return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $mimeType);
}
}
- $this->mimeType[$this->storage->getId()][$this->path] = $this->storage->getMimeType($this->path);
- if ($this->mimeType[$this->storage->getId()][$this->path] === 'application/octet-stream') {
- $this->mimeType[$this->storage->getId()][$this->path] = $this->detectMimetypeFromPath();
+ $mimeType = $this->storage->getMimeType($this->path);
+ if ($mimeType === 'application/octet-stream') {
+ $mimeType = $this->detectMimetypeFromPath();
}
- return $this->mimeType[$this->storage->getId()][$this->path];
+ return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $mimeType);
}
/**