mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge de77189186 into fdb55c65f8

This commit is contained in:
Robin Appelman 2021-06-02 15:36:14 -04:00 committed by GitHub
parent fdb55c65f8 de77189186
commit e261af502e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 199 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/workflowengine/lib/Check/FileMimeType.php
View File

@ -21,6 +21,7 @@
namespace OCA\WorkflowEngine\Check;
use OC\Files\Storage\Local;
use OCA\WorkflowEngine\Entity\File;
use OCP\Files\IMimeTypeDetector;
use OCP\Files\Storage\IStorage;
@ -71,7 +72,7 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
}
/**
* The mimetype is only cached if the file exists. Otherwise files access
* The mimetype is only cached if the file has a valid mimetype. 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
*
@ -86,7 +87,7 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
* @return string
*/
protected function cacheAndReturnMimeType(string $storageId, ?string $path, string $mimeType): string {
if ($path !== null && $this->storage->file_exists($path)) {
if ($path !== null && $mimeType !== 'application/octet-stream') {
$this->mimeType[$storageId][$path] = $mimeType;
}
@ -117,12 +118,12 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
if ($this->mimeType[$this->storage->getId()][$this->path] !== null) {
return $this->mimeType[$this->storage->getId()][$this->path];
}
if ($this->storage->is_dir($this->path)) {
return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, 'httpd/unix-directory');
$cacheEntry = $this->storage->getCache()->get($this->path);
if ($cacheEntry && $cacheEntry->getMimeType() !== 'application/octet-stream') {
return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $cacheEntry->getMimeType());
}
if ($this->storage->file_exists($this->path)) {
if ($this->storage->file_exists($this->path) && $this->storage->instanceOfStorage(Local::class)) {
$path = $this->storage->getLocalFile($this->path);
$mimeType = $this->mimeTypeDetector->detectContent($path);
return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $mimeType);

192
apps/workflowengine/tests/Check/FileMimeTypeTest.php Normal file
View File

@ -0,0 +1,192 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2021 Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\WorkflowEngine\Tests\Check;
use OC\Files\Storage\Temporary;
use OCA\WorkflowEngine\Check\FileMimeType;
use OCP\Files\IMimeTypeDetector;
use OCP\IL10N;
use OCP\IRequest;
use Test\TestCase;
class TemporaryNoLocal extends Temporary {
public function instanceOfStorage($className) {
if ($className === '\OC\Files\Storage\Local') {
return false;
} else {
return parent::instanceOfStorage($className);
}
}
}
/**
* @group DB
*/
class FileMimeTypeTest extends TestCase {
/** @var IL10N */
private $l10n;
/** @var IRequest */
private $request;
/** @var IMimeTypeDetector */
private $mimeDetector;
private $extensions = [
'.txt' => 'text/plain-path-detected',
];
private $content = [
'text-content' => 'text/plain-content-detected',
];
protected function setUp(): void {
parent::setUp();
$this->l10n = $this->createMock(IL10N::class);
$this->request = $this->createMock(IRequest::class);
$this->mimeDetector = $this->createMock(IMimeTypeDetector::class);
$this->mimeDetector->method('detectPath')
->willReturnCallback(function ($path) {
foreach ($this->extensions as $extension => $mime) {
if (strpos($path, $extension) !== false) {
return $mime;
}
}
return 'application/octet-stream';
});
$this->mimeDetector->method('detectContent')
->willReturnCallback(function ($path) {
$body = file_get_contents($path);
foreach ($this->content as $match => $mime) {
if (strpos($body, $match) !== false) {
return $mime;
}
}
return 'application/octet-stream';
});
}
public function testUseCachedMimetype() {
$storage = new Temporary([]);
$storage->mkdir('foo');
$storage->file_put_contents('foo/bar.txt', 'asd');
$storage->getScanner()->scan('');
$check = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
$check->setFileInfo($storage, 'foo/bar.txt');
$this->assertTrue($check->executeCheck('is', 'text/plain'));
}
public function testNonCachedNotExists() {
$storage = new Temporary([]);
$check = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
$check->setFileInfo($storage, 'foo/bar.txt');
$this->assertTrue($check->executeCheck('is', 'text/plain-path-detected'));
}
public function testNonCachedLocal() {
$storage = new Temporary([]);
$storage->mkdir('foo');
$storage->file_put_contents('foo/bar.txt', 'text-content');
$check = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
$check->setFileInfo($storage, 'foo/bar.txt');
$this->assertTrue($check->executeCheck('is', 'text/plain-content-detected'));
}
public function testNonCachedNotLocal() {
$storage = new TemporaryNoLocal([]);
$storage->mkdir('foo');
$storage->file_put_contents('foo/bar.txt', 'text-content');
$check = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
$check->setFileInfo($storage, 'foo/bar.txt');
$this->assertTrue($check->executeCheck('is', 'text/plain-path-detected'));
}
public function testFallback() {
$storage = new Temporary([]);
$check = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
$check->setFileInfo($storage, 'unknown');
$this->assertTrue($check->executeCheck('is', 'application/octet-stream'));
}
public function testFromCacheCached() {
$storage = new Temporary([]);
$storage->mkdir('foo');
$storage->file_put_contents('foo/bar.txt', 'asd');
$storage->getScanner()->scan('');
$check = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
$check->setFileInfo($storage, 'foo/bar.txt');
$this->assertTrue($check->executeCheck('is', 'text/plain'));
$storage->getCache()->clear();
$this->assertTrue($check->executeCheck('is', 'text/plain'));
$newCheck = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
$newCheck->setFileInfo($storage, 'foo/bar.txt');
$this->assertTrue($newCheck->executeCheck('is', 'text/plain-path-detected'));
}
public function testExistsCached() {
$storage = new TemporaryNoLocal([]);
$storage->mkdir('foo');
$storage->file_put_contents('foo/bar.txt', 'text-content');
$check = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
$check->setFileInfo($storage, 'foo/bar.txt');
$this->assertTrue($check->executeCheck('is', 'text/plain-content-detected'));
$storage->unlink('foo/bar.txt');
$this->assertTrue($check->executeCheck('is', 'text/plain-content-detected'));
$newCheck = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
$newCheck->setFileInfo($storage, 'foo/bar.txt');
$this->assertTrue($newCheck->executeCheck('is', 'text/plain-path-detected'));
}
public function testNonExistsNotCached() {
$storage = new TemporaryNoLocal([]);
$check = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
$check->setFileInfo($storage, 'foo/bar.txt');
$this->assertTrue($check->executeCheck('is', 'text/plain-path-detected'));
$storage->mkdir('foo');
$storage->file_put_contents('foo/bar.txt', 'text-content');
$this->assertTrue($check->executeCheck('is', 'text/plain-content-detected'));
}
}