镜像自地址
https://github.com/nextcloud/server.git
已同步 2024-08-18 14:10:42 +02:00
Fix mimetype detection on public uploads for the workflow engine
Signed-off-by: Joas Schilling <coding@schilljs.com>
这个提交包含在:
父节点
15673bc601
当前提交
e8be73f485
@ -76,13 +76,22 @@ class FileMimeType extends AbstractStringCheck {
|
||||
return $this->mimeType[$this->storage->getId()][$this->path];
|
||||
}
|
||||
|
||||
$this->mimeType[$this->storage->getId()][$this->path] = '';
|
||||
if ($this->isWebDAVRequest()) {
|
||||
if ($this->request->getMethod() === 'PUT') {
|
||||
$path = $this->request->getPathInfo();
|
||||
$this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($path);
|
||||
return $this->mimeType[$this->storage->getId()][$this->path];
|
||||
}
|
||||
} 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;
|
||||
$this->mimeType[$this->storage->getId()][$path] = $this->mimeTypeDetector->detectPath($path);
|
||||
return $this->mimeType[$this->storage->getId()][$path];
|
||||
}
|
||||
}
|
||||
|
||||
if (in_array($this->request->getMethod(), ['POST', 'PUT'])) {
|
||||
@ -159,4 +168,14 @@ class FileMimeType extends AbstractStringCheck {
|
||||
strpos($this->request->getPathInfo(), '/dav/files/') === 0
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
protected function isPublicWebDAVRequest() {
|
||||
return substr($this->request->getScriptName(), 0 - strlen('/public.php')) === '/public.php' && (
|
||||
$this->request->getPathInfo() === '/webdav' ||
|
||||
strpos($this->request->getPathInfo(), '/webdav/') === 0
|
||||
);
|
||||
}
|
||||
}
|
||||
|
正在加载...
在新工单中引用
屏蔽一个用户