Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/img/filetypes/indesign.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions core/js/mimetypelist.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ OC.MimeTypeList={
"application/font-woff": "image",
"application/gpx+xml": "location",
"application/illustrator": "image",
"application/x-indesign": "indesign",
"application/javascript": "text/code",
"application/json": "text/code",
"application/msaccess": "file",
Expand All @@ -24,6 +25,7 @@ OC.MimeTypeList={
"application/octet-stream": "file",
"application/postscript": "image",
"application/rss+xml": "application/xml",
"application/vnd.adobe.indesign-idml-package": "indesign",
"application/vnd.android.package-archive": "package/x-generic",
"application/vnd.lotus-wordpro": "x-office/document",
"application/vnd.garmin.tcx+xml": "location",
Expand Down Expand Up @@ -124,6 +126,7 @@ OC.MimeTypeList={
"folder-public",
"folder-shared",
"folder-starred",
"indesign",
"image",
"link",
"location",
Expand Down
2 changes: 2 additions & 0 deletions resources/config/mimetypealiases.dist.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"application/font-woff": "image",
"application/gpx+xml": "location",
"application/illustrator": "image",
"application/x-indesign": "indesign",
"application/javascript": "text/code",
"application/json": "text/code",
"application/msaccess": "file",
Expand All @@ -24,6 +25,7 @@
"application/octet-stream": "file",
"application/postscript": "image",
"application/rss+xml": "application/xml",
"application/vnd.adobe.indesign-idml-package": "indesign",
"application/vnd.android.package-archive": "package/x-generic",
"application/vnd.lotus-wordpro": "x-office/document",
"application/vnd.garmin.tcx+xml": "location",
Expand Down
2 changes: 2 additions & 0 deletions resources/config/mimetypemapping.dist.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@
"htm": ["text/html", "text/plain"],
"ical": ["text/calendar"],
"ics": ["text/calendar"],
"idml": ["application/vnd.adobe.indesign-idml-package"],
"iiq": ["image/x-dcraw"],
"impress": ["text/impress"],
"indd": ["application/x-indesign"],
"java": ["text/x-java-source"],
"jp2": ["image/jp2"],
"jpeg": ["image/jpeg"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ OC.MimeTypeList={
"application/font-woff": "image",
"application/gpx+xml": "location",
"application/illustrator": "image",
"application/x-indesign": "indesign",
"application/javascript": "text/code",
"application/json": "text/code",
"application/msaccess": "file",
Expand All @@ -25,6 +26,7 @@ OC.MimeTypeList={
"application/octet-stream": "file",
"application/postscript": "image",
"application/rss+xml": "application/xml",
"application/vnd.adobe.indesign-idml-package": "indesign",
"application/vnd.android.package-archive": "package/x-generic",
"application/vnd.lotus-wordpro": "x-office/document",
"application/vnd.garmin.tcx+xml": "location",
Expand Down Expand Up @@ -126,6 +128,7 @@ OC.MimeTypeList={
"folder-shared",
"folder-starred",
"image",
"indesign",
"link",
"location",
"mindmap",
Expand Down
8 changes: 6 additions & 2 deletions tests/lib/IntegrityCheck/CheckerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,7 @@ public function testVerifyCoreSignatureWithModifiedMimetypelistSignatureData() {
'application/font-woff' => 'image',
'application/gpx+xml' => 'location',
'application/illustrator' => 'image',
'application/x-indesign' => 'indesign',
'application/javascript' => 'text/code',
'application/json' => 'text/code',
'application/msaccess' => 'file',
Expand All @@ -802,6 +803,7 @@ public function testVerifyCoreSignatureWithModifiedMimetypelistSignatureData() {
'application/octet-stream' => 'file',
'application/postscript' => 'image',
'application/rss+xml' => 'application/xml',
'application/vnd.adobe.indesign-idml-package' => 'indesign',
'application/vnd.android.package-archive' => 'package/x-generic',
'application/vnd.lotus-wordpro' => 'x-office/document',
'application/vnd.garmin.tcx+xml' => 'location',
Expand Down Expand Up @@ -909,6 +911,7 @@ public function testVerifyCoreSignatureWithModifiedMimetypelistSignatureData() {
'application/font-woff' => 'image',
'application/gpx+xml' => 'location',
'application/illustrator' => 'image',
'application/x-indesign' => 'indesign',
'application/javascript' => 'text/code',
'application/json' => 'text/code',
'application/msaccess' => 'file',
Expand All @@ -919,6 +922,7 @@ public function testVerifyCoreSignatureWithModifiedMimetypelistSignatureData() {
'application/octet-stream' => 'file',
'application/postscript' => 'image',
'application/rss+xml' => 'application/xml',
'application/vnd.adobe.indesign-idml-package' => 'indesign',
'application/vnd.android.package-archive' => 'package/x-generic',
'application/vnd.lotus-wordpro' => 'x-office/document',
'application/vnd.garmin.tcx+xml' => 'location',
Expand Down Expand Up @@ -1014,9 +1018,9 @@ public function testVerifyCoreSignatureWithModifiedMimetypelistSignatureData() {
->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/mimetypeListModified');
$signatureDataFile = '{
"hashes": {
"core\/js\/mimetypelist.js": "94195a260a005dac543c3f6aa504f1b28e0078297fe94a4f52f012c16c109f0323eecc9f767d6949f860dfe454625fcaf1dc56f87bb8350975d8f006bbbdf14a"
"core\/js\/mimetypelist.js": "a456159b70f2fdf1de012894c1a2d0db8a03846a12c9eacdae8f99b63fd2183aacf3b70c0e23fd7f49734abf2b1858eff2b539ec032787379f8c0aeaf558eb4b"
},
"signature": "BYPMrU+2vzSOOjSFcRPsWphv0uXQ+Vu6yC7FL6V0iM4WXcAkTK1e5OjkHFqUBNIDxg0AWB14ogUFRGDr+Qh+AqDRaX1u2ST2BhO1mgVh4JaqVOhlnDgWg8NPRMaVqvMy6Rfmyj57D1vmDmbVGQmnaIxEot84mOx4MP6sgZIVOMEe2itlmNwp1ogG6t61wpj4dFe73tYPDePWh0j+TmW8a\/Ry67wIhWHHhSGWIhhYRi8NmfW0oLhL1tgze5+Oo4pvgIgJq47BOYGu4YnfY3w8PB\/sQ5bPIvd\/+CTt\/1RASoadEfLd0MjLFEVEAj3uVGMq1kv7gK4bisXrKJS\/dbCwM+iJQfVFIVjwzuPH1QLbvSEsVUkJKVM4iS4aKiIty5Q760ufuSkZUoZoBrJCy\/PfC6Dc9hmOg1gXiPA9Tzje7L\/V8b0ULmFdnZtITYjEXd52yhfB\/P6qsKOm3HM8bM\/qoL3ra7\/hwe\/dyEi45eJbrbw9lywWwK8Q+fY92o2PCQgVkPYgK0VUOxPMZ6CtBM5OOe9lkuUZzGzCl\/sWZzUiSiXQME\/CDmi2T\/cX65eXzPkFCv2503OKOGtY7fFgBOg2DGXz0\/SEubpeuhs3P+mc\/v\/TUbhJ3hOXD7OBWruTWLbJ4WZyNj4k\/NaXLi1ktbsIB5L19wAFrRLACzCD+ZkVSMs=",
"signature": "Ih0\/z5Qw8G\/aJtQveToi1ubqwlRnyvXG4aQIBD0mQt1eqEV8yy\/Jgjitm0PJgpZ0VQ5zw8siSCuRdUTiBXiecuzUOFiIwWv9mgs0F9wGuGKpIayih6lbj9pfRas5gTIRsRlGFTK1pvCTY4bai3S+46pJaqeOIjGMHOVimR9A+ACPrh5a0m0jZOaxh+5wxnedCxDgd+w+44oIU+QNbmcoJ2MmNnMN6dIDkCk9ssLDMzM27N4por+OVNkldxouonFzana8hkeBpnH8v\/4UoQDCGih0FetnsWgz3pTVoM28MR5JsEbEiJFPtMIp6sSAWVXCy9KFWNBr1\/RNjq6sCUlyqXdGq1h9Z6Rl7q2toiKtTF8DSfEJcGT4\/o+hDlF3o6zZFUSDLSkNcsVfxoGhgP4s8r5afEO6xXdraGAYTPZ4F1KPdDSvPT5AmsRHv7lV0UhCo0Bke8OblsBt9y9Yl+n4LPUcZeMC9fx+2Dgutv\/c9tPC4enDw4PSbknwTImWqLVFev0tiPmZnGFEtoeT6eteC\/\/B834aIBrDCedC1IDC\/SF7Q5B9bEbiXa7wJ1KgFGByu53U\/bnfgb6mGBVrbz657Yfc5+eU5381UPM35KX7Sh9\/\/mdlg+uZDVn1ieTg4u0Q0YxHw\/QDOhZfmVGXS0f2lwBnmXy9vAa++GhWuU83HeM=",
"certificate": "-----BEGIN CERTIFICATE-----\r\nMIIEvjCCAqagAwIBAgIUc\/0FxYrsgSs9rDxp03EJmbjN0NwwDQYJKoZIhvcNAQEF\r\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTEw\r\nMzIxMDMzM1oXDTE2MTEwMzIxMDMzM1owDzENMAsGA1UEAwwEY29yZTCCAiIwDQYJ\r\nKoZIhvcNAQEBBQADggIPADCCAgoCggIBALb6EgHpkAqZbO5vRO8XSh7G7XGWHw5s\r\niOf4RwPXR6SE9bWZEm\/b72SfWk\/\/J6AbrD8WiOzBuT\/ODy6k5T1arEdHO+Pux0W1\r\nMxYJJI4kH74KKgMpC0SB0Rt+8WrMqV1r3hhJ46df6Xr\/xolP3oD+eLbShPcblhdS\r\nVtkZEkoev8Sh6L2wDCeHDyPxzvj1w2dTdGVO9Kztn0xIlyfEBakqvBWtcxyi3Ln0\r\nklnxlMx3tPDUE4kqvpia9qNiB1AN2PV93eNr5\/2riAzIssMFSCarWCx0AKYb54+d\r\nxLpcYFyqPJ0ydBCkF78DD45RCZet6PNYkdzgbqlUWEGGomkuDoJbBg4wzgzO0D77\r\nH87KFhYW8tKFFvF1V3AHl\/sFQ9tDHaxM9Y0pZ2jPp\/ccdiqnmdkBxBDqsiRvHvVB\r\nCn6qpb4vWGFC7vHOBfYspmEL1zLlKXZv3ezMZEZw7O9ZvUP3VO\/wAtd2vUW8UFiq\r\ns2v1QnNLN6jNh51obcwmrBvWhJy9vQIdtIjQbDxqWTHh1zUSrw9wrlklCBZ\/zrM0\r\ni8nfCFwTxWRxp3H9KoECzO\/zS5R5KIS7s3\/wq\/w9T2Ie4rcecgXwDizwnn0C\/aKc\r\nbDIjujpL1s9HO05pcD\/V3wKcPZ1izymBkmMyIbL52iRVN5FTVHeZdXPpFuq+CTQJ\r\nQ238lC+A\/KOVAgMBAAEwDQYJKoZIhvcNAQEFBQADggIBAGoKTnh8RfJV4sQItVC2\r\nAvfJagkrIqZ3iiQTUBQGTKBsTnAqE1H7QgUSV9vSd+8rgvHkyZsRjmtyR1e3A6Ji\r\noNCXUbExC\/0iCPUqdHZIVb+Lc\/vWuv4ByFMybGPydgtLoEUX2ZrKFWmcgZFDUSRd\r\n9Uj26vtUhCC4bU4jgu6hIrR9IuxOBLQUxGTRZyAcXvj7obqRAEZwFAKQgFpfpqTb\r\nH+kjcbZSaAlLVSF7vBc1syyI8RGYbqpwvtREqJtl5IEIwe6huEqJ3zPnlP2th\/55\r\ncf3Fovj6JJgbb9XFxrdnsOsDOu\/tpnaRWlvv5ib4+SzG5wWFT5UUEo4Wg2STQiiX\r\nuVSRQxK1LE1yg84bs3NZk9FSQh4B8vZVuRr5FaJsZZkwlFlhRO\/\/+TJtXRbyNgsf\r\noMRZGi8DLGU2SGEAHcRH\/QZHq\/XDUWVzdxrSBYcy7GSpT7UDVzGv1rEJUrn5veP1\r\n0KmauAqtiIaYRm4f6YBsn0INcZxzIPZ0p8qFtVZBPeHhvQtvOt0iXI\/XUxEWOa2F\r\nK2EqhErgMK\/N07U1JJJay5tYZRtvkGq46oP\/5kQG8hYST0MDK6VihJoPpvCmAm4E\r\npEYKQ96x6A4EH9Y9mZlYozH\/eqmxPbTK8n89\/p7Ydun4rI+B2iiLnY8REWWy6+UQ\r\nV204fGUkJqW5CrKy3P3XvY9X\r\n-----END CERTIFICATE-----"
}';
$this->fileAccessHelper
Expand Down