Merge pull request #52 from matrix-org/michaelk/allow_json_files

Allow upload of files with a .json postfix.
matrix-org · Feb 8, 2022 · cc2374e · cc2374e
2 parents 589e925 + a7724b7
commit cc2374e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/changelog.d/52.feature b/changelog.d/52.feature
@@ -0,0 +1 @@
+Allow upload of Files with a .json postfix.
diff --git a/logserver.go b/logserver.go
@@ -119,6 +119,9 @@ func extensionToMimeType(path string) string {
 		return "image/jpeg"
 	}
 
+	if strings.HasSuffix(path, ".json") {
+		return "application/json"
+	}
 	return "application/octet-stream"
 }
 

diff --git a/submit.go b/submit.go
@@ -402,7 +402,7 @@ func formPartToPayload(field, data string, p *parsedPayload) {
 // * no silly characters (/, ctrl chars, etc)
 //
 // * nothing starting with '.'
-var filenameRegexp = regexp.MustCompile(`^[a-zA-Z0-9_-]+\.(jpg|png|txt)$`)
+var filenameRegexp = regexp.MustCompile(`^[a-zA-Z0-9_-]+\.(jpg|png|txt|json)$`)
 
 // saveFormPart saves a file upload to the report directory.
 //