Skip to content

Fix content-type header for non-text-file attachments #20460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix content-type header for non-text-file attachments #20460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea68b61
Fix content-type header for non-text files
silverwind Jul 23, 2022
fb51aad
move X-Content-Type-Options setter
silverwind Jul 23, 2022
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
2 changes: 2 additions & 0 deletions modules/typesniffer/typesniffer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ const sniffLen = 1024
const (
// SvgMimeType MIME type of SVG images.
SvgMimeType = "image/svg+xml"
// PdfMimeType MIME type of PDF images.
PdfMimeType = "application/pdf"
// ApplicationOctetStream MIME type of binary files.
ApplicationOctetStream = "application/octet-stream"
)
Expand Down
36 changes: 19 additions & 17 deletions routers/common/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,37 +66,39 @@ func ServeData(ctx *context.Context, name string, size int64, reader io.Reader)

st := typesniffer.DetectContentType(buf)

mappedMimeType := ""
mimeType := ""
if setting.MimeTypeMap.Enabled {
fileExtension := strings.ToLower(filepath.Ext(name))
mappedMimeType = setting.MimeTypeMap.Map[fileExtension]
mimeType = setting.MimeTypeMap.Map[fileExtension]
}

if st.IsText() || ctx.FormBool("render") {
cs, err := charset.DetectEncoding(buf)
if err != nil {
log.Error("Detect raw file %s charset failed: %v, using by default utf-8", name, err)
cs = "utf-8"
}
if mappedMimeType == "" {
mappedMimeType = "text/plain"
if mimeType == "" {
mimeType = "text/plain"
}
ctx.Resp.Header().Set("Content-Type", mappedMimeType+"; charset="+strings.ToLower(cs))
ctx.Resp.Header().Set("Content-Type", mimeType+"; charset="+strings.ToLower(cs))
} else {
ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Disposition")
if mappedMimeType != "" {
ctx.Resp.Header().Set("Content-Type", mappedMimeType)
if mimeType == "" {
if st.IsSvgImage() {
mimeType = typesniffer.SvgMimeType
} else if st.IsPDF() {
mimeType = typesniffer.PdfMimeType
} else {
mimeType = typesniffer.ApplicationOctetStream
}
}
ctx.Resp.Header().Set("Content-Type", mimeType)
ctx.Resp.Header().Set("X-Content-Type-Options", "nosniff")

ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Disposition")
if (st.IsImage() || st.IsPDF()) && (setting.UI.SVG.Enabled || !st.IsSvgImage()) {
ctx.Resp.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s"`, name))
if st.IsSvgImage() || st.IsPDF() {
ctx.Resp.Header().Set("Content-Security-Policy", "default-src 'none'; style-src 'unsafe-inline'; sandbox")
ctx.Resp.Header().Set("X-Content-Type-Options", "nosniff")
if st.IsSvgImage() {
ctx.Resp.Header().Set("Content-Type", typesniffer.SvgMimeType)
} else {
ctx.Resp.Header().Set("Content-Type", typesniffer.ApplicationOctetStream)
}
}
ctx.Resp.Header().Set("Content-Security-Policy", "default-src 'none'; style-src 'unsafe-inline'; sandbox")
} else {
ctx.Resp.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, name))
}
Expand Down