Allow to detect mimetype by content

[nickvergessen]

No description provided.

[rullzer]

Needs a rebase

[rullzer]

mmm CI does 💥

[nickvergessen]

1. Test\Files\Type\DetectionTest::testDetectContent with data set Name the repository "server" #1 ('/data.tar.gz', 'application/x-gzip')
   --
   -'application/x-gzip'
   +'application/octet-stream'

Great, works locally. I guess some package is missing. Let's try if testing all the content detections helps. If not someone else needs to take over, as this needs to go into the maintenance releases this week.

[kesselb]

file -i tests/data/data.tar.gz 
tests/data/data.tar.gz: application/gzip; charset=binary

If finfo and mime_content_type are not available file is used to determinate the mime type. On my machine it returns application/gzip. I guess that's the expected result because gzip is registered for a while: https://www.iana.org/assignments/media-types/application/gzip

We could probably add a third column to mimetypemapping.dist.json to specify a alternative syntax. Or replace / with /x- and check if one of them is a safe mime type.

Index: lib/private/Files/Type/Detection.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- lib/private/Files/Type/Detection.php	(revision 107ef72afba5f7d59614637736764ad1c092ff96)
+++ lib/private/Files/Type/Detection.php	(date 1576009620306)
@@ -266,13 +266,17 @@
 
 			if ($mimeType !== false) {
 				//trim the newline
-				$mimeType = trim($mimeType);
-				$mimeType = $this->getSecureMimeType($mimeType);
-				if ($mimeType !== 'application/octet-stream') {
-					return $mimeType;
+				$mimeTypeA = trim($mimeType);
+				$mimeTypeA = $this->getSecureMimeType($mimeTypeA);
+				if ($mimeTypeA !== 'application/octet-stream') {
+					return $mimeTypeA;
 				}
+				$mimeTypeB = str_replace('/', '/x-', trim($mimeType));
+				$mimeTypeB = $this->getSecureMimeType($mimeTypeB);
+				if ($mimeTypeB !== 'application/octet-stream') {
+					return $mimeTypeB;
+				}
 			}
-
 		}
 		return 'application/octet-stream';
 	}

It's dumb 🤣

[rullzer]

/backport to stable17

[rullzer]

/backport to stable16

[rullzer]

/backport to stable15

[backportbot-nextcloud]

The backport to stable17 failed. Please do this backport manually.

[backportbot-nextcloud]

The backport to stable16 failed. Please do this backport manually.

[backportbot-nextcloud]

The backport to stable15 failed. Please do this backport manually.