Merge pull request '#281: /raw/{id} returns empty body for non-image attachment pastes (Fix attempt 1)' (#286) from fix-281 into dev
CI / test (push) Successful in 32s
CI / docker (push) Successful in 43s

This commit was merged in pull request #286.
This commit is contained in:
fen
2026-09-18 01:33:45 +00:00
3 changed files with 68 additions and 15 deletions
+7 -4
View File
@@ -501,15 +501,18 @@ func (a *apiServer) handleRaw(w http.ResponseWriter, r *http.Request) {
http.Error(w, "not found", 404)
return
}
// #221: raw view of an image paste serves the image bytes themselves as
// an image, not the (empty) text content.
if att, err := a.store.GetAttachmentForPaste(row.ID); err == nil && att != nil && isImageMime(att.Mime) {
// #221: raw view of a paste backed by an attachment serves the stored
// blob bytes with the sniffed mime, not the (empty) text content — for
// ALL attachment mimes (#281); /raw/{id} is the raw fetch for the file
// too. serveContentType still forces active-content types (html, svg,
// xml) to text/plain per the #34 rule below.
if att, err := a.store.GetAttachmentForPaste(row.ID); err == nil && att != nil {
blobs := a.store.Blobs()
if blobs != nil {
if blob, err := blobs.Get(row.ID + "/" + att.SHA256); err == nil {
defer blob.Close()
a.store.IncrementViews(row.ID, "", 0) // raw views always count (#49/#95)
w.Header().Set("Content-Type", att.Mime)
w.Header().Set("Content-Type", serveContentType(att.Mime))
w.Header().Set("X-Content-Type-Options", "nosniff")
w.Header().Set("Content-Length", fmt.Sprintf("%d", att.Size))
http.ServeContent(w, r, "", time.Unix(att.CreatedAt, 0), blob)