Merge pull request #8172 from TriPhoenix/file-upload-allow-whitelist

[FIX] Allow unknown file types if no allowed whitelist has been set (#7074)
RocketChat · Sep 18, 2017 · b3cadfb · b3cadfb
1 parent adc895a
commit b3cadfb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/rocketchat-lib/lib/fileUploadRestrictions.js b/packages/rocketchat-lib/lib/fileUploadRestrictions.js
@@ -11,7 +11,15 @@ RocketChat.fileUploadMediaWhiteList = function() {
 
 RocketChat.fileUploadIsValidContentType = function(type) {
 	const list = RocketChat.fileUploadMediaWhiteList();
-	if (!list || _.contains(list, type)) {
+	if (!list) {
+		return true;
+	}
+
+	if (!type) {
+		return false;
+	}
+
+	if (_.contains(list, type)) {
 		return true;
 	} else {
 		const wildCardGlob = '/*';

diff --git a/packages/rocketchat-ui/client/lib/fileUpload.js b/packages/rocketchat-ui/client/lib/fileUpload.js
@@ -56,7 +56,7 @@ fileUpload = function(filesToUpload) {
 			return;
 		}
 
-		if (!file.file.type || !RocketChat.fileUploadIsValidContentType(file.file.type)) {
+		if (!RocketChat.fileUploadIsValidContentType(file.file.type)) {
 			swal({
 				title: t('FileUpload_MediaType_NotAccepted'),
 				text: file.file.type || `*.${ s.strRightBack(file.file.name, '.') }`,