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

[stable9.1] Fix mimetype detection inside hidden folders (#26138) (#26151) 

Downstreaming of https://github.com/owncloud/core/pull/26151

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
This commit is contained in:
Thomas Müller 2016-09-20 11:16:44 +02:00 committed by Lukas Reschke
parent e0dd6768be
commit fca4098fac
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Files/Type/Detection.php
View File

@ -166,9 +166,11 @@ class Detection implements IMimeTypeDetector {
public function detectPath($path) { public function detectPath($path) {
$this->loadMappings(); $this->loadMappings();
if (strpos($path, '.')) { $fileName = basename($path);
// note: leading dot doesn't qualify as extension
if (strpos($fileName, '.') > 0) {
//try to guess the type by the file extension //try to guess the type by the file extension
$extension = strtolower(strrchr(basename($path), ".")); $extension = strtolower(strrchr($fileName, '.'));
$extension = substr($extension, 1); //remove leading . $extension = substr($extension, 1); //remove leading .
return (isset($this->mimetypes[$extension]) && isset($this->mimetypes[$extension][0])) return (isset($this->mimetypes[$extension]) && isset($this->mimetypes[$extension][0]))
? $this->mimetypes[$extension][0] ? $this->mimetypes[$extension][0]

2
tests/lib/Files/Type/DetectionTest.php
View File

@ -74,6 +74,8 @@ class DetectionTest extends \Test\TestCase {
$this->assertEquals('text/plain', $this->detection->detectPath('foo.txt')); $this->assertEquals('text/plain', $this->detection->detectPath('foo.txt'));
$this->assertEquals('image/png', $this->detection->detectPath('foo.png')); $this->assertEquals('image/png', $this->detection->detectPath('foo.png'));
$this->assertEquals('image/png', $this->detection->detectPath('foo.bar.png')); $this->assertEquals('image/png', $this->detection->detectPath('foo.bar.png'));
$this->assertEquals('image/png', $this->detection->detectPath('.hidden/foo.png'));
$this->assertEquals('image/png', $this->detection->detectPath('test.jpg/foo.png'));
$this->assertEquals('application/octet-stream', $this->detection->detectPath('.png')); $this->assertEquals('application/octet-stream', $this->detection->detectPath('.png'));
$this->assertEquals('application/octet-stream', $this->detection->detectPath('foo')); $this->assertEquals('application/octet-stream', $this->detection->detectPath('foo'));
$this->assertEquals('application/octet-stream', $this->detection->detectPath('')); $this->assertEquals('application/octet-stream', $this->detection->detectPath(''));