Compare commits
3
Commits
v0.5.1
...
3ef84c0c83
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3ef84c0c83 | ||
|
|
c3f466565d | ||
|
|
1bfefe079e |
@@ -451,6 +451,14 @@ func (a *apiServer) handleRaw(w http.ResponseWriter, r *http.Request) {
|
||||
http.Error(w, "not found", 404)
|
||||
return
|
||||
}
|
||||
// #221: an attachment paste has no text content; raw view must serve the
|
||||
// file itself, not empty text. Redirect to the /f/ serving route, which
|
||||
// applies the same sniffed-mime + disposition safety rules.
|
||||
if att, err := a.store.GetAttachmentForPaste(row.ID); err == nil && att != nil {
|
||||
a.store.IncrementViews(row.ID, "", 0) // raw views always count (#49/#95)
|
||||
http.Redirect(w, r, "/f/"+att.ID+"/"+att.Filename, http.StatusFound)
|
||||
return
|
||||
}
|
||||
// #34: content_type is attacker-controlled via the create API. Serving it
|
||||
// verbatim let a paste be stored with text/html (or image/svg+xml) and
|
||||
// render as active content on this origin when fetched from /raw —
|
||||
|
||||
@@ -809,7 +809,7 @@ button[type="submit"]:focus-visible,
|
||||
font-size: 22px; padding: 0 4px; border-radius: var(--radius-sm);
|
||||
}
|
||||
.file-chip .file-chip-remove:hover { color: var(--danger, #c0392b); }
|
||||
.attachment-bar { display: flex; flex-direction: column; gap: 10px; }
|
||||
.attachment-bar { display: flex; flex-direction: column; gap: 10px; padding: 12px; }
|
||||
.attachment-chip {
|
||||
display: inline-flex; align-items: center; gap: 12px; align-self: flex-start;
|
||||
border: 1px solid var(--border); border-radius: var(--radius);
|
||||
@@ -818,7 +818,15 @@ button[type="submit"]:focus-visible,
|
||||
}
|
||||
.attachment-chip:hover { border-color: var(--accent); }
|
||||
.attachment-chip .attachment-size { color: var(--muted-fg); font-size: 19px; }
|
||||
.attachment-preview img { max-width: 480px; max-height: 360px; border-radius: var(--radius); border: 1px solid var(--border); }
|
||||
/* #221: image pastes scale to fit the viewer box (no text box below), and
|
||||
the link pill sits above the image without drifting out of place. */
|
||||
.attachment-bar.is-image { align-items: flex-start; }
|
||||
.attachment-bar.is-image .attachment-chip { max-width: 100%; }
|
||||
.attachment-preview { max-width: 100%; }
|
||||
.attachment-preview img {
|
||||
display: block; max-width: 100%; max-height: 70vh; width: auto; height: auto;
|
||||
object-fit: contain; border-radius: var(--radius); border: 1px solid var(--border);
|
||||
}
|
||||
|
||||
/* #139: CSP-safe replacements for inline style attributes (style-src 'self') */
|
||||
.hidden { display: none; }
|
||||
|
||||
@@ -38,20 +38,22 @@
|
||||
{{end}}
|
||||
{{if .Attachment}}
|
||||
<div class="float">
|
||||
<div class="attachment-bar">
|
||||
<div class="attachment-bar{{if .IsImagePaste}} is-image{{end}}">
|
||||
<a class="attachment-chip" href="/f/{{.Attachment.ID}}/{{.Attachment.Filename}}" data-mime="{{.Attachment.Mime}}">
|
||||
<span class="attachment-name">{{.Attachment.Filename}}</span>
|
||||
<span class="attachment-size">{{.Attachment.SizeHuman}}</span>
|
||||
</a>
|
||||
{{if or (eq .Attachment.Mime "image/png") (eq .Attachment.Mime "image/jpeg") (eq .Attachment.Mime "image/gif") (eq .Attachment.Mime "image/webp")}}
|
||||
{{if .IsImagePaste}}
|
||||
<div class="attachment-preview"><img src="/f/{{.Attachment.ID}}/{{.Attachment.Filename}}" alt="{{.Attachment.Filename}}"></div>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
{{end}}
|
||||
{{if not .IsImagePaste}}
|
||||
<div class="float">
|
||||
<div class="code" id="code"><div class="gutter" id="gutter">{{.Gutter}}</div><div class="codebody" id="codebody">{{.ContentHTML}}</div></div>
|
||||
</div>
|
||||
{{end}}
|
||||
</div>
|
||||
<input type="hidden" id="raw-content" value="{{.ContentAttr}}">
|
||||
<script src="/static/paste.js" defer data-paste-id="{{.ID}}"></script>
|
||||
|
||||
+30
-3
@@ -10,6 +10,7 @@ import (
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"html/template"
|
||||
"io"
|
||||
"io/fs"
|
||||
"log"
|
||||
"net/http"
|
||||
@@ -232,6 +233,10 @@ func (h *Handlers) renderPageStatus(w http.ResponseWriter, name string, status i
|
||||
}
|
||||
|
||||
func (h *Handlers) renderPaste(w http.ResponseWriter, row *store.PasteRow, justCreated bool, deletionToken string, readsRemaining *int) {
|
||||
// #221: a non-image attachment is real text; derive its line count from
|
||||
// the blob instead of the (empty) stored content, or details show 1 line.
|
||||
// Image pastes render no code box, so their line count is meaningless
|
||||
// and pinned to 1 below.
|
||||
lines := strings.Count(row.Content, "\n") + 1
|
||||
gutter := ""
|
||||
for i := 1; i <= lines; i++ {
|
||||
@@ -245,28 +250,50 @@ func (h *Handlers) renderPaste(w http.ResponseWriter, row *store.PasteRow, justC
|
||||
if lang == "" {
|
||||
lang = "text"
|
||||
}
|
||||
summary := fmt.Sprintf("%s · %s · %d views · %s", lang, humanSize(len(row.Content)), row.ViewCount, agoString(row.CreatedAt))
|
||||
// #38: one optional file attachment per paste; nil when none.
|
||||
attachment, err := h.Store.GetAttachmentForPaste(row.ID)
|
||||
if err != nil {
|
||||
http.Error(w, "db error", 500)
|
||||
return
|
||||
}
|
||||
// #221: for attachment pastes the stored text content is empty (the file
|
||||
// replaced it), so size must come from the attachment blob, not
|
||||
// len(row.Content), or the view details show a wrong size.
|
||||
sizeBytes := len(row.Content)
|
||||
if attachment != nil {
|
||||
sizeBytes = int(attachment.Size)
|
||||
// #221: the blob replaced the stored text. For non-image
|
||||
// attachments read the real text back to derive the line count
|
||||
// (details showed "1 line" for any attachment); image pastes
|
||||
// render no code box, so leave the meaningless 1.
|
||||
isImage := strings.HasPrefix(attachment.Mime, "image/")
|
||||
if !isImage {
|
||||
if rc, err := h.Store.Blobs().Get(attachment.PasteID + "/" + attachment.SHA256); err == nil {
|
||||
b, rerr := io.ReadAll(rc)
|
||||
rc.Close()
|
||||
if rerr == nil {
|
||||
lines = strings.Count(string(b), "\n") + 1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
summary := fmt.Sprintf("%s · %s · %d views · %s", lang, humanSize(sizeBytes), row.ViewCount, agoString(row.CreatedAt))
|
||||
data := map[string]any{
|
||||
"Page": "paste",
|
||||
"ID": row.ID,
|
||||
"Title": row.Title.String,
|
||||
"Language": row.Language.String,
|
||||
"StatsSummary": summary,
|
||||
"SizeHuman": humanSize(len(row.Content)),
|
||||
"SizeHuman": humanSize(sizeBytes),
|
||||
"HasPassword": row.PasswordHash.Valid,
|
||||
"BurnAfterRead": row.BurnAfterRead,
|
||||
"CustomSlug": row.CustomSlug.String,
|
||||
"IsImagePaste": attachment != nil && strings.HasPrefix(attachment.Mime, "image/"),
|
||||
"ContentHTML": template.HTML(langpkg.HighlightCode(row.Content, row.Language.String)), // safe: HighlightCode escapes all non-span text
|
||||
"ContentAttr": row.Content,
|
||||
"Gutter": strings.TrimSuffix(gutter, "\n"),
|
||||
"LineCount": lines,
|
||||
"SizeBytes": len(row.Content),
|
||||
"SizeBytes": sizeBytes,
|
||||
"CreatedAgo": agoString(row.CreatedAt),
|
||||
"CreatedAtUnix": row.CreatedAt,
|
||||
"ViewCount": row.ViewCount,
|
||||
|
||||
Reference in New Issue
Block a user