Fix Content-Disposition handling

t2bot · Sep 5, 2023 · 77ec235 · 77ec235
1 parent 081a53a
commit 77ec235
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/api/_routers/98-use-rcontext.go b/api/_routers/98-use-rcontext.go
@@ -112,7 +112,7 @@ beforeParseDownload:
 			if contentType == "" {
 				disposition = "attachment"
 			} else {
-				if util.HasAnyPrefix(contentType, []string{"image/", "audio/", "video/", "text/plain"}) {
+				if util.CanInline(contentType) {
 					disposition = "inline"
 				} else {
 					disposition = "attachment"

diff --git a/util/mime.go b/util/mime.go
@@ -16,3 +16,39 @@ func ExtensionForContentType(ct string) string {
 	}
 	return ".bin"
 }
+
+func CanInline(ct string) bool {
+	ct = FixContentType(ct)
+	return ArrayContains(InlineContentTypes, ct)
+}
+
+var InlineContentTypes = []string{
+	// Types are inherited from https://github.com/matrix-org/synapse/pull/15988
+
+	"text/css",
+	"text/plain",
+	"text/csv",
+	"application/json",
+	"application/ld+json",
+	"image/jpeg",
+	"image/gif",
+	"image/png",
+	"image/apng",
+	"image/webp",
+	"image/avif",
+	"video/mp4",
+	"video/webm",
+	"video/ogg",
+	"video/quicktime",
+	"audio/mp4",
+	"audio/webm",
+	"audio/aac",
+	"audio/mpeg",
+	"audio/ogg",
+	"audio/wave",
+	"audio/wav",
+	"audio/x-wav",
+	"audio/x-pn-wav",
+	"audio/flac",
+	"audio/x-flac",
+}