Compare commits
198
Commits
0ceeabc810
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a8a953e4bf | ||
|
|
feb36fc501 | ||
|
|
ce14c6b713 | ||
|
|
d87b93819b | ||
|
|
73c06b864a | ||
|
|
a3abf7c73e | ||
|
|
6e85a7686d | ||
|
|
2046e45601 | ||
|
|
105ffc9f17 | ||
|
|
4fa60ea7b9 | ||
|
|
e87bdb221e | ||
|
|
aa72b4b38b | ||
|
|
cb1b16ae41 | ||
|
|
aac1725c25 | ||
|
|
880f3cd958 | ||
|
|
1149989d07 | ||
|
|
ed435c5e13 | ||
|
|
c190dd9ea6 | ||
|
|
d4da322031 | ||
|
|
eca8533d70 | ||
|
|
5770b2f88e | ||
|
|
8901a3c82c | ||
|
|
3460d54fce | ||
|
|
f63efc6d88 | ||
|
|
bc52f0a608 | ||
|
|
84d19556fc | ||
|
|
f3fe2335d4 | ||
|
|
fe5960f803 | ||
|
|
70b06db192 | ||
|
|
7fdb3ee61c | ||
|
|
ad397b80d0 | ||
|
|
714b4691e9 | ||
|
|
ca0e51192a | ||
|
|
75264ee9f4 | ||
|
|
2a55f50d87 | ||
|
|
b2fd5d548d | ||
|
|
c9ad84f523 | ||
|
|
25906612f6 | ||
|
|
928907dc9d | ||
|
|
9fe64e0928 | ||
|
|
60784386ab | ||
|
|
a4118b92a9 | ||
|
|
11cf7428eb | ||
|
|
1872dac8b4 | ||
|
|
4050f1362e | ||
|
|
f94a813d79 | ||
|
|
cdf9136866 | ||
|
|
4abc8ec202 | ||
|
|
ca54653a11 | ||
|
|
c91d0e53ca | ||
|
|
ee0cd7dcbd | ||
|
|
a4e1abfaae | ||
|
|
d25e20733e | ||
|
|
ca785f5648 | ||
|
|
91757752b8 | ||
|
|
bb2c5e200c | ||
|
|
8474b8eb02 | ||
|
|
e81f825ab8 | ||
|
|
3d50a264ed | ||
|
|
522e016a29 | ||
|
|
cf6e52bcc5 | ||
|
|
3a8f528693 | ||
|
|
ed22579bed | ||
|
|
7ee3ffbfc9 | ||
|
|
53e7a97c44 | ||
|
|
e7ecb9789b | ||
|
|
3c5ccfb787 | ||
|
|
1f745b6e59 | ||
|
|
a9f94ce806 | ||
|
|
dbcdd1b7cd | ||
|
|
c89d064eb8 | ||
|
|
9c0bd7abb9 | ||
|
|
f25ed8bc5d | ||
|
|
9490b8d25a | ||
|
|
b840bffeba | ||
|
|
5075374abe | ||
|
|
0008b8ce0c | ||
|
|
1dd8a3b28a | ||
|
|
9a5eaed00b | ||
|
|
785fafcaf9 | ||
|
|
ca59c19fa4 | ||
|
|
e059ca1554 | ||
|
|
86eb821780 | ||
|
|
e589428315 | ||
|
|
d18bbb7064 | ||
|
|
cb58a51bab | ||
|
|
98ea7eefa9 | ||
|
|
44cff7e718 | ||
|
|
fa702eb8b1 | ||
|
|
7c7e60375c | ||
|
|
700b8252f0 | ||
|
|
89a9c173ca | ||
|
|
13884ca786 | ||
|
|
7cffd21df9 | ||
|
|
5034f156ee | ||
|
|
6951470bda | ||
|
|
c320fa03c9 | ||
|
|
672288e60b | ||
|
|
5039a76bec | ||
|
|
a49127eff2 | ||
|
|
8636a23f49 | ||
|
|
348f792c73 | ||
|
|
5c6cd40539 | ||
|
|
ec791cc2db | ||
|
|
23cf3151c4 | ||
|
|
f1665f1b31 | ||
|
|
e1056df747 | ||
|
|
5fdb34a059 | ||
|
|
734d656f0c | ||
|
|
8042116a69 | ||
|
|
d77f1faf67 | ||
|
|
2149fcc2e1 | ||
|
|
e430eb57b7 | ||
|
|
1f5e671a43 | ||
|
|
b603b29359 | ||
|
|
2a21251c47 | ||
|
|
179eb17da9 | ||
|
|
bb72e09f8f | ||
|
|
6c1bfaf15e | ||
|
|
9621faa052 | ||
|
|
1a8da8cd7a | ||
|
|
368620eb15 | ||
|
|
5fa728f276 | ||
|
|
80e761f53d | ||
|
|
158c0fe4b6 | ||
|
|
02fcb80b6d | ||
|
|
f947415b23 | ||
|
|
f6c7bfa66b | ||
|
|
0e5cfcd403 | ||
|
|
d402113f19 | ||
|
|
bb7251bd25 | ||
|
|
9692531a40 | ||
|
|
b801d7fb56 | ||
|
|
362a59690f | ||
|
|
0643ca433e | ||
|
|
6064404723 | ||
|
|
aa4d017631 | ||
|
|
dee062dfa5 | ||
|
|
6ef0de6e19 | ||
|
|
28a79b20ea | ||
|
|
3fa2c93e22 | ||
|
|
bead90699d | ||
|
|
d7fb87f19b | ||
|
|
b9153c1d95 | ||
|
|
51685f8667 | ||
|
|
269acf1fa5 | ||
|
|
122c1e14f4 | ||
|
|
9712926cf5 | ||
|
|
5fc5ae8aad | ||
|
|
5dba356264 | ||
|
|
4683b8b542 | ||
|
|
16cad8796f | ||
|
|
317ed2137a | ||
|
|
93fea6ad1c | ||
|
|
0787871f2b | ||
|
|
85dcaea522 | ||
|
|
c4d55cb196 | ||
|
|
5a227e2feb | ||
|
|
7a74ff3e74 | ||
|
|
fc07d8b9d7 | ||
|
|
b30d41b87d | ||
|
|
ca77250cce | ||
|
|
521b6f8011 | ||
|
|
fe75dfc746 | ||
|
|
00aaafeb3c | ||
|
|
d7b51f02b6 | ||
|
|
b0a58d6ca5 | ||
|
|
747eba7064 | ||
|
|
33ccfd373a | ||
|
|
72dbfb1b3c | ||
|
|
d44e4d1587 | ||
|
|
d013f3965f | ||
|
|
22c66243d5 | ||
|
|
98222e762f | ||
|
|
a95ee57000 | ||
|
|
b096c2073c | ||
|
|
4d50e644b9 | ||
|
|
8abf821ce9 | ||
|
|
da9039b606 | ||
|
|
7dc70d62f6 | ||
|
|
0073335875 | ||
|
|
fa2e9b1bb5 | ||
|
|
9f4ed91b8f | ||
|
|
24482abccc | ||
|
|
7cc6a9c706 | ||
|
|
19cb8d1d45 | ||
|
|
4948ef9f1c | ||
|
|
dcf2d66a82 | ||
|
|
821f49993f | ||
|
|
f1b5dd0364 | ||
|
|
8eabeb4839 | ||
|
|
7ed50087a6 | ||
|
|
8104cdba4c | ||
|
|
be3ff81e5c | ||
|
|
1e317d11da | ||
|
|
2ce50a6393 | ||
|
|
70c284b15d | ||
|
|
8dde83ff68 |
@@ -4,3 +4,4 @@ palette.db-shm
|
|||||||
palette.db-wal
|
palette.db-wal
|
||||||
admin-key
|
admin-key
|
||||||
settings.json
|
settings.json
|
||||||
|
:memory:.files/
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# Palette
|
# Palette
|
||||||
|
|
||||||
Palette is a fast, self-hosted pastebin. One Go binary, a SQLite database, and
|
Palette is a fast, self-hosted pastebin. One Go binary, a SQLite database, and
|
||||||
a web UI for sharing text and small files
|
a web UI for sharing text and small files.
|
||||||
|
|
||||||
> [!NOTE]
|
> [!NOTE]
|
||||||
> <table><tr><td>
|
> <table><tr><td>
|
||||||
@@ -10,22 +10,27 @@ a web UI for sharing text and small files
|
|||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
- Multiple files in one paste
|
- Text pastes and cans (multiple items in one share)
|
||||||
|
- File attachments (one file per paste, up to 25 MB)
|
||||||
- Password protected pastes
|
- Password protected pastes
|
||||||
- Expir after a specified time
|
- Expire after a specified time
|
||||||
- Burn after a number of views
|
- Burn after a number of views
|
||||||
- Custom URLs
|
- Custom URLs
|
||||||
- Syntax highlighting with language auto-detection (go-enry)
|
- Syntax highlighting with language auto-detection (go-enry)
|
||||||
- Local cookie based submission history
|
- Public paste listing with search, sort and pagination
|
||||||
- Cookie based settings
|
- Cookie based saved pastes and settings
|
||||||
- Themes!
|
- Five base themes (midnight, smooth, pastel-lavender, pastel-peach, pastel-cloud), each with a dark and light variant
|
||||||
|
- Dark mode toggle in the topbar and settings, with a configurable default
|
||||||
|
- Polished code viewer: line-number gutter sized to the widest number and pinned during horizontal scroll, optional line wrap, jump-to-top/bottom buttons, and theme-aware scrollbars
|
||||||
|
|
||||||
## Screenshots
|
## Screenshots
|
||||||
|
|
||||||
| | |
|
| | |
|
||||||
|---|---|
|
|---|---|
|
||||||
|  |  |
|
|  |  |
|
||||||
|  |  |
|
|  |  |
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Get Started
|
## Get Started
|
||||||
|
|
||||||
@@ -61,11 +66,13 @@ go build -o palette ./cmd/palette
|
|||||||
| `PALETTE_ADDR` | `:8080` | Listen address |
|
| `PALETTE_ADDR` | `:8080` | Listen address |
|
||||||
| `PALETTE_DB` | `palette.db` | SQLite database path |
|
| `PALETTE_DB` | `palette.db` | SQLite database path |
|
||||||
| `PALETTE_MAX_TEXT` | `5242880` | Max paste size in bytes (5 MB) |
|
| `PALETTE_MAX_TEXT` | `5242880` | Max paste size in bytes (5 MB) |
|
||||||
| `PALETTE_MAX_ITEM` | `26214400` | Max can item size in bytes (25 MB) |
|
| `PALETTE_MAX_ITEM` | `26214400` | Max can item / file attachment size in bytes (25 MB) |
|
||||||
| `PALETTE_ADMIN_KEY` | generated | Admin key; if unset a 32-char hex key is generated and persisted to `<db-dir>/admin-key` (0600) |
|
| `PALETTE_ADMIN_KEY` | generated | Admin key; if unset a 32-char hex key is generated and persisted to `<db-dir>/admin-key` (0600) |
|
||||||
|
| `PALETTE_DEFAULT_DARK` | dark on | Default dark mode for new visitors. Set `false`, `0`, or `off` to default to light mode. Visitors who toggle dark mode keep their choice in their browser. |
|
||||||
|
| `PALETTE_UNLOCK_SECRET` | random per start | HMAC secret for password-unlock cookies. Set a fixed value to keep unlock sessions across restarts or across replicas. |
|
||||||
|
|
||||||
An `/admin` page exists for runtime settings, protected by a key set at
|
An `/admin` page exists for runtime settings, protected by a key set at
|
||||||
install (`PALETTE_ADMIN_KEY` env var) and resettable locally — see
|
install (`PALETTE_ADMIN_KEY` env var) and resettable locally. See
|
||||||
[API](https://git.archfox.org/poslop/palette/wiki/API) and the [design docs](https://git.archfox.org/poslop/palette/wiki/Home) in the wiki for details.
|
[API](https://git.archfox.org/poslop/palette/wiki/API) and the [design docs](https://git.archfox.org/poslop/palette/wiki/Home) in the wiki for details.
|
||||||
|
|
||||||
## API
|
## API
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ func main() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
|
web.SetDefaultDark(os.Getenv("PALETTE_DEFAULT_DARK"))
|
||||||
srv := api.NewServer(st, cfg, ui, ss, adminKey)
|
srv := api.NewServer(st, cfg, ui, ss, adminKey)
|
||||||
log.Printf("palette listening on %s", cfg.Addr)
|
log.Printf("palette listening on %s", cfg.Addr)
|
||||||
log.Fatal(http.ListenAndServe(cfg.Addr, srv.Routes()))
|
log.Fatal(http.ListenAndServe(cfg.Addr, srv.Routes()))
|
||||||
|
|||||||
+7
-1
@@ -32,10 +32,16 @@ services:
|
|||||||
# Default: 5242880 (5 MiB).
|
# Default: 5242880 (5 MiB).
|
||||||
# PALETTE_MAX_TEXT: "5242880"
|
# PALETTE_MAX_TEXT: "5242880"
|
||||||
|
|
||||||
# Max size in bytes of a single can item (file/text inside a can).
|
# Max size in bytes of a single can item (file/text inside a can) or a
|
||||||
|
# paste file attachment.
|
||||||
# Default: 26214400 (25 MiB).
|
# Default: 26214400 (25 MiB).
|
||||||
# PALETTE_MAX_ITEM: "26214400"
|
# PALETTE_MAX_ITEM: "26214400"
|
||||||
|
|
||||||
|
# Default dark mode for new visitors. Unset = dark on; set to "false",
|
||||||
|
# "0" or "off" to default to light mode. Visitors who toggle dark mode
|
||||||
|
# keep their choice in their browser.
|
||||||
|
# PALETTE_DEFAULT_DARK: "false"
|
||||||
|
|
||||||
# HMAC secret for password-unlock cookies. Default: random per start,
|
# HMAC secret for password-unlock cookies. Default: random per start,
|
||||||
# which logs out every unlocked browser session on restart. Set a fixed
|
# which logs out every unlocked browser session on restart. Set a fixed
|
||||||
# secret (any random string) to keep unlock sessions across restarts,
|
# secret (any random string) to keep unlock sessions across restarts,
|
||||||
|
|||||||
@@ -160,13 +160,12 @@ func HandleResetAdminKey(dbPath string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// adminKeyOK reports whether the request carries the correct admin key via
|
// adminKeyOK reports whether the request carries the correct admin key via
|
||||||
// X-Admin-Key header or ?key=. Constant-time compare; failures and successes
|
// the X-Admin-Key header only. The ?key= query fallback was removed (#137):
|
||||||
// are both logged (#40).
|
// query strings land in access logs, browser history, and Referer headers,
|
||||||
|
// so accepting the key there leaked the admin secret. Constant-time compare;
|
||||||
|
// failures and successes are both logged (#40).
|
||||||
func (a *apiServer) adminKeyOK(r *http.Request, key string) bool {
|
func (a *apiServer) adminKeyOK(r *http.Request, key string) bool {
|
||||||
given := r.Header.Get("X-Admin-Key")
|
given := r.Header.Get("X-Admin-Key")
|
||||||
if given == "" {
|
|
||||||
given = r.URL.Query().Get("key")
|
|
||||||
}
|
|
||||||
return subtle.ConstantTimeCompare([]byte(given), []byte(key)) == 1
|
return subtle.ConstantTimeCompare([]byte(given), []byte(key)) == 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -37,11 +37,12 @@ func TestAdminAuth(t *testing.T) {
|
|||||||
t.Fatalf("wrong key: expected 401, got %d", rec.Code)
|
t.Fatalf("wrong key: expected 401, got %d", rec.Code)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// #137: the ?key= query fallback was removed; keys must go via header.
|
||||||
req = httptest.NewRequest("GET", "/admin/api/settings?key=test-admin-key", nil)
|
req = httptest.NewRequest("GET", "/admin/api/settings?key=test-admin-key", nil)
|
||||||
rec = httptest.NewRecorder()
|
rec = httptest.NewRecorder()
|
||||||
h.ServeHTTP(rec, req)
|
h.ServeHTTP(rec, req)
|
||||||
if rec.Code != 200 {
|
if rec.Code != 401 {
|
||||||
t.Fatalf("query key: expected 200, got %d", rec.Code)
|
t.Fatalf("query key: expected 401 after #137 removal, got %d", rec.Code)
|
||||||
}
|
}
|
||||||
|
|
||||||
req = httptest.NewRequest("GET", "/admin/api/settings", nil)
|
req = httptest.NewRequest("GET", "/admin/api/settings", nil)
|
||||||
|
|||||||
@@ -0,0 +1,352 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/go-chi/chi/v5"
|
||||||
|
|
||||||
|
"palette/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// #38: file attachments, iteration 1: one file per paste. A paste either has
|
||||||
|
// text content OR one attached file. Multipart create + /f/ serving route.
|
||||||
|
|
||||||
|
const (
|
||||||
|
MaxAttachmentBytes = 25 << 20 // 25 MB per file
|
||||||
|
maxFileBytesHard = MaxAttachmentBytes + 1<<20 // sniff headroom; over this reject before reading it all
|
||||||
|
)
|
||||||
|
|
||||||
|
// sniffMime runs http.DetectContentType on the first 512 bytes (and any
|
||||||
|
// remainder of the head) of r, returning the sniffed mime and a reader that
|
||||||
|
// replays the full stream. Mime is NEVER taken from the client.
|
||||||
|
func sniffMime(r io.Reader) (string, io.Reader, error) {
|
||||||
|
head := make([]byte, 512)
|
||||||
|
n, err := io.ReadFull(r, head)
|
||||||
|
if err != nil && err != io.ErrUnexpectedEOF && err != io.EOF {
|
||||||
|
return "", nil, err
|
||||||
|
}
|
||||||
|
head = head[:n]
|
||||||
|
mime := http.DetectContentType(head)
|
||||||
|
return mime, io.MultiReader(bytes.NewReader(head), r), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// sanitizeMimeForServing maps the stored (sniffed) mime to the Content-Type
|
||||||
|
// used on /f/. Active-content types (html, svg, xml...) are forced to
|
||||||
|
// text/plain — same rule as the /raw #34 fix — so a malicious upload can
|
||||||
|
// never execute on this origin.
|
||||||
|
func serveContentType(mime string) string {
|
||||||
|
base := mime
|
||||||
|
if i := strings.IndexByte(mime, ';'); i >= 0 {
|
||||||
|
base = strings.TrimSpace(mime[:i])
|
||||||
|
}
|
||||||
|
base = strings.ToLower(base)
|
||||||
|
switch base {
|
||||||
|
case "text/html", "image/svg+xml", "application/xhtml+xml", "text/xml",
|
||||||
|
"application/xml", "application/xhtml", "image/xml+svg":
|
||||||
|
return "text/plain; charset=utf-8"
|
||||||
|
}
|
||||||
|
return mime
|
||||||
|
}
|
||||||
|
|
||||||
|
// inlineable reports whether the sniffed mime is safe to render inline
|
||||||
|
// (Content-Disposition: inline); everything else downloads as an attachment.
|
||||||
|
func inlineable(mime string) bool {
|
||||||
|
base := mime
|
||||||
|
if i := strings.IndexByte(mime, ';'); i >= 0 {
|
||||||
|
base = strings.TrimSpace(mime[:i])
|
||||||
|
}
|
||||||
|
base = strings.ToLower(base)
|
||||||
|
switch {
|
||||||
|
case strings.HasPrefix(base, "image/"), base == "application/pdf":
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// mime/multipart parts are fully read during parsing (the multipart reader
|
||||||
|
// closes each part when advancing) and the mime is sniffed from bytes.
|
||||||
|
|
||||||
|
// limitAttachment rejects reads past the 25 MB per-file cap server-side.
|
||||||
|
type limitReader struct {
|
||||||
|
r io.Reader
|
||||||
|
n int64
|
||||||
|
max int64
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *limitReader) Read(p []byte) (int, error) {
|
||||||
|
if l.n > l.max {
|
||||||
|
return 0, store.ErrFileTooLarge
|
||||||
|
}
|
||||||
|
n, err := l.r.Read(p)
|
||||||
|
l.n += int64(n)
|
||||||
|
if l.n > l.max && err == nil {
|
||||||
|
err = store.ErrFileTooLarge
|
||||||
|
}
|
||||||
|
return n, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleCreatePasteMultipart implements POST /api/pastes with
|
||||||
|
// multipart/form-data (#38). Fields mirror the JSON create path; a 'file'
|
||||||
|
// part makes the paste a file paste (1 file = 1 paste: if text content is
|
||||||
|
// also present, the file wins and the text is ignored — simplest correct
|
||||||
|
// behavior, documented in the PR).
|
||||||
|
func (a *apiServer) handleCreatePasteMultipart(w http.ResponseWriter, r *http.Request, s Settings) {
|
||||||
|
blobs := a.store.Blobs()
|
||||||
|
if blobs == nil {
|
||||||
|
writeErr(w, 500, "blob storage unavailable")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// guard the raw body: 25 MB file + multipart overhead headroom
|
||||||
|
mr, err := r.MultipartReader()
|
||||||
|
if err != nil {
|
||||||
|
writeErr(w, 400, "invalid multipart body")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var (
|
||||||
|
p store.Paste
|
||||||
|
fileSeen bool
|
||||||
|
att store.Attachment
|
||||||
|
fileBody io.Reader
|
||||||
|
)
|
||||||
|
for {
|
||||||
|
part, err := mr.NextPart()
|
||||||
|
if err == io.EOF {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
if isBodyTooLarge(err) {
|
||||||
|
writeErrCode(w, http.StatusRequestEntityTooLarge, "content_too_large", "request body too large")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
writeErr(w, 400, "invalid multipart body")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
name := part.FormName()
|
||||||
|
if name == "file" {
|
||||||
|
if fileSeen {
|
||||||
|
writeErrCode(w, 400, "one_file_only", "Choose either text or a file for now. Only one file per paste.")
|
||||||
|
part.Close()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// The part must be fully read during parsing: the multipart
|
||||||
|
// reader closes it as soon as the next part is fetched. Read it
|
||||||
|
// here into memory (bounded by the 25 MB cap) and sniff the mime
|
||||||
|
// from the content, never from client headers.
|
||||||
|
limited := io.LimitReader(part, MaxAttachmentBytes+1)
|
||||||
|
raw, err := io.ReadAll(limited)
|
||||||
|
part.Close()
|
||||||
|
if err != nil {
|
||||||
|
writeErr(w, 400, "invalid file part")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if int64(len(raw)) > MaxAttachmentBytes {
|
||||||
|
writeErrCode(w, http.StatusRequestEntityTooLarge, "file_too_large",
|
||||||
|
"File is too large. The limit is 25 MB.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if len(raw) == 0 {
|
||||||
|
writeErrCode(w, 400, "content_empty", "The file is empty.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
filename := store.SanitizeFilename(part.FileName())
|
||||||
|
mime := http.DetectContentType(raw[:min(512, len(raw))])
|
||||||
|
att = store.Attachment{PasteID: "pending", Filename: filename, Mime: mime}
|
||||||
|
fileBody = bytes.NewReader(raw)
|
||||||
|
fileSeen = true
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
val, err := io.ReadAll(io.LimitReader(part, 1<<16))
|
||||||
|
part.Close()
|
||||||
|
if err != nil {
|
||||||
|
writeErr(w, 400, "invalid multipart field")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
v := string(val)
|
||||||
|
switch name {
|
||||||
|
case "content":
|
||||||
|
p.Content = v
|
||||||
|
case "title":
|
||||||
|
p.Title = &v
|
||||||
|
case "language":
|
||||||
|
p.Language = &v
|
||||||
|
case "custom_slug":
|
||||||
|
p.CustomSlug = &v
|
||||||
|
case "password":
|
||||||
|
p.Password = &v
|
||||||
|
case "expires_in":
|
||||||
|
p.ExpiresIn = &v
|
||||||
|
case "visibility":
|
||||||
|
p.Visibility = v
|
||||||
|
case "burn_after_read":
|
||||||
|
p.BurnAfterRead = v == "true" || v == "1" || v == "on"
|
||||||
|
case "burn_after_reads":
|
||||||
|
if n, err := strconv.Atoi(v); err == nil {
|
||||||
|
p.BurnAfterReads = &n
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if fileSeen {
|
||||||
|
// 1 file = 1 paste: the file replaces text content.
|
||||||
|
p.Content = ""
|
||||||
|
} else if status, msg := checkContent(p.Content, s.MaxContentBytes); status != 0 {
|
||||||
|
if status == http.StatusRequestEntityTooLarge {
|
||||||
|
writeErrCode(w, status, "content_too_large", msg)
|
||||||
|
} else {
|
||||||
|
writeErrCode(w, status, "content_empty", msg)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// #86 metadata bounds + default expiry: same rules as the JSON path
|
||||||
|
if p.Title != nil {
|
||||||
|
t, err := checkTitle(*p.Title)
|
||||||
|
if err != nil {
|
||||||
|
writeErr(w, 400, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
p.Title = &t
|
||||||
|
}
|
||||||
|
if p.Language != nil {
|
||||||
|
l, err := checkLanguage(*p.Language)
|
||||||
|
if err != nil {
|
||||||
|
writeErr(w, 400, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if l == "" {
|
||||||
|
p.Language = nil
|
||||||
|
} else {
|
||||||
|
p.Language = &l
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if p.BurnAfterReads != nil {
|
||||||
|
if err := parseBurnAfterReads(*p.BurnAfterReads); err != nil {
|
||||||
|
writeErr(w, 400, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (p.ExpiresIn == nil || *p.ExpiresIn == "") && s.DefaultExpiry != "" {
|
||||||
|
def := s.DefaultExpiry
|
||||||
|
p.ExpiresIn = &def
|
||||||
|
}
|
||||||
|
p.ViewerID = currentViewerID(r)
|
||||||
|
|
||||||
|
created, err := a.store.CreatePaste(&p)
|
||||||
|
if err != nil {
|
||||||
|
writeErrCode(w, 400, createErrCode(err), err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
setDeletionTokenCookie(w, created.ID, created.DeletionToken) // #143
|
||||||
|
resp := map[string]any{
|
||||||
|
"id": created.ID,
|
||||||
|
"deletion_token": created.DeletionToken,
|
||||||
|
"url": "/" + created.ID,
|
||||||
|
"raw_url": "/raw/" + created.ID,
|
||||||
|
"api_url": "/api/pastes/" + created.ID,
|
||||||
|
"expires_at": created.ExpiresAt,
|
||||||
|
"created_at": created.CreatedAt,
|
||||||
|
"rate_limit": map[string]int{"create_per_sec": 1, "burst": 5},
|
||||||
|
}
|
||||||
|
|
||||||
|
if fileSeen {
|
||||||
|
att.PasteID = created.ID
|
||||||
|
// size pre-check happens inside the limited read; re-run with limit
|
||||||
|
// enforced so oversized uploads fail before the blob is stored.
|
||||||
|
err := a.store.CreateAttachment(&att, fileBody, blobs)
|
||||||
|
if err == store.ErrFileTooLarge {
|
||||||
|
a.store.SoftDelete(created.ID)
|
||||||
|
writeErrCode(w, http.StatusRequestEntityTooLarge, "file_too_large",
|
||||||
|
"File is too large. The limit is 25 MB.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
a.store.SoftDelete(created.ID)
|
||||||
|
writeErr(w, 500, "could not store file")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
resp["attachment"] = map[string]any{
|
||||||
|
"id": att.ID,
|
||||||
|
"filename": att.Filename,
|
||||||
|
"mime": att.Mime,
|
||||||
|
"size": att.Size,
|
||||||
|
"sha256": att.SHA256,
|
||||||
|
"url": "/f/" + att.ID + "/" + att.Filename,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
writeJSON(w, 201, resp)
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleServeAttachment serves GET /f/{attachment-id}/{filename} with the
|
||||||
|
// stored (server-sniffed) mime, nosniff, and a safe Content-Disposition.
|
||||||
|
// The filename path segment is decorative; lookups key on the attachment id.
|
||||||
|
func (a *apiServer) handleServeAttachment(w http.ResponseWriter, r *http.Request) {
|
||||||
|
id := chi.URLParam(r, "aid")
|
||||||
|
att, err := a.store.GetAttachment(id)
|
||||||
|
if err != nil {
|
||||||
|
writeErr(w, 500, "db error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if att == nil {
|
||||||
|
writeErr(w, 404, "attachment not found")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// attachment inherits the paste's lifecycle: gone if the paste is gone
|
||||||
|
row, err := a.store.GetPaste(att.PasteID)
|
||||||
|
if err != nil || row == nil {
|
||||||
|
writeErr(w, 404, "attachment not found")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if row.ExpiresAt.Valid && row.ExpiresAt.Int64 < time.Now().Unix() {
|
||||||
|
writeErr(w, 404, "attachment not found")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if row.Burned() {
|
||||||
|
writeErr(w, 404, "attachment not found")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
blobs := a.store.Blobs()
|
||||||
|
if blobs == nil {
|
||||||
|
writeErr(w, 500, "blob storage unavailable")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
blob, err := blobs.Get(att.PasteID + "/" + att.SHA256)
|
||||||
|
if err != nil {
|
||||||
|
writeErr(w, 404, "attachment not found")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer blob.Close()
|
||||||
|
|
||||||
|
ct := serveContentType(att.Mime)
|
||||||
|
w.Header().Set("Content-Type", ct)
|
||||||
|
w.Header().Set("X-Content-Type-Options", "nosniff")
|
||||||
|
disposition := "attachment"
|
||||||
|
if inlineable(att.Mime) {
|
||||||
|
disposition = "inline"
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Disposition",
|
||||||
|
fmt.Sprintf(`%s; filename="%s"`, disposition, asciiFilename(att.Filename)))
|
||||||
|
w.Header().Set("Content-Length", fmt.Sprintf("%d", att.Size))
|
||||||
|
http.ServeContent(w, r, "", time.Unix(att.CreatedAt, 0), blob)
|
||||||
|
}
|
||||||
|
|
||||||
|
// asciiFilename quotes a filename for the Content-Disposition header,
|
||||||
|
// escaping quotes and backslashes and dropping non-ASCII bytes.
|
||||||
|
func asciiFilename(name string) string {
|
||||||
|
var b strings.Builder
|
||||||
|
for _, r := range name {
|
||||||
|
if r < 128 && r != '"' && r != '\\' && r > 31 {
|
||||||
|
b.WriteRune(r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if b.Len() == 0 {
|
||||||
|
return "file"
|
||||||
|
}
|
||||||
|
return b.String()
|
||||||
|
}
|
||||||
@@ -0,0 +1,369 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"mime/multipart"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"palette/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// multipartCreate posts a multipart create to the routes handler; extra
|
||||||
|
// fields are appended as text parts. Returns recorder and parsed response.
|
||||||
|
func multipartCreate(t *testing.T, h http.Handler, filename string, content []byte, fields map[string]string) (*httptest.ResponseRecorder, map[string]any) {
|
||||||
|
t.Helper()
|
||||||
|
var buf bytes.Buffer
|
||||||
|
mw := multipart.NewWriter(&buf)
|
||||||
|
if filename != "" {
|
||||||
|
fw, _ := mw.CreateFormFile("file", filename)
|
||||||
|
fw.Write(content)
|
||||||
|
}
|
||||||
|
for k, v := range fields {
|
||||||
|
mw.WriteField(k, v)
|
||||||
|
}
|
||||||
|
mw.Close()
|
||||||
|
req := httptest.NewRequest("POST", "/api/pastes", &buf)
|
||||||
|
req.Header.Set("Content-Type", mw.FormDataContentType())
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
var resp map[string]any
|
||||||
|
json.Unmarshal(rec.Body.Bytes(), &resp)
|
||||||
|
return rec, resp
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMultipartAttachmentCreateAndServe(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
|
||||||
|
png := append([]byte("\x89PNG\r\n\x1a\n"), bytes.Repeat([]byte{0, 1, 2, 3}, 32)...)
|
||||||
|
rec, resp := multipartCreate(t, h, "shot.png", png, map[string]string{"title": "with file"})
|
||||||
|
if rec.Code != 201 {
|
||||||
|
t.Fatalf("create: %d %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
att, _ := resp["attachment"].(map[string]any)
|
||||||
|
if att == nil {
|
||||||
|
t.Fatalf("no attachment in response: %v", resp)
|
||||||
|
}
|
||||||
|
id, _ := att["id"].(string)
|
||||||
|
url, _ := att["url"].(string)
|
||||||
|
if url != "/f/"+id+"/shot.png" {
|
||||||
|
t.Fatalf("attachment url = %q", url)
|
||||||
|
}
|
||||||
|
if att["mime"] != "image/png" {
|
||||||
|
t.Fatalf("sniffed mime = %v want image/png", att["mime"])
|
||||||
|
}
|
||||||
|
|
||||||
|
// serve: image mime -> inline, nosniff, stored bytes
|
||||||
|
req := httptest.NewRequest("GET", url, nil)
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec2, req)
|
||||||
|
if rec2.Code != 200 {
|
||||||
|
t.Fatalf("serve: %d %s", rec2.Code, rec2.Body.String())
|
||||||
|
}
|
||||||
|
if got := rec2.Header().Get("Content-Type"); got != "image/png" {
|
||||||
|
t.Fatalf("Content-Type = %q", got)
|
||||||
|
}
|
||||||
|
if got := rec2.Header().Get("X-Content-Type-Options"); got != "nosniff" {
|
||||||
|
t.Fatalf("nosniff = %q", got)
|
||||||
|
}
|
||||||
|
if got := rec2.Header().Get("Content-Disposition"); !strings.HasPrefix(got, "inline") {
|
||||||
|
t.Fatalf("Content-Disposition = %q", got)
|
||||||
|
}
|
||||||
|
if !bytes.Equal(rec2.Body.Bytes(), png) {
|
||||||
|
t.Fatal("served bytes differ from upload")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMultipartFileReplacesText(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
rec, resp := multipartCreate(t, h, "notes.txt", []byte("file body"), map[string]string{"content": "some text"})
|
||||||
|
if rec.Code != 201 {
|
||||||
|
t.Fatalf("create: %d %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
id, _ := resp["id"].(string)
|
||||||
|
req := httptest.NewRequest("GET", "/api/pastes/"+id, nil)
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec2, req)
|
||||||
|
var got map[string]any
|
||||||
|
json.Unmarshal(rec2.Body.Bytes(), &got)
|
||||||
|
if got["content"] != "" {
|
||||||
|
t.Fatalf("content should be empty when file provided, got %v", got["content"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMultipartSecondFileRejected(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
var buf bytes.Buffer
|
||||||
|
mw := multipart.NewWriter(&buf)
|
||||||
|
for _, name := range []string{"a.txt", "b.txt"} {
|
||||||
|
fw, _ := mw.CreateFormFile("file", name)
|
||||||
|
fw.Write([]byte("x"))
|
||||||
|
}
|
||||||
|
mw.Close()
|
||||||
|
req := httptest.NewRequest("POST", "/api/pastes", &buf)
|
||||||
|
req.Header.Set("Content-Type", mw.FormDataContentType())
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
if rec.Code != 400 {
|
||||||
|
t.Fatalf("two files: got %d want 400", rec.Code)
|
||||||
|
}
|
||||||
|
if !strings.Contains(rec.Body.String(), "one_file_only") {
|
||||||
|
t.Fatalf("error code missing: %s", rec.Body.String())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMultipartHtmlUploadServesAsPlainText(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
html := []byte("<html><script>alert(1)</script></html>")
|
||||||
|
rec, resp := multipartCreate(t, h, "page.html", html, nil)
|
||||||
|
if rec.Code != 201 {
|
||||||
|
t.Fatalf("create: %d %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
url, _ := resp["attachment"].(map[string]any)["url"].(string)
|
||||||
|
req := httptest.NewRequest("GET", url, nil)
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec2, req)
|
||||||
|
if got := rec2.Header().Get("Content-Type"); got != "text/plain; charset=utf-8" {
|
||||||
|
t.Fatalf("html served as %q, want text/plain", got)
|
||||||
|
}
|
||||||
|
if got := rec2.Header().Get("Content-Disposition"); !strings.HasPrefix(got, "attachment") {
|
||||||
|
t.Fatalf("html Content-Disposition = %q, want attachment", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMultipartSvgUploadServesAsPlainText(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
svg := []byte(`<?xml version="1.0"?><svg xmlns="http://www.w3.org/2000/svg"><script>alert(1)</script></svg>`)
|
||||||
|
rec, resp := multipartCreate(t, h, "evil.svg", svg, nil)
|
||||||
|
if rec.Code != 201 {
|
||||||
|
t.Fatalf("create: %d %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
url, _ := resp["attachment"].(map[string]any)["url"].(string)
|
||||||
|
req := httptest.NewRequest("GET", url, nil)
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec2, req)
|
||||||
|
ct := rec2.Header().Get("Content-Type")
|
||||||
|
if strings.Contains(ct, "svg") || strings.Contains(ct, "html") {
|
||||||
|
t.Fatalf("svg served as %q", ct)
|
||||||
|
}
|
||||||
|
if ct != "text/plain; charset=utf-8" {
|
||||||
|
t.Fatalf("svg Content-Type = %q", ct)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMultipartClientMimeIgnored(t *testing.T) {
|
||||||
|
// client claims image/png; server must sniff the real type (text)
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
var buf bytes.Buffer
|
||||||
|
mw := multipart.NewWriter(&buf)
|
||||||
|
fw, _ := mw.CreateFormFile("file", "fake.png")
|
||||||
|
fw.Write([]byte("just plain text, definitely not a png"))
|
||||||
|
// note: CreateFormFile sets Content-Type: application/octet-stream; the
|
||||||
|
// sniffed type for text content is text/plain either way.
|
||||||
|
mw.Close()
|
||||||
|
req := httptest.NewRequest("POST", "/api/pastes", &buf)
|
||||||
|
req.Header.Set("Content-Type", mw.FormDataContentType())
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
if rec.Code != 201 {
|
||||||
|
t.Fatalf("create: %d %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
var resp map[string]any
|
||||||
|
json.Unmarshal(rec.Body.Bytes(), &resp)
|
||||||
|
att := resp["attachment"].(map[string]any)
|
||||||
|
if att["mime"] != "text/plain; charset=utf-8" && att["mime"] != "text/plain" {
|
||||||
|
t.Fatalf("mime = %v, want sniffed text/plain", att["mime"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMultipartOversizeRejected(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
big := bytes.Repeat([]byte("A"), MaxAttachmentBytes+1024)
|
||||||
|
rec, _ := multipartCreate(t, h, "big.bin", big, nil)
|
||||||
|
if rec.Code != http.StatusRequestEntityTooLarge {
|
||||||
|
t.Fatalf("oversize: got %d want 413", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMultipartExactlyAtLimitAccepted(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
exact := bytes.Repeat([]byte("A"), MaxAttachmentBytes)
|
||||||
|
rec, resp := multipartCreate(t, h, "exact.bin", exact, nil)
|
||||||
|
if rec.Code != 201 {
|
||||||
|
t.Fatalf("at-limit: got %d %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
att := resp["attachment"].(map[string]any)
|
||||||
|
if att["size"].(float64) != float64(MaxAttachmentBytes) {
|
||||||
|
t.Fatalf("size = %v", att["size"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMultipartEmptyFileRejected(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
rec, _ := multipartCreate(t, h, "empty.txt", nil, nil)
|
||||||
|
if rec.Code != 400 {
|
||||||
|
t.Fatalf("empty file: got %d want 400", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestServeAttachment404Missing(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
req := httptest.NewRequest("GET", "/f/zzzzzzzz/nonexistent.txt", nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
if rec.Code != 404 {
|
||||||
|
t.Fatalf("missing attachment: got %d want 404", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestServeAttachmentUnknownPaste404(t *testing.T) {
|
||||||
|
// attachment row referencing a paste that doesn't exist must 404, not leak
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
s.store.CreatePaste(&store.Paste{Content: "x"})
|
||||||
|
att := store.Attachment{PasteID: "ghost00", Filename: "f.txt", Mime: "text/plain"}
|
||||||
|
blobs := s.store.Blobs()
|
||||||
|
if err := s.store.CreateAttachment(&att, strings.NewReader("hello"), blobs); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
req := httptest.NewRequest("GET", "/f/"+att.ID+"/f.txt", nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
if rec.Code != 404 {
|
||||||
|
t.Fatalf("orphan attachment: got %d want 404", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestServeAttachmentPdfInline(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
pdf := []byte("%PDF-1.4\n%fake pdf body\n")
|
||||||
|
rec, resp := multipartCreate(t, h, "doc.pdf", pdf, nil)
|
||||||
|
if rec.Code != 201 {
|
||||||
|
t.Fatalf("create: %d %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
url, _ := resp["attachment"].(map[string]any)["url"].(string)
|
||||||
|
req := httptest.NewRequest("GET", url, nil)
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec2, req)
|
||||||
|
if got := rec2.Header().Get("Content-Type"); !strings.HasPrefix(got, "application/pdf") {
|
||||||
|
t.Fatalf("pdf Content-Type = %q", got)
|
||||||
|
}
|
||||||
|
if got := rec2.Header().Get("Content-Disposition"); !strings.HasPrefix(got, "inline") {
|
||||||
|
t.Fatalf("pdf Content-Disposition = %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestServeAttachmentBurnedPaste404(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
rec, resp := multipartCreate(t, h, "burn.txt", []byte("burn me"), nil)
|
||||||
|
if rec.Code != 201 {
|
||||||
|
t.Fatalf("create: %d", rec.Code)
|
||||||
|
}
|
||||||
|
att := resp["attachment"].(map[string]any)
|
||||||
|
url, _ := att["url"].(string)
|
||||||
|
pid, _ := resp["id"].(string)
|
||||||
|
// burn the paste via API read (burn_after_read default off here, so force)
|
||||||
|
s.store.SoftDelete(pid)
|
||||||
|
req := httptest.NewRequest("GET", url, nil)
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec2, req)
|
||||||
|
if rec2.Code != 404 {
|
||||||
|
t.Fatalf("deleted paste attachment: got %d want 404", rec2.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMultipartPasswordFieldAccepted(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
rec, resp := multipartCreate(t, h, "secret.txt", []byte("top secret"),
|
||||||
|
map[string]string{"password": "hunter2", "expires_in": "1h"})
|
||||||
|
if rec.Code != 201 {
|
||||||
|
t.Fatalf("create: %d %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
if resp["attachment"] == nil {
|
||||||
|
t.Fatal("attachment missing")
|
||||||
|
}
|
||||||
|
id, _ := resp["id"].(string)
|
||||||
|
req := httptest.NewRequest("GET", "/api/pastes/"+id, nil)
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec2, req)
|
||||||
|
if rec2.Code != 401 {
|
||||||
|
t.Fatalf("paste should require password, got %d", rec2.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// #281: /raw/{id} must stream the attachment blob for ALL attachment mimes,
|
||||||
|
// not just raster images (the old isImageMime gate left non-image
|
||||||
|
// attachments serving an empty body from row.Content).
|
||||||
|
func TestRawStreamsNonImageAttachment(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
|
||||||
|
body := []byte("hello, this is a plain text attachment body")
|
||||||
|
rec, resp := multipartCreate(t, h, "notes.txt", body, nil)
|
||||||
|
if rec.Code != 201 {
|
||||||
|
t.Fatalf("create: %d %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
if resp["attachment"] == nil {
|
||||||
|
t.Fatalf("no attachment in response: %v", resp)
|
||||||
|
}
|
||||||
|
id, _ := resp["id"].(string)
|
||||||
|
|
||||||
|
req := httptest.NewRequest("GET", "/raw/"+id, nil)
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec2, req)
|
||||||
|
if rec2.Code != 200 {
|
||||||
|
t.Fatalf("raw: %d %s", rec2.Code, rec2.Body.String())
|
||||||
|
}
|
||||||
|
if got := rec2.Header().Get("Content-Type"); got != "text/plain; charset=utf-8" {
|
||||||
|
t.Fatalf("Content-Type = %q", got)
|
||||||
|
}
|
||||||
|
if got := rec2.Header().Get("X-Content-Type-Options"); got != "nosniff" {
|
||||||
|
t.Fatalf("nosniff = %q", got)
|
||||||
|
}
|
||||||
|
if !bytes.Equal(rec2.Body.Bytes(), body) {
|
||||||
|
t.Fatalf("raw bytes differ: got %d bytes want %d", rec2.Body.Len(), len(body))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// #281: active-content attachment types still get forced to text/plain on
|
||||||
|
// /raw, same rule as the /f/ serving path (#34).
|
||||||
|
func TestRawHtmlAttachmentServesAsPlainText(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
|
||||||
|
html := []byte("<html><body><script>alert(1)</script></body></html>")
|
||||||
|
rec, resp := multipartCreate(t, h, "page.html", html, nil)
|
||||||
|
if rec.Code != 201 {
|
||||||
|
t.Fatalf("create: %d %s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
id, _ := resp["id"].(string)
|
||||||
|
|
||||||
|
req := httptest.NewRequest("GET", "/raw/"+id, nil)
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec2, req)
|
||||||
|
if rec2.Code != 200 {
|
||||||
|
t.Fatalf("raw: %d %s", rec2.Code, rec2.Body.String())
|
||||||
|
}
|
||||||
|
if got := rec2.Header().Get("Content-Type"); got != "text/plain; charset=utf-8" {
|
||||||
|
t.Fatalf("Content-Type = %q", got)
|
||||||
|
}
|
||||||
|
if !bytes.Equal(rec2.Body.Bytes(), html) {
|
||||||
|
t.Fatal("raw bytes differ from upload")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,10 +20,12 @@ func (a *apiServer) burnViewerWindow() int {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// handleRedeemDeletion lets a holder of the deletion token hard-delete immediately.
|
// handleRedeemDeletion lets a holder of the deletion token hard-delete immediately.
|
||||||
// DELETE /api/pastes/{id}/redeem?token=...
|
// DELETE /api/pastes/{id}/redeem with the token in the Authorization header
|
||||||
|
// (#143: the ?token= query path was removed so the secret stays out of
|
||||||
|
// access logs and browser history).
|
||||||
func (a *apiServer) handleRedeemDeletion(w http.ResponseWriter, r *http.Request) {
|
func (a *apiServer) handleRedeemDeletion(w http.ResponseWriter, r *http.Request) {
|
||||||
id := chi.URLParam(r, "id")
|
id := chi.URLParam(r, "id")
|
||||||
token := r.URL.Query().Get("token")
|
token := deletionAuthorization(r)
|
||||||
if token == "" {
|
if token == "" {
|
||||||
writeErr(w, 400, "token required")
|
writeErr(w, 400, "token required")
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -53,8 +53,9 @@ func TestDeletionTokenRedeem(t *testing.T) {
|
|||||||
t.Fatal("no deletion token in create response")
|
t.Fatal("no deletion token in create response")
|
||||||
}
|
}
|
||||||
|
|
||||||
// wrong token
|
// wrong token (#143: token goes in the Authorization header, not the URL)
|
||||||
req = httptest.NewRequest("DELETE", "/api/pastes/"+created.ID+"/redeem?token=wrong", nil)
|
req = httptest.NewRequest("DELETE", "/api/pastes/"+created.ID+"/redeem", nil)
|
||||||
|
req.Header.Set("Authorization", "Bearer wrong")
|
||||||
rec = httptest.NewRecorder()
|
rec = httptest.NewRecorder()
|
||||||
h.ServeHTTP(rec, req)
|
h.ServeHTTP(rec, req)
|
||||||
if rec.Code != 403 {
|
if rec.Code != 403 {
|
||||||
@@ -62,7 +63,8 @@ func TestDeletionTokenRedeem(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// right token: hard delete
|
// right token: hard delete
|
||||||
req = httptest.NewRequest("DELETE", "/api/pastes/"+created.ID+"/redeem?token="+created.DeletionToken, nil)
|
req = httptest.NewRequest("DELETE", "/api/pastes/"+created.ID+"/redeem", nil)
|
||||||
|
req.Header.Set("Authorization", "Bearer "+created.DeletionToken)
|
||||||
rec = httptest.NewRecorder()
|
rec = httptest.NewRecorder()
|
||||||
h.ServeHTTP(rec, req)
|
h.ServeHTTP(rec, req)
|
||||||
if rec.Code != 200 {
|
if rec.Code != 200 {
|
||||||
|
|||||||
@@ -206,9 +206,6 @@ func (a *apiServer) handleGetCan(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
if can.PasswordHash.Valid {
|
if can.PasswordHash.Valid {
|
||||||
pw := r.Header.Get("X-Paste-Password")
|
pw := r.Header.Get("X-Paste-Password")
|
||||||
if pw == "" {
|
|
||||||
pw = r.URL.Query().Get("password")
|
|
||||||
}
|
|
||||||
if pw == "" || !store.CheckPassword(can.PasswordHash.String, pw) {
|
if pw == "" || !store.CheckPassword(can.PasswordHash.String, pw) {
|
||||||
writeErr(w, 401, "password required")
|
writeErr(w, 401, "password required")
|
||||||
return
|
return
|
||||||
@@ -256,9 +253,6 @@ func (a *apiServer) handleCanItem(w http.ResponseWriter, r *http.Request) {
|
|||||||
can, _ := a.store.GetCan(row.CanID.String)
|
can, _ := a.store.GetCan(row.CanID.String)
|
||||||
if can != nil && can.PasswordHash.Valid {
|
if can != nil && can.PasswordHash.Valid {
|
||||||
pw := r.Header.Get("X-Paste-Password")
|
pw := r.Header.Get("X-Paste-Password")
|
||||||
if pw == "" {
|
|
||||||
pw = r.URL.Query().Get("password")
|
|
||||||
}
|
|
||||||
if pw == "" || !store.CheckPassword(can.PasswordHash.String, pw) {
|
if pw == "" || !store.CheckPassword(can.PasswordHash.String, pw) {
|
||||||
// fall back to the browser's unlock cookie for this can
|
// fall back to the browser's unlock cookie for this can
|
||||||
c, cerr := r.Cookie("pw_" + can.ID)
|
c, cerr := r.Cookie("pw_" + can.ID)
|
||||||
|
|||||||
@@ -294,7 +294,8 @@ func TestCanItemCookieParity(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// item id from API (with password query)
|
// item id from API (with password query)
|
||||||
req = httptest.NewRequest("GET", "/api/cans/"+created.ID+"?password=pw123", nil)
|
req = httptest.NewRequest("GET", "/api/cans/"+created.ID, nil)
|
||||||
|
req.Header.Set("X-Paste-Password", "pw123")
|
||||||
rec = httptest.NewRecorder()
|
rec = httptest.NewRecorder()
|
||||||
h.ServeHTTP(rec, req)
|
h.ServeHTTP(rec, req)
|
||||||
var can struct {
|
var can struct {
|
||||||
|
|||||||
@@ -112,7 +112,8 @@ func TestCanPasswordInheritedByItems(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// get item id with pw
|
// get item id with pw
|
||||||
req = httptest.NewRequest("GET", "/api/cans/"+created.ID+"?password=pw123", nil)
|
req = httptest.NewRequest("GET", "/api/cans/"+created.ID, nil)
|
||||||
|
req.Header.Set("X-Paste-Password", "pw123")
|
||||||
rec = httptest.NewRecorder()
|
rec = httptest.NewRecorder()
|
||||||
h.ServeHTTP(rec, req)
|
h.ServeHTTP(rec, req)
|
||||||
var can struct {
|
var can struct {
|
||||||
@@ -130,7 +131,8 @@ func TestCanPasswordInheritedByItems(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// item with pw -> 200
|
// item with pw -> 200
|
||||||
req = httptest.NewRequest("GET", "/api/cans/"+created.ID+"/items/"+itemID+"?password=pw123", nil)
|
req = httptest.NewRequest("GET", "/api/cans/"+created.ID+"/items/"+itemID, nil)
|
||||||
|
req.Header.Set("X-Paste-Password", "pw123")
|
||||||
rec = httptest.NewRecorder()
|
rec = httptest.NewRecorder()
|
||||||
h.ServeHTTP(rec, req)
|
h.ServeHTTP(rec, req)
|
||||||
if rec.Code != 200 {
|
if rec.Code != 200 {
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
// clientIP extracts the client IP for rate-limit keying.
|
||||||
|
//
|
||||||
|
// Trust boundary (issue #280): the bucket key MUST NOT come from any header a
|
||||||
|
// client can influence. The previous rightmost-X-Forwarded-For scheme (#85)
|
||||||
|
// assumed Traefik appends the real client IP, but the deployed ingress does
|
||||||
|
// not rewrite XFF, so a client rotating its own XFF value got a fresh bucket
|
||||||
|
// per request and the limit was unenforceable (pentest H1: 6x201 across 8
|
||||||
|
// rotating-XFF creates).
|
||||||
|
//
|
||||||
|
// The bucket key is the actual peer address (RemoteAddr) only. Behind any
|
||||||
|
// reverse proxy this is the proxy's address, so all clients share one bucket
|
||||||
|
// per endpoint — coarse, but safe. Client-supplied IP headers
|
||||||
|
// (X-Forwarded-For, X-Real-Ip) are never trusted.
|
||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
func clientIP(r *http.Request) string {
|
||||||
|
host := r.RemoteAddr
|
||||||
|
if h, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {
|
||||||
|
host = h
|
||||||
|
}
|
||||||
|
return host
|
||||||
|
}
|
||||||
@@ -0,0 +1,105 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
// #143: create responses must set the short-lived tok_<id> HttpOnly cookie
|
||||||
|
// that the paste view reads for the one-time created banner.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestCreateSetsDeletionTokenCookie(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
|
||||||
|
// JSON create
|
||||||
|
body := `{"content":"hello #143 cookie"}`
|
||||||
|
req := httptest.NewRequest("POST", "/api/pastes", strings.NewReader(body))
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
if rec.Code != 201 {
|
||||||
|
t.Fatalf("json create: got %d", rec.Code)
|
||||||
|
}
|
||||||
|
found := false
|
||||||
|
for _, c := range rec.Result().Cookies() {
|
||||||
|
if strings.HasPrefix(c.Name, "tok_") && c.Value != "" {
|
||||||
|
found = true
|
||||||
|
if !c.HttpOnly {
|
||||||
|
t.Error("tok_ cookie not HttpOnly")
|
||||||
|
}
|
||||||
|
if c.MaxAge != 60 {
|
||||||
|
t.Errorf("tok_ cookie MaxAge = %d, want 60", c.MaxAge)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
t.Error("json create did not set tok_<id> cookie (#143)")
|
||||||
|
}
|
||||||
|
|
||||||
|
// multipart create
|
||||||
|
var buf strings.Builder
|
||||||
|
boundary := "----qa143"
|
||||||
|
buf.WriteString("--" + boundary + "\r\n")
|
||||||
|
buf.WriteString("Content-Disposition: form-data; name=\"content\"\r\n\r\n")
|
||||||
|
buf.WriteString("multipart #143\r\n")
|
||||||
|
buf.WriteString("--" + boundary + "--\r\n")
|
||||||
|
req2 := httptest.NewRequest("POST", "/api/pastes", strings.NewReader(buf.String()))
|
||||||
|
req2.Header.Set("Content-Type", "multipart/form-data; boundary="+boundary)
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec2, req2)
|
||||||
|
if rec2.Code != 201 {
|
||||||
|
t.Fatalf("multipart create: got %d body=%s", rec2.Code, rec2.Body.String())
|
||||||
|
}
|
||||||
|
found = false
|
||||||
|
for _, c := range rec2.Result().Cookies() {
|
||||||
|
if strings.HasPrefix(c.Name, "tok_") && c.Value != "" {
|
||||||
|
found = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
t.Error("multipart create did not set tok_<id> cookie (#143)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCreatedBannerViaCookie(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
body := `{"content":"banner flow #143"}`
|
||||||
|
req := httptest.NewRequest("POST", "/api/pastes", strings.NewReader(body))
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
if rec.Code != 201 {
|
||||||
|
t.Fatalf("create: got %d", rec.Code)
|
||||||
|
}
|
||||||
|
var id, tok string
|
||||||
|
for _, c := range rec.Result().Cookies() {
|
||||||
|
if strings.HasPrefix(c.Name, "tok_") {
|
||||||
|
id = strings.TrimPrefix(c.Name, "tok_")
|
||||||
|
tok = c.Value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if id == "" || tok == "" {
|
||||||
|
t.Fatal("no tok_ cookie from create")
|
||||||
|
}
|
||||||
|
// follow the redirect the browser would make: GET /<id>?created=1 with the cookie
|
||||||
|
req2 := httptest.NewRequest("GET", "/"+id+"?created=1", nil)
|
||||||
|
req2.AddCookie(&http.Cookie{Name: "tok_" + id, Value: tok})
|
||||||
|
rec2 := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec2, req2)
|
||||||
|
if rec2.Code != 200 {
|
||||||
|
t.Fatalf("paste view: got %d", rec2.Code)
|
||||||
|
}
|
||||||
|
// #168: the created pill no longer prints the deletion token; the token
|
||||||
|
// still arrives via the one-time cookie flow (re-set on the view response).
|
||||||
|
var got bool
|
||||||
|
for _, c := range rec2.Result().Cookies() {
|
||||||
|
if c.Name == "tok_"+id && c.Value == tok {
|
||||||
|
got = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !got {
|
||||||
|
t.Error("created view did not re-set the deletion token cookie (#143 cookie flow broken)")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
package api
|
package api
|
||||||
|
|
||||||
// Regression tests for #63: DELETE /api/pastes/{id} must require the
|
// Regression tests for #63 and #143: DELETE /api/pastes/{id} must require the
|
||||||
// deletion token (Authorization header or ?token= query param, constant-time
|
// deletion token in the Authorization header (constant-time compare). The
|
||||||
// compare). Without a token, or with a wrong token, the paste must survive
|
// ?token= query parameter is NOT accepted (#143): URL-carried tokens leak
|
||||||
// and the response must be 403.
|
// into access logs and browser history. Without a token, or with a wrong
|
||||||
|
// token, the paste must survive and the response must be 403.
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
@@ -68,10 +69,14 @@ func TestDeleteWithWrongTokenForbidden(t *testing.T) {
|
|||||||
h := s.routes()
|
h := s.routes()
|
||||||
id, _ := createTestPaste(t, h)
|
id, _ := createTestPaste(t, h)
|
||||||
|
|
||||||
// query param
|
// query param: even the CORRECT token must be rejected now (#143)
|
||||||
rec := doReq(t, h, "DELETE", "/api/pastes/"+id+"?token=wrong-token", "", "")
|
id2, tok2 := createTestPaste(t, h)
|
||||||
|
rec := doReq(t, h, "DELETE", "/api/pastes/"+id2+"?token="+tok2, "", "")
|
||||||
if rec.Code != http.StatusForbidden {
|
if rec.Code != http.StatusForbidden {
|
||||||
t.Fatalf("delete with wrong token (query): got %d want 403", rec.Code)
|
t.Fatalf("delete with correct token in query: got %d want 403 (#143)", rec.Code)
|
||||||
|
}
|
||||||
|
if !pasteExists(t, h, id2) {
|
||||||
|
t.Fatal("paste was deleted via ?token= query param (#143 regression)")
|
||||||
}
|
}
|
||||||
// header
|
// header
|
||||||
req := httptest.NewRequest("DELETE", "/api/pastes/"+id, nil)
|
req := httptest.NewRequest("DELETE", "/api/pastes/"+id, nil)
|
||||||
@@ -103,14 +108,43 @@ func TestDeleteWithCorrectToken(t *testing.T) {
|
|||||||
t.Fatal("paste still exists after authorized delete")
|
t.Fatal("paste still exists after authorized delete")
|
||||||
}
|
}
|
||||||
|
|
||||||
// via query param
|
// query param: even with the correct token the delete must fail (#143)
|
||||||
id, tok = createTestPaste(t, h)
|
id, tok = createTestPaste(t, h)
|
||||||
rec = doReq(t, h, "DELETE", "/api/pastes/"+id+"?token="+tok, "", "")
|
rec = doReq(t, h, "DELETE", "/api/pastes/"+id+"?token="+tok, "", "")
|
||||||
|
if rec.Code != http.StatusForbidden {
|
||||||
|
t.Fatalf("delete with correct token (query): got %d want 403 (#143)", rec.Code)
|
||||||
|
}
|
||||||
|
if !pasteExists(t, h, id) {
|
||||||
|
t.Fatal("paste was deleted via ?token= query param (#143 regression)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// #143: the deletion token must be accepted via the Authorization header on
|
||||||
|
// the redeem (hard delete) endpoint too.
|
||||||
|
func TestRedeemWithCorrectTokenHeader(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
id, tok := createTestPaste(t, h)
|
||||||
|
|
||||||
|
req := httptest.NewRequest("DELETE", "/api/pastes/"+id+"/redeem", nil)
|
||||||
|
req.Header.Set("Authorization", "Bearer "+tok)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
if rec.Code != 200 {
|
if rec.Code != 200 {
|
||||||
t.Fatalf("delete with correct token (query): got %d want 200", rec.Code)
|
t.Fatalf("redeem with correct token (header): got %d want 200: %s", rec.Code, rec.Body.String())
|
||||||
}
|
}
|
||||||
if pasteExists(t, h, id) {
|
if pasteExists(t, h, id) {
|
||||||
t.Fatal("paste still exists after authorized delete (query)")
|
t.Fatal("paste still exists after authorized redeem")
|
||||||
|
}
|
||||||
|
|
||||||
|
// query param must NOT work on redeem either
|
||||||
|
id, tok = createTestPaste(t, h)
|
||||||
|
rec = doReq(t, h, "DELETE", "/api/pastes/"+id+"/redeem?token="+tok, "", "")
|
||||||
|
if rec.Code != http.StatusBadRequest {
|
||||||
|
t.Fatalf("redeem via ?token= query: got %d want 400 (#143)", rec.Code)
|
||||||
|
}
|
||||||
|
if !pasteExists(t, h, id) {
|
||||||
|
t.Fatal("paste was hard-deleted via ?token= query param (#143 regression)")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -161,8 +195,8 @@ func TestDeletionAuthorizationExtract(t *testing.T) {
|
|||||||
{"bearer tok", "", "tok"},
|
{"bearer tok", "", "tok"},
|
||||||
{"Token tok", "", "tok"},
|
{"Token tok", "", "tok"},
|
||||||
{"tok", "", "tok"},
|
{"tok", "", "tok"},
|
||||||
{"", "?token=q", "q"},
|
{"", "?token=q", ""}, // #143: query tokens are never accepted
|
||||||
{"Bearer hdr", "?token=q", "hdr"}, // header wins
|
{"Bearer hdr", "?token=q", "hdr"}, // header only
|
||||||
}
|
}
|
||||||
for _, c := range cases {
|
for _, c := range cases {
|
||||||
if got := deletionAuthorization(mk(c.hdr, c.q)); got != c.want {
|
if got := deletionAuthorization(mk(c.hdr, c.q)); got != c.want {
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
// #138: the vwr viewer cookie must carry the Secure attribute. Tests inspect
|
||||||
|
// the Set-Cookie header directly rather than relying on cookie round-tripping,
|
||||||
|
// because Go's HTTP client (and browsers) drop Secure cookies over plain HTTP,
|
||||||
|
// which is how tests and local dev run.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"palette/internal/store"
|
||||||
|
"palette/internal/web"
|
||||||
|
)
|
||||||
|
|
||||||
|
func newTestServer138(t *testing.T) *httptest.ResponseRecorder {
|
||||||
|
t.Helper()
|
||||||
|
st, err := store.OpenStore(":memory:")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
ui, err := web.New()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
cfg := Config{MaxTextBytes: 5 * 1024 * 1024}
|
||||||
|
ss := NewTestSettingsStore(t, cfg)
|
||||||
|
globalSettingsFn = ss.get
|
||||||
|
t.Cleanup(func() { globalSettingsFn = nil })
|
||||||
|
a := &apiServer{store: st, cfg: cfg, ui: ui, settings: ss, adminKey: "test-admin-key"}
|
||||||
|
req := httptest.NewRequest("GET", "/public", nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
a.routes().ServeHTTP(rec, req)
|
||||||
|
return rec
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestViewerCookieAttributes(t *testing.T) {
|
||||||
|
rec := newTestServer138(t)
|
||||||
|
var vwr *string
|
||||||
|
for _, c := range rec.Result().Cookies() {
|
||||||
|
if c.Name == "vwr" {
|
||||||
|
cc := c
|
||||||
|
vwr = &cc.Value
|
||||||
|
if !c.Secure {
|
||||||
|
t.Error("vwr cookie missing Secure attribute (#138)")
|
||||||
|
}
|
||||||
|
if !c.HttpOnly {
|
||||||
|
t.Error("vwr cookie missing HttpOnly attribute")
|
||||||
|
}
|
||||||
|
if c.Path != "/" {
|
||||||
|
t.Errorf("vwr cookie Path = %q, want /", c.Path)
|
||||||
|
}
|
||||||
|
if c.SameSite != 2 { // http.SameSiteLaxMode
|
||||||
|
t.Errorf("vwr cookie SameSite = %v, want Lax", c.SameSite)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if vwr == nil {
|
||||||
|
t.Fatal("no vwr cookie set")
|
||||||
|
}
|
||||||
|
// also confirm the raw header form spells out Secure
|
||||||
|
sc := rec.Header().Get("Set-Cookie")
|
||||||
|
if !strings.Contains(sc, "Secure") {
|
||||||
|
t.Errorf("Set-Cookie header %q lacks Secure", sc)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// #235: Type column. Text pastes show the language, attachment pastes show
|
||||||
|
// the file extension (lowercase, no dot).
|
||||||
|
func TestDisplayType(t *testing.T) {
|
||||||
|
lang := "python"
|
||||||
|
cases := []struct {
|
||||||
|
lang *string
|
||||||
|
att string
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{nil, "", "text"},
|
||||||
|
{&lang, "", "python"},
|
||||||
|
{&lang, "report.pdf", "pdf"},
|
||||||
|
{nil, "photo.PNG", "png"},
|
||||||
|
{&lang, "archive.tar.gz", "gz"},
|
||||||
|
{&lang, "noext", "python"}, // no extension: fall back to language
|
||||||
|
{&lang, ".hidden", "python"}, // dotfile: no extension
|
||||||
|
{&lang, "dir/name.txt", "txt"}, // path component only
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
if got := displayType(c.lang, c.att); got != c.want {
|
||||||
|
t.Errorf("displayType(%v, %q) = %q, want %q", c.lang, c.att, got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAttachmentExtName(t *testing.T) {
|
||||||
|
cases := map[string]string{
|
||||||
|
"a.txt": "txt", "A.PNG": "png", "noext": "", ".hidden": "",
|
||||||
|
"x.": "", "dir/b.md": "md", "": "",
|
||||||
|
}
|
||||||
|
for in, want := range cases {
|
||||||
|
if got := attachmentExtName(in); got != want {
|
||||||
|
t.Errorf("attachmentExtName(%q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,7 +2,7 @@ package api
|
|||||||
|
|
||||||
// #81: ALL password verification attempts (GET query param, header, POST
|
// #81: ALL password verification attempts (GET query param, header, POST
|
||||||
// form) must go through the per-IP unlock limiter. Regression: N wrong
|
// form) must go through the per-IP unlock limiter. Regression: N wrong
|
||||||
// passwords via GET ?password= must eventually yield 429.
|
// passwords via X-Paste-Password must eventually yield 429.
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
@@ -26,7 +26,7 @@ func createPasswordPaste(t *testing.T, s *apiServer, pw string) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TestRateLimitGetPasswordQuery: repeated wrong passwords via GET
|
// TestRateLimitGetPasswordQuery: repeated wrong passwords via GET
|
||||||
// ?password= must eventually return 429 (unlock limiter: burst 5).
|
// X-Paste-Password wrong attempts must eventually return 429 (unlock limiter: burst 5).
|
||||||
func TestRateLimitGetPasswordQuery(t *testing.T) {
|
func TestRateLimitGetPasswordQuery(t *testing.T) {
|
||||||
s := testServer(t)
|
s := testServer(t)
|
||||||
h := s.routes()
|
h := s.routes()
|
||||||
@@ -35,7 +35,8 @@ func TestRateLimitGetPasswordQuery(t *testing.T) {
|
|||||||
var saw429 bool
|
var saw429 bool
|
||||||
// more attempts than the unlock burst (5)
|
// more attempts than the unlock burst (5)
|
||||||
for i := 0; i < 10; i++ {
|
for i := 0; i < 10; i++ {
|
||||||
req := httptest.NewRequest("GET", "/api/pastes/"+id+"?password=wrong"+string(rune('a'+i)), nil)
|
req := httptest.NewRequest("GET", "/api/pastes/"+id, nil)
|
||||||
|
req.Header.Set("X-Paste-Password", "wrong"+string(rune('a'+i)))
|
||||||
rec := httptest.NewRecorder()
|
rec := httptest.NewRecorder()
|
||||||
h.ServeHTTP(rec, req)
|
h.ServeHTTP(rec, req)
|
||||||
if rec.Code == 429 {
|
if rec.Code == 429 {
|
||||||
@@ -47,7 +48,7 @@ func TestRateLimitGetPasswordQuery(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !saw429 {
|
if !saw429 {
|
||||||
t.Fatal("expected 429 after repeated wrong ?password= attempts, never got one")
|
t.Fatal("expected 429 after repeated wrong password attempts, never got one")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,7 +84,8 @@ func TestRateLimitGetPasswordCorrectStillAllowed(t *testing.T) {
|
|||||||
h := s.routes()
|
h := s.routes()
|
||||||
id := createPasswordPaste(t, s, "hunter2")
|
id := createPasswordPaste(t, s, "hunter2")
|
||||||
|
|
||||||
req := httptest.NewRequest("GET", "/api/pastes/"+id+"?password=hunter2", nil)
|
req := httptest.NewRequest("GET", "/api/pastes/"+id, nil)
|
||||||
|
req.Header.Set("X-Paste-Password", "hunter2")
|
||||||
rec := httptest.NewRecorder()
|
rec := httptest.NewRecorder()
|
||||||
h.ServeHTTP(rec, req)
|
h.ServeHTTP(rec, req)
|
||||||
if rec.Code != 200 {
|
if rec.Code != 200 {
|
||||||
|
|||||||
@@ -89,7 +89,8 @@ func TestPasswordProtection(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// with password -> 200
|
// with password -> 200
|
||||||
req = httptest.NewRequest("GET", "/api/pastes/"+created.ID+"?password=hunter2", nil)
|
req = httptest.NewRequest("GET", "/api/pastes/"+created.ID, nil)
|
||||||
|
req.Header.Set("X-Paste-Password", "hunter2")
|
||||||
rec = httptest.NewRecorder()
|
rec = httptest.NewRecorder()
|
||||||
h.ServeHTTP(rec, req)
|
h.ServeHTTP(rec, req)
|
||||||
if rec.Code != 200 {
|
if rec.Code != 200 {
|
||||||
@@ -97,7 +98,8 @@ func TestPasswordProtection(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// wrong password -> 401
|
// wrong password -> 401
|
||||||
req = httptest.NewRequest("GET", "/api/pastes/"+created.ID+"?password=nope", nil)
|
req = httptest.NewRequest("GET", "/api/pastes/"+created.ID, nil)
|
||||||
|
req.Header.Set("X-Paste-Password", "nope")
|
||||||
rec = httptest.NewRecorder()
|
rec = httptest.NewRecorder()
|
||||||
h.ServeHTTP(rec, req)
|
h.ServeHTTP(rec, req)
|
||||||
if rec.Code != 401 {
|
if rec.Code != 401 {
|
||||||
@@ -297,3 +299,27 @@ func TestNotFound(t *testing.T) {
|
|||||||
t.Fatalf("expected 404, got %d", rec.Code)
|
t.Fatalf("expected 404, got %d", rec.Code)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// #173: a missing paste ID on the UI route (/p/{id}, i.e. /{id} HTML view)
|
||||||
|
// should render the main UI page with a friendly "Paste ID not found"
|
||||||
|
// message, not a bare text 404. Status stays 404.
|
||||||
|
func TestPasteViewNotFoundFriendly(t *testing.T) {
|
||||||
|
s := testServer(t)
|
||||||
|
h := s.routes()
|
||||||
|
req := httptest.NewRequest("GET", "/zzzzzz", nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
if rec.Code != http.StatusNotFound {
|
||||||
|
t.Fatalf("expected 404 status, got %d", rec.Code)
|
||||||
|
}
|
||||||
|
body := rec.Body.String()
|
||||||
|
if !strings.Contains(body, "Paste ID not found") {
|
||||||
|
t.Fatalf("expected friendly message in body, got: %.200s", body)
|
||||||
|
}
|
||||||
|
if !strings.Contains(body, "<nav>") {
|
||||||
|
t.Fatalf("expected main UI chrome in body")
|
||||||
|
}
|
||||||
|
if strings.Contains(body, "404 page not found") {
|
||||||
|
t.Fatalf("body still contains bare Go 404 text")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ func TestMineCreateListDelete(t *testing.T) {
|
|||||||
a := &apiServer{store: st, cfg: cfg, ui: ui, settings: ss, adminKey: "test-admin-key"}
|
a := &apiServer{store: st, cfg: cfg, ui: ui, settings: ss, adminKey: "test-admin-key"}
|
||||||
h := a.routes()
|
h := a.routes()
|
||||||
|
|
||||||
alice := viewerCookieFor(t, h, "/history")
|
alice := viewerCookieFor(t, h, "/public")
|
||||||
if alice == "" {
|
if alice == "" {
|
||||||
t.Fatal("no viewer cookie issued")
|
t.Fatal("no viewer cookie issued")
|
||||||
}
|
}
|
||||||
@@ -89,7 +89,7 @@ func TestMineCreateListDelete(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// a different browser's cookie does NOT see it
|
// a different browser's cookie does NOT see it
|
||||||
bob := viewerCookieFor(t, h, "/history")
|
bob := viewerCookieFor(t, h, "/public")
|
||||||
rec = doReq(t, h, "GET", "/api/mine", bob, "")
|
rec = doReq(t, h, "GET", "/api/mine", bob, "")
|
||||||
json.Unmarshal(rec.Body.Bytes(), &list)
|
json.Unmarshal(rec.Body.Bytes(), &list)
|
||||||
if list.Total != 0 {
|
if list.Total != 0 {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package api
|
|||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -48,35 +47,6 @@ func (l *limiter) allow(key string, rate, burst float64) bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
// clientIP extracts the client IP for rate-limit keying (#85).
|
|
||||||
//
|
|
||||||
// Trust boundary: palette runs behind exactly ONE trusted reverse proxy
|
|
||||||
// (Traefik in the k3s pod network). Traefik APPENDS the real client IP to
|
|
||||||
// X-Forwarded-For, so the RIGHTMOST entry is the last value the trusted
|
|
||||||
// proxy observed and is unspoofable by the client (a client-supplied fake
|
|
||||||
// entry only lands on the LEFT and is ignored). This matches chi's
|
|
||||||
// middleware.RealIP semantics for a single trusted proxy hop.
|
|
||||||
//
|
|
||||||
// Direct connections (no XFF header) fall back to RemoteAddr. Directly
|
|
||||||
// reachable deployments must NOT expose the app to untrusted networks
|
|
||||||
// without a proxy in front, or attackers could forge the rightmost entry.
|
|
||||||
func clientIP(r *http.Request) string {
|
|
||||||
if xff := r.Header.Get("X-Forwarded-For"); xff != "" {
|
|
||||||
if i := strings.LastIndex(xff, ","); i >= 0 {
|
|
||||||
return strings.TrimSpace(xff[i+1:])
|
|
||||||
}
|
|
||||||
return strings.TrimSpace(xff)
|
|
||||||
}
|
|
||||||
if xr := r.Header.Get("X-Real-Ip"); xr != "" {
|
|
||||||
return strings.TrimSpace(xr)
|
|
||||||
}
|
|
||||||
host := r.RemoteAddr
|
|
||||||
if i := strings.LastIndex(host, ":"); i > 0 {
|
|
||||||
host = host[:i]
|
|
||||||
}
|
|
||||||
return host
|
|
||||||
}
|
|
||||||
|
|
||||||
var globalLimiter = newLimiter()
|
var globalLimiter = newLimiter()
|
||||||
|
|
||||||
// globalSettingsFn is set at startup; tests can point it at fixed settings.
|
// globalSettingsFn is set at startup; tests can point it at fixed settings.
|
||||||
|
|||||||
@@ -166,8 +166,11 @@ func TestHighlightCode(t *testing.T) {
|
|||||||
if plain != "<b>x</b>" {
|
if plain != "<b>x</b>" {
|
||||||
t.Fatalf("plain escaping wrong: %q", plain)
|
t.Fatalf("plain escaping wrong: %q", plain)
|
||||||
}
|
}
|
||||||
// line count preserved (gutter alignment)
|
// #205: newline join preserved as the delimiter paste-lines.js splits on;
|
||||||
if got := len(splitLines(lang.HighlightCode("a\nb\nc", "go"))); got != 3 {
|
// per-line segments survive and the client joins with '' so no newline
|
||||||
|
// text node reaches the rendered DOM.
|
||||||
|
hl := lang.HighlightCode("a\nb\nc", "go")
|
||||||
|
if got := len(splitLines(hl)); got != 3 {
|
||||||
t.Fatalf("want 3 lines, got %d", got)
|
t.Fatalf("want 3 lines, got %d", got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,85 +1,50 @@
|
|||||||
package api
|
package api
|
||||||
|
|
||||||
// Issue #85: the rate limit key must use the rightmost X-Forwarded-For entry
|
|
||||||
// (appended by the trusted Traefik proxy), never the raw/leftmost header
|
|
||||||
// value a client can forge. A spoofed FIRST XFF entry must not bypass the
|
|
||||||
// limit or rotate buckets.
|
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"fmt"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestClientIPTakesRightmostXFF(t *testing.T) {
|
func TestClientIPUsesRemoteAddrNotXFF(t *testing.T) {
|
||||||
r := httptest.NewRequest("POST", "/", nil)
|
r := httptest.NewRequest("POST", "/api/pastes", nil)
|
||||||
r.RemoteAddr = "10.42.0.7:51000" // trusted Traefik pod
|
r.RemoteAddr = "203.0.113.7:4432"
|
||||||
r.Header.Set("X-Forwarded-For", "1.2.3.4, 1.2.3.5, 203.0.113.9")
|
r.Header.Set("X-Forwarded-For", "1.2.3.4, 1.2.3.5, 203.0.113.9")
|
||||||
if got := clientIP(r); got != "203.0.113.9" {
|
|
||||||
t.Fatalf("clientIP = %q, want rightmost 203.0.113.9", got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestClientIPXRealIPFallback(t *testing.T) {
|
|
||||||
r := httptest.NewRequest("POST", "/", nil)
|
|
||||||
r.RemoteAddr = "10.42.0.7:51000"
|
|
||||||
r.Header.Set("X-Real-Ip", "203.0.113.10")
|
r.Header.Set("X-Real-Ip", "203.0.113.10")
|
||||||
if got := clientIP(r); got != "203.0.113.10" {
|
if got := clientIP(r); got != "203.0.113.7" {
|
||||||
t.Fatalf("clientIP = %q, want 203.0.113.10", got)
|
t.Fatalf("clientIP = %q, want peer 203.0.113.7", got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestClientIPDirectFallback(t *testing.T) {
|
// A proxy-controlled header is not honored even when set: #280 revision
|
||||||
r := httptest.NewRequest("POST", "/", nil)
|
// removed the PALETTE_TRUSTED_IP_HEADER mechanism per owner decision, so the
|
||||||
r.RemoteAddr = "198.51.100.5:51000"
|
// bucket key is the peer address only.
|
||||||
if got := clientIP(r); got != "198.51.100.5" {
|
func TestClientIPNeverTrustsHeaders(t *testing.T) {
|
||||||
t.Fatalf("clientIP = %q, want 198.51.100.5", got)
|
r := httptest.NewRequest("POST", "/api/pastes", nil)
|
||||||
|
r.RemoteAddr = "10.0.1.47:9999"
|
||||||
|
r.Header.Set("CF-Connecting-IP", "198.51.100.9")
|
||||||
|
if got := clientIP(r); got != "10.0.1.47" {
|
||||||
|
t.Fatalf("clientIP = %q, want peer 10.0.1.47", got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestRateLimitSpoofedFirstXFFDoesNotBypass: an attacker rotating a fake
|
// Issue #280: rotating X-Forwarded-For must NOT reset the bucket. Pentest
|
||||||
// leftmost XFF entry stays limited on their real (rightmost) IP.
|
// repro was 8 creates with rotating XFF -> 6x201.
|
||||||
func TestRateLimitSpoofedFirstXFFDoesNotBypass(t *testing.T) {
|
func TestRotatingXFFDoesNotResetBucket(t *testing.T) {
|
||||||
srv := newTestServer(t)
|
globalLimiter = newLimiter()
|
||||||
h := srv.routes()
|
s := defaultSettings(Config{}) // burst/limit defaults; header values are ignored anyway
|
||||||
for i := 0; i < 5; i++ {
|
var allowed, limited int
|
||||||
req := httptest.NewRequest("POST", "/api/pastes", bytes.NewReader([]byte(`{"content":"hi"}`)))
|
for i := 0; i < 8; i++ {
|
||||||
req.RemoteAddr = "10.42.0.7:51000"
|
r := httptest.NewRequest("POST", "/api/pastes", nil)
|
||||||
// each request spoofs a DIFFERENT leftmost entry
|
r.RemoteAddr = "198.51.100.1:5000"
|
||||||
req.Header.Set("X-Forwarded-For", spoofN(i)+", 203.0.113.9")
|
r.Header.Set("X-Forwarded-For", fmt.Sprintf("9.9.9.%d", i))
|
||||||
rr := httptest.NewRecorder()
|
if rateLimitCreate(r, s) {
|
||||||
h.ServeHTTP(rr, req)
|
allowed++
|
||||||
if rr.Code != 201 {
|
} else {
|
||||||
t.Fatalf("req %d: want 201, got %d", i, rr.Code)
|
limited++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 6th request, still the same real IP, new spoofed prefix: must 429
|
if float64(allowed) != s.RateLimitBurst || limited != 8-int(s.RateLimitBurst) {
|
||||||
req := httptest.NewRequest("POST", "/api/pastes", bytes.NewReader([]byte(`{"content":"hi"}`)))
|
t.Fatalf("rotating XFF: allowed=%d limited=%d, want allowed=%v (burst), limited=%d", allowed, limited, s.RateLimitBurst, 8-int(s.RateLimitBurst))
|
||||||
req.RemoteAddr = "10.42.0.7:51000"
|
|
||||||
req.Header.Set("X-Forwarded-For", "9.9.9.9, 203.0.113.9")
|
|
||||||
rr := httptest.NewRecorder()
|
|
||||||
h.ServeHTTP(rr, req)
|
|
||||||
if rr.Code != 429 {
|
|
||||||
t.Fatalf("spoofed 6th req: want 429, got %d", rr.Code)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func spoofN(i int) string {
|
|
||||||
return "1.2.3." + string(rune('0'+i))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Distinct real IPs must still get distinct buckets (no over-limiting).
|
|
||||||
func TestRateLimitDistinctRightmostIPsIndependent(t *testing.T) {
|
|
||||||
srv := newTestServer(t)
|
|
||||||
h := srv.routes()
|
|
||||||
for _, ip := range []string{"203.0.113.20", "203.0.113.21"} {
|
|
||||||
req := httptest.NewRequest("POST", "/api/pastes", bytes.NewReader([]byte(`{"content":"hi"}`)))
|
|
||||||
req.RemoteAddr = "10.42.0.7:51000"
|
|
||||||
req.Header.Set("X-Forwarded-For", "6.6.6.6, "+ip)
|
|
||||||
rr := httptest.NewRecorder()
|
|
||||||
h.ServeHTTP(rr, req)
|
|
||||||
if rr.Code != 201 {
|
|
||||||
t.Fatalf("ip %s: want 201, got %d", ip, rr.Code)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
// #256: renamed page routes; old URLs redirect.
|
||||||
|
import (
|
||||||
|
"palette/internal/store"
|
||||||
|
"palette/internal/web"
|
||||||
|
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestRenamedPageRoutes(t *testing.T) {
|
||||||
|
globalLimiter = newLimiter() // fresh rate-limit buckets
|
||||||
|
st, err := store.OpenStore(":memory:")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
ui, err := web.New()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
cfg := Config{MaxTextBytes: 5 * 1024 * 1024}
|
||||||
|
ss := NewTestSettingsStore(t, cfg)
|
||||||
|
globalSettingsFn = ss.get
|
||||||
|
t.Cleanup(func() { globalSettingsFn = nil })
|
||||||
|
a := &apiServer{store: st, cfg: cfg, ui: ui, settings: ss, adminKey: "test-admin-key"}
|
||||||
|
h := a.routes()
|
||||||
|
|
||||||
|
// new routes render pages
|
||||||
|
for _, path := range []string{"/public", "/saved"} {
|
||||||
|
req := httptest.NewRequest("GET", path, nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("GET %s: %d, want 200", path, rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// old routes redirect
|
||||||
|
for _, tc := range [][2]string{{"/history", "/public"}, {"/mine", "/saved"}, {"/", "/public"}} {
|
||||||
|
req := httptest.NewRequest("GET", tc[0], nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
if rec.Code != http.StatusMovedPermanently && rec.Code != http.StatusFound {
|
||||||
|
t.Fatalf("GET %s: %d, want redirect", tc[0], rec.Code)
|
||||||
|
}
|
||||||
|
if loc := rec.Header().Get("Location"); loc != tc[1] {
|
||||||
|
t.Fatalf("GET %s redirects to %s, want %s", tc[0], loc, tc[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+110
-21
@@ -113,23 +113,30 @@ func (a *apiServer) routes() http.Handler {
|
|||||||
r.Get("/can/{id}", a.handleCanPage)
|
r.Get("/can/{id}", a.handleCanPage)
|
||||||
r.Post("/can/{id}", a.handleCanPage)
|
r.Post("/can/{id}", a.handleCanPage)
|
||||||
|
|
||||||
// raw
|
// raw + #38 attachment serving
|
||||||
|
r.Get("/f/{aid}/{filename}", a.handleServeAttachment)
|
||||||
r.Get("/raw/{id}", a.handleRaw)
|
r.Get("/raw/{id}", a.handleRaw)
|
||||||
|
|
||||||
// web pages
|
// web pages
|
||||||
r.Get("/", http.RedirectHandler("/history", http.StatusFound).ServeHTTP)
|
r.Get("/", http.RedirectHandler("/public", http.StatusFound).ServeHTTP)
|
||||||
r.Get("/new", a.ui.Handlers().HandleNewPage)
|
r.Get("/new", a.ui.Handlers().HandleNewPage)
|
||||||
r.Get("/history", a.ui.Handlers().HandleHistoryPage)
|
r.Get("/public", a.ui.Handlers().HandleHistoryPage)
|
||||||
|
r.Get("/saved", a.ui.Handlers().HandleMinePage)
|
||||||
r.Get("/settings", a.ui.Handlers().HandleSettingsPage)
|
r.Get("/settings", a.ui.Handlers().HandleSettingsPage)
|
||||||
r.Get("/mine", a.ui.Handlers().HandleMinePage)
|
// #256: old URLs redirect to the renamed pages
|
||||||
|
r.Get("/history", http.RedirectHandler("/public", http.StatusMovedPermanently).ServeHTTP)
|
||||||
|
r.Get("/mine", http.RedirectHandler("/saved", http.StatusMovedPermanently).ServeHTTP)
|
||||||
r.Handle("/static/*", a.ui.StaticHandler())
|
r.Handle("/static/*", a.ui.StaticHandler())
|
||||||
r.Get("/unlock/{id}", a.handlePasteView)
|
r.Get("/unlock/{id}", a.handlePasteView)
|
||||||
r.Post("/unlock/{id}", a.handlePasteView)
|
r.Post("/unlock/{id}", a.handlePasteView)
|
||||||
r.Get("/{id}", a.handlePasteView)
|
r.Get("/{id}", a.handlePasteView)
|
||||||
r.Post("/{id}", a.handlePasteView)
|
r.Post("/{id}", a.handlePasteView)
|
||||||
|
|
||||||
|
// #173: missing paste URLs render the main UI with a friendly not-found
|
||||||
|
// message instead of a bare JSON 404. Known routes (above) handle real pages;
|
||||||
|
// anything else is a nonexistent paste ID or typo.
|
||||||
r.NotFound(func(w http.ResponseWriter, r *http.Request) {
|
r.NotFound(func(w http.ResponseWriter, r *http.Request) {
|
||||||
writeErr(w, 404, "not found")
|
a.webHandlers().HandleNotFoundPage(w, r)
|
||||||
})
|
})
|
||||||
return r
|
return r
|
||||||
}
|
}
|
||||||
@@ -140,9 +147,12 @@ func viewerCookieMiddleware(next http.Handler) http.Handler {
|
|||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
if c, err := r.Cookie("vwr"); err != nil || c.Value == "" {
|
if c, err := r.Cookie("vwr"); err != nil || c.Value == "" {
|
||||||
id := store.GenSlug(16)
|
id := store.GenSlug(16)
|
||||||
|
// #138: Secure keeps the viewer id off plain-HTTP requests
|
||||||
|
// (all deployments are HTTPS-only behind traefik).
|
||||||
http.SetCookie(w, &http.Cookie{
|
http.SetCookie(w, &http.Cookie{
|
||||||
Name: "vwr", Value: id, Path: "/",
|
Name: "vwr", Value: id, Path: "/",
|
||||||
MaxAge: 31536000, HttpOnly: true, SameSite: http.SameSiteLaxMode,
|
MaxAge: 31536000, HttpOnly: true, Secure: true,
|
||||||
|
SameSite: http.SameSiteLaxMode,
|
||||||
})
|
})
|
||||||
r.AddCookie(&http.Cookie{Name: "vwr", Value: id})
|
r.AddCookie(&http.Cookie{Name: "vwr", Value: id})
|
||||||
// remember that this cookie was minted here, not sent by the client
|
// remember that this cookie was minted here, not sent by the client
|
||||||
@@ -173,6 +183,16 @@ func viewerSentCookie(r *http.Request) bool {
|
|||||||
return !minted
|
return !minted
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// #143: hand the deletion token to the creator's browser via a short-lived
|
||||||
|
// HttpOnly cookie instead of the URL. The paste view reads it once to show
|
||||||
|
// the one-time created banner; it expires after 60s.
|
||||||
|
func setDeletionTokenCookie(w http.ResponseWriter, pasteID, token string) {
|
||||||
|
http.SetCookie(w, &http.Cookie{
|
||||||
|
Name: "tok_" + pasteID, Value: token, Path: "/",
|
||||||
|
MaxAge: 60, HttpOnly: true, SameSite: http.SameSiteLaxMode,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func (a *apiServer) handleCreatePaste(w http.ResponseWriter, r *http.Request) {
|
func (a *apiServer) handleCreatePaste(w http.ResponseWriter, r *http.Request) {
|
||||||
s := a.settings.get()
|
s := a.settings.get()
|
||||||
setRateLimitHeaders(w, 1, 5)
|
setRateLimitHeaders(w, 1, 5)
|
||||||
@@ -180,6 +200,11 @@ func (a *apiServer) handleCreatePaste(w http.ResponseWriter, r *http.Request) {
|
|||||||
writeRateLimited(w, 1)
|
writeRateLimited(w, 1)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
ct := r.Header.Get("Content-Type")
|
||||||
|
if strings.HasPrefix(ct, "multipart/form-data") {
|
||||||
|
a.handleCreatePasteMultipart(w, r, s) // #38: file attachment create
|
||||||
|
return
|
||||||
|
}
|
||||||
var p store.Paste
|
var p store.Paste
|
||||||
if err := json.NewDecoder(r.Body).Decode(&p); err != nil {
|
if err := json.NewDecoder(r.Body).Decode(&p); err != nil {
|
||||||
if isBodyTooLarge(err) { // #68: body cut off by MaxBytesReader
|
if isBodyTooLarge(err) { // #68: body cut off by MaxBytesReader
|
||||||
@@ -235,6 +260,7 @@ func (a *apiServer) handleCreatePaste(w http.ResponseWriter, r *http.Request) {
|
|||||||
writeErrCode(w, 400, createErrCode(err), err.Error())
|
writeErrCode(w, 400, createErrCode(err), err.Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
setDeletionTokenCookie(w, created.ID, created.DeletionToken) // #143
|
||||||
writeJSON(w, 201, map[string]any{
|
writeJSON(w, 201, map[string]any{
|
||||||
"id": created.ID,
|
"id": created.ID,
|
||||||
"deletion_token": created.DeletionToken,
|
"deletion_token": created.DeletionToken,
|
||||||
@@ -267,18 +293,17 @@ func (a *apiServer) handleGetPaste(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if row.PasswordHash.Valid {
|
if row.PasswordHash.Valid {
|
||||||
// #81: every password verification (header, query param, or empty)
|
// #81/#141: every password verification (header or empty) goes
|
||||||
// goes through the same per-IP+paste unlock limiter as the POST form
|
// through the same per-IP+paste unlock limiter as the POST form
|
||||||
// path, so brute-force via GET ?password= or X-Paste-Password gets 429.
|
// path, so brute-force via X-Paste-Password gets 429. The
|
||||||
|
// ?password= query fallback was removed (#141): query strings
|
||||||
|
// leak into access logs, browser history, and Referer headers.
|
||||||
if !rateLimitUnlock(row.ID, r) {
|
if !rateLimitUnlock(row.ID, r) {
|
||||||
writeRateLimited(w, 60)
|
writeRateLimited(w, 60)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// require password via header or query
|
// require password via header or query
|
||||||
pw := r.Header.Get("X-Paste-Password")
|
pw := r.Header.Get("X-Paste-Password")
|
||||||
if pw == "" {
|
|
||||||
pw = r.URL.Query().Get("password")
|
|
||||||
}
|
|
||||||
if pw == "" || !store.CheckPassword(row.PasswordHash.String, pw) {
|
if pw == "" || !store.CheckPassword(row.PasswordHash.String, pw) {
|
||||||
writeErr(w, 401, "password required")
|
writeErr(w, 401, "password required")
|
||||||
return
|
return
|
||||||
@@ -293,11 +318,26 @@ func (a *apiServer) handleGetPaste(w http.ResponseWriter, r *http.Request) {
|
|||||||
writeJSON(w, 200, map[string]any{
|
writeJSON(w, 200, map[string]any{
|
||||||
"id": row.ID, "content": row.Content, "content_type": row.ContentType,
|
"id": row.ID, "content": row.Content, "content_type": row.ContentType,
|
||||||
"language": store.NullStrPtr(row.Language), "title": store.NullStrPtr(row.Title), "created_at": row.CreatedAt,
|
"language": store.NullStrPtr(row.Language), "title": store.NullStrPtr(row.Title), "created_at": row.CreatedAt,
|
||||||
|
"type": a.pasteTypeLabel(row),
|
||||||
"view_count": row.ViewCount, "visibility": row.Visibility,
|
"view_count": row.ViewCount, "visibility": row.Visibility,
|
||||||
"reads_remaining": rem,
|
"reads_remaining": rem,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// pasteTypeLabel computes the Type value for a single paste (#235): file
|
||||||
|
// extension for attachment pastes, else the stored language, else "text".
|
||||||
|
func (a *apiServer) pasteTypeLabel(row *store.PasteRow) string {
|
||||||
|
if att, err := a.store.GetAttachmentForPaste(row.ID); err == nil && att != nil {
|
||||||
|
if ext := attachmentExtName(att.Filename); ext != "" {
|
||||||
|
return ext
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !row.Language.Valid || row.Language.String == "" {
|
||||||
|
return "text"
|
||||||
|
}
|
||||||
|
return row.Language.String
|
||||||
|
}
|
||||||
|
|
||||||
func (a *apiServer) handleDeletePaste(w http.ResponseWriter, r *http.Request) {
|
func (a *apiServer) handleDeletePaste(w http.ResponseWriter, r *http.Request) {
|
||||||
id := chi.URLParam(r, "id")
|
id := chi.URLParam(r, "id")
|
||||||
row, err := a.store.GetPaste(id)
|
row, err := a.store.GetPaste(id)
|
||||||
@@ -306,9 +346,10 @@ func (a *apiServer) handleDeletePaste(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
// #63: deletion requires authorization. Either the deletion token issued
|
// #63: deletion requires authorization. Either the deletion token issued
|
||||||
// at create time (Authorization header or ?token= query param, matching
|
// at create time (Authorization header; #143 removed the ?token= query
|
||||||
// the create response's "deletion_token" field), or the creator browser
|
// path so the bearer secret never lands in access logs or history), or
|
||||||
// itself (client-sent vwr cookie matching the paste's viewer, #37).
|
// the creator browser itself (client-sent vwr cookie matching the
|
||||||
|
// paste's viewer, #37).
|
||||||
if !a.deletionAuthorized(r, row) {
|
if !a.deletionAuthorized(r, row) {
|
||||||
writeErr(w, 403, "deletion token required")
|
writeErr(w, 403, "deletion token required")
|
||||||
return
|
return
|
||||||
@@ -320,9 +361,11 @@ func (a *apiServer) handleDeletePaste(w http.ResponseWriter, r *http.Request) {
|
|||||||
writeJSON(w, 200, map[string]string{"status": "soft-deleted"})
|
writeJSON(w, 200, map[string]string{"status": "soft-deleted"})
|
||||||
}
|
}
|
||||||
|
|
||||||
// deletionAuthorization extracts the deletion token from the request: the
|
// deletionAuthorization extracts the deletion token from the request:
|
||||||
// Authorization header ("Bearer <t>", "Token <t>", or a bare token) or the
|
// the Authorization header ("Bearer <t>", "Token <t>", or a bare token).
|
||||||
// token query parameter. Returns "" when absent.
|
// The ?token= query parameter is deliberately NOT accepted (#143): URL
|
||||||
|
// query strings end up in proxy access logs and browser history. Returns
|
||||||
|
// "" when absent.
|
||||||
func deletionAuthorization(r *http.Request) string {
|
func deletionAuthorization(r *http.Request) string {
|
||||||
if h := r.Header.Get("Authorization"); h != "" {
|
if h := r.Header.Get("Authorization"); h != "" {
|
||||||
for _, prefix := range []string{"Bearer ", "Token "} {
|
for _, prefix := range []string{"Bearer ", "Token "} {
|
||||||
@@ -332,7 +375,7 @@ func deletionAuthorization(r *http.Request) string {
|
|||||||
}
|
}
|
||||||
return strings.TrimSpace(h)
|
return strings.TrimSpace(h)
|
||||||
}
|
}
|
||||||
return r.URL.Query().Get("token")
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
// deletionAuthorized reports whether the request may soft-delete the paste:
|
// deletionAuthorized reports whether the request may soft-delete the paste:
|
||||||
@@ -351,6 +394,33 @@ func (a *apiServer) deletionAuthorized(r *http.Request, row *store.PasteRow) boo
|
|||||||
row.ViewerID.String != "" && row.ViewerID.String == vid
|
row.ViewerID.String != "" && row.ViewerID.String == vid
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// displayType returns the Type-column value for a list row (#235): the file
|
||||||
|
// extension for attachment pastes, otherwise the detected language (default
|
||||||
|
// "text").
|
||||||
|
func displayType(lang *string, attFilename string) string {
|
||||||
|
if ext := attachmentExtName(attFilename); ext != "" {
|
||||||
|
return ext
|
||||||
|
}
|
||||||
|
if lang == nil || *lang == "" {
|
||||||
|
return "text"
|
||||||
|
}
|
||||||
|
return *lang
|
||||||
|
}
|
||||||
|
|
||||||
|
// attachmentExtName returns the lowercase extension (without dot) of a
|
||||||
|
// filename, or "" when there is none.
|
||||||
|
func attachmentExtName(filename string) string {
|
||||||
|
name := filename
|
||||||
|
if i := strings.LastIndexByte(name, '/'); i >= 0 {
|
||||||
|
name = name[i+1:]
|
||||||
|
}
|
||||||
|
i := strings.LastIndexByte(name, '.')
|
||||||
|
if i <= 0 || i == len(name)-1 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return strings.ToLower(name[i+1:])
|
||||||
|
}
|
||||||
|
|
||||||
// handleListMine serves /api/mine: pastes created from this browser (#37).
|
// handleListMine serves /api/mine: pastes created from this browser (#37).
|
||||||
func (a *apiServer) handleListMine(w http.ResponseWriter, r *http.Request) {
|
func (a *apiServer) handleListMine(w http.ResponseWriter, r *http.Request) {
|
||||||
vid := currentViewerID(r)
|
vid := currentViewerID(r)
|
||||||
@@ -369,7 +439,7 @@ func (a *apiServer) handleListMine(w http.ResponseWriter, r *http.Request) {
|
|||||||
for _, row := range rows {
|
for _, row := range rows {
|
||||||
lang, title := store.NullStrPtr(row.Language), store.NullStrPtr(row.Title)
|
lang, title := store.NullStrPtr(row.Language), store.NullStrPtr(row.Title)
|
||||||
items = append(items, map[string]any{
|
items = append(items, map[string]any{
|
||||||
"id": row.ID, "title": title, "language": lang,
|
"id": row.ID, "title": title, "language": lang, "type": displayType(lang, row.AttFilename),
|
||||||
"created_at": row.CreatedAt, "view_count": row.ViewCount, "size": row.Size,
|
"created_at": row.CreatedAt, "view_count": row.ViewCount, "size": row.Size,
|
||||||
"custom_slug": store.NullStrPtr(row.CustomSlug), "visibility": row.Visibility,
|
"custom_slug": store.NullStrPtr(row.CustomSlug), "visibility": row.Visibility,
|
||||||
"is_can": row.IsCan,
|
"is_can": row.IsCan,
|
||||||
@@ -390,7 +460,7 @@ func (a *apiServer) handleListPublic(w http.ResponseWriter, r *http.Request) {
|
|||||||
for _, row := range rows {
|
for _, row := range rows {
|
||||||
lang, title := store.NullStrPtr(row.Language), store.NullStrPtr(row.Title)
|
lang, title := store.NullStrPtr(row.Language), store.NullStrPtr(row.Title)
|
||||||
items = append(items, map[string]any{
|
items = append(items, map[string]any{
|
||||||
"id": row.ID, "title": title, "language": lang,
|
"id": row.ID, "title": title, "language": lang, "type": displayType(lang, row.AttFilename),
|
||||||
"created_at": row.CreatedAt, "view_count": row.ViewCount, "size": row.Size,
|
"created_at": row.CreatedAt, "view_count": row.ViewCount, "size": row.Size,
|
||||||
"custom_slug": store.NullStrPtr(row.CustomSlug),
|
"custom_slug": store.NullStrPtr(row.CustomSlug),
|
||||||
"is_can": row.IsCan,
|
"is_can": row.IsCan,
|
||||||
@@ -426,6 +496,25 @@ func (a *apiServer) handleRaw(w http.ResponseWriter, r *http.Request) {
|
|||||||
http.Error(w, "not found", 404)
|
http.Error(w, "not found", 404)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
// #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", 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)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
// #34: content_type is attacker-controlled via the create API. Serving it
|
// #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
|
// 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 —
|
// render as active content on this origin when fetched from /raw —
|
||||||
|
|||||||
@@ -18,6 +18,10 @@ import (
|
|||||||
func (a *apiServer) maxRequestBody() int64 {
|
func (a *apiServer) maxRequestBody() int64 {
|
||||||
s := a.settings.get()
|
s := a.settings.get()
|
||||||
max := s.MaxContentBytes + 4096
|
max := s.MaxContentBytes + 4096
|
||||||
|
// #38: multipart create carries up to one 25 MB file plus overhead
|
||||||
|
if a.cfg.MaxItemBytes+1<<20 > max {
|
||||||
|
max = a.cfg.MaxItemBytes + 1<<20
|
||||||
|
}
|
||||||
if max < 64*1024 {
|
if max < 64*1024 {
|
||||||
max = 64 * 1024
|
max = 64 * 1024
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -146,5 +146,9 @@ func HighlightCode(content, langID string) string {
|
|||||||
for i, line := range lines {
|
for i, line := range lines {
|
||||||
out[i] = highlightLine(line, h, langID)
|
out[i] = highlightLine(line, h, langID)
|
||||||
}
|
}
|
||||||
|
// Note: lines are joined with "\n" on purpose — paste-lines.js splits on
|
||||||
|
// the newline to build its per-line .codeline blocks, then joins those
|
||||||
|
// with "" and strips whitespace-only text nodes (#205), so no newline
|
||||||
|
// text node ever reaches the rendered DOM.
|
||||||
return strings.Join(out, "\n")
|
return strings.Join(out, "\n")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,150 @@
|
|||||||
|
package store
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/sha256"
|
||||||
|
"database/sql"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// #38: file attachments, one file per paste (iteration 1). A paste either
|
||||||
|
// has text content OR one attached file. Bytes live in the BlobStore; this
|
||||||
|
// table carries the metadata.
|
||||||
|
|
||||||
|
type Attachment struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
PasteID string `json:"paste_id"`
|
||||||
|
Filename string `json:"filename"`
|
||||||
|
Mime string `json:"mime"`
|
||||||
|
Size int64 `json:"size"`
|
||||||
|
SHA256 string `json:"sha256"`
|
||||||
|
CreatedAt int64 `json:"created_at"`
|
||||||
|
|
||||||
|
SizeHuman string `json:"-"` // template-only: human-readable size
|
||||||
|
}
|
||||||
|
|
||||||
|
// MaxFilenameLen caps stored attachment filenames (bytes) to bound DB
|
||||||
|
// rows and Content-Disposition echoes. 128 keeps names readable while
|
||||||
|
// stopping filename-bloat abuse; longer names truncate.
|
||||||
|
const MaxFilenameLen = 128
|
||||||
|
|
||||||
|
// ErrFileTooLarge is returned when an attachment exceeds the per-file cap.
|
||||||
|
var ErrFileTooLarge = errors.New("file too large")
|
||||||
|
|
||||||
|
// SanitizeFilename cleans a user-supplied filename: strips directory
|
||||||
|
// components, control chars, and caps at 255 bytes. The extension is never
|
||||||
|
// trusted for mime decisions (mime is sniffed server-side).
|
||||||
|
func SanitizeFilename(name string) string {
|
||||||
|
name = filepath.Base(strings.ReplaceAll(name, "\\", "/"))
|
||||||
|
name = strings.TrimSpace(name)
|
||||||
|
var b strings.Builder
|
||||||
|
for _, r := range name {
|
||||||
|
if r < 32 || r == 127 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
b.WriteRune(r)
|
||||||
|
}
|
||||||
|
name = b.String()
|
||||||
|
if len(name) > MaxFilenameLen {
|
||||||
|
runes := []rune(name)
|
||||||
|
for len(string(runes)) > MaxFilenameLen {
|
||||||
|
runes = runes[:len(runes)-1]
|
||||||
|
}
|
||||||
|
name = string(runes)
|
||||||
|
}
|
||||||
|
if name == "" || name == "." || name == ".." {
|
||||||
|
name = "file"
|
||||||
|
}
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateAttachment stores the file bytes and inserts the attachments row.
|
||||||
|
// The mime MUST already be sniffed server-side (http.DetectContentType by
|
||||||
|
// the caller); it is never taken from the client.
|
||||||
|
func (s *Store) CreateAttachment(a *Attachment, r interface{ Read([]byte) (int, error) }, blobs BlobStore) error {
|
||||||
|
pasteID := a.PasteID
|
||||||
|
sha, size, err := blobs.Put(pasteID+"/pending", r)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if a.Size > 0 && size > a.Size {
|
||||||
|
// caller-provided pre-check limit; treat as too large
|
||||||
|
blobs.Delete(pasteID + "/" + sha)
|
||||||
|
return ErrFileTooLarge
|
||||||
|
}
|
||||||
|
a.SHA256 = sha
|
||||||
|
a.Size = size
|
||||||
|
now := time.Now().Unix()
|
||||||
|
id := genSlug(20)
|
||||||
|
_, err = s.db.Exec(`INSERT INTO attachments (id, paste_id, filename, mime, size, sha256, created_at)
|
||||||
|
VALUES (?,?,?,?,?,?,?)`, id, pasteID, a.Filename, a.Mime, size, sha, now)
|
||||||
|
if err != nil {
|
||||||
|
blobs.Delete(pasteID + "/" + sha)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
a.ID = id
|
||||||
|
a.CreatedAt = now
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetAttachment returns the attachment row for a paste, or nil.
|
||||||
|
// One file per paste (iteration 1), so a single-row lookup keyed on paste.
|
||||||
|
func (s *Store) GetAttachmentForPaste(pasteID string) (*Attachment, error) {
|
||||||
|
row := s.db.QueryRow(`SELECT id, paste_id, filename, mime, size, sha256, created_at
|
||||||
|
FROM attachments WHERE paste_id = ? ORDER BY created_at ASC LIMIT 1`, pasteID)
|
||||||
|
return scanAttachment(row)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Store) GetAttachment(id string) (*Attachment, error) {
|
||||||
|
row := s.db.QueryRow(`SELECT id, paste_id, filename, mime, size, sha256, created_at
|
||||||
|
FROM attachments WHERE id = ?`, id)
|
||||||
|
return scanAttachment(row)
|
||||||
|
}
|
||||||
|
|
||||||
|
func scanAttachment(row *sql.Row) (*Attachment, error) {
|
||||||
|
var a Attachment
|
||||||
|
err := row.Scan(&a.ID, &a.PasteID, &a.Filename, &a.Mime, &a.Size, &a.SHA256, &a.CreatedAt)
|
||||||
|
if err == sql.ErrNoRows {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
a.SizeHuman = humanBytes(a.Size)
|
||||||
|
return &a, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// humanBytes formats a byte count for display (KB/MB).
|
||||||
|
func humanBytes(n int64) string {
|
||||||
|
switch {
|
||||||
|
case n >= 1<<20:
|
||||||
|
return fmt.Sprintf("%.1f MB", float64(n)/(1<<20))
|
||||||
|
case n >= 1<<10:
|
||||||
|
return fmt.Sprintf("%.1f KB", float64(n)/(1<<10))
|
||||||
|
default:
|
||||||
|
return fmt.Sprintf("%d B", n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeleteAttachment removes the row and its blob.
|
||||||
|
func (s *Store) DeleteAttachment(a *Attachment, blobs BlobStore) error {
|
||||||
|
blobs.Delete(a.PasteID + "/" + a.SHA256)
|
||||||
|
_, err := s.db.Exec(`DELETE FROM attachments WHERE id = ?`, a.ID)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// HasAttachment reports whether a paste already carries a file (#38: one file per paste).
|
||||||
|
func (s *Store) HasAttachment(pasteID string) bool {
|
||||||
|
var n int
|
||||||
|
s.db.QueryRow(`SELECT COUNT(*) FROM attachments WHERE paste_id = ?`, pasteID).Scan(&n)
|
||||||
|
return n > 0
|
||||||
|
}
|
||||||
|
|
||||||
|
// HashBytes is a small helper used by handlers to name/verify blobs.
|
||||||
|
func HashBytes(b []byte) string {
|
||||||
|
h := sha256.Sum256(b)
|
||||||
|
return string(h[:])
|
||||||
|
}
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
package store
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/sha256"
|
||||||
|
"encoding/hex"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// #38: blob storage abstraction. Files live outside SQLite on the data
|
||||||
|
// volume behind this interface so a MinIO/S3 backend can replace the fs
|
||||||
|
// implementation later without touching handlers or the UI.
|
||||||
|
|
||||||
|
// ErrBlobNotFound is returned by Get/Stat when the key does not exist.
|
||||||
|
var ErrBlobNotFound = errors.New("blob not found")
|
||||||
|
|
||||||
|
// BlobStore persists attachment bytes by key.
|
||||||
|
type BlobStore interface {
|
||||||
|
Put(key string, r io.Reader) (sha string, size int64, err error)
|
||||||
|
Get(key string) (io.ReadSeekCloser, error)
|
||||||
|
Delete(key string) error
|
||||||
|
Stat(key string) (int64, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FsBlobStore is the filesystem implementation: blobs are stored under
|
||||||
|
// root/<key>, where key is "<paste-id>/<sha256-hex>" (see SanitizeBlobKey).
|
||||||
|
type FsBlobStore struct {
|
||||||
|
root string
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewFsBlobStore creates the blob root directory.
|
||||||
|
func NewFsBlobStore(root string) (*FsBlobStore, error) {
|
||||||
|
if err := os.MkdirAll(root, 0o700); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &FsBlobStore{root: root}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SanitizeBlobKey validates a blob key and returns the safe on-disk path
|
||||||
|
// under root. Keys must be exactly "<paste-id>/<sha256-hex>"; anything with
|
||||||
|
// separators outside that shape, "..", or absolute paths is rejected, so a
|
||||||
|
// crafted key can never escape the blob root (traversal).
|
||||||
|
func (f *FsBlobStore) path(key string) (string, error) {
|
||||||
|
clean := filepath.ToSlash(key)
|
||||||
|
parts := strings.Split(clean, "/")
|
||||||
|
if len(parts) != 2 || parts[0] == "" || parts[1] == "" ||
|
||||||
|
parts[0] == "." || parts[0] == ".." || parts[1] == "." || parts[1] == ".." {
|
||||||
|
return "", fmt.Errorf("invalid blob key %q", key)
|
||||||
|
}
|
||||||
|
return filepath.Join(f.root, filepath.FromSlash(clean)), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *FsBlobStore) Put(key string, r io.Reader) (string, int64, error) {
|
||||||
|
dst, err := f.path(key)
|
||||||
|
if err != nil {
|
||||||
|
return "", 0, err
|
||||||
|
}
|
||||||
|
if err := os.MkdirAll(filepath.Dir(dst), 0o700); err != nil {
|
||||||
|
return "", 0, err
|
||||||
|
}
|
||||||
|
h := sha256.New()
|
||||||
|
tmp := dst + ".tmp"
|
||||||
|
out, err := os.OpenFile(tmp, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o600)
|
||||||
|
if err != nil {
|
||||||
|
return "", 0, err
|
||||||
|
}
|
||||||
|
size, err := io.Copy(io.MultiWriter(out, h), r)
|
||||||
|
if cerr := out.Close(); err == nil {
|
||||||
|
err = cerr
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
os.Remove(tmp)
|
||||||
|
return "", 0, err
|
||||||
|
}
|
||||||
|
sha := hex.EncodeToString(h.Sum(nil))
|
||||||
|
// The caller-supplied key must match the content hash; rename to the
|
||||||
|
// canonical "<paste-id>/<sha256>" path so keys are always content-derived.
|
||||||
|
canonical, err := f.path(key[:strings.IndexByte(key, '/')] + "/" + sha)
|
||||||
|
if err != nil {
|
||||||
|
os.Remove(tmp)
|
||||||
|
return "", 0, err
|
||||||
|
}
|
||||||
|
if err := os.MkdirAll(filepath.Dir(canonical), 0o700); err != nil {
|
||||||
|
os.Remove(tmp)
|
||||||
|
return "", 0, err
|
||||||
|
}
|
||||||
|
if err := os.Rename(tmp, canonical); err != nil {
|
||||||
|
os.Remove(tmp)
|
||||||
|
return "", 0, err
|
||||||
|
}
|
||||||
|
return sha, size, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *FsBlobStore) Get(key string) (io.ReadSeekCloser, error) {
|
||||||
|
dst, err := f.path(key)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
file, err := os.Open(dst)
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return nil, ErrBlobNotFound
|
||||||
|
}
|
||||||
|
return file, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *FsBlobStore) Delete(key string) error {
|
||||||
|
dst, err := f.path(key)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = os.Remove(dst)
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return ErrBlobNotFound
|
||||||
|
}
|
||||||
|
if err == nil {
|
||||||
|
// best-effort cleanup of the now-empty paste directory
|
||||||
|
os.Remove(filepath.Dir(dst))
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *FsBlobStore) Stat(key string) (int64, error) {
|
||||||
|
dst, err := f.path(key)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
fi, err := os.Stat(dst)
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return 0, ErrBlobNotFound
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return fi.Size(), nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,113 @@
|
|||||||
|
package store
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func testBlobs(t *testing.T) *FsBlobStore {
|
||||||
|
t.Helper()
|
||||||
|
b, err := NewFsBlobStore(t.TempDir() + "/files")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBlobPutGetStatDeleteRoundtrip(t *testing.T) {
|
||||||
|
b := testBlobs(t)
|
||||||
|
data := []byte("hello attachment world")
|
||||||
|
sha, size, err := b.Put("abc123/pending", strings.NewReader(string(data)))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if size != int64(len(data)) {
|
||||||
|
t.Fatalf("size = %d want %d", size, len(data))
|
||||||
|
}
|
||||||
|
if len(sha) != 64 {
|
||||||
|
t.Fatalf("sha256 = %q", sha)
|
||||||
|
}
|
||||||
|
// canonical key is <paste-id>/<sha256>
|
||||||
|
got, err := b.Get("abc123/" + sha)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
buf := make([]byte, len(data)+10)
|
||||||
|
n, _ := got.Read(buf)
|
||||||
|
got.Close()
|
||||||
|
if string(buf[:n]) != string(data) {
|
||||||
|
t.Fatalf("roundtrip mismatch: %q", buf[:n])
|
||||||
|
}
|
||||||
|
sz, err := b.Stat("abc123/" + sha)
|
||||||
|
if err != nil || sz != int64(len(data)) {
|
||||||
|
t.Fatalf("stat = %d, %v", sz, err)
|
||||||
|
}
|
||||||
|
if err := b.Delete("abc123/" + sha); err != nil {
|
||||||
|
t.Fatalf("delete: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := b.Get("abc123/" + sha); err != ErrBlobNotFound {
|
||||||
|
t.Fatalf("get after delete: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBlobStatMissing(t *testing.T) {
|
||||||
|
b := testBlobs(t)
|
||||||
|
if _, err := b.Stat("nope/deadbeef"); err != ErrBlobNotFound {
|
||||||
|
t.Fatalf("want ErrBlobNotFound, got %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBlobTraversalPrevention(t *testing.T) {
|
||||||
|
b := testBlobs(t)
|
||||||
|
evil := []string{
|
||||||
|
"../../etc/passwd",
|
||||||
|
"../escape",
|
||||||
|
"..\\windows",
|
||||||
|
"/abs/path",
|
||||||
|
"a/b/c", // too many segments
|
||||||
|
"onlyone", // no slash
|
||||||
|
"./relative", // dot segment
|
||||||
|
"../..", // bare traversal
|
||||||
|
"ok/../traverse", // traversal inside
|
||||||
|
}
|
||||||
|
for _, key := range evil {
|
||||||
|
if _, _, err := b.Put(key, strings.NewReader("x")); err == nil {
|
||||||
|
t.Errorf("Put accepted evil key %q", key)
|
||||||
|
}
|
||||||
|
if _, err := b.Get(key); err == nil {
|
||||||
|
t.Errorf("Get accepted evil key %q", key)
|
||||||
|
}
|
||||||
|
if err := b.Delete(key); err == nil {
|
||||||
|
t.Errorf("Delete accepted evil key %q", key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSanitizeFilename(t *testing.T) {
|
||||||
|
cases := [][2]string{
|
||||||
|
{"../../etc/passwd", "passwd"},
|
||||||
|
{"C:\\Users\\evil\\file.txt", "file.txt"},
|
||||||
|
{"normal.txt", "normal.txt"},
|
||||||
|
{"a<b>c", "a<b>c"},
|
||||||
|
{"", "file"},
|
||||||
|
{"..", "file"},
|
||||||
|
{".hidden", ".hidden"},
|
||||||
|
{"with\x00null.txt", "withnull.txt"},
|
||||||
|
{"new\nline.txt", "newline.txt"},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
got := SanitizeFilename(c[0])
|
||||||
|
if got != c[1] {
|
||||||
|
t.Errorf("SanitizeFilename(%q) = %q want %q", c[0], got, c[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
long := strings.Repeat("x", 300)
|
||||||
|
if got := SanitizeFilename(long); len(got) != MaxFilenameLen {
|
||||||
|
t.Errorf("long name len = %d want %d", len(got), MaxFilenameLen)
|
||||||
|
}
|
||||||
|
// issue #248: a 250-char multipart filename must truncate to the cap
|
||||||
|
repro := strings.Repeat("b", 246) + ".txt"
|
||||||
|
if got := SanitizeFilename(repro); len(got) != MaxFilenameLen {
|
||||||
|
t.Errorf("repro name len = %d want %d", len(got), MaxFilenameLen)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,7 @@ var reservedSlugs = map[string]bool{
|
|||||||
"api": true, "raw": true, "can": true, "cans": true, "public": true,
|
"api": true, "raw": true, "can": true, "cans": true, "public": true,
|
||||||
"history": true, "static": true, "assets": true, "favicon.ico": true,
|
"history": true, "static": true, "assets": true, "favicon.ico": true,
|
||||||
"new": true, "login": true, "logout": true, "admin": true, "settings": true,
|
"new": true, "login": true, "logout": true, "admin": true, "settings": true,
|
||||||
|
"mine": true, "saved": true, "unlock": true, "guess": true, "f": true,
|
||||||
}
|
}
|
||||||
|
|
||||||
var ErrInvalidSlug = errors.New("custom slug must be 1-64 chars: letters, digits, dash, underscore; must start with letter or digit")
|
var ErrInvalidSlug = errors.New("custom slug must be 1-64 chars: letters, digits, dash, underscore; must start with letter or digit")
|
||||||
|
|||||||
+37
-10
@@ -63,6 +63,7 @@ type PasteRow struct {
|
|||||||
DeletionToken sql.NullString
|
DeletionToken sql.NullString
|
||||||
ViewerID sql.NullString
|
ViewerID sql.NullString
|
||||||
IsCan bool // set on list rows that are cans (#4)
|
IsCan bool // set on list rows that are cans (#4)
|
||||||
|
AttFilename string // attachment filename when the paste is a file paste (#235); empty otherwise
|
||||||
}
|
}
|
||||||
|
|
||||||
type CanRow struct {
|
type CanRow struct {
|
||||||
@@ -79,6 +80,7 @@ type CanRow struct {
|
|||||||
|
|
||||||
type Store struct {
|
type Store struct {
|
||||||
db *sql.DB
|
db *sql.DB
|
||||||
|
blob BlobStore // #38: attachment byte storage (nil in some unit tests)
|
||||||
}
|
}
|
||||||
|
|
||||||
func OpenStore(path string) (*Store, error) {
|
func OpenStore(path string) (*Store, error) {
|
||||||
@@ -95,6 +97,12 @@ func OpenStore(path string) (*Store, error) {
|
|||||||
if err := s.migrate(); err != nil {
|
if err := s.migrate(); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
// #38: attachment blobs live beside the database under <db>.files
|
||||||
|
blobs, err := NewFsBlobStore(path + ".files")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
s.blob = blobs
|
||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,9 +150,26 @@ deletion_token TEXT
|
|||||||
last_viewed INTEGER NOT NULL,
|
last_viewed INTEGER NOT NULL,
|
||||||
PRIMARY KEY (paste_id, viewer_id)
|
PRIMARY KEY (paste_id, viewer_id)
|
||||||
)`) // #49: per-viewer read dedupe window
|
)`) // #49: per-viewer read dedupe window
|
||||||
|
// #38: file attachments, one per paste in iteration 1. mime is sniffed
|
||||||
|
// server-side before insert; bytes live in the BlobStore keyed
|
||||||
|
// <paste_id>/<sha256>.
|
||||||
|
s.db.Exec(`CREATE TABLE IF NOT EXISTS attachments (
|
||||||
|
id TEXT PRIMARY KEY,
|
||||||
|
paste_id TEXT NOT NULL,
|
||||||
|
filename TEXT NOT NULL,
|
||||||
|
mime TEXT NOT NULL,
|
||||||
|
size INTEGER NOT NULL,
|
||||||
|
sha256 TEXT NOT NULL,
|
||||||
|
created_at INTEGER NOT NULL
|
||||||
|
)`)
|
||||||
|
s.db.Exec(`CREATE INDEX IF NOT EXISTS idx_attachments_paste ON attachments(paste_id)`)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Blobs returns the attachment blob store (nil when unavailable, e.g. some
|
||||||
|
// unit-test stores).
|
||||||
|
func (s *Store) Blobs() BlobStore { return s.blob }
|
||||||
|
|
||||||
// SlugAlphabet is the paste-id charset (no ambiguous chars).
|
// SlugAlphabet is the paste-id charset (no ambiguous chars).
|
||||||
var SlugAlphabet = "23456789abcdefghjkmnpqrstuvwxyz"
|
var SlugAlphabet = "23456789abcdefghjkmnpqrstuvwxyz"
|
||||||
|
|
||||||
@@ -280,11 +305,12 @@ func (s *Store) GetPaste(idOrSlug string) (*PasteRow, error) {
|
|||||||
// listed, and password-protected pastes are excluded at the query level
|
// listed, and password-protected pastes are excluded at the query level
|
||||||
// (#65) so their metadata (title, slug, existence) never leaks.
|
// (#65) so their metadata (title, slug, existence) never leaks.
|
||||||
func (s *Store) ListPublic(limit, offset int) ([]PasteRow, int, error) {
|
func (s *Store) ListPublic(limit, offset int) ([]PasteRow, int, error) {
|
||||||
rows, err := s.db.Query(`SELECT id, custom_slug, content_type, language, title, visibility, created_at, view_count, LENGTH(content), 0
|
rows, err := s.db.Query(`SELECT p.id, p.custom_slug, p.content_type, p.language, p.title, p.visibility, p.created_at, p.view_count, LENGTH(p.content), 0, COALESCE(a.filename, '')
|
||||||
FROM pastes
|
FROM pastes p
|
||||||
WHERE visibility='public' AND deleted_at IS NULL AND can_id IS NULL AND password_hash IS NULL AND (expires_at IS NULL OR expires_at > ?)
|
LEFT JOIN attachments a ON a.paste_id = p.id
|
||||||
|
WHERE p.visibility='public' AND p.deleted_at IS NULL AND p.can_id IS NULL AND p.password_hash IS NULL AND (p.expires_at IS NULL OR p.expires_at > ?)
|
||||||
UNION ALL
|
UNION ALL
|
||||||
SELECT id, NULL, 'text/plain', NULL, title, visibility, created_at, 0, 0, 1
|
SELECT id, NULL, 'text/plain', NULL, title, visibility, created_at, 0, 0, 1, ''
|
||||||
FROM paste_cans
|
FROM paste_cans
|
||||||
WHERE visibility='public' AND deleted_at IS NULL AND (expires_at IS NULL OR expires_at > ?)
|
WHERE visibility='public' AND deleted_at IS NULL AND (expires_at IS NULL OR expires_at > ?)
|
||||||
ORDER BY created_at DESC LIMIT ? OFFSET ?`, time.Now().Unix(), time.Now().Unix(), limit, offset)
|
ORDER BY created_at DESC LIMIT ? OFFSET ?`, time.Now().Unix(), time.Now().Unix(), limit, offset)
|
||||||
@@ -297,7 +323,7 @@ func (s *Store) ListPublic(limit, offset int) ([]PasteRow, int, error) {
|
|||||||
var r PasteRow
|
var r PasteRow
|
||||||
var cs, lang, title sql.NullString
|
var cs, lang, title sql.NullString
|
||||||
var isCan int
|
var isCan int
|
||||||
if err := rows.Scan(&r.ID, &cs, &r.ContentType, &lang, &title, &r.Visibility, &r.CreatedAt, &r.ViewCount, &r.Size, &isCan); err != nil {
|
if err := rows.Scan(&r.ID, &cs, &r.ContentType, &lang, &title, &r.Visibility, &r.CreatedAt, &r.ViewCount, &r.Size, &isCan, &r.AttFilename); err != nil {
|
||||||
return nil, 0, err
|
return nil, 0, err
|
||||||
}
|
}
|
||||||
r.CustomSlug = cs
|
r.CustomSlug = cs
|
||||||
@@ -315,11 +341,12 @@ func (s *Store) ListPublic(limit, offset int) ([]PasteRow, int, error) {
|
|||||||
|
|
||||||
// ListMine lists pastes created from the given viewer id (browser cookie), newest first.
|
// ListMine lists pastes created from the given viewer id (browser cookie), newest first.
|
||||||
func (s *Store) ListMine(viewerID string, limit, offset int) ([]PasteRow, int, error) {
|
func (s *Store) ListMine(viewerID string, limit, offset int) ([]PasteRow, int, error) {
|
||||||
rows, err := s.db.Query(`SELECT id, custom_slug, language, title, visibility, created_at, view_count, LENGTH(content), 0
|
rows, err := s.db.Query(`SELECT p.id, p.custom_slug, p.language, p.title, p.visibility, p.created_at, p.view_count, LENGTH(p.content), 0, COALESCE(a.filename, '')
|
||||||
FROM pastes
|
FROM pastes p
|
||||||
WHERE viewer_id = ? AND deleted_at IS NULL AND can_id IS NULL AND (expires_at IS NULL OR expires_at > ?)
|
LEFT JOIN attachments a ON a.paste_id = p.id
|
||||||
|
WHERE p.viewer_id = ? AND p.deleted_at IS NULL AND p.can_id IS NULL AND (p.expires_at IS NULL OR p.expires_at > ?)
|
||||||
UNION ALL
|
UNION ALL
|
||||||
SELECT id, NULL, NULL, title, visibility, created_at, 0, 0, 1
|
SELECT id, NULL, NULL, title, visibility, created_at, 0, 0, 1, ''
|
||||||
FROM paste_cans
|
FROM paste_cans
|
||||||
WHERE viewer_id = ? AND deleted_at IS NULL AND (expires_at IS NULL OR expires_at > ?)
|
WHERE viewer_id = ? AND deleted_at IS NULL AND (expires_at IS NULL OR expires_at > ?)
|
||||||
ORDER BY created_at DESC LIMIT ? OFFSET ?`, viewerID, time.Now().Unix(), viewerID, time.Now().Unix(), limit, offset)
|
ORDER BY created_at DESC LIMIT ? OFFSET ?`, viewerID, time.Now().Unix(), viewerID, time.Now().Unix(), limit, offset)
|
||||||
@@ -332,7 +359,7 @@ func (s *Store) ListMine(viewerID string, limit, offset int) ([]PasteRow, int, e
|
|||||||
var r PasteRow
|
var r PasteRow
|
||||||
var cs, lang, title sql.NullString
|
var cs, lang, title sql.NullString
|
||||||
var isCan int
|
var isCan int
|
||||||
if err := rows.Scan(&r.ID, &cs, &lang, &title, &r.Visibility, &r.CreatedAt, &r.ViewCount, &r.Size, &isCan); err != nil {
|
if err := rows.Scan(&r.ID, &cs, &lang, &title, &r.Visibility, &r.CreatedAt, &r.ViewCount, &r.Size, &isCan, &r.AttFilename); err != nil {
|
||||||
return nil, 0, err
|
return nil, 0, err
|
||||||
}
|
}
|
||||||
r.CustomSlug, r.Language, r.Title = cs, lang, title
|
r.CustomSlug, r.Language, r.Title = cs, lang, title
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
package web
|
||||||
|
|
||||||
|
import (
|
||||||
|
"embed"
|
||||||
|
"io/fs"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// #139 regression guards: with CSP script-src/style-src 'self' (no
|
||||||
|
// 'unsafe-inline'), the templates must not carry inline <script> blocks or
|
||||||
|
// style="" attributes, and the external scripts referenced must exist.
|
||||||
|
func TestNoInlineScripts(t *testing.T) {
|
||||||
|
entries, err := fs.ReadDir(tmplFS, "templates")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
re := regexp.MustCompile(`(?s)<script[^>]*>.*?</script>`)
|
||||||
|
srcOnly := regexp.MustCompile(`<script[^>]+src=`)
|
||||||
|
for _, e := range entries {
|
||||||
|
b, err := fs.ReadFile(tmplFS, "templates/"+e.Name())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, m := range re.FindAll(b, -1) {
|
||||||
|
if srcOnly.Match(m) {
|
||||||
|
continue // external script tag with src: fine
|
||||||
|
}
|
||||||
|
t.Errorf("%s: inline <script> block found (CSP #139): %q", e.Name(), string(m[:60]))
|
||||||
|
}
|
||||||
|
if strings.Contains(string(b), " onclick=") || strings.Contains(string(b), "onload=") {
|
||||||
|
t.Errorf("%s: inline event handler attribute found (CSP #139)", e.Name())
|
||||||
|
}
|
||||||
|
if strings.Contains(string(b), "style=\"") {
|
||||||
|
t.Errorf("%s: inline style attribute found (CSP #139)", e.Name())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestReferencedStaticScriptsExist(t *testing.T) {
|
||||||
|
entries, _ := fs.ReadDir(tmplFS, "templates")
|
||||||
|
var staticFiles embed.FS = staticFS
|
||||||
|
for _, e := range entries {
|
||||||
|
b, err := fs.ReadFile(tmplFS, "templates/"+e.Name())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, m := range regexp.MustCompile(`<script src="/static/([^"]+)"`).FindAllSubmatch(b, -1) {
|
||||||
|
name := string(m[1])
|
||||||
|
if _, err := fs.ReadFile(staticFiles, "static/"+name); err != nil {
|
||||||
|
t.Errorf("%s references /static/%s: %v", e.Name(), name, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,7 +16,7 @@ func TestSecurityHeaders(t *testing.T) {
|
|||||||
h := SecurityHeaders(pages)
|
h := SecurityHeaders(pages)
|
||||||
rec := httptest.NewRecorder()
|
rec := httptest.NewRecorder()
|
||||||
h.ServeHTTP(rec, httptest.NewRequest("GET", "/", nil))
|
h.ServeHTTP(rec, httptest.NewRequest("GET", "/", nil))
|
||||||
wantCSP := "default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; frame-ancestors 'none'"
|
wantCSP := "default-src 'self'; script-src 'self'; style-src 'self'; img-src 'self' data:; frame-ancestors 'none'"
|
||||||
if got := rec.Header().Get("Content-Security-Policy"); got != wantCSP {
|
if got := rec.Header().Get("Content-Security-Policy"); got != wantCSP {
|
||||||
t.Errorf("CSP = %q, want %q", got, wantCSP)
|
t.Errorf("CSP = %q, want %q", got, wantCSP)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
// #99/#139: admin lock + settings panel. Key lives in sessionStorage for this visit only.
|
||||||
|
(function () {
|
||||||
|
var KEY = 'palette_admin_key';
|
||||||
|
var keyInput = document.getElementById('admin-key');
|
||||||
|
var status = document.getElementById('admin-key-status');
|
||||||
|
var panel = document.getElementById('admin-panel');
|
||||||
|
|
||||||
|
function key() { return sessionStorage.getItem(KEY) || ''; }
|
||||||
|
|
||||||
|
function api(path, opts) {
|
||||||
|
opts = opts || {};
|
||||||
|
// allow callers to override the key header (e.g. validating a typed key, #99)
|
||||||
|
opts.headers = Object.assign({ 'X-Admin-Key': key() }, opts.headers || {});
|
||||||
|
if (opts.body) opts.headers['Content-Type'] = 'application/json';
|
||||||
|
return fetch(path, opts);
|
||||||
|
}
|
||||||
|
|
||||||
|
function loadSettings() {
|
||||||
|
api('/admin/api/settings').then(function (r) {
|
||||||
|
if (r.status !== 200) { showLock(); return; }
|
||||||
|
return r.json();
|
||||||
|
}).then(function (s) {
|
||||||
|
if (!s) return;
|
||||||
|
document.getElementById('rl-burst').value = s.rate_limit_burst;
|
||||||
|
document.getElementById('rl-refill').value = s.rate_limit_per_minute;
|
||||||
|
document.getElementById('max-content').value = s.max_content_bytes;
|
||||||
|
document.getElementById('default-expiry').value = s.default_expiry;
|
||||||
|
document.getElementById('slug-days').value = s.custom_slug_reservation_days;
|
||||||
|
document.getElementById('burn-window').value = s.burn_viewer_window_minutes;
|
||||||
|
panel.classList.remove('hidden');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function showLock() {
|
||||||
|
panel.classList.add('hidden');
|
||||||
|
sessionStorage.removeItem(KEY);
|
||||||
|
}
|
||||||
|
|
||||||
|
document.getElementById('admin-key-form').addEventListener('submit', function (e) {
|
||||||
|
e.preventDefault();
|
||||||
|
// #99: don't persist the key until the server accepts it
|
||||||
|
api('/admin/api/settings', { headers: { 'X-Admin-Key': keyInput.value } }).then(function (r) {
|
||||||
|
if (r.status === 200) {
|
||||||
|
sessionStorage.setItem(KEY, keyInput.value);
|
||||||
|
status.textContent = '✓';
|
||||||
|
keyInput.value = '';
|
||||||
|
loadSettings();
|
||||||
|
} else {
|
||||||
|
status.textContent = 'invalid key';
|
||||||
|
showLock();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
document.getElementById('admin-settings-form').addEventListener('submit', function (e) {
|
||||||
|
e.preventDefault();
|
||||||
|
var body = {
|
||||||
|
rate_limit_burst: parseFloat(document.getElementById('rl-burst').value),
|
||||||
|
rate_limit_per_minute: parseFloat(document.getElementById('rl-refill').value),
|
||||||
|
max_content_bytes: parseInt(document.getElementById('max-content').value, 10),
|
||||||
|
default_expiry: document.getElementById('default-expiry').value,
|
||||||
|
custom_slug_reservation_days: parseInt(document.getElementById('slug-days').value, 10),
|
||||||
|
burn_viewer_window_minutes: parseInt(document.getElementById('burn-window').value, 10)
|
||||||
|
};
|
||||||
|
api('/admin/api/settings', { method: 'POST', body: JSON.stringify(body) }).then(function (r) {
|
||||||
|
document.getElementById('admin-save-status').textContent = r.status === 200 ? 'saved' : 'error';
|
||||||
|
if (r.status !== 200) showLock();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// #112: always show the lock on fresh load — do not auto-restore the
|
||||||
|
// panel from a stale sessionStorage key. The key is only written after a
|
||||||
|
// successful unlock (above) so in-page actions still work within this visit.
|
||||||
|
})();
|
||||||
+468
-27
@@ -4,6 +4,8 @@
|
|||||||
--muted: #7A6A9E; --muted-fg: #C0B2DE; --fg: #F2EDF8;
|
--muted: #7A6A9E; --muted-fg: #C0B2DE; --fg: #F2EDF8;
|
||||||
--accent: #C4A8F0; --border: #42355C;
|
--accent: #C4A8F0; --border: #42355C;
|
||||||
--radius-lg: 20px; --radius: 10px; --radius-sm: 999px;
|
--radius-lg: 20px; --radius: 10px; --radius-sm: 999px;
|
||||||
|
--chevron: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='8' viewBox='0 0 12 8'%3E%3Cpath d='M1 1l5 5 5-5' fill='none' stroke='%23C8C8D4' stroke-width='1.6' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E"); /* #136: select chevron stroke (dark presets) */
|
||||||
|
--chevron-fg: #C8C8D4;
|
||||||
--font-body: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
|
--font-body: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
|
||||||
--font-mono: ui-monospace, "JetBrains Mono", "Fira Code", monospace;
|
--font-mono: ui-monospace, "JetBrains Mono", "Fira Code", monospace;
|
||||||
}
|
}
|
||||||
@@ -18,6 +20,8 @@
|
|||||||
--accent: #7A7796; --border: #DAD7E6;
|
--accent: #7A7796; --border: #DAD7E6;
|
||||||
--ok: #456F45; --warn: #7A5E1B; --err: #9E4054;
|
--ok: #456F45; --warn: #7A5E1B; --err: #9E4054;
|
||||||
--on-accent: #F6F5FA;
|
--on-accent: #F6F5FA;
|
||||||
|
--chevron: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='8' viewBox='0 0 12 8'%3E%3Cpath d='M1 1l5 5 5-5' fill='none' stroke='%23555560' stroke-width='1.6' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E"); /* #136: light presets use a dark stroke */
|
||||||
|
--chevron-fg: #555560;
|
||||||
}
|
}
|
||||||
[data-preset="pastel-lavender"] {
|
[data-preset="pastel-lavender"] {
|
||||||
--bg: #e6e0f5; --surface: #f1edfa; --surface-2: #cbb8e7;
|
--bg: #e6e0f5; --surface: #f1edfa; --surface-2: #cbb8e7;
|
||||||
@@ -25,6 +29,8 @@
|
|||||||
--accent: #806bb8; --border: #c4b6e0;
|
--accent: #806bb8; --border: #c4b6e0;
|
||||||
--ok: #3E6B3E; --warn: #7A5E1B; --err: #9E4054;
|
--ok: #3E6B3E; --warn: #7A5E1B; --err: #9E4054;
|
||||||
--on-accent: #f1edfa;
|
--on-accent: #f1edfa;
|
||||||
|
--chevron: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='8' viewBox='0 0 12 8'%3E%3Cpath d='M1 1l5 5 5-5' fill='none' stroke='%23555560' stroke-width='1.6' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E"); /* #136: light presets use a dark stroke */
|
||||||
|
--chevron-fg: #555560;
|
||||||
}
|
}
|
||||||
[data-preset="pastel-peach"] {
|
[data-preset="pastel-peach"] {
|
||||||
--bg: #ffe0d6; --surface: #fff0ea; --surface-2: #ffc4a8;
|
--bg: #ffe0d6; --surface: #fff0ea; --surface-2: #ffc4a8;
|
||||||
@@ -32,6 +38,8 @@
|
|||||||
--accent: #f9826c; --border: #ffc9b5;
|
--accent: #f9826c; --border: #ffc9b5;
|
||||||
--ok: #3E6B3E; --warn: #7A5E1B; --err: #9E4054;
|
--ok: #3E6B3E; --warn: #7A5E1B; --err: #9E4054;
|
||||||
--on-accent: #4F2318;
|
--on-accent: #4F2318;
|
||||||
|
--chevron: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='8' viewBox='0 0 12 8'%3E%3Cpath d='M1 1l5 5 5-5' fill='none' stroke='%23555560' stroke-width='1.6' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E"); /* #136: light presets use a dark stroke */
|
||||||
|
--chevron-fg: #555560;
|
||||||
}
|
}
|
||||||
[data-preset="pastel-cloud"] {
|
[data-preset="pastel-cloud"] {
|
||||||
--bg: #fff0f6; --surface: #fff7fb; --surface-2: #ffc8dd;
|
--bg: #fff0f6; --surface: #fff7fb; --surface-2: #ffc8dd;
|
||||||
@@ -39,6 +47,51 @@
|
|||||||
--accent: #a2d2ff; --border: #ffccd9;
|
--accent: #a2d2ff; --border: #ffccd9;
|
||||||
--ok: #3E6B3E; --warn: #7A5E1B; --err: #9E4054;
|
--ok: #3E6B3E; --warn: #7A5E1B; --err: #9E4054;
|
||||||
--on-accent: #274a6b;
|
--on-accent: #274a6b;
|
||||||
|
--chevron: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='8' viewBox='0 0 12 8'%3E%3Cpath d='M1 1l5 5 5-5' fill='none' stroke='%23555560' stroke-width='1.6' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E"); /* #136: light presets use a dark stroke */
|
||||||
|
--chevron-fg: #555560;
|
||||||
|
}
|
||||||
|
/* matching light/dark counterparts: same hue family, flipped lightness roles */
|
||||||
|
/* Midnight Light: light counterpart of midnight (violet family) */
|
||||||
|
[data-preset="midnight-light"] {
|
||||||
|
--bg: #F3EFF9; --surface: #FAF8FD; --surface-2: #E1D9EF;
|
||||||
|
--muted: #A99CC9; --muted-fg: #5F5390; --fg: #2B2140;
|
||||||
|
--accent: #7B5FC0; --border: #D8CEEC;
|
||||||
|
--ok: #3E6B3E; --warn: #7A5E1B; --err: #9E4054;
|
||||||
|
--on-accent: #FAF8FD;
|
||||||
|
--chevron: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='8' viewBox='0 0 12 8'%3E%3Cpath d='M1 1l5 5 5-5' fill='none' stroke='%23555560' stroke-width='1.6' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E"); /* #136: light presets use a dark stroke */
|
||||||
|
--chevron-fg: #555560;
|
||||||
|
}
|
||||||
|
/* Smooth Dark: dark counterpart of smooth (muted slate-violet family) */
|
||||||
|
[data-preset="smooth-dark"] {
|
||||||
|
--bg: #23222E; --surface: #2C2B3A; --surface-2: #3B3A4D;
|
||||||
|
--muted: #7A7796; --muted-fg: #B5B1C9; --fg: #E8E7F0;
|
||||||
|
--accent: #A9A6C4; --border: #45435A;
|
||||||
|
--ok: #9CD49C; --warn: #E8C77B; --err: #F2A3B3;
|
||||||
|
--on-accent: #23222E;
|
||||||
|
}
|
||||||
|
/* Pastel Lavender Dark: dark counterpart (lavender family) */
|
||||||
|
[data-preset="pastel-lavender-dark"] {
|
||||||
|
--bg: #2A2340; --surface: #352C50; --surface-2: #4A3E6B;
|
||||||
|
--muted: #8F7FB8; --muted-fg: #CBBEE8; --fg: #EFEAF8;
|
||||||
|
--accent: #B39DE4; --border: #4E4272;
|
||||||
|
--ok: #9CD49C; --warn: #E8C77B; --err: #F2A3B3;
|
||||||
|
--on-accent: #2A2340;
|
||||||
|
}
|
||||||
|
/* Pastel Peach Dark: dark counterpart (peach family) */
|
||||||
|
[data-preset="pastel-peach-dark"] {
|
||||||
|
--bg: #3A241C; --surface: #4A2F24; --surface-2: #654234;
|
||||||
|
--muted: #B07A64; --muted-fg: #F0C4B0; --fg: #FBEBE2;
|
||||||
|
--accent: #F9826C; --border: #75503F;
|
||||||
|
--ok: #9CD49C; --warn: #E8C77B; --err: #F2A3B3;
|
||||||
|
--on-accent: #3A241C;
|
||||||
|
}
|
||||||
|
/* Pastel Cloud Dark: dark counterpart (pink cloud family, blue accent) */
|
||||||
|
[data-preset="pastel-cloud-dark"] {
|
||||||
|
--bg: #33222E; --surface: #402C3A; --surface-2: #583D50;
|
||||||
|
--muted: #A87E97; --muted-fg: #E5C2D6; --fg: #FAEEF5;
|
||||||
|
--accent: #A2D2FF; --border: #644759;
|
||||||
|
--ok: #9CD49C; --warn: #E8C77B; --err: #F2A3B3;
|
||||||
|
--on-accent: #33222E;
|
||||||
}
|
}
|
||||||
|
|
||||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||||
@@ -86,13 +139,23 @@ body {
|
|||||||
.pane-l-col { display: flex; flex-direction: column; gap: 14px; min-height: 0; }
|
.pane-l-col { display: flex; flex-direction: column; gap: 14px; min-height: 0; }
|
||||||
.pane-l-head { flex-shrink: 0; }
|
.pane-l-head { flex-shrink: 0; }
|
||||||
.editor-head {
|
.editor-head {
|
||||||
display: flex; align-items: center; gap: 12px; padding: 12px 16px;
|
display: flex; align-items: stretch; gap: 12px; padding: 12px 16px;
|
||||||
}
|
}
|
||||||
|
/* #147: title lives in its own pill; select+refresh stay paired in a second pill */
|
||||||
|
.editor-head-title,
|
||||||
|
.editor-head-settings {
|
||||||
|
display: flex; align-items: center; gap: 8px;
|
||||||
|
background: var(--surface-2); border: 1px solid var(--border);
|
||||||
|
border-radius: var(--radius); padding: 6px 10px;
|
||||||
|
}
|
||||||
|
.editor-head-title { flex: 1; min-width: 0; }
|
||||||
|
.editor-head-settings { flex: 0 0 fit-content; }
|
||||||
|
.editor-head-title:focus-within { border-color: var(--accent); }
|
||||||
.editor-head input {
|
.editor-head input {
|
||||||
border: none; outline: none; background: transparent; color: var(--fg); font: inherit; font-size: 23.2px; flex: 1;
|
border: none; outline: none; background: transparent; color: var(--fg); font: inherit; font-size: 23.2px; flex: 1;
|
||||||
}
|
}
|
||||||
.editor-head select {
|
.editor-head select {
|
||||||
border: 1px solid var(--border); background: var(--surface-2); color: var(--muted-fg);
|
border: 1px solid var(--border); background-color: var(--surface-2); color: var(--muted-fg);
|
||||||
border-radius: var(--radius); padding: 4px 10px; font: inherit; font-size: 21.6px; cursor: pointer;
|
border-radius: var(--radius); padding: 4px 10px; font: inherit; font-size: 21.6px; cursor: pointer;
|
||||||
}
|
}
|
||||||
/* shared code line metrics (#50): gutter + code must share one line box */
|
/* shared code line metrics (#50): gutter + code must share one line box */
|
||||||
@@ -134,11 +197,17 @@ body {
|
|||||||
border: 1px solid var(--border); border-radius: var(--radius); padding: 5px 8px; background: var(--bg);
|
border: 1px solid var(--border); border-radius: var(--radius); padding: 5px 8px; background: var(--bg);
|
||||||
color: var(--fg); font: inherit; font-size: 21.6px; width: 130px;
|
color: var(--fg); font: inherit; font-size: 21.6px; width: 130px;
|
||||||
}
|
}
|
||||||
.created-banner {
|
/* #168: compact side notification pill (paste-created feedback) */
|
||||||
display: none; padding: 10px 16px; font-size: 22.4px; background: var(--surface-2);
|
.created-pill {
|
||||||
border-bottom: 1px solid var(--border); word-break: break-all;
|
position: fixed; right: 12px; bottom: 12px; z-index: 200;
|
||||||
|
background: var(--surface-2); color: var(--ok); border: 1px solid var(--ok);
|
||||||
|
border-radius: var(--radius-sm); padding: 2px 8px; font-size: 11.5px;
|
||||||
|
opacity: 0; pointer-events: none; transform: translateY(6px);
|
||||||
|
transition: opacity .25s ease, transform .25s ease;
|
||||||
|
box-shadow: 0 4px 16px rgba(0,0,0,.25);
|
||||||
}
|
}
|
||||||
.created-banner a { color: var(--accent); }
|
.created-pill.show { opacity: 1; transform: translateY(0); }
|
||||||
|
@media (max-width: 640px) { .created-pill { right: 12px; bottom: 12px; } }
|
||||||
|
|
||||||
/* paste view */
|
/* paste view */
|
||||||
.meta-bar { display: flex; align-items: center; gap: 12px; padding: 12px 18px; flex-wrap: wrap; }
|
.meta-bar { display: flex; align-items: center; gap: 12px; padding: 12px 18px; flex-wrap: wrap; }
|
||||||
@@ -146,15 +215,18 @@ body {
|
|||||||
.slug { font-family: var(--font-mono); font-size: 21.6px; color: var(--muted-fg); background: var(--surface-2); padding: 3px 9px; border-radius: var(--radius-sm); }
|
.slug { font-family: var(--font-mono); font-size: 21.6px; color: var(--muted-fg); background: var(--surface-2); padding: 3px 9px; border-radius: var(--radius-sm); }
|
||||||
.tag { font-size: 19.8px; color: var(--muted-fg); border: 1px solid var(--border); border-radius: var(--radius-sm); padding: 2px 9px; }
|
.tag { font-size: 19.8px; color: var(--muted-fg); border: 1px solid var(--border); border-radius: var(--radius-sm); padding: 2px 9px; }
|
||||||
.paste-title-bar { display: flex; align-items: center; gap: 12px; padding: 12px 18px; flex-wrap: wrap; }
|
.paste-title-bar { display: flex; align-items: center; gap: 12px; padding: 12px 18px; flex-wrap: wrap; }
|
||||||
.paste-title-bar h1 { font-size: 29.2px; font-weight: 600; margin: 0; }
|
.paste-title-bar h1 { font-size: 29.2px; font-weight: 600; margin: 0; word-break: normal; overflow-wrap: anywhere; }
|
||||||
.stats-pill { border: 1px solid var(--border); border-radius: var(--radius); overflow: hidden; }
|
/* #222: .float already draws the border + radius and clips corners; the pill's own
|
||||||
.stats-head { display: flex; align-items: center; gap: 16px; width: 100%; background: none; border: 0; color: var(--muted-fg); font: inherit; font-size: 21.6px; padding: 14px 18px; cursor: pointer; text-align: left; }
|
tighter border curve was getting clipped thin at the corners. Let .float be the
|
||||||
|
only border/paint surface for the details pill (collapsed and expanded). */
|
||||||
|
.stats-pill { border: 0; border-radius: 0; overflow: hidden; }
|
||||||
|
.stats-head { display: flex; align-items: center; gap: 16px; width: 100%; background: none; border: 0; border-bottom: 1px solid var(--border); color: var(--muted-fg); font: inherit; font-size: 21.6px; padding: 14px 18px; cursor: pointer; text-align: left; }
|
||||||
.stats-head:hover { color: var(--fg); background: var(--surface-2); }
|
.stats-head:hover { color: var(--fg); background: var(--surface-2); }
|
||||||
.stats-chev { width: 18px; height: 18px; flex: none; transition: transform 0.15s ease; }
|
.stats-chev { width: 18px; height: 18px; flex: none; transition: transform 0.15s ease; }
|
||||||
.stats-pill.open .stats-chev { transform: rotate(180deg); }
|
.stats-pill.open .stats-chev { transform: rotate(180deg); }
|
||||||
.stats-summary { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; letter-spacing: .01em; }
|
.stats-summary { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; letter-spacing: .01em; }
|
||||||
@media (max-width: 640px) { .stats-summary { white-space: normal; word-break: break-word; } }
|
@media (max-width: 640px) { .stats-summary { white-space: normal; word-break: break-word; } }
|
||||||
.stats-body { border-top: 1px solid var(--border); }
|
.stats-body { /* #169: divider under the dropdown title is the head's own persistent border-bottom */ }
|
||||||
.stats-grid { display: grid; grid-template-columns: max-content 1fr; gap: 6px 18px; padding: 12px 16px; font-size: 20.7px; }
|
.stats-grid { display: grid; grid-template-columns: max-content 1fr; gap: 6px 18px; padding: 12px 16px; font-size: 20.7px; }
|
||||||
.stats-k { color: var(--muted-fg); }
|
.stats-k { color: var(--muted-fg); }
|
||||||
.stats-v { color: var(--fg); word-break: break-all; }
|
.stats-v { color: var(--fg); word-break: break-all; }
|
||||||
@@ -162,12 +234,34 @@ body {
|
|||||||
.iconbtn { border: 1px solid var(--border); background: var(--surface-2); color: var(--muted-fg); border-radius: var(--radius); padding: 5px 12px; font: inherit; font-size: 21.6px; cursor: pointer; text-decoration: none; }
|
.iconbtn { border: 1px solid var(--border); background: var(--surface-2); color: var(--muted-fg); border-radius: var(--radius); padding: 5px 12px; font: inherit; font-size: 21.6px; cursor: pointer; text-decoration: none; }
|
||||||
.iconbtn.gear { display: inline-flex; align-items: center; padding: 5px 9px; }
|
.iconbtn.gear { display: inline-flex; align-items: center; padding: 5px 9px; }
|
||||||
.iconbtn.gear svg { width: 22px; height: 22px; }
|
.iconbtn.gear svg { width: 22px; height: 22px; }
|
||||||
|
/* #127: gear highlights like selected nav tabs; dark toggle button */
|
||||||
|
.iconbtn.gear.on { background: var(--accent); color: var(--bg); border-color: var(--accent); }
|
||||||
|
.iconbtn.dark-toggle { display: inline-flex; align-items: center; gap: 6px; padding: 5px 9px; }
|
||||||
|
.iconbtn.dark-toggle svg { width: 22px; height: 22px; }
|
||||||
|
.iconbtn.dark-toggle .icon-moon { display: none; }
|
||||||
|
.iconbtn.dark-toggle .icon-sun { display: inline-block; }
|
||||||
|
.dark .iconbtn.dark-toggle .icon-sun { display: none; }
|
||||||
|
.dark .iconbtn.dark-toggle .icon-moon { display: inline-block; }
|
||||||
|
/* #127: gear highlights like selected nav tabs; dark toggle button */
|
||||||
|
.iconbtn.gear.on { background: var(--accent); color: var(--bg); border-color: var(--accent); }
|
||||||
|
.iconbtn.dark-toggle { display: inline-flex; align-items: center; gap: 6px; padding: 5px 9px; }
|
||||||
|
.iconbtn.dark-toggle svg { width: 22px; height: 22px; }
|
||||||
|
.iconbtn.dark-toggle .icon-moon { display: none; }
|
||||||
|
.iconbtn.dark-toggle .icon-sun { display: inline-block; }
|
||||||
|
.dark .iconbtn.dark-toggle .icon-sun { display: none; }
|
||||||
|
.dark .iconbtn.dark-toggle .icon-moon { display: inline-block; }
|
||||||
.settings-head { padding: 12px 18px; border-bottom: 1px solid var(--border); }
|
.settings-head { padding: 12px 18px; border-bottom: 1px solid var(--border); }
|
||||||
.settings-head h1 { font-size: 29.2px; font-weight: 600; margin: 0; }
|
.settings-head h1 { font-size: 29.2px; font-weight: 600; margin: 0; }
|
||||||
.settings-body { padding: 16px 18px; color: var(--muted-fg); font-size: 21.6px; }
|
.settings-body { padding: 16px 18px; color: var(--muted-fg); font-size: 21.6px; }
|
||||||
.settings-section-title { color: var(--fg); font-size: 24px; margin-bottom: 6px; }
|
.settings-section-title { color: var(--fg); font-size: 24px; margin-bottom: 6px; }
|
||||||
/* theme switcher cards (#100) */
|
/* theme switcher cards (#100) */
|
||||||
.theme-grid { display: flex; flex-wrap: wrap; gap: 14px; margin-top: 14px; }
|
.theme-grid { display: flex; flex-wrap: wrap; gap: 14px; margin-top: 14px; }
|
||||||
|
|
||||||
|
/* #161: more breathing room between settings sections */
|
||||||
|
/* #207 r2: owner wants the toggle left aligned (revert #197 centering) */
|
||||||
|
#settings-dark-toggle { margin-bottom: 20px; }
|
||||||
|
.settings-body h3 { margin-top: 28px; }
|
||||||
|
.settings-body .theme-grid { margin-bottom: 8px; }
|
||||||
.theme-card {
|
.theme-card {
|
||||||
display: flex; flex-direction: column; gap: 10px; align-items: flex-start;
|
display: flex; flex-direction: column; gap: 10px; align-items: flex-start;
|
||||||
padding: 14px 16px; min-width: 180px;
|
padding: 14px 16px; min-width: 180px;
|
||||||
@@ -180,6 +274,23 @@ body {
|
|||||||
.theme-card .swatch { width: 26px; height: 26px; border-radius: 6px; border: 1px solid rgba(255,255,255,.15); }
|
.theme-card .swatch { width: 26px; height: 26px; border-radius: 6px; border: 1px solid rgba(255,255,255,.15); }
|
||||||
.theme-name { font-weight: 600; }
|
.theme-name { font-weight: 600; }
|
||||||
.iconbtn:hover { color: var(--fg); border-color: var(--muted); }
|
.iconbtn:hover { color: var(--fg); border-color: var(--muted); }
|
||||||
|
/* #130: line wrap toggle, accent when active like other toggles */
|
||||||
|
/* #166: wrap toggle must show its state: neutral when off, accent when on.
|
||||||
|
The .btn base is accent filled, which made on and off look identical. */
|
||||||
|
.btn-icon.wrap-toggle { background: var(--surface-2); color: var(--muted-fg); font-size: 21.6px; font-weight: inherit; border: 1px solid var(--border); }
|
||||||
|
.btn-icon.wrap-toggle:hover { color: var(--fg); border-color: var(--muted-fg); filter: none; }
|
||||||
|
.iconbtn.wrap-toggle[aria-pressed="true"],
|
||||||
|
.btn-icon.wrap-toggle[aria-pressed="true"] { background: var(--accent); color: var(--bg); border-color: var(--accent); }
|
||||||
|
/* #152: wrap ON must break long unbroken tokens mid-word and allow no horizontal scrolling */
|
||||||
|
html[data-wrap] .codebody { white-space: pre-wrap; overflow-wrap: anywhere; word-break: break-all; overflow-x: hidden; }
|
||||||
|
/* #167: overflow:hidden zeroes the flex auto-minimum, so the codebody must
|
||||||
|
be told to fill the space left of the gutter or it collapses and the
|
||||||
|
gutter (flex-shrink:0) consumes the whole row */
|
||||||
|
html[data-wrap] .code .codebody { flex: 1 1 auto; min-width: 0; }
|
||||||
|
html[data-wrap] .editor { white-space: pre-wrap; overflow-wrap: anywhere; word-break: break-all; overflow-x: hidden; }
|
||||||
|
/* #152: with wrap on nothing may scroll horizontally, including the code container and mobile floats */
|
||||||
|
html[data-wrap] .code { overflow-x: hidden; }
|
||||||
|
html[data-wrap] .float { overflow-x: hidden; }
|
||||||
.iconbtn.danger:hover { color: #ff8fa3; border-color: #ff8fa3; }
|
.iconbtn.danger:hover { color: #ff8fa3; border-color: #ff8fa3; }
|
||||||
.code-head {
|
.code-head {
|
||||||
display: flex; align-items: center; gap: 10px; padding: 8px 16px;
|
display: flex; align-items: center; gap: 10px; padding: 8px 16px;
|
||||||
@@ -188,12 +299,33 @@ body {
|
|||||||
.code-head .dot { width: 8px; height: 8px; border-radius: 50%; background: var(--accent); }
|
.code-head .dot { width: 8px; height: 8px; border-radius: 50%; background: var(--accent); }
|
||||||
.code {
|
.code {
|
||||||
font-family: var(--font-mono); font-size: var(--code-fs); line-height: var(--code-lh);
|
font-family: var(--font-mono); font-size: var(--code-fs); line-height: var(--code-lh);
|
||||||
padding: 14px 0; display: flex; overflow-x: auto;
|
padding: 14px 0; display: flex; overflow-x: hidden;
|
||||||
}
|
}
|
||||||
|
/* #261: horizontal scroll must live on the codebody, not the .code flex
|
||||||
|
container — a container-level scroll takes the gutter with it when the
|
||||||
|
user scrolls long lines. The gutter sits OUTSIDE the scroll container and
|
||||||
|
stays visible; the codebody shrinks to the remaining space and scrolls
|
||||||
|
(min-width: 0 lets it shrink below its content width inside the flex row). */
|
||||||
|
.code .codebody { flex: 1 1 auto; min-width: 0; overflow-x: auto; }
|
||||||
|
/* #167: the gutter must not drive the flex layout — its content width
|
||||||
|
(row count × number width) shrinks the code column, which re-wraps lines,
|
||||||
|
which grows the gutter: a feedback loop. Pin the gutter with a fixed
|
||||||
|
basis, take its width out of the negotiation, and let the codebody take
|
||||||
|
the rest. */
|
||||||
|
.code .gutter { flex: 0 0 auto; width: 3ch; min-width: 3ch; overflow: visible; }
|
||||||
.code .gutter { flex-shrink: 0; }
|
.code .gutter { flex-shrink: 0; }
|
||||||
/* gutter/code share line metrics; the editor gutter keeps its own padding (#50) */
|
/* gutter/code share line metrics; the editor gutter keeps its own padding (#50) */
|
||||||
.code .gutter { padding-top: 0; padding-bottom: 0; }
|
.code .gutter { padding-top: 0; padding-bottom: 0; }
|
||||||
.codebody { padding: 0 18px; white-space: pre; }
|
.codebody { padding: 0 18px; white-space: pre; overflow-x: auto; }
|
||||||
|
/* #167: each logical line is its own block so offsetTop identifies its first visual row */
|
||||||
|
.codeline { display: block; }
|
||||||
|
/* #167: gutter number spans must stack one per visual row (wrap on).
|
||||||
|
#274: the /new editor gutter uses the same .gutline blocks when its own
|
||||||
|
wrap toggle is on, so scope the rule to any gutter, not just .code. */
|
||||||
|
.code .gutter .gutline, .editor-wrap .gutter .gutline { display: block; }
|
||||||
|
/* #194: codeline blocks are adjacent (no '\n' text between them), so an
|
||||||
|
empty block (blank source line) needs its own line box to stay one row */
|
||||||
|
.codeline:empty::before { content: "\200B"; }
|
||||||
/* syntax highlight tokens (#1) */
|
/* syntax highlight tokens (#1) */
|
||||||
.tok-kw { color: #c792ea; }
|
.tok-kw { color: #c792ea; }
|
||||||
.tok-str { color: #a5e075; }
|
.tok-str { color: #a5e075; }
|
||||||
@@ -202,7 +334,8 @@ body {
|
|||||||
.footnote { display: flex; gap: 20px; padding: 10px 18px; font-size: 20.7px; color: var(--muted-fg); border-top: 1px solid var(--border); flex-wrap: wrap; }
|
.footnote { display: flex; gap: 20px; padding: 10px 18px; font-size: 20.7px; color: var(--muted-fg); border-top: 1px solid var(--border); flex-wrap: wrap; }
|
||||||
|
|
||||||
/* history */
|
/* history */
|
||||||
.page { max-width: 1200px; margin: 0 auto; padding: 20px; display: flex; flex-direction: column; gap: 16px; }
|
.page { max-width: 1200px; margin: 0 auto; padding: 20px 20px 28px; display: flex; flex-direction: column; gap: 16px; min-height: calc(100vh - 76px); }
|
||||||
|
.pager { position: sticky; bottom: 0; margin-top: auto; z-index: 5; }
|
||||||
.head-row { display: flex; align-items: baseline; gap: 14px; }
|
.head-row { display: flex; align-items: baseline; gap: 14px; }
|
||||||
.head-row h1 { font-size: 34.5px; font-weight: 600; }
|
.head-row h1 { font-size: 34.5px; font-weight: 600; }
|
||||||
.search {
|
.search {
|
||||||
@@ -221,8 +354,15 @@ tr:last-child td { border-bottom: none; }
|
|||||||
tr.row { cursor: pointer; }
|
tr.row { cursor: pointer; }
|
||||||
tr.row:hover td { background: var(--surface-2); }
|
tr.row:hover td { background: var(--surface-2); }
|
||||||
tr.row:hover td a.slug { color: var(--accent); }
|
tr.row:hover td a.slug { color: var(--accent); }
|
||||||
|
/* #292: highlight the paste NAME uniformly on row hover, titled or not */
|
||||||
|
tr.row:hover td .paste-name { color: var(--accent); }
|
||||||
td a.slug { font-family: var(--font-mono); font-size: 21.6px; color: var(--fg); text-decoration: none; }
|
td a.slug { font-family: var(--font-mono); font-size: 21.6px; color: var(--fg); text-decoration: none; }
|
||||||
|
td a.url-link { font-family: inherit; font-size: inherit; color: inherit; text-decoration: none; }
|
||||||
|
td a.url-link:hover { color: var(--accent); }
|
||||||
td a.slug:hover { color: var(--accent); }
|
td a.slug:hover { color: var(--accent); }
|
||||||
|
/* PASTE column fallback for untitled pastes: plain text, identical to a titled paste. URL/ID chips keep .slug styling. */
|
||||||
|
td a.slug.paste-name { background: none; padding: 0; border-radius: 0; font-family: inherit; font-size: inherit; color: var(--fg); }
|
||||||
|
td a.paste-name { color: var(--fg); text-decoration: none; font-family: inherit; font-size: inherit; }
|
||||||
.badge { font-size: 18.9px; border: 1px solid var(--border); color: var(--muted-fg); border-radius: var(--radius-sm); padding: 1px 8px; }
|
.badge { font-size: 18.9px; border: 1px solid var(--border); color: var(--muted-fg); border-radius: var(--radius-sm); padding: 1px 8px; }
|
||||||
.badge.lock { color: var(--accent); border-color: var(--accent); }
|
.badge.lock { color: var(--accent); border-color: var(--accent); }
|
||||||
.dim { color: var(--muted-fg); white-space: nowrap; }
|
.dim { color: var(--muted-fg); white-space: nowrap; }
|
||||||
@@ -244,6 +384,9 @@ td a.slug:hover { color: var(--accent); }
|
|||||||
}
|
}
|
||||||
.inner h1 { font-size: 29.2px; font-weight: 600; margin-bottom: 6px; }
|
.inner h1 { font-size: 29.2px; font-weight: 600; margin-bottom: 6px; }
|
||||||
.inner .sub { font-size: 22.4px; color: var(--muted-fg); margin-bottom: 20px; }
|
.inner .sub { font-size: 22.4px; color: var(--muted-fg); margin-bottom: 20px; }
|
||||||
|
/* #173: missing paste message box */
|
||||||
|
.notfound-err { color: var(--err); }
|
||||||
|
.notfound-card .btn { display: block; margin-top: 10px; }
|
||||||
.pwinput {
|
.pwinput {
|
||||||
width: 100%; padding: 10px 14px; border: 1px solid var(--border); border-radius: var(--radius);
|
width: 100%; padding: 10px 14px; border: 1px solid var(--border); border-radius: var(--radius);
|
||||||
background: var(--bg); color: var(--fg); font: inherit; font-size: 23.2px; outline: none; text-align: center;
|
background: var(--bg); color: var(--fg); font: inherit; font-size: 23.2px; outline: none; text-align: center;
|
||||||
@@ -283,15 +426,15 @@ td a.slug:hover { color: var(--accent); }
|
|||||||
}
|
}
|
||||||
.seg input, .toggle input { accent-color: var(--accent); width: 16px; height: 16px; margin: 0; }
|
.seg input, .toggle input { accent-color: var(--accent); width: 16px; height: 16px; margin: 0; }
|
||||||
|
|
||||||
/* toast (#19) */
|
/* toast (#19, #168): small pill anchored to the corner, out of content flow */
|
||||||
.toast {
|
.toast {
|
||||||
position: fixed; left: 50%; bottom: 32px; transform: translateX(-50%) translateY(8px);
|
position: fixed; right: 16px; bottom: 16px;
|
||||||
background: var(--surface-2); color: var(--fg); border: 1px solid var(--border);
|
background: var(--surface-2); color: var(--fg); border: 1px solid var(--border);
|
||||||
border-radius: var(--radius-sm); padding: 6px 18px; font-size: 20.7px;
|
border-radius: var(--radius-sm); padding: 6px 12px; font-size: 13px;
|
||||||
opacity: 0; pointer-events: none; transition: opacity .25s ease, transform .25s ease; z-index: 200;
|
opacity: 0; pointer-events: none; transition: opacity .25s ease, transform .25s ease; z-index: 200;
|
||||||
box-shadow: 0 4px 16px rgba(0,0,0,.25);
|
box-shadow: 0 4px 16px rgba(0,0,0,.25);
|
||||||
}
|
}
|
||||||
.toast.show { opacity: 1; transform: translateX(-50%) translateY(0); }
|
.toast.show { opacity: 1; transform: translateY(0); }
|
||||||
/* status variants (#16) */
|
/* status variants (#16) */
|
||||||
.toast.success { border-color: var(--ok); color: var(--ok); }
|
.toast.success { border-color: var(--ok); color: var(--ok); }
|
||||||
.toast.error { border-color: var(--err); color: var(--err); }
|
.toast.error { border-color: var(--err); color: var(--err); }
|
||||||
@@ -305,7 +448,42 @@ td a.slug:hover { color: var(--accent); }
|
|||||||
|
|
||||||
/* protection section rhythm (#20) */
|
/* protection section rhythm (#20) */
|
||||||
.protect { display: flex; flex-direction: column; gap: 2px; }
|
.protect { display: flex; flex-direction: column; gap: 2px; }
|
||||||
.protect .pw-row { padding: 2px 8px 4px; }
|
.protect .pw-row:not(.submenu) { padding: 2px 8px 4px; }
|
||||||
|
|
||||||
|
/* submenu number boxes (#157): styled number inputs + unit selects,
|
||||||
|
padded + indented to line up with parent option labels */
|
||||||
|
.submenu {
|
||||||
|
/* #240: indent the box under the parent option LABEL text (8px row padding
|
||||||
|
+ 16px control + 8px gap = 32px), and match the row control padding rhythm */
|
||||||
|
margin: 4px 0 4px 32px;
|
||||||
|
padding: 6px 10px;
|
||||||
|
background: var(--bg);
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
border-radius: var(--radius);
|
||||||
|
}
|
||||||
|
.exp-group { display: flex; align-items: center; gap: 8px; }
|
||||||
|
.num-input {
|
||||||
|
width: 72px;
|
||||||
|
border: 1px solid var(--border); border-radius: var(--radius);
|
||||||
|
background: var(--surface-2); color: var(--fg);
|
||||||
|
font: inherit; font-size: 21.6px; padding: 6px 10px; outline: none;
|
||||||
|
-moz-appearance: textfield; appearance: textfield;
|
||||||
|
}
|
||||||
|
.num-input::-webkit-outer-spin-button,
|
||||||
|
.num-input::-webkit-inner-spin-button { -webkit-appearance: none; margin: 0; }
|
||||||
|
.num-input:focus { border-color: var(--accent); }
|
||||||
|
.unit-select {
|
||||||
|
border: 1px solid var(--border); border-radius: var(--radius);
|
||||||
|
background-color: var(--surface-2); color: var(--muted-fg);
|
||||||
|
font: inherit; font-size: 21.6px; padding: 6px 28px 6px 10px;
|
||||||
|
cursor: pointer; outline: none;
|
||||||
|
appearance: none; -webkit-appearance: none;
|
||||||
|
background-image: var(--chevron);
|
||||||
|
background-repeat: no-repeat; background-position: right 10px center;
|
||||||
|
}
|
||||||
|
.unit-select:focus { border-color: var(--accent); }
|
||||||
|
.readable-group { gap: 8px; }
|
||||||
|
.readable-label { font-size: 19px; color: var(--muted-fg); white-space: nowrap; }
|
||||||
.pw-field {
|
.pw-field {
|
||||||
display: flex; align-items: center; gap: 2px; width: 100%;
|
display: flex; align-items: center; gap: 2px; width: 100%;
|
||||||
border: 1px solid var(--border); border-radius: var(--radius); background: var(--bg);
|
border: 1px solid var(--border); border-radius: var(--radius); background: var(--bg);
|
||||||
@@ -355,7 +533,7 @@ td a.slug:hover { color: var(--accent); }
|
|||||||
/* paste name under slug pill in Paste column (#43) */
|
/* paste name under slug pill in Paste column (#43) */
|
||||||
.paste-sub { font-size: 19.8px; color: var(--muted-fg); margin-top: 2px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
.paste-sub { font-size: 19.8px; color: var(--muted-fg); margin-top: 2px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||||
.paste-sub.dim { color: var(--muted); }
|
.paste-sub.dim { color: var(--muted); }
|
||||||
td a.slug.url-link { max-width: 100%; display: inline-block; vertical-align: middle; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; box-sizing: border-box; }
|
td a.url-link { max-width: 100%; display: inline-block; vertical-align: middle; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; box-sizing: border-box; }
|
||||||
td .id-link { color: var(--muted-fg); text-decoration: none; font-family: var(--font-mono); font-size: 19.8px; }
|
td .id-link { color: var(--muted-fg); text-decoration: none; font-family: var(--font-mono); font-size: 19.8px; }
|
||||||
td .id-link:hover { color: var(--accent); }
|
td .id-link:hover { color: var(--accent); }
|
||||||
|
|
||||||
@@ -363,12 +541,11 @@ td .id-link:hover { color: var(--accent); }
|
|||||||
th.sortable { cursor: pointer; user-select: none; }
|
th.sortable { cursor: pointer; user-select: none; }
|
||||||
th.sortable:hover { color: var(--fg); }
|
th.sortable:hover { color: var(--fg); }
|
||||||
th.sortable { cursor: pointer; user-select: none; white-space: nowrap; }
|
th.sortable { cursor: pointer; user-select: none; white-space: nowrap; }
|
||||||
/* #101: arrow sits LEFT of the label, further spaced, vertically centered,
|
/* #209: arrow sits RIGHT of the label, vertically centered, and absolutely
|
||||||
and absolutely positioned so it never shifts the label text. */
|
positioned so it never shifts the label text; label aligns with column contents. */
|
||||||
th.sortable { position: relative; padding-left: 24px; }
|
|
||||||
th.sortable .sort-ind {
|
th.sortable .sort-ind {
|
||||||
position: absolute; left: 8px; top: 50%; transform: translateY(-50%);
|
/* #209 r2: inline right after the label text with a fixed gap, not pinned to the column edge */
|
||||||
display: inline-block; width: 0; height: 0;
|
display: inline-block; width: 0; height: 0; margin-left: 6px; vertical-align: middle;
|
||||||
border-left: 5px solid transparent; border-right: 5px solid transparent;
|
border-left: 5px solid transparent; border-right: 5px solid transparent;
|
||||||
}
|
}
|
||||||
th.sorted.asc .sort-ind { border-bottom: 6px solid var(--accent); }
|
th.sorted.asc .sort-ind { border-bottom: 6px solid var(--accent); }
|
||||||
@@ -416,6 +593,20 @@ a.admin-link:hover { color: var(--fg); text-decoration: underline; }
|
|||||||
border-color: var(--ok);
|
border-color: var(--ok);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* #260: static-width success feedback. Label and checkmark stack in one
|
||||||
|
grid cell, so the button is always as wide as the wider of the two and
|
||||||
|
never shifts on click. Feedback is a pure .ok class toggle. */
|
||||||
|
.swapbtn {
|
||||||
|
display: inline-grid;
|
||||||
|
}
|
||||||
|
.swapbtn > * {
|
||||||
|
grid-area: 1 / 1;
|
||||||
|
justify-self: center;
|
||||||
|
}
|
||||||
|
.swapbtn .swap-check { visibility: hidden; }
|
||||||
|
.swapbtn.ok .swap-check { visibility: visible; }
|
||||||
|
.swapbtn.ok .swap-label { visibility: hidden; }
|
||||||
|
|
||||||
/* headings: unified treatment (mirrors .side-section h3) */
|
/* headings: unified treatment (mirrors .side-section h3) */
|
||||||
.settings-head h1, .paste-title-bar h1, .head-row h1, .inner h1 {
|
.settings-head h1, .paste-title-bar h1, .head-row h1, .inner h1 {
|
||||||
letter-spacing: -0.01em;
|
letter-spacing: -0.01em;
|
||||||
@@ -432,13 +623,19 @@ a.admin-link:hover { color: var(--fg); text-decoration: underline; }
|
|||||||
body { font-size: 16px; }
|
body { font-size: 16px; }
|
||||||
|
|
||||||
/* topbar: tighten so logo + nav + gear fit */
|
/* topbar: tighten so logo + nav + gear fit */
|
||||||
.topbar { gap: 10px; padding: 0 12px; height: 56px; }
|
.topbar { gap: 6px; padding: 0 10px; height: 56px; }
|
||||||
.logo { font-size: 17px; white-space: nowrap; }
|
.logo { font-size: 17px; white-space: nowrap; }
|
||||||
.logo em { display: none; }
|
.logo em { display: none; }
|
||||||
.topbar nav { gap: 2px; flex-shrink: 0; }
|
.topbar nav { gap: 2px; flex-shrink: 0; }
|
||||||
.topbar nav a { padding: 5px 8px; font-size: 15px; }
|
.topbar nav a { padding: 4px 6px; font-size: 15px; }
|
||||||
.iconbtn.gear { padding: 4px 7px; flex-shrink: 0; }
|
.iconbtn.gear { padding: 4px 7px; flex-shrink: 0; }
|
||||||
.iconbtn.gear svg { width: 18px; height: 18px; }
|
.iconbtn.gear svg { width: 18px; height: 18px; }
|
||||||
|
.iconbtn.dark-toggle { padding: 4px 7px; flex-shrink: 0; }
|
||||||
|
.iconbtn.dark-toggle svg { width: 18px; height: 18px; }
|
||||||
|
.iconbtn.dark-toggle span { display: none; }
|
||||||
|
.iconbtn.dark-toggle { padding: 4px 7px; flex-shrink: 0; }
|
||||||
|
.iconbtn.dark-toggle svg { width: 18px; height: 18px; }
|
||||||
|
.iconbtn.dark-toggle span { display: none; }
|
||||||
|
|
||||||
/* new paste: stack editor above sidebar, natural page height */
|
/* new paste: stack editor above sidebar, natural page height */
|
||||||
.deck {
|
.deck {
|
||||||
@@ -451,8 +648,11 @@ a.admin-link:hover { color: var(--fg); text-decoration: underline; }
|
|||||||
.editor-wrap { min-height: 45vh; }
|
.editor-wrap { min-height: 45vh; }
|
||||||
.editor { font-size: 15px; }
|
.editor { font-size: 15px; }
|
||||||
.gutter { font-size: 15px; }
|
.gutter { font-size: 15px; }
|
||||||
|
.editor-head { flex-wrap: wrap; }
|
||||||
|
.editor-head-title { flex: 1 1 100%; }
|
||||||
.editor-head input { min-width: 0; font-size: 16px; }
|
.editor-head input { min-width: 0; font-size: 16px; }
|
||||||
.editor-head select { max-width: 120px; font-size: 14px; }
|
.editor-head select { max-width: 120px; font-size: 14px; }
|
||||||
|
.editor-head-title, .editor-head-settings { padding: 4px 8px; }
|
||||||
.actionbar { flex-wrap: wrap; }
|
.actionbar { flex-wrap: wrap; }
|
||||||
.actionbar .btn { padding: 12px 22px; }
|
.actionbar .btn { padding: 12px 22px; }
|
||||||
.hint { font-size: 13px; }
|
.hint { font-size: 13px; }
|
||||||
@@ -476,9 +676,12 @@ a.admin-link:hover { color: var(--fg); text-decoration: underline; }
|
|||||||
.stats-head { font-size: 13px; }
|
.stats-head { font-size: 13px; }
|
||||||
.stats-grid { font-size: 13px; padding: 10px 12px; }
|
.stats-grid { font-size: 13px; padding: 10px 12px; }
|
||||||
.code { font-size: 13px; }
|
.code { font-size: 13px; }
|
||||||
|
/* #167: gutter and code must share one line box at mobile width too — a
|
||||||
|
taller gutter font stacks its rows taller than the code rows and every
|
||||||
|
number drifts off its line start */
|
||||||
|
.code .gutter { font-size: 13px; }
|
||||||
.codebody { padding: 0 12px; }
|
.codebody { padding: 0 12px; }
|
||||||
.footnote { font-size: 12px; padding: 8px 12px; gap: 10px; }
|
.footnote { font-size: 12px; padding: 8px 12px; gap: 10px; }
|
||||||
.created-banner { font-size: 13px; }
|
|
||||||
.iconbtn { font-size: 13px; padding: 6px 10px; }
|
.iconbtn { font-size: 13px; padding: 6px 10px; }
|
||||||
|
|
||||||
/* unlock card */
|
/* unlock card */
|
||||||
@@ -499,7 +702,245 @@ a.admin-link:hover { color: var(--fg); text-decoration: underline; }
|
|||||||
.can-item-head strong { flex: 1; word-break: break-all; }
|
.can-item-head strong { flex: 1; word-break: break-all; }
|
||||||
.can-item-body { margin-top: 8px; }
|
.can-item-body { margin-top: 8px; }
|
||||||
.can-item-body summary { cursor: pointer; font-size: 19px; color: var(--muted, #888); }
|
.can-item-body summary { cursor: pointer; font-size: 19px; color: var(--muted, #888); }
|
||||||
|
/* #169: divider between the dropdown title and body must be persistent
|
||||||
|
(not hover dependent) and extend the full width of the card left and right */
|
||||||
|
.can-item-body[open] summary {
|
||||||
|
border-bottom: 1px solid var(--border);
|
||||||
|
margin: 0 -14px 8px;
|
||||||
|
padding: 0 14px 8px;
|
||||||
|
}
|
||||||
.can-item-body pre.code { margin: 8px 0 0; overflow-x: auto; }
|
.can-item-body pre.code { margin: 8px 0 0; overflow-x: auto; }
|
||||||
.can-item-row { margin-top: 8px; }
|
.can-item-row { margin-top: 8px; }
|
||||||
.can-item-row .can-item-title { width: 100%; margin-bottom: 6px; }
|
.can-item-row .can-item-title { width: 100%; margin-bottom: 6px; }
|
||||||
.can-item-row .can-item-content { width: 100%; font-family: var(--mono, monospace); resize: vertical; }
|
.can-item-row .can-item-content { width: 100%; font-family: var(--mono, monospace); resize: vertical; }
|
||||||
|
|
||||||
|
/* ============================================================
|
||||||
|
Styled controls (#123) — buttons, selects, checkboxes, radios
|
||||||
|
match the custom URL box house pattern: 1px var(--border) on
|
||||||
|
var(--bg), var(--radius) corners, accent border on focus, no
|
||||||
|
default browser chrome (appearance: none).
|
||||||
|
============================================================ */
|
||||||
|
|
||||||
|
/* selects: replace native chrome with a house-styled pill */
|
||||||
|
select {
|
||||||
|
appearance: none;
|
||||||
|
-webkit-appearance: none;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
border-radius: var(--radius);
|
||||||
|
background: var(--bg) var(--chevron) no-repeat right 10px center; /* #136: themed chevron */
|
||||||
|
color: var(--fg);
|
||||||
|
font: inherit;
|
||||||
|
padding: 4px 30px 4px 12px;
|
||||||
|
cursor: pointer;
|
||||||
|
outline: none;
|
||||||
|
transition: border-color .12s ease, background-color .12s ease;
|
||||||
|
}
|
||||||
|
select:hover { border-color: var(--muted-fg); background-color: var(--surface-2); }
|
||||||
|
select:focus-visible { border-color: var(--accent); outline: 2px solid var(--accent); outline-offset: 1px; }
|
||||||
|
.editor-head select { padding: 4px 30px 4px 10px; }
|
||||||
|
|
||||||
|
/* checkboxes and radios: custom drawn, accent when checked */
|
||||||
|
input[type="checkbox"],
|
||||||
|
input[type="radio"] {
|
||||||
|
appearance: none;
|
||||||
|
-webkit-appearance: none;
|
||||||
|
width: 16px; height: 16px; margin: 0; flex-shrink: 0;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
background: var(--bg);
|
||||||
|
cursor: pointer;
|
||||||
|
position: relative;
|
||||||
|
transition: border-color .12s ease, background-color .12s ease;
|
||||||
|
}
|
||||||
|
input[type="checkbox"] { border-radius: 4px; }
|
||||||
|
input[type="radio"] { border-radius: 50%; }
|
||||||
|
input[type="checkbox"]:hover,
|
||||||
|
input[type="radio"]:hover { border-color: var(--muted-fg); }
|
||||||
|
input[type="checkbox"]:checked,
|
||||||
|
input[type="radio"]:checked { background: var(--accent); border-color: var(--accent); }
|
||||||
|
input[type="checkbox"]:checked::after {
|
||||||
|
content: "";
|
||||||
|
position: absolute; inset: 0;
|
||||||
|
background: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='10' viewBox='0 0 12 10'%3E%3Cpath d='M1 5l4 4 6-8' fill='none' stroke='white' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E") center / 11px no-repeat;
|
||||||
|
}
|
||||||
|
input[type="radio"]:checked::after {
|
||||||
|
content: "";
|
||||||
|
position: absolute; inset: 3px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: var(--bg);
|
||||||
|
}
|
||||||
|
input[type="checkbox"]:focus-visible,
|
||||||
|
input[type="radio"]:focus-visible {
|
||||||
|
outline: 2px solid var(--accent);
|
||||||
|
outline-offset: 1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* buttons: every submit-style button gets the .btn treatment,
|
||||||
|
and .btn itself gains the house surface/border/hover pattern */
|
||||||
|
button[type="submit"] {
|
||||||
|
background: var(--accent); color: var(--bg); border: 1px solid var(--accent);
|
||||||
|
border-radius: var(--radius); font: inherit; font-weight: 600;
|
||||||
|
padding: 8px 18px; cursor: pointer;
|
||||||
|
transition: filter .12s ease;
|
||||||
|
}
|
||||||
|
button[type="submit"]:hover { filter: brightness(1.08); }
|
||||||
|
button[type="submit"]:focus-visible,
|
||||||
|
.btn:focus-visible { outline: 2px solid var(--accent); outline-offset: 1px; }
|
||||||
|
.btn {
|
||||||
|
border: 1px solid var(--accent);
|
||||||
|
}
|
||||||
|
.btn:hover { filter: brightness(1.08); }
|
||||||
|
|
||||||
|
/* settings: give the Admin link clear separation from the theme grid */
|
||||||
|
.admin-link-row {
|
||||||
|
margin-top: 32px;
|
||||||
|
padding-top: 20px;
|
||||||
|
border-top: 1px solid var(--border);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* #38: attachment upload on /new + attachment display on paste view */
|
||||||
|
.side-section .file-input { display: none; }
|
||||||
|
.dropzone {
|
||||||
|
border: 1px dashed var(--border);
|
||||||
|
border-radius: var(--radius-lg);
|
||||||
|
padding: 14px 12px;
|
||||||
|
text-align: center;
|
||||||
|
color: var(--muted-fg);
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 20.7px;
|
||||||
|
transition: border-color .15s, background .15s;
|
||||||
|
background: var(--surface-2, transparent);
|
||||||
|
}
|
||||||
|
.dropzone:hover, .dropzone.dragover {
|
||||||
|
border-color: var(--accent);
|
||||||
|
background: var(--surface-2);
|
||||||
|
}
|
||||||
|
.dropzone.dragover { border-width: 2px; }
|
||||||
|
/* #171: uploaded-file preview replaces the editor area; image fitted inside */
|
||||||
|
.file-preview {
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
min-height: 0;
|
||||||
|
max-width: 100%;
|
||||||
|
max-height: 100%;
|
||||||
|
object-fit: contain;
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
|
.editor-wrap.previewing .editor,
|
||||||
|
.editor-wrap.previewing .gutter { display: none; }
|
||||||
|
|
||||||
|
.file-chip {
|
||||||
|
display: flex; align-items: center; gap: 10px;
|
||||||
|
border: 1px solid var(--border); border-radius: var(--radius);
|
||||||
|
padding: 8px 14px; margin-top: 8px; background: var(--surface);
|
||||||
|
font-size: 21.6px;
|
||||||
|
}
|
||||||
|
.file-chip .file-chip-name { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; flex: 1; }
|
||||||
|
.file-chip .file-chip-size { color: var(--muted-fg); font-size: 19px; }
|
||||||
|
.file-chip .file-chip-remove {
|
||||||
|
border: none; background: none; color: var(--muted-fg); cursor: pointer;
|
||||||
|
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; padding: 12px; }
|
||||||
|
/* #221: the link pill under an image preview stays a small inline chip,
|
||||||
|
left-aligned under the image, not stretched above it. */
|
||||||
|
.attachment-bar .attachment-chip {
|
||||||
|
display: inline-flex; align-items: center; gap: 12px; align-self: flex-start;
|
||||||
|
border: 1px solid var(--border); border-radius: var(--radius);
|
||||||
|
padding: 6px 14px; text-decoration: none; color: var(--fg);
|
||||||
|
background: var(--surface-2); font-size: 19px;
|
||||||
|
}
|
||||||
|
.attachment-bar .attachment-chip:hover { border-color: var(--accent); }
|
||||||
|
.attachment-bar .attachment-chip .attachment-name {
|
||||||
|
min-width: 0;
|
||||||
|
flex: 1;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
/* #232: long filenames are truncated but the pill stays a reasonable
|
||||||
|
width; on narrow viewports it shrinks to the container instead of
|
||||||
|
overflowing the card. */
|
||||||
|
.attachment-bar .attachment-chip {
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
.attachment-bar .attachment-chip .attachment-name:hover {
|
||||||
|
white-space: normal;
|
||||||
|
overflow-wrap: anywhere;
|
||||||
|
}
|
||||||
|
/* #221: images scale to fit the viewer box, aspect ratio preserved. */
|
||||||
|
.attachment-preview {
|
||||||
|
max-width: 100%;
|
||||||
|
align-self: flex-start;
|
||||||
|
/* #229: no inner border/radius of its own; the .float wrapper already
|
||||||
|
frames the pill (inner borders get corner-clipped by overflow:hidden).
|
||||||
|
Padding on .attachment-bar gives the image breathing room from the
|
||||||
|
pill border. */
|
||||||
|
border: 0;
|
||||||
|
border-radius: 0;
|
||||||
|
background: var(--surface-2);
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
.attachment-preview img {
|
||||||
|
display: block;
|
||||||
|
max-width: 100%;
|
||||||
|
max-height: 70vh;
|
||||||
|
width: auto;
|
||||||
|
height: auto;
|
||||||
|
object-fit: contain;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* #139: CSP-safe replacements for inline style attributes (style-src 'self') */
|
||||||
|
.hidden { display: none; }
|
||||||
|
.can-page { max-width: 900px; width: 100%; }
|
||||||
|
.col-a { width: 260px; } .col-b { width: 140px; } .col-c { width: 120px; }
|
||||||
|
.col-d { width: 90px; } .col-d2 { width: 150px; } .col-e { width: 150px; }
|
||||||
|
.col-f { width: 100px; } .col-g { width: 120px; }
|
||||||
|
/* #255: history's URL column had its own narrow width (col-f doubles as
|
||||||
|
/mine's ID column); give it a dedicated class. */
|
||||||
|
.col-url { width: 230px; }
|
||||||
|
/* #210: /mine rows render a delete button cell that had no declared column,
|
||||||
|
so under table-layout:fixed it overlapped the ID column. */
|
||||||
|
.col-del { width: 64px; }
|
||||||
|
.spacer-flex { flex: 1; }
|
||||||
|
.input-num { width: 80px; }
|
||||||
|
.input-num-sm { width: 64px; }
|
||||||
|
.danger-hint { color: var(--danger, #c0392b); margin-top: 6px; }
|
||||||
|
.hint-lg { font-size: 19px; }
|
||||||
|
.mt6 { margin-top: 6px; }
|
||||||
|
.mt18 { margin-top: 18px; }
|
||||||
|
.toggle-inline { display: inline-flex; }
|
||||||
|
.wrap-normal { word-break: normal; overflow-wrap: break-word; }
|
||||||
|
.created-banner { display: block; }
|
||||||
|
/* #167: gutter rows for wrapped paste view — one row per visual code line */
|
||||||
|
.gutline { display: block; }
|
||||||
|
|
||||||
|
/* #267: jump to top/bottom pills for long pastes and the editor.
|
||||||
|
Hidden unless JS (jump.js) detects content more than 2x the viewport. */
|
||||||
|
.jumpnav {
|
||||||
|
position: fixed;
|
||||||
|
right: 18px;
|
||||||
|
bottom: 18px;
|
||||||
|
z-index: 50;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
.jumpnav.hidden { display: none; }
|
||||||
|
.jump-btn { box-shadow: 0 4px 16px rgba(0, 0, 0, 0.25); }
|
||||||
|
|
||||||
|
/* #273: theme-aware scrollbars. Standard properties first (Firefox, and
|
||||||
|
Chromium >= 121 honors scrollbar-color), then ::-webkit rules for finer
|
||||||
|
Chromium styling. Colors come from CSS vars so they track the preset. */
|
||||||
|
* {
|
||||||
|
scrollbar-width: thin;
|
||||||
|
scrollbar-color: var(--border) transparent;
|
||||||
|
}
|
||||||
|
::-webkit-scrollbar { width: 10px; height: 10px; }
|
||||||
|
::-webkit-scrollbar-track { background: transparent; }
|
||||||
|
::-webkit-scrollbar-thumb {
|
||||||
|
background: var(--border);
|
||||||
|
border-radius: 5px;
|
||||||
|
}
|
||||||
|
::-webkit-scrollbar-thumb:hover { background: var(--muted-fg); }
|
||||||
|
::-webkit-scrollbar-corner { background: transparent; }
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
|
||||||
|
<rect width="32" height="32" rx="7" fill="#7B5FC0"/>
|
||||||
|
<g fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
|
<path d="M16 7a9 9 0 1 0 0 18c1.4 0 2-1 2-2s-.7-2.2-.7-3c0-1.1.9-2 2-2h3.2A2.5 2.5 0 0 0 25 15.5 9 9 0 0 0 16 7z"/>
|
||||||
|
<circle cx="11.5" cy="14.5" r="1.6" fill="#ffffff" stroke="none"/>
|
||||||
|
<circle cx="16" cy="11.5" r="1.6" fill="#ffffff" stroke="none"/>
|
||||||
|
<circle cx="20.8" cy="13.8" r="1.6" fill="#ffffff" stroke="none"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 560 B |
@@ -0,0 +1,19 @@
|
|||||||
|
// #46: live relative-time counters: tick any [data-ts] (epoch seconds) every second
|
||||||
|
(function () {
|
||||||
|
function fmt(ts) {
|
||||||
|
const s = Math.max(0, Math.floor(Date.now() / 1000) - ts);
|
||||||
|
if (s < 60) return s + 's ago';
|
||||||
|
if (s < 3600) return Math.floor(s / 60) + 'm ago';
|
||||||
|
if (s < 86400) return Math.floor(s / 3600) + 'h ago';
|
||||||
|
return Math.floor(s / 86400) + 'd ago';
|
||||||
|
}
|
||||||
|
function tick() {
|
||||||
|
document.querySelectorAll('[data-ts]').forEach(el => {
|
||||||
|
const ts = parseInt(el.dataset.ts, 10);
|
||||||
|
if (!isNaN(ts)) el.textContent = fmt(ts);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
setInterval(tick, 1000);
|
||||||
|
document.addEventListener('DOMContentLoaded', tick);
|
||||||
|
tick();
|
||||||
|
})();
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
// #139: public history table + 30s auto-refresh.
|
||||||
|
const t = PaletteTable.init({
|
||||||
|
endpoint: '/api/public',
|
||||||
|
perPage: 25,
|
||||||
|
hasPager: true,
|
||||||
|
rowHtml: it =>
|
||||||
|
`<tr class="row" data-href="/${t.esc(it.id)}"><td>` +
|
||||||
|
(it.title
|
||||||
|
? `<a class="paste-name" href="/${t.esc(it.id)}">${t.esc(it.title)}</a>${it.is_can ? ' <span class="badge" title="Can — bundle of items">can</span>' : ''}`
|
||||||
|
: `<a class="slug paste-name" href="/${t.esc(it.id)}">${t.esc(it.id)}</a>${it.is_can ? ' <span class="badge" title="Can — bundle of items">can</span>' : ''}`) +
|
||||||
|
`</td>` +
|
||||||
|
`<td><span class="badge">${t.esc(it.type || it.language || 'text')}</span></td>` +
|
||||||
|
`<td class="dim">${t.fmtSize(it.size)}</td><td class="dim">${it.view_count}</td><td class="dim" data-ts="${it.created_at}">${t.ago(it.created_at)}</td>` +
|
||||||
|
(it.custom_slug ? `<td class="dim"><a class="url-link" href="/${t.esc(it.custom_slug)}">/${t.esc(it.custom_slug)}</a></td>` : `<td class="dim">none</td>`) +
|
||||||
|
`<td class="dim"><a class="id-link" href="/${t.esc(it.id)}">${t.esc(it.id)}</a></td></tr>`,
|
||||||
|
emptyFiltered: 'No pastes match your search.',
|
||||||
|
emptyAll: 'No pastes yet. Create the first one.',
|
||||||
|
});
|
||||||
|
t.load();
|
||||||
|
setInterval(t.load, 30000); // auto-refresh history every 30s
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
/* #267: jump to top / bottom controls for long content.
|
||||||
|
Paste view scrolls the window; the /new editor scrolls its textarea.
|
||||||
|
The active scroller is chosen via data-jump-scroll on the script tag. */
|
||||||
|
(function () {
|
||||||
|
var nav = document.getElementById('jumpnav');
|
||||||
|
if (!nav) return;
|
||||||
|
var scroller = window;
|
||||||
|
var sel = nav.dataset.jumpScroll;
|
||||||
|
if (sel) scroller = document.querySelector(sel);
|
||||||
|
|
||||||
|
function el() {
|
||||||
|
return scroller === window ? document.scrollingElement : scroller;
|
||||||
|
}
|
||||||
|
function isLarge() {
|
||||||
|
var e = el();
|
||||||
|
if (!e) return false;
|
||||||
|
var visible = scroller === window ? window.innerHeight : e.clientHeight;
|
||||||
|
return e.scrollHeight > visible * 2;
|
||||||
|
}
|
||||||
|
function refresh() {
|
||||||
|
nav.classList.toggle('hidden', !isLarge());
|
||||||
|
}
|
||||||
|
function jump(toTop) {
|
||||||
|
var e = el();
|
||||||
|
if (!e) return;
|
||||||
|
if (scroller === window) {
|
||||||
|
window.scrollTo({ top: toTop ? 0 : e.scrollHeight });
|
||||||
|
} else {
|
||||||
|
e.scrollTop = toTop ? 0 : e.scrollHeight;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
nav.addEventListener('click', function (ev) {
|
||||||
|
var b = ev.target.closest('[data-jump]');
|
||||||
|
if (!b) return;
|
||||||
|
ev.preventDefault();
|
||||||
|
jump(b.dataset.jump === 'top');
|
||||||
|
});
|
||||||
|
window.addEventListener('resize', refresh);
|
||||||
|
if (scroller !== window && scroller) scroller.addEventListener('input', refresh);
|
||||||
|
refresh();
|
||||||
|
/* #282: the first evaluation can run before the layout settles (media
|
||||||
|
queries, web fonts, async highlighting) and under-measure the content,
|
||||||
|
leaving the nav hidden on long pages. Re-check once a real layout exists
|
||||||
|
and after load; the ResizeObserver also catches late content growth. */
|
||||||
|
requestAnimationFrame(function () { requestAnimationFrame(refresh); });
|
||||||
|
window.addEventListener('load', refresh);
|
||||||
|
window.setTimeout(refresh, 300);
|
||||||
|
if (window.ResizeObserver && scroller === window && document.body) {
|
||||||
|
new ResizeObserver(refresh).observe(document.body);
|
||||||
|
}
|
||||||
|
})();
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
// #139: saved pastes table.
|
||||||
|
function toast(msg, kind) {
|
||||||
|
let t = document.querySelector('.toast');
|
||||||
|
if (!t) { t = document.createElement('div'); t.className = 'toast'; document.body.appendChild(t); }
|
||||||
|
t.textContent = msg;
|
||||||
|
t.classList.remove('success', 'error');
|
||||||
|
if (kind === 'success') t.classList.add('success');
|
||||||
|
if (kind === 'error') t.classList.add('error');
|
||||||
|
t.classList.add('show');
|
||||||
|
clearTimeout(t._h);
|
||||||
|
t._h = setTimeout(() => t.classList.remove('show'), 2000);
|
||||||
|
}
|
||||||
|
|
||||||
|
const t = PaletteTable.init({
|
||||||
|
endpoint: '/api/mine',
|
||||||
|
perPage: 25,
|
||||||
|
hasPager: true,
|
||||||
|
rowHtml: it =>
|
||||||
|
`<tr class="row" data-href="/${t.esc(it.id)}"><td>` +
|
||||||
|
(it.title
|
||||||
|
? `<a class="paste-name" href="/${t.esc(it.id)}">${t.esc(it.title)}</a>${it.is_can ? ' <span class="badge" title="Can — bundle of items">can</span>' : ''}`
|
||||||
|
: `<a class="slug paste-name" href="/${t.esc(it.id)}">${t.esc(it.id)}</a>${it.is_can ? ' <span class="badge" title="Can — bundle of items">can</span>' : ''}`) +
|
||||||
|
`</td>` +
|
||||||
|
`<td><span class="badge">${t.esc(it.type || it.language || 'text')}</span></td>` +
|
||||||
|
`<td class="dim">${t.fmtSize(it.size)}</td><td class="dim" data-ts="${it.created_at}">${t.ago(it.created_at)}</td>` +
|
||||||
|
(it.custom_slug ? `<td class="dim"><a class="url-link" href="/${t.esc(it.custom_slug)}">/${t.esc(it.custom_slug)}</a></td>` : `<td class="dim">none</td>`) +
|
||||||
|
`<td class="dim"><a class="id-link" href="/${t.esc(it.id)}">${t.esc(it.id)}</a></td>` +
|
||||||
|
`<td><button class="btn btn-icon del" data-id="${t.esc(it.id)}" title="Delete paste" aria-label="Delete paste">×</button></td></tr>`,
|
||||||
|
emptyFiltered: 'No pastes from this browser match your search.',
|
||||||
|
emptyAll: 'No pastes from this browser yet.',
|
||||||
|
});
|
||||||
|
|
||||||
|
// delete buttons (viewer-scoped, enforced server-side #37)
|
||||||
|
document.getElementById('rows').addEventListener('click', async e => {
|
||||||
|
const del = e.target.closest('button.del');
|
||||||
|
if (!del) return;
|
||||||
|
e.stopPropagation();
|
||||||
|
del.disabled = true;
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/pastes/' + del.dataset.id, { method: 'DELETE' });
|
||||||
|
if (res.ok) { toast('Deleted', 'success'); t.load(); }
|
||||||
|
else { toast('Delete failed', 'error'); del.disabled = false; }
|
||||||
|
} catch (err) { toast('Delete failed', 'error'); del.disabled = false; }
|
||||||
|
});
|
||||||
|
|
||||||
|
t.load();
|
||||||
@@ -0,0 +1,487 @@
|
|||||||
|
// #139: editor page logic (gutter, expiry, burn, attachments, create).
|
||||||
|
const $ = id => document.getElementById(id);
|
||||||
|
const content = $('content'), gutter = $('gutter');
|
||||||
|
|
||||||
|
// #274: with wrap on, a logical line occupies several VISUAL rows in the
|
||||||
|
// textarea, so one number per logical line drifts off its text (same bug the
|
||||||
|
// paste view fixed in #167). A textarea can't be split into spans, so the
|
||||||
|
// wrapped row count per logical line is measured with a hidden mirror div
|
||||||
|
// that shares the editor's font, line metrics and wrapping rules, and the
|
||||||
|
// gutter renders one .gutline block per visual row with the number on the
|
||||||
|
// FIRST row of its logical line (fillers elsewhere).
|
||||||
|
let mirror = null;
|
||||||
|
function measureRows(lines) {
|
||||||
|
if (!mirror) {
|
||||||
|
mirror = document.createElement('div');
|
||||||
|
mirror.style.position = 'absolute';
|
||||||
|
mirror.style.visibility = 'hidden';
|
||||||
|
mirror.style.top = '0';
|
||||||
|
mirror.style.left = '-9999px';
|
||||||
|
document.body.appendChild(mirror);
|
||||||
|
}
|
||||||
|
const cs = getComputedStyle(content);
|
||||||
|
mirror.style.font = cs.font;
|
||||||
|
mirror.style.lineHeight = cs.lineHeight;
|
||||||
|
mirror.style.whiteSpace = 'pre-wrap';
|
||||||
|
mirror.style.overflowWrap = 'anywhere';
|
||||||
|
mirror.style.wordBreak = 'break-all';
|
||||||
|
mirror.style.width = (content.clientWidth - parseFloat(cs.paddingLeft) - parseFloat(cs.paddingRight)) + 'px';
|
||||||
|
const lh = parseFloat(cs.lineHeight) || 1;
|
||||||
|
const starts = [];
|
||||||
|
let total = 0;
|
||||||
|
const n = Math.max(lines.length, 1);
|
||||||
|
for (let i = 0; i < n; i++) {
|
||||||
|
// A trailing newline yields an empty last line: it still occupies one row.
|
||||||
|
mirror.textContent = lines[i] + '\n';
|
||||||
|
let rows = Math.max(1, Math.round(mirror.getBoundingClientRect().height / lh));
|
||||||
|
starts.push(total);
|
||||||
|
total += rows;
|
||||||
|
}
|
||||||
|
return { starts, total };
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateGutter() {
|
||||||
|
const lines = content.value.split('\n');
|
||||||
|
const n = Math.max(lines.length, 1);
|
||||||
|
if (!document.documentElement.hasAttribute('data-wrap')) {
|
||||||
|
let s = '';
|
||||||
|
for (let i = 1; i <= n; i++) s += i + '\n';
|
||||||
|
gutter.textContent = s.slice(0, -1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const { starts, total } = measureRows(lines);
|
||||||
|
gutter.textContent = '';
|
||||||
|
const frag = document.createDocumentFragment();
|
||||||
|
const spans = [];
|
||||||
|
for (let r = 0; r < total; r++) {
|
||||||
|
const c = document.createElement('span');
|
||||||
|
c.className = 'gutline';
|
||||||
|
c.textContent = '\u00a0';
|
||||||
|
spans.push(c);
|
||||||
|
frag.appendChild(c);
|
||||||
|
}
|
||||||
|
gutter.appendChild(frag);
|
||||||
|
for (let j = 0; j < starts.length; j++) spans[starts[j]].textContent = String(j + 1);
|
||||||
|
}
|
||||||
|
content.addEventListener('input', updateGutter);
|
||||||
|
// #274: the wrap toggle and width changes re-wrap the textarea; re-measure.
|
||||||
|
new MutationObserver(updateGutter).observe(document.documentElement, { attributes: true, attributeFilter: ['data-wrap'] });
|
||||||
|
window.addEventListener('resize', updateGutter);
|
||||||
|
// #259: the editor scrolls itself; keep the gutter's numbers in step with it.
|
||||||
|
content.addEventListener('scroll', () => { gutter.scrollTop = content.scrollTop; });
|
||||||
|
updateGutter();
|
||||||
|
|
||||||
|
function toast(msg, kind) {
|
||||||
|
let t = document.querySelector('.toast');
|
||||||
|
if (!t) { t = document.createElement('div'); t.className = 'toast'; document.body.appendChild(t); }
|
||||||
|
t.textContent = msg;
|
||||||
|
t.classList.remove('success', 'error');
|
||||||
|
if (kind === 'success') t.classList.add('success');
|
||||||
|
if (kind === 'error') t.classList.add('error');
|
||||||
|
t.classList.add('show');
|
||||||
|
clearTimeout(t._h);
|
||||||
|
t._h = setTimeout(() => t.classList.remove('show'), 2000);
|
||||||
|
}
|
||||||
|
const setHidden = (id, hid) => { const el = $(id); if (el) el.classList.toggle('hidden', hid); };
|
||||||
|
$('haspw').addEventListener('change', e => setHidden('pwrow', !e.target.checked));
|
||||||
|
$('burn').addEventListener('change', e => setHidden('burnrow', !e.target.checked));
|
||||||
|
document.querySelectorAll('input[name="exp"]').forEach(r => r.addEventListener('change', () => {
|
||||||
|
setHidden('customexp-row', document.querySelector('input[name="exp"]:checked').value !== 'custom');
|
||||||
|
setHidden('customexp-err', true);
|
||||||
|
}));
|
||||||
|
|
||||||
|
// compose the expires_in Go-duration string when Custom is checked (#48).
|
||||||
|
// Returns the string, or null with an inline error shown.
|
||||||
|
function composeCustomExpiry() {
|
||||||
|
const n = parseInt($('expnum').value, 10);
|
||||||
|
const unit = $('expunit').value;
|
||||||
|
let mins = NaN;
|
||||||
|
if (n > 0) {
|
||||||
|
if (unit === 'm') mins = n;
|
||||||
|
else if (unit === 'h') mins = n * 60;
|
||||||
|
else if (unit === 'd') mins = n * 1440;
|
||||||
|
else if (unit === 'w') mins = n * 10080;
|
||||||
|
else if (unit === 'mo') mins = n * 43200; // months counted as 30 days
|
||||||
|
}
|
||||||
|
const err = $('customexp-err');
|
||||||
|
if (!(mins >= 1)) {
|
||||||
|
err.textContent = 'Enter a duration of at least 1 minute.';
|
||||||
|
err.classList.remove('hidden');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (mins > 525600) { // more than 1 year
|
||||||
|
err.textContent = 'Custom expiry cannot exceed 1 year.';
|
||||||
|
err.classList.remove('hidden');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
err.classList.add('hidden');
|
||||||
|
// compose as h (+d/m remainders); Go parses '336h', '90m', '6h30m' fine
|
||||||
|
const hours = Math.floor(mins / 60), rem = mins % 60;
|
||||||
|
if (rem === 0) return hours + 'h';
|
||||||
|
if (hours === 0) return rem + 'm';
|
||||||
|
return hours + 'h' + rem + 'm';
|
||||||
|
}
|
||||||
|
|
||||||
|
$('pwreveal').addEventListener('click', () => {
|
||||||
|
const pw = $('password');
|
||||||
|
const show = pw.type === 'password';
|
||||||
|
pw.type = show ? 'text' : 'password';
|
||||||
|
$('pwreveal').classList.toggle('off', !show);
|
||||||
|
$('pwreveal').title = show ? 'Hide password' : 'Show password';
|
||||||
|
});
|
||||||
|
|
||||||
|
let guessed = ''; // last auto-detected language, '' = user override
|
||||||
|
|
||||||
|
// #105: map backend machine-readable error codes to plain-language guidance.
|
||||||
|
// Unknown codes fall back to a generic message; the technical detail stays
|
||||||
|
// in the API response for API consumers.
|
||||||
|
const ERROR_MESSAGES = {
|
||||||
|
slug_taken: 'That Custom URL is already taken. Try another.',
|
||||||
|
slug_reserved: 'That Custom URL is reserved. Try another.',
|
||||||
|
slug_invalid: 'Please keep the Custom URL under 64 characters, using only letters, numbers, dashes, or underscores.',
|
||||||
|
content_empty: 'Write or paste something first.',
|
||||||
|
content_too_large: 'This paste is too large. The limit is 5 MB.',
|
||||||
|
file_too_large: 'File is too large. The limit is 25 MB.',
|
||||||
|
one_file_only: 'Choose either text or a file for now.',
|
||||||
|
expiry_invalid: 'Please pick an expiry between 1 minute and 1 year.',
|
||||||
|
rate_limited: 'Too many tries. Wait a minute and try again.',
|
||||||
|
};
|
||||||
|
const GENERIC_ERROR = 'Something went wrong. Please try again.';
|
||||||
|
|
||||||
|
function friendlyError(data) {
|
||||||
|
return ERROR_MESSAGES[data && data.code] || GENERIC_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
// #105: color the result box by outcome — success (ok), error (err),
|
||||||
|
// warning (warn) — with a colored left border (CSS .result-ok/.result-err).
|
||||||
|
function setResultKind(kind) {
|
||||||
|
const card = $('result-card');
|
||||||
|
card.classList.remove('result-ok', 'result-err', 'result-warn');
|
||||||
|
if (kind) card.classList.add('result-' + kind);
|
||||||
|
}
|
||||||
|
|
||||||
|
function showResult(html, kind) {
|
||||||
|
$('result').innerHTML = html;
|
||||||
|
$('result').dataset.token = kind === 'ok' ? ($('result').dataset.token || '') : ($('result').dataset.token || '');
|
||||||
|
setHidden('result-card', false);
|
||||||
|
setResultKind(kind === 'ok' ? 'ok' : (kind === 'warn' ? 'warn' : 'err'));
|
||||||
|
}
|
||||||
|
function defaultFilename(lang) {
|
||||||
|
const names = {
|
||||||
|
python: 'Python.py', go: 'main.go', javascript: 'script.js', typescript: 'index.ts',
|
||||||
|
rust: 'main.rs', c: 'main.c', cpp: 'main.cpp', java: 'Main.java', bash: 'script.sh',
|
||||||
|
sql: 'query.sql', yaml: 'config.yaml', json: 'data.json', html: 'index.html',
|
||||||
|
css: 'style.css', xml: 'doc.xml', php: 'index.php', ruby: 'main.rb',
|
||||||
|
perl: 'main.pl', lua: 'main.lua', dockerfile: 'Dockerfile', toml: 'config.toml',
|
||||||
|
ini: 'config.ini', diff: 'changes.diff',
|
||||||
|
markdown: 'notes.md', text: 'Text.txt',
|
||||||
|
};
|
||||||
|
return names[lang] || '';
|
||||||
|
}
|
||||||
|
// fill default filename when title is still blank
|
||||||
|
function maybeSetDefaultTitle(lang) {
|
||||||
|
const title = $('title');
|
||||||
|
if (lang && !title.value.trim()) {
|
||||||
|
const fn = defaultFilename(lang);
|
||||||
|
if (fn) title.value = fn;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function guessLang() {
|
||||||
|
if (!content.value.trim()) return;
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/guess-language', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {'Content-Type': 'application/json'},
|
||||||
|
body: JSON.stringify({content: content.value}),
|
||||||
|
});
|
||||||
|
const data = await res.json();
|
||||||
|
if (res.ok && data.language) {
|
||||||
|
guessed = data.language;
|
||||||
|
$('language').value = data.language;
|
||||||
|
maybeSetDefaultTitle(data.language);
|
||||||
|
}
|
||||||
|
} catch(e) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
// refresh button: always re-detect, even if user picked something
|
||||||
|
$('reguess').addEventListener('click', guessLang);
|
||||||
|
|
||||||
|
// auto-guess when pasting into the editor
|
||||||
|
content.addEventListener('paste', () => setTimeout(guessLang, 0));
|
||||||
|
|
||||||
|
async function create() {
|
||||||
|
// #38: file attached -> file paste (1 file = 1 paste; text is ignored)
|
||||||
|
if (attachedFile) return createFilePaste();
|
||||||
|
|
||||||
|
const body = {
|
||||||
|
content: content.value,
|
||||||
|
title: $('title').value || null,
|
||||||
|
language: $('language').value || null,
|
||||||
|
custom_slug: $('custom').value || null,
|
||||||
|
burn_after_read: $('burn').checked,
|
||||||
|
};
|
||||||
|
if ($('burn').checked) body.burn_after_reads = parseInt($('burnreads').value, 10) || 1;
|
||||||
|
if ($('haspw').checked) body.password = $('password').value;
|
||||||
|
const exp = document.querySelector('input[name="exp"]:checked').value;
|
||||||
|
if (exp === 'custom') {
|
||||||
|
const dur = composeCustomExpiry();
|
||||||
|
if (dur === null) { toast('Check the custom expiry', 'error'); return; }
|
||||||
|
body.expires_in = dur;
|
||||||
|
} else if (exp) {
|
||||||
|
body.expires_in = exp;
|
||||||
|
}
|
||||||
|
|
||||||
|
const res = await fetch('/api/pastes', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {'Content-Type': 'application/json'},
|
||||||
|
body: JSON.stringify(body),
|
||||||
|
});
|
||||||
|
const data = await res.json();
|
||||||
|
if (!res.ok) {
|
||||||
|
showResult(friendlyError(data), 'err');
|
||||||
|
toast('Create failed', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
finishCreate(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
// shared success handling for both create paths (#38): result box, copy
|
||||||
|
// button, password auto-unlock, then redirect to the paste.
|
||||||
|
function finishCreate(data) {
|
||||||
|
const url = location.origin + '/' + (data.custom_slug || data.id);
|
||||||
|
// #260 attempt 2: .swapbtn markup — label and checkmark share one grid
|
||||||
|
// cell, so the button width is static and feedback is a class toggle.
|
||||||
|
showResult('<a href="' + url + '">' + url + '</a> <button class="btn btn-icon swapbtn" id="result-copy" title="Copy URL" type="button"><span class="swap-label">Copy</span><span class="swap-check">✓</span></button>', 'ok');
|
||||||
|
$('result').dataset.token = data.deletion_token || '';
|
||||||
|
const copyBtn = document.getElementById('result-copy');
|
||||||
|
copyBtn.addEventListener('click', () => {
|
||||||
|
try {
|
||||||
|
navigator.clipboard.writeText(url);
|
||||||
|
copyBtn.classList.add('ok'); // in-place success feedback (#53)
|
||||||
|
setTimeout(() => copyBtn.classList.remove('ok'), 2000);
|
||||||
|
} catch(e) { toast('Copy failed', 'error'); }
|
||||||
|
});
|
||||||
|
// token carried via sessionStorage, never in the URL (#143)
|
||||||
|
const dest = '/' + data.id + '?created=1';
|
||||||
|
try { sessionStorage.setItem('deletion_token_' + data.id, data.deletion_token || ''); } catch(e) {}
|
||||||
|
// password-protected: unlock now with the password we already have (#26)
|
||||||
|
if ($('haspw').checked && data.id) {
|
||||||
|
const fd = new FormData();
|
||||||
|
fd.append('password', $('password').value);
|
||||||
|
fd.append('next', dest);
|
||||||
|
try {
|
||||||
|
fetch('/' + data.id, {method: 'POST', body: fd}).finally(() => { location.href = dest; });
|
||||||
|
return;
|
||||||
|
} catch(e) {}
|
||||||
|
}
|
||||||
|
// show the paste
|
||||||
|
location.href = dest;
|
||||||
|
}
|
||||||
|
$('create').addEventListener('click', create);
|
||||||
|
|
||||||
|
// #38: file attachment support — 1 file = 1 paste. Three input paths:
|
||||||
|
// Ctrl+V paste of a file, upload button (file picker), drag-and-drop.
|
||||||
|
const MAX_FILE_BYTES = 25 * 1024 * 1024;
|
||||||
|
let attachedFile = null; // the single attached File, or null
|
||||||
|
|
||||||
|
function humanSize(n) {
|
||||||
|
if (n >= 1048576) return (n / 1048576).toFixed(1) + ' MB';
|
||||||
|
if (n >= 1024) return (n / 1024).toFixed(1) + ' KB';
|
||||||
|
return n + ' B';
|
||||||
|
}
|
||||||
|
|
||||||
|
// #171: text-file extensions -> language key for title placeholder
|
||||||
|
// convention (e.g. Python.py); fallback Text.
|
||||||
|
const LANG_BY_EXT = {
|
||||||
|
py: 'python', go: 'go', js: 'javascript', mjs: 'javascript', ts: 'typescript',
|
||||||
|
tsx: 'typescript', rs: 'rust', c: 'c', h: 'c', cpp: 'cpp', cc: 'cpp', hpp: 'cpp',
|
||||||
|
java: 'java', cs: 'csharp', sh: 'bash', bash: 'bash', sql: 'sql', yml: 'yaml',
|
||||||
|
yaml: 'yaml', json: 'json', html: 'html', htm: 'html', css: 'css', xml: 'xml',
|
||||||
|
php: 'php', rb: 'ruby', pl: 'perl', lua: 'lua', toml: 'toml', ini: 'ini',
|
||||||
|
diff: 'diff', md: 'markdown', txt: 'text', log: 'text',
|
||||||
|
};
|
||||||
|
const TEXT_EXTS = new Set(Object.keys(LANG_BY_EXT));
|
||||||
|
|
||||||
|
function extOf(name) {
|
||||||
|
const i = name.lastIndexOf('.');
|
||||||
|
return i >= 0 ? name.slice(i + 1).toLowerCase() : '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// #171: when a file is attached it takes over the main editing area.
|
||||||
|
// Images render fitted into the editor area; text files load their
|
||||||
|
// content into the editor. Title auto-fills only if still blank (house
|
||||||
|
// rule: never overwrite a typed title).
|
||||||
|
const IMAGE_RE = /^image\//;
|
||||||
|
let previewURL = null;
|
||||||
|
|
||||||
|
// #171: CSP img-src only allows 'self' and data:, so blob: URLs are
|
||||||
|
// blocked — read the file as a data: URL via FileReader instead.
|
||||||
|
function readFileDataURL(file, cb) {
|
||||||
|
const r = new FileReader();
|
||||||
|
r.onload = () => cb(r.result);
|
||||||
|
r.readAsDataURL(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function showFileInEditor(file) {
|
||||||
|
const wrap = document.querySelector('.editor-wrap');
|
||||||
|
const img = $('file-preview');
|
||||||
|
if (IMAGE_RE.test(file.type)) {
|
||||||
|
readFileDataURL(file, (dataURL) => {
|
||||||
|
previewURL = dataURL;
|
||||||
|
img.src = dataURL;
|
||||||
|
img.alt = file.name;
|
||||||
|
wrap.classList.add('previewing');
|
||||||
|
img.classList.remove('hidden');
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
wrap.classList.remove('previewing');
|
||||||
|
img.classList.add('hidden');
|
||||||
|
if (!TEXT_EXTS.has(extOf(file.name))) return; // unknown binary: leave editor alone
|
||||||
|
try {
|
||||||
|
const text = await file.text();
|
||||||
|
// #184: the file replaces the main editing area, so the text always
|
||||||
|
// loads over whatever was in the editor (same rule as images, which
|
||||||
|
// hide the editor entirely).
|
||||||
|
content.value = text;
|
||||||
|
updateGutter();
|
||||||
|
guessLang();
|
||||||
|
} catch (e) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearPreview() {
|
||||||
|
const wrap = document.querySelector('.editor-wrap');
|
||||||
|
const img = $('file-preview');
|
||||||
|
wrap.classList.remove('previewing');
|
||||||
|
img.classList.add('hidden');
|
||||||
|
img.removeAttribute('src');
|
||||||
|
if (previewURL) { URL.revokeObjectURL(previewURL); previewURL = null; }
|
||||||
|
}
|
||||||
|
|
||||||
|
function setAttachedFile(file) {
|
||||||
|
if (!file) return clearAttachedFile();
|
||||||
|
if (file.size > MAX_FILE_BYTES) {
|
||||||
|
toast('File is too large. The limit is 25 MB.', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
attachedFile = file;
|
||||||
|
renderFileChip();
|
||||||
|
setHidden('file-text-note', false);
|
||||||
|
// #233: title auto-fill — the file's own name always wins when the
|
||||||
|
// title is still blank; fallback is date.fileextension (e.g.
|
||||||
|
// 2026-09-10.txt) when the name is missing or unusable. Never
|
||||||
|
// overwrite a typed title.
|
||||||
|
if (!$('title').value.trim()) {
|
||||||
|
const raw = (file.name || '').trim();
|
||||||
|
if (raw) {
|
||||||
|
$('title').value = raw;
|
||||||
|
} else {
|
||||||
|
const d = new Date();
|
||||||
|
const iso = d.getFullYear() + '-' + String(d.getMonth() + 1).padStart(2, '0') + '-' + String(d.getDate()).padStart(2, '0');
|
||||||
|
const ext = extOf(raw || file.name);
|
||||||
|
$('title').value = ext ? iso + '.' + ext : iso;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
showFileInEditor(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearAttachedFile() {
|
||||||
|
attachedFile = null;
|
||||||
|
$('file-input').value = '';
|
||||||
|
renderFileChip();
|
||||||
|
setHidden('file-text-note', true);
|
||||||
|
clearPreview();
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderFileChip() {
|
||||||
|
const slot = $('file-chip-slot');
|
||||||
|
slot.innerHTML = '';
|
||||||
|
if (!attachedFile) return;
|
||||||
|
const chip = document.createElement('div');
|
||||||
|
chip.className = 'file-chip';
|
||||||
|
chip.innerHTML = '<span class="file-chip-name"></span>' +
|
||||||
|
'<span class="file-chip-size">' + humanSize(attachedFile.size) + '</span>' +
|
||||||
|
'<button type="button" class="file-chip-remove" title="Remove file">×</button>';
|
||||||
|
chip.querySelector('.file-chip-name').textContent = attachedFile.name;
|
||||||
|
chip.querySelector('.file-chip-remove').addEventListener('click', clearAttachedFile);
|
||||||
|
slot.appendChild(chip);
|
||||||
|
}
|
||||||
|
|
||||||
|
// (1) file picker via the dropzone click
|
||||||
|
$('dropzone').addEventListener('click', () => $('file-input').click());
|
||||||
|
$('file-input').addEventListener('change', () => {
|
||||||
|
if ($('file-input').files.length) setAttachedFile($('file-input').files[0]);
|
||||||
|
});
|
||||||
|
|
||||||
|
// (2) drag-and-drop onto the dropzone (and the page broadly)
|
||||||
|
const dz = $('dropzone');
|
||||||
|
['dragenter', 'dragover'].forEach(ev => {
|
||||||
|
document.addEventListener(ev, e => {
|
||||||
|
if (!e.dataTransfer || ![...e.dataTransfer.types].includes('Files')) return;
|
||||||
|
e.preventDefault();
|
||||||
|
dz.classList.add('dragover');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
['dragleave', 'drop'].forEach(ev => {
|
||||||
|
document.addEventListener(ev, e => {
|
||||||
|
if (ev === 'drop') e.preventDefault();
|
||||||
|
if (e.target === dz || ev === 'drop') dz.classList.remove('dragover');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
document.addEventListener('drop', e => {
|
||||||
|
if (!e.dataTransfer || !e.dataTransfer.files.length) return;
|
||||||
|
e.preventDefault();
|
||||||
|
setAttachedFile(e.dataTransfer.files[0]);
|
||||||
|
});
|
||||||
|
|
||||||
|
// (3) Ctrl+V of a file anywhere on the page
|
||||||
|
document.addEventListener('paste', e => {
|
||||||
|
const files = e.clipboardData && e.clipboardData.files;
|
||||||
|
if (!files || !files.length) return; // normal text paste into the editor
|
||||||
|
e.preventDefault();
|
||||||
|
setAttachedFile(files[0]);
|
||||||
|
});
|
||||||
|
|
||||||
|
// file create path: POST multipart. 1 file = 1 paste: when a file is
|
||||||
|
// attached the editor text is ignored (server enforces this too).
|
||||||
|
async function createFilePaste() {
|
||||||
|
const fd = new FormData();
|
||||||
|
fd.append('file', attachedFile);
|
||||||
|
if ($('title').value) fd.append('title', $('title').value);
|
||||||
|
if ($('custom').value) fd.append('custom_slug', $('custom').value);
|
||||||
|
if ($('haspw').checked) fd.append('password', $('password').value);
|
||||||
|
if ($('burn').checked) {
|
||||||
|
fd.append('burn_after_read', 'true');
|
||||||
|
fd.append('burn_after_reads', String(parseInt($('burnreads').value, 10) || 1));
|
||||||
|
}
|
||||||
|
if ($('unlisted').checked) fd.append('visibility', 'unlisted');
|
||||||
|
const exp = document.querySelector('input[name="exp"]:checked').value;
|
||||||
|
if (exp === 'custom') {
|
||||||
|
const dur = composeCustomExpiry();
|
||||||
|
if (dur === null) { toast('Check the custom expiry', 'error'); return; }
|
||||||
|
fd.append('expires_in', dur);
|
||||||
|
} else if (exp) {
|
||||||
|
fd.append('expires_in', exp);
|
||||||
|
}
|
||||||
|
const res = await fetch('/api/pastes', { method: 'POST', body: fd });
|
||||||
|
const data = await res.json();
|
||||||
|
if (!res.ok) {
|
||||||
|
showResult(friendlyError(data), 'err');
|
||||||
|
toast('Create failed', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
finishCreate(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
// reset stale result state when returning via Back (bfcache) (#28)
|
||||||
|
window.addEventListener('pageshow', e => {
|
||||||
|
if (!e.persisted) return;
|
||||||
|
const rc = document.getElementById('result-card');
|
||||||
|
if (rc) rc.classList.add('hidden');
|
||||||
|
const r = document.getElementById('result');
|
||||||
|
if (r) { r.innerHTML = 'empty'; delete r.dataset.token; }
|
||||||
|
});
|
||||||
|
document.addEventListener('keydown', e => {
|
||||||
|
if ((e.ctrlKey || e.metaKey) && e.key === 'Enter') { e.preventDefault(); create(); }
|
||||||
|
});
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
// #167: with line wrapping on, a logical line can occupy several visual
|
||||||
|
// lines; the gutter must show one number per VISUAL line, and each number
|
||||||
|
// must sit on the visual row where its logical line STARTS. Per-line spans
|
||||||
|
// give each logical line its own box so offsetTop order stays correct even
|
||||||
|
// when highlighting spans cross no line boundaries.
|
||||||
|
(function () {
|
||||||
|
var body = document.getElementById('codebody');
|
||||||
|
var gutter = document.getElementById('gutter');
|
||||||
|
var code = document.getElementById('code');
|
||||||
|
if (!body || !gutter || !code) return;
|
||||||
|
|
||||||
|
var wrapOn = function () {
|
||||||
|
return document.documentElement.hasAttribute('data-wrap');
|
||||||
|
};
|
||||||
|
|
||||||
|
// Wrap each logical line (split on newline; spans never contain newlines
|
||||||
|
// because HighlightCode highlights per line) in a .codeline block. The
|
||||||
|
// spans are display:block, so they are joined with '' — a '\n' join leaves
|
||||||
|
// newline text nodes between blocks that pre-wrap renders as an extra line
|
||||||
|
// box per line, which would shift every following number down one row (#167,
|
||||||
|
// #205). Whitespace-only text nodes are also stripped defensively below: any
|
||||||
|
// that reach the DOM (older cached HTML, other templates) render as phantom
|
||||||
|
// rows under white-space: pre and drift the gutter.
|
||||||
|
function splitLines() {
|
||||||
|
var html = body.innerHTML;
|
||||||
|
var parts = html.split('\n');
|
||||||
|
var out = [];
|
||||||
|
for (var i = 0; i < parts.length; i++) {
|
||||||
|
out.push('<span class="codeline">' + parts[i] + '</span>');
|
||||||
|
}
|
||||||
|
body.innerHTML = out.join('');
|
||||||
|
// #205: strip whitespace-only text nodes between the .codeline blocks.
|
||||||
|
var ws = [];
|
||||||
|
for (var n = body.firstChild; n; n = n.nextSibling) {
|
||||||
|
if (n.nodeType === 3 && !/\S/.test(n.nodeValue)) ws.push(n);
|
||||||
|
}
|
||||||
|
for (var w = 0; w < ws.length; w++) body.removeChild(ws[w]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// One .gutline block per visual row. The gutter must reproduce the code
|
||||||
|
// column's REAL rendered rows: each number goes on the visual row whose top
|
||||||
|
// matches its .codeline's top (a line wrapping to N rows gets its number on
|
||||||
|
// the FIRST of those rows), and filler rows pad the gaps. Geometry is
|
||||||
|
// measured, not derived from span counts or heights.
|
||||||
|
function renumber() {
|
||||||
|
var lines = body.querySelectorAll('.codeline');
|
||||||
|
// #257: size the gutter column to the widest line number so numbers in
|
||||||
|
// the 100s+ fit their own column instead of bleeding into the code text.
|
||||||
|
// The gutter is box-sizing: border-box, so the column width must be the
|
||||||
|
// digits PLUS the 10px left + 10px right padding; at the CSS default 3ch
|
||||||
|
// the padding alone leaves only ~19px of content, and any 2+ digit
|
||||||
|
// number overflows into the code. Numbers are right-aligned, and the
|
||||||
|
// width below fits the widest number exactly. Set via CSSOM (CSP
|
||||||
|
// forbids inline style attributes). Only touch the width when it
|
||||||
|
// changes: the resize observer below re-runs renumber() when the gutter
|
||||||
|
// width reflows the code column, and rewriting the same value would
|
||||||
|
// ping-pong the fixed point forever.
|
||||||
|
var digits = String(lines.length || 1).length;
|
||||||
|
var w = 'calc(' + digits + 'ch + 20px)';
|
||||||
|
if (gutter.style.width !== w) {
|
||||||
|
gutter.style.minWidth = w;
|
||||||
|
gutter.style.width = w;
|
||||||
|
}
|
||||||
|
if (!wrapOn() || !lines.length) {
|
||||||
|
// wrap OFF: one number per logical line (pre-existing behavior,
|
||||||
|
// including the gutter scrolling with horizontal scroll).
|
||||||
|
var s = '';
|
||||||
|
for (var k = 1; k <= lines.length; k++) s += k + '\n';
|
||||||
|
gutter.textContent = lines.length ? s.slice(0, -1) : '1';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Read all rects first: batching layout reads before the writes below
|
||||||
|
// avoids interleaved read/write reflows.
|
||||||
|
var bodyTop = body.getBoundingClientRect().top;
|
||||||
|
var lh = parseFloat(getComputedStyle(body).lineHeight) || 1;
|
||||||
|
var rowIdx = [];
|
||||||
|
var totalRows = 1;
|
||||||
|
for (var i = 0; i < lines.length; i++) {
|
||||||
|
var row = Math.round((lines[i].getBoundingClientRect().top - bodyTop) / lh);
|
||||||
|
if (row < 0) row = 0;
|
||||||
|
rowIdx.push(row);
|
||||||
|
if (row + 1 > totalRows) totalRows = row + 1;
|
||||||
|
}
|
||||||
|
if (totalRows < lines.length) totalRows = lines.length;
|
||||||
|
gutter.textContent = '';
|
||||||
|
var frag = document.createDocumentFragment();
|
||||||
|
var spans = [];
|
||||||
|
for (var r = 0; r < totalRows; r++) {
|
||||||
|
var cell = document.createElement('span');
|
||||||
|
cell.className = 'gutline';
|
||||||
|
cell.textContent = '\u00a0';
|
||||||
|
spans.push(cell);
|
||||||
|
frag.appendChild(cell);
|
||||||
|
}
|
||||||
|
gutter.appendChild(frag);
|
||||||
|
for (var j = 0; j < rowIdx.length; j++) {
|
||||||
|
spans[rowIdx[j]].textContent = String(j + 1);
|
||||||
|
}
|
||||||
|
// A wrapped line whose last visual row is only partially filled can
|
||||||
|
// settle a hair under N * line-height after the gutter is rebuilt; a
|
||||||
|
// gutter pass that changes the code column width reflows it. Verify the
|
||||||
|
// placement one frame later and re-run if any line's row moved (#167).
|
||||||
|
var placed = [];
|
||||||
|
for (var p = 0; p < rowIdx.length; p++) placed.push(rowIdx[p]);
|
||||||
|
requestAnimationFrame(function () {
|
||||||
|
var moved = false;
|
||||||
|
var bodyTop2 = body.getBoundingClientRect().top;
|
||||||
|
var lh2 = parseFloat(getComputedStyle(body).lineHeight) || lh;
|
||||||
|
var tops2 = [];
|
||||||
|
for (var q2 = 0; q2 < lines.length; q2++) tops2.push(lines[q2].getBoundingClientRect().top);
|
||||||
|
for (var q3 = 0; q3 < tops2.length; q3++) {
|
||||||
|
if (Math.round((tops2[q3] - bodyTop2) / lh2) !== placed[q3]) { moved = true; break; }
|
||||||
|
}
|
||||||
|
if (moved) renumber();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
splitLines();
|
||||||
|
renumber();
|
||||||
|
|
||||||
|
// Re-renumber on toggle (theme.js toggles data-wrap on <html>) and on any
|
||||||
|
// size change (paste of lots of text, window resize, zoom). Only width
|
||||||
|
// changes of the code column affect wrapping, so observe width only —
|
||||||
|
// height changes caused by our own renumbering must not re-trigger.
|
||||||
|
var mo = new MutationObserver(renumber);
|
||||||
|
mo.observe(document.documentElement, { attributes: true, attributeFilter: ['data-wrap'] });
|
||||||
|
var lastW = body.getBoundingClientRect().width;
|
||||||
|
if (window.ResizeObserver) {
|
||||||
|
var ro = new ResizeObserver(function () {
|
||||||
|
var w = body.getBoundingClientRect().width;
|
||||||
|
if (Math.abs(w - lastW) < 0.5) return;
|
||||||
|
lastW = w;
|
||||||
|
renumber();
|
||||||
|
});
|
||||||
|
ro.observe(body);
|
||||||
|
} else {
|
||||||
|
window.addEventListener('resize', renumber);
|
||||||
|
}
|
||||||
|
})();
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
// #53/#139: paste viewer page logic. Paste id arrives via <body data-paste-id>.
|
||||||
|
function toast(msg) {
|
||||||
|
let t = document.querySelector('.toast');
|
||||||
|
if (!t) { t = document.createElement('div'); t.className = 'toast'; document.body.appendChild(t); }
|
||||||
|
t.textContent = msg;
|
||||||
|
t.classList.add('show');
|
||||||
|
clearTimeout(t._h);
|
||||||
|
t._h = setTimeout(() => t.classList.remove('show'), 2000);
|
||||||
|
}
|
||||||
|
function toggleStats() {
|
||||||
|
const body = document.getElementById('stats-body');
|
||||||
|
const pill = document.getElementById('stats-pill');
|
||||||
|
const btn = document.getElementById('stats-toggle');
|
||||||
|
const open = body.hidden;
|
||||||
|
body.hidden = !open;
|
||||||
|
pill.classList.toggle('open', open);
|
||||||
|
btn.setAttribute('aria-expanded', open ? 'true' : 'false');
|
||||||
|
}
|
||||||
|
function copyFeedback(btn) {
|
||||||
|
if (!btn) return;
|
||||||
|
// #260 attempt 2: .swapbtn stacks the label and checkmark in the same grid
|
||||||
|
// cell, so the button width is always the wider of the two and never moves.
|
||||||
|
// Feedback is a pure class toggle; no width pinning, no textContent swap.
|
||||||
|
btn.classList.add('ok');
|
||||||
|
clearTimeout(btn._okh);
|
||||||
|
btn._okh = setTimeout(() => btn.classList.remove('ok'), 2000);
|
||||||
|
}
|
||||||
|
function copyContent(btn) {
|
||||||
|
navigator.clipboard.writeText(document.getElementById('raw-content').value)
|
||||||
|
.then(() => copyFeedback(btn))
|
||||||
|
.catch(() => toast('Copy failed'));
|
||||||
|
}
|
||||||
|
// #243: copy the paste LINK (full URL), not the paste id or content
|
||||||
|
function copyLink(btn) {
|
||||||
|
const url = location.origin + location.pathname;
|
||||||
|
navigator.clipboard.writeText(url)
|
||||||
|
.then(() => copyFeedback(btn))
|
||||||
|
.catch(() => toast('Copy failed'));
|
||||||
|
}
|
||||||
|
function redeem() {
|
||||||
|
if (!confirm('Hard delete this paste immediately?')) return;
|
||||||
|
let tok = '';
|
||||||
|
try { tok = sessionStorage.getItem('deletion_token_' + PASTE_ID) || ''; } catch(e) {}
|
||||||
|
if (!tok) { alert('deletion token not available in this browser'); return; }
|
||||||
|
fetch('/api/pastes/' + PASTE_ID + '/redeem', {method: 'DELETE', headers: {'Authorization': 'Bearer ' + tok}})
|
||||||
|
.then(r => { if (r.ok) location.href = '/public'; else alert('delete failed'); });
|
||||||
|
}
|
||||||
|
|
||||||
|
// wiring (moved from inline handlers for CSP #139)
|
||||||
|
var PASTE_ID = document.currentScript.getAttribute('data-paste-id');
|
||||||
|
var copyBtn = document.getElementById('copy-btn');
|
||||||
|
if (copyBtn) copyBtn.addEventListener('click', function (e) { e.preventDefault(); copyContent(copyBtn); });
|
||||||
|
var copyLinkBtn = document.getElementById('copy-link-btn');
|
||||||
|
if (copyLinkBtn) copyLinkBtn.addEventListener('click', function (e) { e.preventDefault(); copyLink(copyLinkBtn); });
|
||||||
|
var delBtn = document.getElementById('delete-btn');
|
||||||
|
|
||||||
|
// #168: show the compact paste-created pill in the bottom corner, then fade it out
|
||||||
|
const createdPill = document.getElementById('created-pill');
|
||||||
|
if (createdPill) {
|
||||||
|
requestAnimationFrame(() => createdPill.classList.add('show'));
|
||||||
|
setTimeout(() => createdPill.classList.remove('show'), 4000);
|
||||||
|
}
|
||||||
|
if (delBtn) delBtn.addEventListener('click', function (e) { e.preventDefault(); redeem(); });
|
||||||
|
var statsToggle = document.getElementById('stats-toggle');
|
||||||
|
if (statsToggle) statsToggle.addEventListener('click', toggleStats);
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
// #112/#127/#139: theme switcher. Swatch colors are derived from computed CSS vars per preset.
|
||||||
|
(function () {
|
||||||
|
// #112: derive each preset's swatches from the real CSS variables in
|
||||||
|
// app.css by temporarily applying data-preset, so they can never drift.
|
||||||
|
// #127: 5 theme pairs, light swatches top row, dark bottom row.
|
||||||
|
var pairs = [
|
||||||
|
{ id: 'midnight', name: 'Midnight' },
|
||||||
|
{ id: 'smooth', name: 'Smooth' },
|
||||||
|
{ id: 'pastel-lavender', name: 'Pastel Lavender' },
|
||||||
|
{ id: 'pastel-peach', name: 'Pastel Peach' },
|
||||||
|
{ id: 'pastel-cloud', name: 'Pastel Cloud' }
|
||||||
|
];
|
||||||
|
var SWATCH_VARS = ['--bg', '--surface', '--surface-2', '--muted', '--accent'];
|
||||||
|
|
||||||
|
function presetColors(id) {
|
||||||
|
var root = document.documentElement;
|
||||||
|
var prev = root.getAttribute('data-preset');
|
||||||
|
root.setAttribute('data-preset', id);
|
||||||
|
var cs = getComputedStyle(root);
|
||||||
|
var colors = SWATCH_VARS.map(function (v) { return cs.getPropertyValue(v).trim(); });
|
||||||
|
if (prev === null) root.removeAttribute('data-preset'); else root.setAttribute('data-preset', prev);
|
||||||
|
return colors;
|
||||||
|
}
|
||||||
|
|
||||||
|
// current base pair + dark flag from the resolved data-preset.
|
||||||
|
// "midnight" is itself the dark variant, so check dark ids first.
|
||||||
|
function state() {
|
||||||
|
var p = document.documentElement.dataset.preset || 'midnight';
|
||||||
|
if (p === 'midnight' || /-dark$/.test(p)) {
|
||||||
|
return { base: p === 'midnight' ? 'midnight' : p.replace(/-dark$/, ''), dark: true };
|
||||||
|
}
|
||||||
|
return { base: p === 'midnight-light' ? 'midnight' : p, dark: false };
|
||||||
|
}
|
||||||
|
|
||||||
|
var grid = document.getElementById('theme-grid');
|
||||||
|
var cards = {};
|
||||||
|
// #132: midnight is dark-first (root preset = midnight = dark; its light
|
||||||
|
// variant is midnight-light), the others are light-first. Resolve the
|
||||||
|
// LIGHT and DARK preset ids generically so the light swatches always
|
||||||
|
// render in the top row of every card.
|
||||||
|
function lightPreset(id) {
|
||||||
|
if (id === 'midnight') return 'midnight-light';
|
||||||
|
return id; // light-first bases use themselves as the light variant
|
||||||
|
}
|
||||||
|
function darkPreset(id) {
|
||||||
|
if (id === 'midnight') return 'midnight'; // root preset is midnight's dark
|
||||||
|
return id + '-dark';
|
||||||
|
}
|
||||||
|
pairs.forEach(function (t) {
|
||||||
|
var light = presetColors(lightPreset(t.id));
|
||||||
|
var dark = presetColors(darkPreset(t.id));
|
||||||
|
var btn = document.createElement('button');
|
||||||
|
btn.type = 'button';
|
||||||
|
btn.className = 'theme-card';
|
||||||
|
btn.setAttribute('aria-pressed', 'false');
|
||||||
|
btn.setAttribute('data-pair', t.id);
|
||||||
|
// #139: build the swatches via DOM APIs (CSSOM styles) instead of
|
||||||
|
// innerHTML strings: re-parsing serialized inline styles would trip
|
||||||
|
// style-src 'self'.
|
||||||
|
var label = document.createElement('strong');
|
||||||
|
label.textContent = t.name;
|
||||||
|
btn.appendChild(label);
|
||||||
|
[light, dark].forEach(function (colors) {
|
||||||
|
var row = document.createElement('span');
|
||||||
|
row.className = 'swatches';
|
||||||
|
colors.forEach(function (c) {
|
||||||
|
var sw = document.createElement('span');
|
||||||
|
sw.className = 'swatch';
|
||||||
|
sw.style.backgroundColor = c;
|
||||||
|
row.appendChild(sw);
|
||||||
|
});
|
||||||
|
btn.appendChild(row);
|
||||||
|
});
|
||||||
|
btn.addEventListener('click', function () {
|
||||||
|
var dark = state().dark;
|
||||||
|
// #294: use the generic variant resolvers - midnight is dark-first
|
||||||
|
// (dark preset = 'midnight', light = 'midnight-light'), so a raw
|
||||||
|
// t.id + '-dark' build landed on nonexistent/forced-dark presets.
|
||||||
|
document.documentElement.dataset.preset = dark ? darkPreset(t.id) : lightPreset(t.id);
|
||||||
|
try { localStorage.setItem('palette-theme', t.id); } catch (e) {}
|
||||||
|
Object.keys(cards).forEach(function (k) { cards[k].setAttribute('aria-pressed', 'false'); });
|
||||||
|
btn.setAttribute('aria-pressed', 'true');
|
||||||
|
});
|
||||||
|
cards[t.id] = btn;
|
||||||
|
grid.appendChild(btn);
|
||||||
|
});
|
||||||
|
|
||||||
|
function sync() {
|
||||||
|
var s = state();
|
||||||
|
Object.keys(cards).forEach(function (k) {
|
||||||
|
cards[k].setAttribute('aria-pressed', k === s.base ? 'true' : 'false');
|
||||||
|
});
|
||||||
|
var dt = document.getElementById('settings-dark-toggle');
|
||||||
|
if (dt) dt.setAttribute('aria-pressed', s.dark ? 'true' : 'false');
|
||||||
|
}
|
||||||
|
sync();
|
||||||
|
// topbar.js already binds every .dark-toggle (deferred, so the settings
|
||||||
|
// button exists by then). Only wire here if it somehow did not run,
|
||||||
|
// otherwise the button would toggle twice per click and never change (#197).
|
||||||
|
var dt = document.getElementById('settings-dark-toggle');
|
||||||
|
if (dt && !dt.dataset.darkWired) {
|
||||||
|
dt.addEventListener('click', function () {
|
||||||
|
var btns = document.querySelectorAll('.topbar .dark-toggle');
|
||||||
|
if (btns.length) btns[0].click(); else document.dispatchEvent(new CustomEvent('palette-darkchange'));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
document.addEventListener('palette-darkchange', sync);
|
||||||
|
})();
|
||||||
@@ -16,7 +16,7 @@ const PaletteTable = (() => {
|
|||||||
const sortVal = (it, k) => {
|
const sortVal = (it, k) => {
|
||||||
let v = it[k];
|
let v = it[k];
|
||||||
if (k === 'title' || k === 'custom_slug') v = (v == null || v === '') ? null : String(v).toLowerCase();
|
if (k === 'title' || k === 'custom_slug') v = (v == null || v === '') ? null : String(v).toLowerCase();
|
||||||
if (k === 'language') v = (v == null || v === '') ? 'text' : String(v).toLowerCase();
|
if (k === 'language' || k === 'type') v = (v == null || v === '') ? 'text' : String(v).toLowerCase();
|
||||||
if (k === 'size' || k === 'view_count' || k === 'created_at') return v == null ? -1 : v;
|
if (k === 'size' || k === 'view_count' || k === 'created_at') return v == null ? -1 : v;
|
||||||
return v == null ? null : v;
|
return v == null ? null : v;
|
||||||
};
|
};
|
||||||
@@ -79,10 +79,10 @@ const PaletteTable = (() => {
|
|||||||
const rows = $('rows'), empty = $('empty');
|
const rows = $('rows'), empty = $('empty');
|
||||||
if (!items.length) {
|
if (!items.length) {
|
||||||
rows.innerHTML = '';
|
rows.innerHTML = '';
|
||||||
empty.style.display = 'block';
|
empty.classList.remove('hidden');
|
||||||
empty.textContent = filtered ? opts.emptyFiltered : opts.emptyAll;
|
empty.textContent = filtered ? opts.emptyFiltered : opts.emptyAll;
|
||||||
} else {
|
} else {
|
||||||
empty.style.display = 'none';
|
empty.classList.add('hidden');
|
||||||
rows.innerHTML = items.map(opts.rowHtml).join('');
|
rows.innerHTML = items.map(opts.rowHtml).join('');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,17 +90,38 @@ const PaletteTable = (() => {
|
|||||||
if (opts.hasPager && pager && showing) {
|
if (opts.hasPager && pager && showing) {
|
||||||
const pages = Math.max(1, Math.ceil(state.total / opts.perPage));
|
const pages = Math.max(1, Math.ceil(state.total / opts.perPage));
|
||||||
if (filtered || state.sortKey) {
|
if (filtered || state.sortKey) {
|
||||||
showing.textContent = state.sortKey
|
// Pagination operates over the FILTERED set (#133): never hide the bar.
|
||||||
? 'Sorted by ' + state.sortKey + ' (' + (state.sortDir === 1 ? 'ascending' : 'descending') + ') · ' + items.length.toLocaleString() + ' of ' + state.total.toLocaleString()
|
const filtPages = Math.max(1, Math.ceil(items.length / opts.perPage));
|
||||||
: 'Showing ' + items.length.toLocaleString() + ' matches for "' + state.filter + '"';
|
if (state.page > filtPages) state.page = filtPages;
|
||||||
pager.innerHTML = '';
|
const fOff = (state.page - 1) * opts.perPage;
|
||||||
|
const view = items.slice(fOff, fOff + opts.perPage);
|
||||||
|
rows.innerHTML = view.length ? view.map(opts.rowHtml).join('') : '';
|
||||||
|
if (!view.length) {
|
||||||
|
empty.classList.remove('hidden');
|
||||||
|
empty.textContent = filtered ? opts.emptyFiltered : opts.emptyAll;
|
||||||
|
}
|
||||||
|
showing.textContent = `Showing ${view.length === 0 ? 0 : fOff+1}–${fOff+view.length} of ${items.length.toLocaleString()} ${filtered ? 'matches' : 'sorted'} · page ${state.page} of ${filtPages}`;
|
||||||
|
const btns = [];
|
||||||
|
const add = (label, target, o={}) => btns.push(`<button ${o.on?'class="on"':''} ${o.dis?'disabled':''} data-p="${target}">${label}</button>`);
|
||||||
|
add('‹', state.page-1, {dis: state.page===1});
|
||||||
|
const win = new Set([1, state.page-1, state.page, state.page+1, filtPages]);
|
||||||
|
let last = 0;
|
||||||
|
for (let i = 1; i <= filtPages; i++) {
|
||||||
|
if (win.has(i)) {
|
||||||
|
if (last && i - last > 1) btns.push('<span class="dim">…</span>');
|
||||||
|
add(String(i), i, {on: i===state.page});
|
||||||
|
last = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
add('›', state.page+1, {dis: state.page===filtPages});
|
||||||
|
pager.innerHTML = btns.join('');
|
||||||
} else {
|
} else {
|
||||||
showing.textContent = state.total === 0 ? 'Nothing here yet' :
|
showing.textContent = state.total === 0 ? 'Nothing here yet' :
|
||||||
`Showing ${off+1}–${Math.min(off+opts.perPage, state.total)} of ${state.total.toLocaleString()} · page ${state.page} of ${pages}`;
|
`Showing ${off+1}–${Math.min(off+opts.perPage, state.total)} of ${state.total.toLocaleString()} · page ${state.page} of ${pages}`;
|
||||||
const btns = [];
|
const btns = [];
|
||||||
const add = (label, target, o={}) => btns.push(`<button ${o.on?'class="on"':''} ${o.dis?'disabled':''} data-p="${target}">${label}</button>`);
|
const add = (label, target, o={}) => btns.push(`<button ${o.on?'class="on"':''} ${o.dis?'disabled':''} data-p="${target}">${label}</button>`);
|
||||||
add('‹', state.page-1, {dis: state.page===1});
|
add('‹', state.page-1, {dis: state.page===1});
|
||||||
const win = new Set([1, 2, state.page-1, state.page, state.page+1, pages]);
|
const win = new Set([1, state.page-1, state.page, state.page+1, pages]);
|
||||||
let last = 0;
|
let last = 0;
|
||||||
for (let i = 1; i <= pages; i++) {
|
for (let i = 1; i <= pages; i++) {
|
||||||
if (win.has(i)) {
|
if (win.has(i)) {
|
||||||
@@ -126,6 +147,7 @@ const PaletteTable = (() => {
|
|||||||
if (!th) return;
|
if (!th) return;
|
||||||
const k = th.dataset.sort;
|
const k = th.dataset.sort;
|
||||||
if (state.sortKey === k) { state.sortDir = -state.sortDir; } else { state.sortKey = k; state.sortDir = 1; }
|
if (state.sortKey === k) { state.sortDir = -state.sortDir; } else { state.sortKey = k; state.sortDir = 1; }
|
||||||
|
state.page = 1;
|
||||||
renderSortIndicators();
|
renderSortIndicators();
|
||||||
load();
|
load();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,78 @@
|
|||||||
|
// #16/#100/#127: theme preset resolution. Runs in <head> (blocking) so the
|
||||||
|
// correct data-preset is set before first paint. The server default dark flag
|
||||||
|
// arrives via the script tag's data-default-dark attribute so no inline script is needed.
|
||||||
|
// #130: shared line wrap preference (localStorage 'palette-wrap', default off).
|
||||||
|
// preset hook (#16): ?theme= wins; else persisted choice (#100).
|
||||||
|
// #127: theme pairs - each base theme has a light and dark variant;
|
||||||
|
// palette-theme stores the base id, palette-dark the dark flag.
|
||||||
|
(function () {
|
||||||
|
var PAIRS = {
|
||||||
|
'midnight': { light: 'midnight-light', dark: 'midnight' },
|
||||||
|
'smooth': { light: 'smooth', dark: 'smooth-dark' },
|
||||||
|
'pastel-lavender': { light: 'pastel-lavender', dark: 'pastel-lavender-dark' },
|
||||||
|
'pastel-peach': { light: 'pastel-peach', dark: 'pastel-peach-dark' },
|
||||||
|
'pastel-cloud': { light: 'pastel-cloud', dark: 'pastel-cloud-dark' }
|
||||||
|
};
|
||||||
|
function resolve(t, dark) {
|
||||||
|
for (var base in PAIRS) {
|
||||||
|
if (t === PAIRS[base].light || t === PAIRS[base].dark) return t;
|
||||||
|
if (t === base) return dark ? PAIRS[base].dark : PAIRS[base].light;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
var t = new URLSearchParams(location.search).get('theme');
|
||||||
|
// precedence: URL ?theme= > stored pair+dark prefs > server default dark > dark on
|
||||||
|
var dark = (document.currentScript && document.currentScript.getAttribute('data-default-dark')) === '1';
|
||||||
|
try {
|
||||||
|
var stored = localStorage.getItem('palette-dark');
|
||||||
|
if (stored !== null) dark = stored !== 'false';
|
||||||
|
} catch (e) {}
|
||||||
|
if (t) {
|
||||||
|
// URL ?theme= wins and accepts both base and variant ids; a variant id
|
||||||
|
// also sets the dark flag and normalizes t back to its base pair id.
|
||||||
|
var found = false;
|
||||||
|
for (var base in PAIRS) {
|
||||||
|
if (t === PAIRS[base].dark) { dark = true; t = base; found = true; break; }
|
||||||
|
if (t === PAIRS[base].light) { dark = false; t = base; found = true; break; }
|
||||||
|
if (t === base) { found = true; break; }
|
||||||
|
}
|
||||||
|
if (!found) t = null;
|
||||||
|
}
|
||||||
|
if (!t) {
|
||||||
|
try { t = localStorage.getItem('palette-theme'); } catch (e) {}
|
||||||
|
}
|
||||||
|
if (!PAIRS[t]) t = 'midnight';
|
||||||
|
// do not persist anything here: URL theme is a one-off override
|
||||||
|
document.documentElement.dataset.preset = dark ? PAIRS[t].dark : PAIRS[t].light;
|
||||||
|
})();
|
||||||
|
// #130: shared line wrap preference (localStorage 'palette-wrap', default off)
|
||||||
|
(function () {
|
||||||
|
function wrapOn() {
|
||||||
|
try { return localStorage.getItem('palette-wrap') === '1'; } catch (e) { return false; }
|
||||||
|
}
|
||||||
|
function wrapApply(on) {
|
||||||
|
if (on) document.documentElement.setAttribute('data-wrap', '1');
|
||||||
|
else document.documentElement.removeAttribute('data-wrap');
|
||||||
|
document.querySelectorAll('.wrap-toggle').forEach(function (b) {
|
||||||
|
b.setAttribute('aria-pressed', on ? 'true' : 'false');
|
||||||
|
});
|
||||||
|
var s = document.getElementById('wrap-setting');
|
||||||
|
if (s) s.checked = on;
|
||||||
|
}
|
||||||
|
window.paletteWrapToggle = function () {
|
||||||
|
var on = !wrapOn();
|
||||||
|
try { localStorage.setItem('palette-wrap', on ? '1' : '0'); } catch (e) {}
|
||||||
|
wrapApply(on);
|
||||||
|
return on;
|
||||||
|
};
|
||||||
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
|
wrapApply(wrapOn());
|
||||||
|
document.querySelectorAll('.wrap-toggle').forEach(function (b) {
|
||||||
|
b.addEventListener('click', function () { window.paletteWrapToggle(); });
|
||||||
|
});
|
||||||
|
var s = document.getElementById('wrap-setting');
|
||||||
|
if (s) s.addEventListener('change', function () {
|
||||||
|
if (s.checked !== wrapOn()) window.paletteWrapToggle();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
})();
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
// #127: dark mode toggle: flips to the other variant of the active pair.
|
||||||
|
// #127: dark mode toggle - flips to the other variant of the active pair.
|
||||||
|
(function () {
|
||||||
|
var PAIRS = {
|
||||||
|
'midnight': { light: 'midnight-light', dark: 'midnight' },
|
||||||
|
'smooth': { light: 'smooth', dark: 'smooth-dark' },
|
||||||
|
'pastel-lavender': { light: 'pastel-lavender', dark: 'pastel-lavender-dark' },
|
||||||
|
'pastel-peach': { light: 'pastel-peach', dark: 'pastel-peach-dark' },
|
||||||
|
'pastel-cloud': { light: 'pastel-cloud', dark: 'pastel-cloud-dark' }
|
||||||
|
};
|
||||||
|
var root = document.documentElement;
|
||||||
|
function state() {
|
||||||
|
var p = root.dataset.preset || 'midnight';
|
||||||
|
for (var base in PAIRS) {
|
||||||
|
if (p === PAIRS[base].dark) return { base: base, dark: true };
|
||||||
|
if (p === PAIRS[base].light) return { base: base, dark: false };
|
||||||
|
}
|
||||||
|
return { base: 'midnight', dark: true };
|
||||||
|
}
|
||||||
|
function apply() {
|
||||||
|
var s = state();
|
||||||
|
document.body.classList.toggle('dark', s.dark);
|
||||||
|
root.classList.toggle('dark', s.dark);
|
||||||
|
}
|
||||||
|
function sync(btns) {
|
||||||
|
btns.forEach(function (b) {
|
||||||
|
b.setAttribute('aria-pressed', state().dark ? 'true' : 'false');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
var btns = document.querySelectorAll('.dark-toggle');
|
||||||
|
apply();
|
||||||
|
sync(Array.prototype.slice.call(btns));
|
||||||
|
btns.forEach(function (b) {
|
||||||
|
// mark as wired so settings.js does not add a second handler
|
||||||
|
// (#197: double-binding made the settings toggle flip twice = no-op)
|
||||||
|
b.dataset.darkWired = '1';
|
||||||
|
b.addEventListener('click', function () {
|
||||||
|
var s = state();
|
||||||
|
var dark = !s.dark;
|
||||||
|
root.dataset.preset = dark ? PAIRS[s.base].dark : PAIRS[s.base].light;
|
||||||
|
try { localStorage.setItem('palette-dark', dark ? 'true' : 'false'); } catch (e) {}
|
||||||
|
apply();
|
||||||
|
sync(Array.prototype.slice.call(btns));
|
||||||
|
document.dispatchEvent(new CustomEvent('palette-darkchange'));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
})();
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
// #139: unlock page: password reveal toggle.
|
||||||
|
document.getElementById('pwreveal').addEventListener('click', () => {
|
||||||
|
const pw = document.getElementById('password');
|
||||||
|
const show = pw.type === 'password';
|
||||||
|
pw.type = show ? 'text' : 'password';
|
||||||
|
document.getElementById('pwreveal').title = show ? 'Hide password' : 'Show password';
|
||||||
|
});
|
||||||
@@ -1,21 +1,18 @@
|
|||||||
{{template "head" .}}
|
{{template "head" .}}
|
||||||
{{template "topbar" .}}
|
{{template "topbar" .}}
|
||||||
<div class="page">
|
<div class="center">
|
||||||
<div class="float">
|
<div class="float unlock-card">
|
||||||
<div class="settings-head">
|
<div class="inner">
|
||||||
<h1>Admin</h1>
|
<h1>Admin</h1>
|
||||||
</div>
|
|
||||||
<div class="settings-body">
|
|
||||||
<p>Enter the admin key to manage server settings. The key is kept in
|
|
||||||
sessionStorage for this tab only and is sent as a request header — it is
|
|
||||||
never stored in a cookie, so it will not accompany normal paste requests.</p>
|
|
||||||
<form id="admin-key-form">
|
<form id="admin-key-form">
|
||||||
<label for="admin-key">Admin key</label><br>
|
<div class="pw-field">
|
||||||
<input type="password" id="admin-key" autocomplete="off" style="width:100%">
|
<input type="password" id="admin-key" placeholder="Admin key" autocomplete="off" autofocus>
|
||||||
<button type="submit">Unlock</button>
|
</div>
|
||||||
|
<button class="btn" type="submit">Unlock</button>
|
||||||
<span id="admin-key-status"></span>
|
<span id="admin-key-status"></span>
|
||||||
</form>
|
</form>
|
||||||
<div id="admin-panel" style="display:none">
|
|
||||||
|
<div id="admin-panel" class="hidden">
|
||||||
<h2>Settings</h2>
|
<h2>Settings</h2>
|
||||||
<form id="admin-settings-form">
|
<form id="admin-settings-form">
|
||||||
<table>
|
<table>
|
||||||
@@ -33,79 +30,5 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script src="/static/admin.js" defer></script>
|
||||||
(function () {
|
|
||||||
var KEY = 'palette_admin_key';
|
|
||||||
var keyInput = document.getElementById('admin-key');
|
|
||||||
var status = document.getElementById('admin-key-status');
|
|
||||||
var panel = document.getElementById('admin-panel');
|
|
||||||
|
|
||||||
function key() { return sessionStorage.getItem(KEY) || ''; }
|
|
||||||
|
|
||||||
function api(path, opts) {
|
|
||||||
opts = opts || {};
|
|
||||||
// allow callers to override the key header (e.g. validating a typed key, #99)
|
|
||||||
opts.headers = Object.assign({ 'X-Admin-Key': key() }, opts.headers || {});
|
|
||||||
if (opts.body) opts.headers['Content-Type'] = 'application/json';
|
|
||||||
return fetch(path, opts);
|
|
||||||
}
|
|
||||||
|
|
||||||
function loadSettings() {
|
|
||||||
api('/admin/api/settings').then(function (r) {
|
|
||||||
if (r.status !== 200) { showLock(); return; }
|
|
||||||
return r.json();
|
|
||||||
}).then(function (s) {
|
|
||||||
if (!s) return;
|
|
||||||
document.getElementById('rl-burst').value = s.rate_limit_burst;
|
|
||||||
document.getElementById('rl-refill').value = s.rate_limit_per_minute;
|
|
||||||
document.getElementById('max-content').value = s.max_content_bytes;
|
|
||||||
document.getElementById('default-expiry').value = s.default_expiry;
|
|
||||||
document.getElementById('slug-days').value = s.custom_slug_reservation_days;
|
|
||||||
document.getElementById('burn-window').value = s.burn_viewer_window_minutes;
|
|
||||||
panel.style.display = '';
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function showLock() {
|
|
||||||
panel.style.display = 'none';
|
|
||||||
sessionStorage.removeItem(KEY);
|
|
||||||
}
|
|
||||||
|
|
||||||
document.getElementById('admin-key-form').addEventListener('submit', function (e) {
|
|
||||||
e.preventDefault();
|
|
||||||
// #99: don't persist the key until the server accepts it
|
|
||||||
api('/admin/api/settings', { headers: { 'X-Admin-Key': keyInput.value } }).then(function (r) {
|
|
||||||
if (r.status === 200) {
|
|
||||||
sessionStorage.setItem(KEY, keyInput.value);
|
|
||||||
status.textContent = '✓';
|
|
||||||
keyInput.value = '';
|
|
||||||
loadSettings();
|
|
||||||
} else {
|
|
||||||
status.textContent = 'invalid key';
|
|
||||||
showLock();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
document.getElementById('admin-settings-form').addEventListener('submit', function (e) {
|
|
||||||
e.preventDefault();
|
|
||||||
var body = {
|
|
||||||
rate_limit_burst: parseFloat(document.getElementById('rl-burst').value),
|
|
||||||
rate_limit_per_minute: parseFloat(document.getElementById('rl-refill').value),
|
|
||||||
max_content_bytes: parseInt(document.getElementById('max-content').value, 10),
|
|
||||||
default_expiry: document.getElementById('default-expiry').value,
|
|
||||||
custom_slug_reservation_days: parseInt(document.getElementById('slug-days').value, 10),
|
|
||||||
burn_viewer_window_minutes: parseInt(document.getElementById('burn-window').value, 10)
|
|
||||||
};
|
|
||||||
api('/admin/api/settings', { method: 'POST', body: JSON.stringify(body) }).then(function (r) {
|
|
||||||
document.getElementById('admin-save-status').textContent = r.status === 200 ? 'saved' : 'error';
|
|
||||||
if (r.status !== 200) showLock();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
// #112: always show the lock on fresh load — do not auto-restore the
|
|
||||||
// panel from a stale sessionStorage key. The key is only written after a
|
|
||||||
// successful unlock (above) so in-page actions still work within this visit.
|
|
||||||
})();
|
|
||||||
</script>
|
|
||||||
{{template "foot" .}}
|
{{template "foot" .}}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{{template "head" .}}
|
{{template "head" .}}
|
||||||
{{template "topbar" .}}
|
{{template "topbar" .}}
|
||||||
<div class="center">
|
<div class="center">
|
||||||
<div class="float can-page" style="max-width:900px; width:100%;">
|
<div class="float can-page">
|
||||||
<div class="inner">
|
<div class="inner">
|
||||||
<h1>{{.Title}} <span class="badge" title="This is a can — a bundle of pastes">can</span></h1>
|
<h1>{{.Title}} <span class="badge" title="This is a can — a bundle of pastes">can</span></h1>
|
||||||
{{if .HasDescription}}<p class="sub">{{.Description}}</p>{{end}}
|
{{if .HasDescription}}<p class="sub">{{.Description}}</p>{{end}}
|
||||||
|
|||||||
@@ -1,21 +1 @@
|
|||||||
{{define "foot"}}<script>
|
{{define "foot"}}<script src="/static/foot.js" defer></script>{{end}}
|
||||||
// live relative-time counters (#46): tick any [data-ts] (epoch seconds) every second
|
|
||||||
(function () {
|
|
||||||
function fmt(ts) {
|
|
||||||
const s = Math.max(0, Math.floor(Date.now() / 1000) - ts);
|
|
||||||
if (s < 60) return s + 's ago';
|
|
||||||
if (s < 3600) return Math.floor(s / 60) + 'm ago';
|
|
||||||
if (s < 86400) return Math.floor(s / 3600) + 'h ago';
|
|
||||||
return Math.floor(s / 86400) + 'd ago';
|
|
||||||
}
|
|
||||||
function tick() {
|
|
||||||
document.querySelectorAll('[data-ts]').forEach(el => {
|
|
||||||
const ts = parseInt(el.dataset.ts, 10);
|
|
||||||
if (!isNaN(ts)) el.textContent = fmt(ts);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
setInterval(tick, 1000);
|
|
||||||
document.addEventListener('DOMContentLoaded', tick);
|
|
||||||
tick();
|
|
||||||
})();
|
|
||||||
</script>{{end}}
|
|
||||||
@@ -8,19 +8,19 @@
|
|||||||
<div class="search"><input id="filter" placeholder="Search…"><span class="search-spinner" id="search-spinner"></span></div>
|
<div class="search"><input id="filter" placeholder="Search…"><span class="search-spinner" id="search-spinner"></span></div>
|
||||||
<div class="float">
|
<div class="float">
|
||||||
<table>
|
<table>
|
||||||
<colgroup><col style="width:260px"><col style="width:140px"><col style="width:120px"><col style="width:96px"><col style="width:140px"><col style="width:190px"><col style="width:100px"></colgroup>
|
<colgroup><col class="col-a"><col class="col-b"><col class="col-c"><col class="col-d"><col class="col-e"><col class="col-url"><col class="col-g"></colgroup>
|
||||||
<thead><tr>
|
<thead><tr>
|
||||||
<th data-sort="title" class="sortable"><span class="sort-ind"></span>Paste</th>
|
<th data-sort="title" class="sortable">Paste<span class="sort-ind"></span></th>
|
||||||
<th data-sort="language" class="sortable"><span class="sort-ind"></span>Language</th>
|
<th data-sort="type" class="sortable">Type<span class="sort-ind"></span></th>
|
||||||
<th data-sort="size" class="sortable"><span class="sort-ind"></span>Size</th>
|
<th data-sort="size" class="sortable">Size<span class="sort-ind"></span></th>
|
||||||
<th data-sort="view_count" class="sortable"><span class="sort-ind"></span>Views</th>
|
<th data-sort="view_count" class="sortable">Views<span class="sort-ind"></span></th>
|
||||||
<th data-sort="created_at" class="sortable"><span class="sort-ind"></span>Created</th>
|
<th data-sort="created_at" class="sortable">Created<span class="sort-ind"></span></th>
|
||||||
<th data-sort="custom_slug" class="sortable"><span class="sort-ind"></span>URL</th>
|
<th data-sort="custom_slug" class="sortable">URL<span class="sort-ind"></span></th>
|
||||||
<th data-sort="id" class="sortable"><span class="sort-ind"></span>ID</th>
|
<th data-sort="id" class="sortable">ID<span class="sort-ind"></span></th>
|
||||||
</tr></thead>
|
</tr></thead>
|
||||||
<tbody id="rows"></tbody>
|
<tbody id="rows"></tbody>
|
||||||
</table>
|
</table>
|
||||||
<div class="empty" id="empty" style="display:none">No pastes yet. Create the first one.</div>
|
<div class="empty hidden" id="empty">No pastes yet. Create the first one.</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="pager float">
|
<div class="pager float">
|
||||||
<span id="showing"></span>
|
<span id="showing"></span>
|
||||||
@@ -28,25 +28,5 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script src="/static/table.js"></script>
|
<script src="/static/table.js"></script>
|
||||||
<script>
|
<script src="/static/history.js" defer></script>
|
||||||
const t = PaletteTable.init({
|
|
||||||
endpoint: '/api/public',
|
|
||||||
perPage: 25,
|
|
||||||
hasPager: true,
|
|
||||||
rowHtml: it =>
|
|
||||||
`<tr class="row" data-href="/${t.esc(it.id)}"><td>` +
|
|
||||||
(it.title
|
|
||||||
? `${t.esc(it.title)}${it.is_can ? ' <span class="badge" title="Can — bundle of items">can</span>' : ''}`
|
|
||||||
: `<a class="slug" href="/${t.esc(it.id)}">${t.esc(it.id)}</a>${it.is_can ? ' <span class="badge" title="Can — bundle of items">can</span>' : ''}`) +
|
|
||||||
`</td>` +
|
|
||||||
`<td><span class="badge">${t.esc(it.language || 'text')}</span></td>` +
|
|
||||||
`<td class="dim">${t.fmtSize(it.size)}</td><td class="dim">${it.view_count}</td><td class="dim" data-ts="${it.created_at}">${t.ago(it.created_at)}</td>` +
|
|
||||||
(it.custom_slug ? `<td><a class="slug url-link" href="/${t.esc(it.custom_slug)}">/${t.esc(it.custom_slug)}</a></td>` : `<td class="dim">none</td>`) +
|
|
||||||
`<td class="dim"><a class="id-link" href="/${t.esc(it.id)}">${t.esc(it.id)}</a></td></tr>`,
|
|
||||||
emptyFiltered: 'No pastes match your search.',
|
|
||||||
emptyAll: 'No pastes yet. Create the first one.',
|
|
||||||
});
|
|
||||||
t.load();
|
|
||||||
setInterval(t.load, 30000); // auto-refresh history every 30s
|
|
||||||
</script>
|
|
||||||
{{template "foot" .}}
|
{{template "foot" .}}
|
||||||
|
|||||||
@@ -2,28 +2,27 @@
|
|||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<link rel="stylesheet" href="/static/app.css">
|
<link rel="stylesheet" href="/static/app.css">
|
||||||
<script>
|
<link rel="icon" type="image/svg+xml" href="/static/favicon.svg">
|
||||||
// preset hook (#16): ?theme= wins; else persisted choice (#100)
|
<script src="/static/theme.js" data-default-dark="{{ if defaultDark }}1{{ else }}0{{ end }}"></script>
|
||||||
(function () {
|
|
||||||
var t = new URLSearchParams(location.search).get('theme');
|
|
||||||
if (!t) try { t = localStorage.getItem('palette-theme'); } catch (e) {}
|
|
||||||
if (t) document.documentElement.dataset.preset = t;
|
|
||||||
})();
|
|
||||||
</script>
|
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
||||||
{{define "topbar"}}
|
{{define "topbar"}}
|
||||||
<div class="topbar">
|
<div class="topbar">
|
||||||
<a class="logo" href="/history">Palette <em>/ {{ version }}</em></a>
|
<a class="logo" href="/public">Palette <em>/ {{ version }}</em></a>
|
||||||
<nav>
|
<nav>
|
||||||
<a href="/new" {{if eq .Page "new"}}class="on"{{end}}>New</a>
|
<a href="/new" {{if eq .Page "new"}}class="on"{{end}}>New</a>
|
||||||
<a href="/history" {{if eq .Page "history"}}class="on"{{end}}>Public</a>
|
<a href="/public" {{if eq .Page "public"}}class="on"{{end}}>Public</a>
|
||||||
<a href="/mine" {{if eq .Page "mine"}}class="on"{{end}}>Saved</a>
|
<a href="/saved" {{if eq .Page "saved"}}class="on"{{end}}>Saved</a>
|
||||||
<a href="https://git.archfox.org/poslop/palette" target="_blank" rel="noopener">Git<svg class="ext" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"/><polyline points="15 3 21 3 21 9"/><line x1="10" y1="14" x2="21" y2="3"/></svg></a>
|
<a href="https://git.archfox.org/poslop/palette" target="_blank" rel="noopener">Git<svg class="ext" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"/><polyline points="15 3 21 3 21 9"/><line x1="10" y1="14" x2="21" y2="3"/></svg></a>
|
||||||
</nav>
|
</nav>
|
||||||
<div class="spacer"></div>
|
<div class="spacer"></div>
|
||||||
<a class="iconbtn gear" href="/settings" title="Settings" aria-label="Settings">
|
<button class="iconbtn dark-toggle" id="dark-toggle" type="button" title="Toggle dark mode" aria-label="Toggle dark mode">
|
||||||
|
<svg class="icon-sun" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="5"/><line x1="12" y1="1" x2="12" y2="3"/><line x1="12" y1="21" x2="12" y2="23"/><line x1="4.22" y1="4.22" x2="5.64" y2="5.64"/><line x1="18.36" y1="18.36" x2="19.78" y2="19.78"/><line x1="1" y1="12" x2="3" y2="12"/><line x1="21" y1="12" x2="23" y2="12"/><line x1="4.22" y1="19.78" x2="5.64" y2="18.36"/><line x1="18.36" y1="5.64" x2="19.78" y2="4.22"/></svg>
|
||||||
|
<svg class="icon-moon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"/></svg>
|
||||||
|
</button>
|
||||||
|
<a class="iconbtn gear{{if eq .Page "settings"}} on{{end}}" href="/settings" title="Settings" aria-label="Settings">
|
||||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"/></svg>
|
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"/></svg>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
<script src="/static/topbar.js" defer></script>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|||||||
@@ -8,18 +8,19 @@
|
|||||||
<div class="search"><input id="filter" placeholder="Search…"><span class="search-spinner" id="search-spinner"></span></div>
|
<div class="search"><input id="filter" placeholder="Search…"><span class="search-spinner" id="search-spinner"></span></div>
|
||||||
<div class="float">
|
<div class="float">
|
||||||
<table>
|
<table>
|
||||||
<colgroup><col style="width:260px"><col style="width:140px"><col style="width:120px"><col style="width:150px"><col style="width:190px"><col style="width:100px"></colgroup>
|
<colgroup><col class="col-a"><col class="col-b"><col class="col-c"><col class="col-d2"><col class="col-url"><col class="col-f"><col class="col-del"></colgroup>
|
||||||
<thead><tr>
|
<thead><tr>
|
||||||
<th data-sort="title" class="sortable"><span class="sort-ind"></span>Paste</th>
|
<th data-sort="title" class="sortable">Paste<span class="sort-ind"></span></th>
|
||||||
<th data-sort="language" class="sortable"><span class="sort-ind"></span>Language</th>
|
<th data-sort="type" class="sortable">Type<span class="sort-ind"></span></th>
|
||||||
<th data-sort="size" class="sortable"><span class="sort-ind"></span>Size</th>
|
<th data-sort="size" class="sortable">Size<span class="sort-ind"></span></th>
|
||||||
<th data-sort="created_at" class="sortable"><span class="sort-ind"></span>Created</th>
|
<th data-sort="created_at" class="sortable">Created<span class="sort-ind"></span></th>
|
||||||
<th data-sort="custom_slug" class="sortable"><span class="sort-ind"></span>URL</th>
|
<th data-sort="custom_slug" class="sortable">URL<span class="sort-ind"></span></th>
|
||||||
<th data-sort="id" class="sortable"><span class="sort-ind"></span>ID</th>
|
<th data-sort="id" class="sortable">ID<span class="sort-ind"></span></th>
|
||||||
|
<th aria-label="Delete"></th>
|
||||||
</tr></thead>
|
</tr></thead>
|
||||||
<tbody id="rows"></tbody>
|
<tbody id="rows"></tbody>
|
||||||
</table>
|
</table>
|
||||||
<div class="empty" id="empty" style="display:none">No pastes from this browser yet.</div>
|
<div class="empty hidden" id="empty">No pastes from this browser yet.</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="pager float">
|
<div class="pager float">
|
||||||
<span id="showing"></span>
|
<span id="showing"></span>
|
||||||
@@ -27,51 +28,5 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script src="/static/table.js"></script>
|
<script src="/static/table.js"></script>
|
||||||
<script>
|
<script src="/static/mine.js" defer></script>
|
||||||
function toast(msg, kind) {
|
|
||||||
let t = document.querySelector('.toast');
|
|
||||||
if (!t) { t = document.createElement('div'); t.className = 'toast'; document.body.appendChild(t); }
|
|
||||||
t.textContent = msg;
|
|
||||||
t.classList.remove('success', 'error');
|
|
||||||
if (kind === 'success') t.classList.add('success');
|
|
||||||
if (kind === 'error') t.classList.add('error');
|
|
||||||
t.classList.add('show');
|
|
||||||
clearTimeout(t._h);
|
|
||||||
t._h = setTimeout(() => t.classList.remove('show'), 2000);
|
|
||||||
}
|
|
||||||
|
|
||||||
const t = PaletteTable.init({
|
|
||||||
endpoint: '/api/mine',
|
|
||||||
perPage: 25,
|
|
||||||
hasPager: true,
|
|
||||||
rowHtml: it =>
|
|
||||||
`<tr class="row" data-href="/${t.esc(it.id)}"><td>` +
|
|
||||||
(it.title
|
|
||||||
? `${t.esc(it.title)}${it.is_can ? ' <span class="badge" title="Can — bundle of items">can</span>' : ''}`
|
|
||||||
: `<a class="slug" href="/${t.esc(it.id)}">${t.esc(it.id)}</a>${it.is_can ? ' <span class="badge" title="Can — bundle of items">can</span>' : ''}`) +
|
|
||||||
`</td>` +
|
|
||||||
`<td><span class="badge">${t.esc(it.language || 'text')}</span></td>` +
|
|
||||||
`<td class="dim">${t.fmtSize(it.size)}</td><td class="dim" data-ts="${it.created_at}">${t.ago(it.created_at)}</td>` +
|
|
||||||
(it.custom_slug ? `<td><a class="slug url-link" href="/${t.esc(it.custom_slug)}">/${t.esc(it.custom_slug)}</a></td>` : `<td class="dim">none</td>`) +
|
|
||||||
`<td class="dim"><a class="id-link" href="/${t.esc(it.id)}">${t.esc(it.id)}</a></td>` +
|
|
||||||
`<td><button class="btn btn-icon del" data-id="${t.esc(it.id)}" title="Delete paste" aria-label="Delete paste">×</button></td></tr>`,
|
|
||||||
emptyFiltered: 'No pastes from this browser match your search.',
|
|
||||||
emptyAll: 'No pastes from this browser yet.',
|
|
||||||
});
|
|
||||||
|
|
||||||
// delete buttons (viewer-scoped, enforced server-side #37)
|
|
||||||
document.getElementById('rows').addEventListener('click', async e => {
|
|
||||||
const del = e.target.closest('button.del');
|
|
||||||
if (!del) return;
|
|
||||||
e.stopPropagation();
|
|
||||||
del.disabled = true;
|
|
||||||
try {
|
|
||||||
const res = await fetch('/api/pastes/' + del.dataset.id, { method: 'DELETE' });
|
|
||||||
if (res.ok) { toast('Deleted', 'success'); t.load(); }
|
|
||||||
else { toast('Delete failed', 'error'); del.disabled = false; }
|
|
||||||
} catch (err) { toast('Delete failed', 'error'); del.disabled = false; }
|
|
||||||
});
|
|
||||||
|
|
||||||
t.load();
|
|
||||||
</script>
|
|
||||||
{{template "foot" .}}
|
{{template "foot" .}}
|
||||||
|
|||||||
+32
-311
@@ -4,7 +4,10 @@
|
|||||||
<div class="pane-l-col">
|
<div class="pane-l-col">
|
||||||
<div class="float pane-l-head">
|
<div class="float pane-l-head">
|
||||||
<div class="editor-head">
|
<div class="editor-head">
|
||||||
|
<div class="editor-head-title">
|
||||||
<input id="title" placeholder="Title">
|
<input id="title" placeholder="Title">
|
||||||
|
</div>
|
||||||
|
<div class="editor-head-settings">
|
||||||
<select id="language">
|
<select id="language">
|
||||||
<option value="">auto</option>
|
<option value="">auto</option>
|
||||||
<option>go</option><option>python</option><option>javascript</option><option>typescript</option>
|
<option>go</option><option>python</option><option>javascript</option><option>typescript</option>
|
||||||
@@ -16,18 +19,24 @@
|
|||||||
<option>markdown</option><option>text</option>
|
<option>markdown</option><option>text</option>
|
||||||
</select>
|
</select>
|
||||||
<button class="btn btn-icon" id="reguess" title="Re-detect language" type="button"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 12a9 9 0 1 1-2.64-6.36"/><polyline points="21 3 21 9 15 9"/></svg></button>
|
<button class="btn btn-icon" id="reguess" title="Re-detect language" type="button"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 12a9 9 0 1 1-2.64-6.36"/><polyline points="21 3 21 9 15 9"/></svg></button>
|
||||||
|
<button type="button" class="btn btn-icon wrap-toggle" id="wrap-toggle" title="Toggle line wrap" aria-pressed="false">Wrap</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="float editor-wrap">
|
<div class="float editor-wrap">
|
||||||
<div class="gutter" id="gutter">1</div>
|
<div class="gutter" id="gutter">1</div>
|
||||||
<textarea class="editor" id="content" placeholder="Paste your code, text, or notes here…" spellcheck="false"></textarea>
|
<textarea class="editor" id="content" placeholder="Paste your code, text, or notes here…" spellcheck="false"></textarea>
|
||||||
|
<img id="file-preview" class="file-preview hidden" alt="File preview">
|
||||||
</div>
|
</div>
|
||||||
<div class="created-banner" id="created"></div>
|
|
||||||
<div class="actionbar">
|
<div class="actionbar">
|
||||||
<span class="hint">Ctrl+Enter to create</span>
|
<span class="hint">Ctrl+Enter to create</span>
|
||||||
<div class="spacer" style="flex:1"></div>
|
<div class="spacer spacer-flex"></div>
|
||||||
<button class="btn" id="create">Create</button>
|
<button class="btn" id="create">Create</button>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="jumpnav hidden" id="jumpnav" data-jump-scroll="#content">
|
||||||
|
<button type="button" class="btn jump-btn" data-jump="top">Top</button>
|
||||||
|
<button type="button" class="btn jump-btn" data-jump="bottom">Bottom</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="pane-r">
|
<div class="pane-r">
|
||||||
@@ -41,337 +50,49 @@
|
|||||||
<label><input type="radio" name="exp" value="720h"> 30 days</label>
|
<label><input type="radio" name="exp" value="720h"> 30 days</label>
|
||||||
<label><input type="radio" name="exp" value="custom"> Custom</label>
|
<label><input type="radio" name="exp" value="custom"> Custom</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="pw-row" id="customexp-row" style="display:none">
|
<div class="pw-row submenu hidden" id="customexp-row">
|
||||||
<input type="number" id="expnum" min="1" style="width:80px" placeholder="90">
|
<div class="exp-group">
|
||||||
<select id="expunit">
|
<input type="number" class="num-input" id="expnum" min="1" placeholder="90" aria-label="Custom expiry amount">
|
||||||
|
<select id="expunit" class="unit-select">
|
||||||
<option value="m">minutes</option>
|
<option value="m">minutes</option>
|
||||||
<option value="h" selected>hours</option>
|
<option value="h" selected>hours</option>
|
||||||
<option value="d">days</option>
|
<option value="d">days</option>
|
||||||
<option value="w">weeks</option>
|
<option value="w">weeks</option>
|
||||||
<option value="mo">months</option>
|
<option value="mo">months</option>
|
||||||
</select>
|
</select>
|
||||||
<div class="hint" id="customexp-err" style="display:none; color:var(--danger, #c0392b); margin-top:6px;"></div>
|
</div>
|
||||||
|
<div class="hint danger-hint hidden" id="customexp-err"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="float side-section">
|
<div class="float side-section">
|
||||||
<h3>Protection</h3>
|
<h3>Protection</h3>
|
||||||
<div class="protect">
|
<div class="protect">
|
||||||
<label class="toggle"><input type="checkbox" id="haspw"> Password lock</label>
|
<label class="toggle"><input type="checkbox" id="haspw"> Password lock</label>
|
||||||
<div class="pw-row" id="pwrow" style="display:none"><div class="pw-field"><input type="password" id="password" placeholder="Password" autocomplete="new-password"><button type="button" class="reveal" id="pwreveal" title="Show password" tabindex="-1"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7-11-7-11-7z"/><circle cx="12" cy="12" r="3"/><line class="eye-slash" x1="4" y1="4" x2="20" y2="20"/></svg></button></div></div>
|
<div class="pw-row hidden" id="pwrow"><div class="pw-field"><input type="password" id="password" placeholder="Password" autocomplete="new-password"><button type="button" class="reveal" id="pwreveal" title="Show password" tabindex="-1"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7-11-7-11-7z"/><circle cx="12" cy="12" r="3"/><line class="eye-slash" x1="4" y1="4" x2="20" y2="20"/></svg></button></div></div>
|
||||||
<label class="toggle"><input type="checkbox" id="burn"> Burn after read</label>
|
<label class="toggle"><input type="checkbox" id="burn"> Burn after read</label>
|
||||||
<div class="pw-row" id="burnrow" style="display:none"><label class="hint" style="font-size:19px;">Readable <input type="number" id="burnreads" min="1" value="1" style="width:64px"> times</label></div>
|
<div class="pw-row submenu hidden" id="burnrow"><div class="exp-group readable-group"><label class="hint readable-label">Readable</label><input type="number" class="num-input" id="burnreads" min="1" value="1" aria-label="Times readable"><label class="hint readable-label">times</label></div></div>
|
||||||
<label class="toggle"><input type="checkbox" id="unlisted"> Unlisted</label>
|
<label class="toggle"><input type="checkbox" id="unlisted"> Unlisted</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="float side-section">
|
<div class="float side-section">
|
||||||
<h3>Custom URL</h3>
|
<h3>Attachment</h3>
|
||||||
<input type="text" id="custom" class="custom-input" placeholder="/my-snippet">
|
<div class="dropzone" id="dropzone" title="Paste (Ctrl+V), drop a file here, or click to browse">
|
||||||
<div class="hint" style="margin-top:6px; font-size:19px;">Stays reserved while the paste exists</div>
|
Drop a file here, press Ctrl+V, or click to browse
|
||||||
|
</div>
|
||||||
|
<input type="file" id="file-input" class="file-input" aria-label="Choose a file">
|
||||||
|
<div id="file-chip-slot"></div>
|
||||||
|
<div class="hint hint-lg hidden mt6" id="file-text-note">File pastes ignore the text editor (one file per paste)</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="float side-section">
|
<div class="float side-section">
|
||||||
<h3>Can contents</h3>
|
<h3>Custom URL</h3>
|
||||||
<label class="toggle"><input type="checkbox" id="iscan"> Bundle as a can (multiple text items)</label>
|
<input type="text" id="custom" class="custom-input" placeholder="my-snippet">
|
||||||
<div class="pw-row" id="canrow" style="display:none">
|
|
||||||
<div id="can-items"></div>
|
|
||||||
<button class="btn btn-icon" id="can-add" type="button" title="Add item" style="margin-top:6px">+ Add item</button>
|
|
||||||
<div class="hint" style="margin-top:6px; font-size:19px;">Each item gets its own card on the can page. File uploads in cans come later.</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="float side-section hidden" id="result-card">
|
||||||
<div class="float side-section" id="result-card" style="display:none">
|
|
||||||
<h3>Result</h3>
|
<h3>Result</h3>
|
||||||
<div class="hint" id="result" style="word-break:break-all">empty</div>
|
<div class="hint wrap-normal" id="result">empty</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script src="/static/new.js" defer></script>
|
||||||
const $ = id => document.getElementById(id);
|
<script src="/static/jump.js" defer></script>
|
||||||
const content = $('content'), gutter = $('gutter');
|
|
||||||
|
|
||||||
function updateGutter() {
|
|
||||||
const lines = content.value.split('\n').length;
|
|
||||||
let s = '';
|
|
||||||
for (let i = 1; i <= Math.max(lines, 1); i++) s += i + '\n';
|
|
||||||
gutter.textContent = s;
|
|
||||||
}
|
|
||||||
content.addEventListener('input', updateGutter);
|
|
||||||
updateGutter();
|
|
||||||
|
|
||||||
function toast(msg, kind) {
|
|
||||||
let t = document.querySelector('.toast');
|
|
||||||
if (!t) { t = document.createElement('div'); t.className = 'toast'; document.body.appendChild(t); }
|
|
||||||
t.textContent = msg;
|
|
||||||
t.classList.remove('success', 'error');
|
|
||||||
if (kind === 'success') t.classList.add('success');
|
|
||||||
if (kind === 'error') t.classList.add('error');
|
|
||||||
t.classList.add('show');
|
|
||||||
clearTimeout(t._h);
|
|
||||||
t._h = setTimeout(() => t.classList.remove('show'), 2000);
|
|
||||||
}
|
|
||||||
$('haspw').addEventListener('change', e => { $('pwrow').style.display = e.target.checked ? 'block' : 'none'; });
|
|
||||||
$('burn').addEventListener('change', e => { $('burnrow').style.display = e.target.checked ? 'block' : 'none'; });
|
|
||||||
document.querySelectorAll('input[name="exp"]').forEach(r => r.addEventListener('change', () => {
|
|
||||||
$('customexp-row').style.display = document.querySelector('input[name="exp"]:checked').value === 'custom' ? 'block' : 'none';
|
|
||||||
$('customexp-err').style.display = 'none';
|
|
||||||
}));
|
|
||||||
|
|
||||||
// compose the expires_in Go-duration string when Custom is checked (#48).
|
|
||||||
// Returns the string, or null with an inline error shown.
|
|
||||||
function composeCustomExpiry() {
|
|
||||||
const n = parseInt($('expnum').value, 10);
|
|
||||||
const unit = $('expunit').value;
|
|
||||||
let mins = NaN;
|
|
||||||
if (n > 0) {
|
|
||||||
if (unit === 'm') mins = n;
|
|
||||||
else if (unit === 'h') mins = n * 60;
|
|
||||||
else if (unit === 'd') mins = n * 1440;
|
|
||||||
else if (unit === 'w') mins = n * 10080;
|
|
||||||
else if (unit === 'mo') mins = n * 43200; // months counted as 30 days
|
|
||||||
}
|
|
||||||
const err = $('customexp-err');
|
|
||||||
if (!(mins >= 1)) {
|
|
||||||
err.textContent = 'Enter a duration of at least 1 minute.';
|
|
||||||
err.style.display = 'block';
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
if (mins > 525600) { // more than 1 year
|
|
||||||
err.textContent = 'Custom expiry cannot exceed 1 year.';
|
|
||||||
err.style.display = 'block';
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
err.style.display = 'none';
|
|
||||||
// compose as h (+d/m remainders); Go parses '336h', '90m', '6h30m' fine
|
|
||||||
const hours = Math.floor(mins / 60), rem = mins % 60;
|
|
||||||
if (rem === 0) return hours + 'h';
|
|
||||||
if (hours === 0) return rem + 'm';
|
|
||||||
return hours + 'h' + rem + 'm';
|
|
||||||
}
|
|
||||||
|
|
||||||
$('pwreveal').addEventListener('click', () => {
|
|
||||||
const pw = $('password');
|
|
||||||
const show = pw.type === 'password';
|
|
||||||
pw.type = show ? 'text' : 'password';
|
|
||||||
$('pwreveal').classList.toggle('off', !show);
|
|
||||||
$('pwreveal').title = show ? 'Hide password' : 'Show password';
|
|
||||||
});
|
|
||||||
|
|
||||||
// #4: can builder — multiple text items bundled into one shareable page.
|
|
||||||
// The main editor becomes the first item; extra items are added below.
|
|
||||||
$('iscan').addEventListener('change', e => {
|
|
||||||
$('canrow').style.display = e.target.checked ? 'block' : 'none';
|
|
||||||
if (e.target.checked && !$('can-items').children.length) addCanItem();
|
|
||||||
});
|
|
||||||
function addCanItem() {
|
|
||||||
const row = document.createElement('div');
|
|
||||||
row.className = 'can-item-row';
|
|
||||||
row.innerHTML = '<input class="can-item-title" placeholder="Item title">' +
|
|
||||||
'<textarea class="can-item-content" placeholder="Item content" rows="3" spellcheck="false"></textarea>';
|
|
||||||
$('can-items').appendChild(row);
|
|
||||||
}
|
|
||||||
$('can-add').addEventListener('click', addCanItem);
|
|
||||||
|
|
||||||
let guessed = ''; // last auto-detected language, '' = user override
|
|
||||||
|
|
||||||
// #105: map backend machine-readable error codes to plain-language guidance.
|
|
||||||
// Unknown codes fall back to a generic message; the technical detail stays
|
|
||||||
// in the API response for API consumers.
|
|
||||||
const ERROR_MESSAGES = {
|
|
||||||
slug_taken: 'That Custom URL is already taken. Try another.',
|
|
||||||
slug_reserved: 'That Custom URL is reserved. Try another.',
|
|
||||||
slug_invalid: 'Please keep the Custom URL under 64 characters, using only letters, numbers, dashes, or underscores.',
|
|
||||||
content_empty: 'Write or paste something first.',
|
|
||||||
content_too_large: 'This paste is too large. The limit is 5 MB.',
|
|
||||||
expiry_invalid: 'Please pick an expiry between 1 minute and 1 year.',
|
|
||||||
rate_limited: 'Too many tries. Wait a minute and try again.',
|
|
||||||
};
|
|
||||||
const GENERIC_ERROR = 'Something went wrong. Please try again.';
|
|
||||||
|
|
||||||
function friendlyError(data) {
|
|
||||||
return ERROR_MESSAGES[data && data.code] || GENERIC_ERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
// #105: color the result box by outcome — success (ok), error (err),
|
|
||||||
// warning (warn) — with a colored left border (CSS .result-ok/.result-err).
|
|
||||||
function setResultKind(kind) {
|
|
||||||
const card = $('result-card');
|
|
||||||
card.classList.remove('result-ok', 'result-err', 'result-warn');
|
|
||||||
if (kind) card.classList.add('result-' + kind);
|
|
||||||
}
|
|
||||||
|
|
||||||
function showResult(html, kind) {
|
|
||||||
$('result').innerHTML = html;
|
|
||||||
$('result').dataset.token = kind === 'ok' ? ($('result').dataset.token || '') : ($('result').dataset.token || '');
|
|
||||||
$('result-card').style.display = 'block';
|
|
||||||
setResultKind(kind === 'ok' ? 'ok' : (kind === 'warn' ? 'warn' : 'err'));
|
|
||||||
}
|
|
||||||
function defaultFilename(lang) {
|
|
||||||
const names = {
|
|
||||||
python: 'Python.py', go: 'main.go', javascript: 'script.js', typescript: 'index.ts',
|
|
||||||
rust: 'main.rs', c: 'main.c', cpp: 'main.cpp', java: 'Main.java', bash: 'script.sh',
|
|
||||||
sql: 'query.sql', yaml: 'config.yaml', json: 'data.json', html: 'index.html',
|
|
||||||
css: 'style.css', xml: 'doc.xml', php: 'index.php', ruby: 'main.rb',
|
|
||||||
perl: 'main.pl', lua: 'main.lua', dockerfile: 'Dockerfile', toml: 'config.toml',
|
|
||||||
ini: 'config.ini', diff: 'changes.diff',
|
|
||||||
markdown: 'notes.md', text: 'Text.txt',
|
|
||||||
};
|
|
||||||
return names[lang] || '';
|
|
||||||
}
|
|
||||||
// fill default filename when title is still blank
|
|
||||||
function maybeSetDefaultTitle(lang) {
|
|
||||||
const title = $('title');
|
|
||||||
if (lang && !title.value.trim()) {
|
|
||||||
const fn = defaultFilename(lang);
|
|
||||||
if (fn) title.value = fn;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function guessLang() {
|
|
||||||
if (!content.value.trim()) return;
|
|
||||||
try {
|
|
||||||
const res = await fetch('/api/guess-language', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({content: content.value}),
|
|
||||||
});
|
|
||||||
const data = await res.json();
|
|
||||||
if (res.ok && data.language) {
|
|
||||||
guessed = data.language;
|
|
||||||
$('language').value = data.language;
|
|
||||||
maybeSetDefaultTitle(data.language);
|
|
||||||
}
|
|
||||||
} catch(e) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
// refresh button: always re-detect, even if user picked something
|
|
||||||
$('reguess').addEventListener('click', guessLang);
|
|
||||||
|
|
||||||
// auto-guess when pasting into the editor
|
|
||||||
content.addEventListener('paste', () => setTimeout(guessLang, 0));
|
|
||||||
|
|
||||||
async function create() {
|
|
||||||
// #4: can mode — bundle the editor + extra items into a can via multipart
|
|
||||||
if ($('iscan').checked) return createCan();
|
|
||||||
|
|
||||||
const body = {
|
|
||||||
content: content.value,
|
|
||||||
title: $('title').value || null,
|
|
||||||
language: $('language').value || null,
|
|
||||||
custom_slug: $('custom').value || null,
|
|
||||||
burn_after_read: $('burn').checked,
|
|
||||||
};
|
|
||||||
if ($('burn').checked) body.burn_after_reads = parseInt($('burnreads').value, 10) || 1;
|
|
||||||
if ($('haspw').checked) body.password = $('password').value;
|
|
||||||
const exp = document.querySelector('input[name="exp"]:checked').value;
|
|
||||||
if (exp === 'custom') {
|
|
||||||
const dur = composeCustomExpiry();
|
|
||||||
if (dur === null) { toast('Check the custom expiry', 'error'); return; }
|
|
||||||
body.expires_in = dur;
|
|
||||||
} else if (exp) {
|
|
||||||
body.expires_in = exp;
|
|
||||||
}
|
|
||||||
|
|
||||||
const res = await fetch('/api/pastes', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify(body),
|
|
||||||
});
|
|
||||||
const data = await res.json();
|
|
||||||
if (!res.ok) {
|
|
||||||
showResult(friendlyError(data), 'err');
|
|
||||||
toast('Create failed', 'error');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const url = location.origin + '/' + (data.custom_slug || data.id);
|
|
||||||
showResult('<a href="' + url + '">' + url + '</a> <button class="btn btn-icon" id="result-copy" title="Copy URL" type="button">⧉</button>', 'ok');
|
|
||||||
$('result').dataset.token = data.deletion_token || '';
|
|
||||||
const copyBtn = document.getElementById('result-copy');
|
|
||||||
copyBtn.addEventListener('click', () => {
|
|
||||||
try {
|
|
||||||
navigator.clipboard.writeText(url);
|
|
||||||
copyBtn.classList.add('ok'); // in-place success feedback (#53)
|
|
||||||
copyBtn.textContent = 'Success!';
|
|
||||||
setTimeout(() => { copyBtn.classList.remove('ok'); copyBtn.textContent = '⧉'; }, 2000);
|
|
||||||
} catch(e) { toast('Copy failed', 'error'); }
|
|
||||||
});
|
|
||||||
const dest = '/' + data.id + '?created=1&token=' + encodeURIComponent(data.deletion_token || '');
|
|
||||||
// password-protected: unlock now with the password we already have (#26)
|
|
||||||
if ($('haspw').checked && data.id) {
|
|
||||||
const fd = new FormData();
|
|
||||||
fd.append('password', $('password').value);
|
|
||||||
fd.append('next', dest);
|
|
||||||
try {
|
|
||||||
await fetch('/' + data.id, {method: 'POST', body: fd});
|
|
||||||
} catch(e) {}
|
|
||||||
}
|
|
||||||
// show the paste
|
|
||||||
location.href = dest;
|
|
||||||
}
|
|
||||||
$('create').addEventListener('click', create);
|
|
||||||
|
|
||||||
// #4: can creation — POST multipart to /api/pastes/can. The main editor is
|
|
||||||
// the first item; each extra can-item row is another text item.
|
|
||||||
async function createCan() {
|
|
||||||
const items = [];
|
|
||||||
if (content.value.trim()) {
|
|
||||||
items.push({title: $('title').value || 'main', content: content.value, language: $('language').value || ''});
|
|
||||||
}
|
|
||||||
document.querySelectorAll('#can-items .can-item-row').forEach(row => {
|
|
||||||
const t = row.querySelector('.can-item-title').value.trim();
|
|
||||||
const c = row.querySelector('.can-item-content').value;
|
|
||||||
if (c.trim()) items.push({title: t || ('item-' + (items.length + 1)), content: c});
|
|
||||||
});
|
|
||||||
if (!items.length) { toast('Nothing to put in the can', 'error'); return; }
|
|
||||||
|
|
||||||
const fd = new FormData();
|
|
||||||
fd.append('title', $('title').value || 'Untitled can');
|
|
||||||
fd.append('json_items', JSON.stringify(items));
|
|
||||||
if ($('haspw').checked) fd.append('password', $('password').value);
|
|
||||||
if ($('unlisted').checked) fd.append('visibility', 'unlisted');
|
|
||||||
const exp = document.querySelector('input[name="exp"]:checked').value;
|
|
||||||
if (exp === 'custom') {
|
|
||||||
const dur = composeCustomExpiry();
|
|
||||||
if (dur === null) { toast('Check the custom expiry', 'error'); return; }
|
|
||||||
if (dur) fd.append('expires_in', dur);
|
|
||||||
} else if (exp) {
|
|
||||||
fd.append('expires_in', exp);
|
|
||||||
}
|
|
||||||
if ($('custom').value.trim()) fd.append('custom_slug', $('custom').value.trim());
|
|
||||||
|
|
||||||
const res = await fetch('/api/pastes/can', {method: 'POST', body: fd});
|
|
||||||
const data = await res.json();
|
|
||||||
if (!res.ok) {
|
|
||||||
showResult(friendlyError(data), 'err');
|
|
||||||
toast('Can create failed', 'error');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const url = location.origin + data.url;
|
|
||||||
showResult('<a href="' + url + '">' + url + '</a> <button class="btn btn-icon" id="result-copy" title="Copy URL" type="button">⧉</button>', 'ok');
|
|
||||||
const copyBtn = document.getElementById('result-copy');
|
|
||||||
copyBtn.addEventListener('click', () => {
|
|
||||||
try {
|
|
||||||
navigator.clipboard.writeText(url);
|
|
||||||
copyBtn.classList.add('ok');
|
|
||||||
copyBtn.textContent = 'Success!';
|
|
||||||
setTimeout(() => { copyBtn.classList.remove('ok'); copyBtn.textContent = '⧉'; }, 2000);
|
|
||||||
} catch(e) { toast('Copy failed', 'error'); }
|
|
||||||
});
|
|
||||||
// password-protected can: unlock now with the password we already have (#26 parity)
|
|
||||||
if ($('haspw').checked && data.id) {
|
|
||||||
const pd = new FormData();
|
|
||||||
pd.append('password', $('password').value);
|
|
||||||
try { await fetch('/can/' + data.id, {method: 'POST', body: pd}); } catch(e) {}
|
|
||||||
}
|
|
||||||
location.href = data.url;
|
|
||||||
}
|
|
||||||
// reset stale result state when returning via Back (bfcache) (#28)
|
|
||||||
window.addEventListener('pageshow', e => {
|
|
||||||
if (!e.persisted) return;
|
|
||||||
const rc = document.getElementById('result-card');
|
|
||||||
if (rc) rc.style.display = 'none';
|
|
||||||
const r = document.getElementById('result');
|
|
||||||
if (r) { r.innerHTML = 'empty'; delete r.dataset.token; }
|
|
||||||
});
|
|
||||||
document.addEventListener('keydown', e => {
|
|
||||||
if ((e.ctrlKey || e.metaKey) && e.key === 'Enter') { e.preventDefault(); create(); }
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
{{template "foot" .}}
|
{{template "foot" .}}
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
{{template "head" .}}
|
||||||
|
{{template "topbar" .}}
|
||||||
|
<div class="center">
|
||||||
|
<div class="float notfound-card">
|
||||||
|
<div class="inner">
|
||||||
|
<div class="lockring"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="10"/><line x1="12" y1="8" x2="12" y2="12"/><line x1="12" y1="16" x2="12.01" y2="16"/></svg></div>
|
||||||
|
<h1>Paste ID not found</h1>
|
||||||
|
<p class="sub">The paste <span class="slug">/{{.ID}}</span> does not exist, has expired, or was burned.</p>
|
||||||
|
<a class="btn" href="/new">Create a new paste</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{template "foot" .}}
|
||||||
@@ -6,20 +6,22 @@
|
|||||||
<h1>{{if .Title}}{{.Title}}{{else}}Untitled paste{{end}}</h1>
|
<h1>{{if .Title}}{{.Title}}{{else}}Untitled paste{{end}}</h1>
|
||||||
{{if .CustomSlug}}<span class="slug">/{{.CustomSlug}}</span>{{end}}
|
{{if .CustomSlug}}<span class="slug">/{{.CustomSlug}}</span>{{end}}
|
||||||
<div class="spacer"></div>
|
<div class="spacer"></div>
|
||||||
<a class="iconbtn" href="/raw/{{.ID}}">raw</a>
|
<button type="button" class="iconbtn wrap-toggle" title="Toggle line wrap" aria-pressed="false">Wrap</button>
|
||||||
<a class="iconbtn" href="#" id="copy-btn" onclick="copyContent(this); return false;">copy</a>
|
<a class="iconbtn" href="/raw/{{.ID}}">Raw</a>
|
||||||
{{if .DeletionToken}}<a class="iconbtn danger" href="#" onclick="redeem('{{.DeletionToken}}'); return false;">delete</a>{{end}}
|
<a class="iconbtn swapbtn" href="#" id="copy-link-btn"><span class="swap-label">Link</span><span class="swap-check">✓</span></a>
|
||||||
|
<a class="iconbtn swapbtn" href="#" id="copy-btn"><span class="swap-label">Copy</span><span class="swap-check">✓</span></a>
|
||||||
|
{{if .DeletionToken}}<a class="iconbtn danger" href="#" id="delete-btn">Delete</a>{{end}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="float">
|
<div class="float">
|
||||||
<div class="stats-pill" id="stats-pill">
|
<div class="stats-pill" id="stats-pill">
|
||||||
<button type="button" class="stats-head" id="stats-toggle" aria-expanded="false" onclick="toggleStats()">
|
<button type="button" class="stats-head" id="stats-toggle" aria-expanded="false">
|
||||||
<svg class="stats-chev" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="6 9 12 15 18 9"/></svg>
|
<svg class="stats-chev" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="6 9 12 15 18 9"/></svg>
|
||||||
<span class="stats-summary">{{.StatsSummary}}</span>
|
<span class="stats-summary">{{.StatsSummary}}</span>
|
||||||
</button>
|
</button>
|
||||||
<div class="stats-body" id="stats-body" hidden>
|
<div class="stats-body" id="stats-body" hidden>
|
||||||
<div class="stats-grid">
|
<div class="stats-grid">
|
||||||
<span class="stats-k">Language</span><span class="stats-v">{{if .Language}}{{.Language}}{{else}}text{{end}}</span>
|
<span class="stats-k">Type</span><span class="stats-v">{{.TypeLabel}}</span>
|
||||||
<span class="stats-k">Size</span><span class="stats-v">{{.SizeHuman}} ({{.LineCount}} lines)</span>
|
<span class="stats-k">Size</span><span class="stats-v">{{.SizeHuman}} ({{.LineCount}} lines)</span>
|
||||||
<span class="stats-k">Views</span><span class="stats-v">{{.ViewCount}}</span>
|
<span class="stats-k">Views</span><span class="stats-v">{{.ViewCount}}</span>
|
||||||
<span class="stats-k">Created</span><span class="stats-v" data-ts="{{.CreatedAtUnix}}">{{.CreatedAgo}}</span>
|
<span class="stats-k">Created</span><span class="stats-v" data-ts="{{.CreatedAtUnix}}">{{.CreatedAgo}}</span>
|
||||||
@@ -33,52 +35,33 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{if .JustCreated}}
|
{{if .JustCreated}}
|
||||||
|
<div class="created-pill" id="created-pill" role="status">Paste Created</div>
|
||||||
|
{{end}}
|
||||||
|
{{if .Attachment}}
|
||||||
<div class="float">
|
<div class="float">
|
||||||
<div class="created-banner" style="display:block">
|
<div class="attachment-bar">
|
||||||
Paste created. Link copied to clipboard: <a href="/{{.ID}}">{{.Host}}/{{.ID}}</a>
|
{{if .AttachmentImage}}
|
||||||
{{if .DeletionToken}} · deletion token: <code>{{.DeletionToken}}</code>{{end}}
|
<div class="attachment-preview"><img src="/f/{{.Attachment.ID}}/{{.Attachment.Filename}}" alt="{{.Attachment.Filename}}"></div>
|
||||||
|
{{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>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
{{if not .Attachment}}
|
||||||
<div class="float">
|
<div class="float">
|
||||||
<div class="code"><div class="gutter">{{.Gutter}}</div><div class="codebody" id="codebody">{{.ContentHTML}}</div></div>
|
<div class="code" id="code"><div class="gutter" id="gutter">{{.Gutter}}</div><div class="codebody" id="codebody">{{.ContentHTML}}</div></div>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
<div class="jumpnav hidden" id="jumpnav">
|
||||||
|
<button type="button" class="btn jump-btn" data-jump="top">Top</button>
|
||||||
|
<button type="button" class="btn jump-btn" data-jump="bottom">Bottom</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<input type="hidden" id="raw-content" value="{{.ContentAttr}}">
|
<input type="hidden" id="raw-content" value="{{.ContentAttr}}">
|
||||||
<script>
|
<script src="/static/paste.js" defer data-paste-id="{{.ID}}"></script>
|
||||||
function toast(msg) {
|
<script src="/static/paste-lines.js" defer></script>
|
||||||
let t = document.querySelector('.toast');
|
<script src="/static/jump.js" defer></script>
|
||||||
if (!t) { t = document.createElement('div'); t.className = 'toast'; document.body.appendChild(t); }
|
|
||||||
t.textContent = msg;
|
|
||||||
t.classList.add('show');
|
|
||||||
clearTimeout(t._h);
|
|
||||||
t._h = setTimeout(() => t.classList.remove('show'), 2000);
|
|
||||||
}
|
|
||||||
function toggleStats() {
|
|
||||||
const body = document.getElementById('stats-body');
|
|
||||||
const pill = document.getElementById('stats-pill');
|
|
||||||
const btn = document.getElementById('stats-toggle');
|
|
||||||
const open = body.hidden;
|
|
||||||
body.hidden = !open;
|
|
||||||
pill.classList.toggle('open', open);
|
|
||||||
btn.setAttribute('aria-expanded', open ? 'true' : 'false');
|
|
||||||
}
|
|
||||||
function copyContent(btn) {
|
|
||||||
navigator.clipboard.writeText(document.getElementById('raw-content').value);
|
|
||||||
// in-place success feedback (#53)
|
|
||||||
if (btn) {
|
|
||||||
btn.classList.add('ok');
|
|
||||||
btn.textContent = 'Success!';
|
|
||||||
clearTimeout(btn._okh);
|
|
||||||
btn._okh = setTimeout(() => { btn.classList.remove('ok'); btn.textContent = 'copy'; }, 2000);
|
|
||||||
} else {
|
|
||||||
toast('Copied', 'success');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
function redeem(token) {
|
|
||||||
if (!confirm('Hard delete this paste immediately?')) return;
|
|
||||||
fetch('/api/pastes/{{.ID}}/redeem?token=' + encodeURIComponent(token), {method: 'DELETE'})
|
|
||||||
.then(r => { if (r.ok) location.href = '/history'; else alert('delete failed'); });
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
{{template "foot" .}}
|
{{template "foot" .}}
|
||||||
|
|||||||
@@ -6,55 +6,18 @@
|
|||||||
<h1>Settings</h1>
|
<h1>Settings</h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="settings-body">
|
<div class="settings-body">
|
||||||
|
<button class="iconbtn dark-toggle" id="settings-dark-toggle" type="button" title="Toggle dark mode" aria-label="Toggle dark mode">
|
||||||
|
<svg class="icon-sun" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="5"/><line x1="12" y1="1" x2="12" y2="3"/><line x1="12" y1="21" x2="12" y2="23"/><line x1="4.22" y1="4.22" x2="5.64" y2="5.64"/><line x1="18.36" y1="18.36" x2="19.78" y2="19.78"/><line x1="1" y1="12" x2="3" y2="12"/><line x1="21" y1="12" x2="23" y2="12"/><line x1="4.22" y1="19.78" x2="5.64" y2="18.36"/><line x1="18.36" y1="5.64" x2="19.78" y2="4.22"/></svg>
|
||||||
|
<svg class="icon-moon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"/></svg>
|
||||||
|
<span>Dark mode</span>
|
||||||
|
</button>
|
||||||
<h3>Theme</h3>
|
<h3>Theme</h3>
|
||||||
<div class="theme-grid" id="theme-grid"></div>
|
<div class="theme-grid" id="theme-grid"></div>
|
||||||
|
<h3 class="mt18">Editor</h3>
|
||||||
|
<label class="toggle toggle-inline" for="wrap-setting"><input type="checkbox" id="wrap-setting"> Line wrap</label>
|
||||||
<p class="admin-link-row"><a class="admin-link" href="/admin">Admin</a></p>
|
<p class="admin-link-row"><a class="admin-link" href="/admin">Admin</a></p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script src="/static/settings.js" defer></script>
|
||||||
(function () {
|
|
||||||
// #112: derive each preset's swatches from the real CSS variables in
|
|
||||||
// app.css by temporarily applying data-preset, so they can never drift.
|
|
||||||
var themeNames = [
|
|
||||||
{ id: 'midnight', name: 'Midnight' },
|
|
||||||
{ id: 'smooth', name: 'Smooth' },
|
|
||||||
{ id: 'pastel-lavender', name: 'Pastel Lavender' },
|
|
||||||
{ id: 'pastel-peach', name: 'Pastel Peach' },
|
|
||||||
{ id: 'pastel-cloud', name: 'Pastel Cloud' }
|
|
||||||
];
|
|
||||||
var SWATCH_VARS = ['--bg', '--surface', '--surface-2', '--muted', '--accent'];
|
|
||||||
|
|
||||||
function presetColors(id) {
|
|
||||||
var root = document.documentElement;
|
|
||||||
var prev = root.getAttribute('data-preset');
|
|
||||||
root.setAttribute('data-preset', id);
|
|
||||||
var cs = getComputedStyle(root);
|
|
||||||
var colors = SWATCH_VARS.map(function (v) { return cs.getPropertyValue(v).trim(); });
|
|
||||||
if (prev === null) root.removeAttribute('data-preset'); else root.setAttribute('data-preset', prev);
|
|
||||||
return colors;
|
|
||||||
}
|
|
||||||
|
|
||||||
var grid = document.getElementById('theme-grid');
|
|
||||||
var current = document.documentElement.dataset.preset || 'midnight';
|
|
||||||
themeNames.forEach(function (t) {
|
|
||||||
var colors = presetColors(t.id);
|
|
||||||
var btn = document.createElement('button');
|
|
||||||
btn.type = 'button';
|
|
||||||
btn.className = 'theme-card';
|
|
||||||
btn.setAttribute('aria-pressed', current === t.id ? 'true' : 'false');
|
|
||||||
btn.innerHTML = '<strong>' + t.name + '</strong>' +
|
|
||||||
'<span class="swatches">' + colors.map(function (c) {
|
|
||||||
return '<span class="swatch" style="background:' + c + '"></span>';
|
|
||||||
}).join('') + '</span>';
|
|
||||||
btn.addEventListener('click', function () {
|
|
||||||
document.documentElement.dataset.preset = t.id;
|
|
||||||
try { localStorage.setItem('palette-theme', t.id); } catch (e) {}
|
|
||||||
grid.querySelectorAll('.theme-card').forEach(function (c) { c.setAttribute('aria-pressed', 'false'); });
|
|
||||||
btn.setAttribute('aria-pressed', 'true');
|
|
||||||
});
|
|
||||||
grid.appendChild(btn);
|
|
||||||
});
|
|
||||||
})();
|
|
||||||
</script>
|
|
||||||
{{template "foot" .}}
|
{{template "foot" .}}
|
||||||
|
|||||||
@@ -18,12 +18,5 @@
|
|||||||
<div class="foot">Created <span data-ts="{{.CreatedAtUnix}}">{{.CreatedAgo}}</span></div>
|
<div class="foot">Created <span data-ts="{{.CreatedAtUnix}}">{{.CreatedAgo}}</span></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script src="/static/unlock.js" defer></script>
|
||||||
document.getElementById('pwreveal').addEventListener('click', () => {
|
|
||||||
const pw = document.getElementById('password');
|
|
||||||
const show = pw.type === 'password';
|
|
||||||
pw.type = show ? 'text' : 'password';
|
|
||||||
document.getElementById('pwreveal').title = show ? 'Hide password' : 'Show password';
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
{{template "foot" .}}
|
{{template "foot" .}}
|
||||||
|
|||||||
+157
-17
@@ -24,6 +24,44 @@ import (
|
|||||||
//go:embed templates/*.html
|
//go:embed templates/*.html
|
||||||
var tmplFS embed.FS
|
var tmplFS embed.FS
|
||||||
|
|
||||||
|
// DefaultDark is the server-configured default dark mode state for visitors
|
||||||
|
// without stored preferences (#127). Set via PALETTE_DEFAULT_DARK.
|
||||||
|
var DefaultDark = true
|
||||||
|
|
||||||
|
// SetDefaultDark applies the PALETTE_DEFAULT_DARK env var: unset = dark on,
|
||||||
|
// "false"/"0"/"off" = dark off.
|
||||||
|
func SetDefaultDark(v string) {
|
||||||
|
switch strings.ToLower(strings.TrimSpace(v)) {
|
||||||
|
case "false", "0", "off":
|
||||||
|
DefaultDark = false
|
||||||
|
default:
|
||||||
|
DefaultDark = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResolvePreset maps a theme pair id (or explicit variant id) plus dark state
|
||||||
|
// to a concrete preset id. Returns the defaults when pair is empty or unknown.
|
||||||
|
// Precedence handled by callers: URL ?theme= > stored pair+dark > defaults.
|
||||||
|
func ResolvePreset(pair string, dark bool) string {
|
||||||
|
variants := map[string][2]string{ // pair -> {light, dark}
|
||||||
|
"midnight": {"midnight-light", "midnight"},
|
||||||
|
"smooth": {"smooth", "smooth-dark"},
|
||||||
|
"pastel-lavender": {"pastel-lavender", "pastel-lavender-dark"},
|
||||||
|
"pastel-peach": {"pastel-peach", "pastel-peach-dark"},
|
||||||
|
"pastel-cloud": {"pastel-cloud", "pastel-cloud-dark"},
|
||||||
|
}
|
||||||
|
if v, ok := variants[pair]; ok {
|
||||||
|
if dark {
|
||||||
|
return v[1]
|
||||||
|
}
|
||||||
|
return v[0]
|
||||||
|
}
|
||||||
|
if dark {
|
||||||
|
return "midnight"
|
||||||
|
}
|
||||||
|
return "midnight-light"
|
||||||
|
}
|
||||||
|
|
||||||
//go:embed static
|
//go:embed static
|
||||||
var staticFS embed.FS
|
var staticFS embed.FS
|
||||||
|
|
||||||
@@ -35,6 +73,7 @@ func New() (*UI, error) {
|
|||||||
funcs := template.FuncMap{
|
funcs := template.FuncMap{
|
||||||
"humanSize": humanSize,
|
"humanSize": humanSize,
|
||||||
"version": func() string { return Version }, // #93: topbar version label
|
"version": func() string { return Version }, // #93: topbar version label
|
||||||
|
"defaultDark": func() bool { return DefaultDark }, // #127: server-configured default
|
||||||
}
|
}
|
||||||
t, err := template.New("").Funcs(funcs).ParseFS(tmplFS, "templates/*.html")
|
t, err := template.New("").Funcs(funcs).ParseFS(tmplFS, "templates/*.html")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -65,6 +104,13 @@ func (h *Handlers) renderPage(w http.ResponseWriter, name string, data any) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RenderNotFoundPage is the exported not-found renderer used by the api
|
||||||
|
// package (#173): the router's NotFound handler renders the main UI with a
|
||||||
|
// friendly "Paste ID not found" message, still with HTTP 404.
|
||||||
|
func (h *Handlers) RenderNotFoundPage(w http.ResponseWriter, r *http.Request) {
|
||||||
|
h.renderNotFound(w, r, r.URL.Path)
|
||||||
|
}
|
||||||
|
|
||||||
// RenderPage is the exported wrapper used by the api package (#4 can pages).
|
// RenderPage is the exported wrapper used by the api package (#4 can pages).
|
||||||
func (h *Handlers) RenderPage(w http.ResponseWriter, name string, data any) {
|
func (h *Handlers) RenderPage(w http.ResponseWriter, name string, data any) {
|
||||||
h.renderPage(w, name, data)
|
h.renderPage(w, name, data)
|
||||||
@@ -161,6 +207,44 @@ func (h *Handlers) writeRateLimited(w http.ResponseWriter, retryAfterSecs int) {
|
|||||||
w.Write([]byte(`{"error":"rate limit exceeded"}`))
|
w.Write([]byte(`{"error":"rate limit exceeded"}`))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// renderNotFound serves the friendly not-found page (#173): the main UI
|
||||||
|
// chrome (topbar, centered card) with a "Paste ID not found" message in the
|
||||||
|
// result card, instead of a bare text 404. Still returns HTTP 404 so
|
||||||
|
// crawlers/validators see the correct status.
|
||||||
|
func (h *Handlers) renderNotFound(w http.ResponseWriter, r *http.Request, id string) {
|
||||||
|
h.renderPageStatus(w, "notfound.html", http.StatusNotFound, map[string]any{"Page": "notfound", "ID": id})
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleNotFoundPage serves the friendly not-found page for unknown routes
|
||||||
|
// (#173): main UI chrome with a "Paste ID not found" message. Called from the
|
||||||
|
// chi NotFound handler in the api package.
|
||||||
|
func (h *Handlers) HandleNotFoundPage(w http.ResponseWriter, r *http.Request) {
|
||||||
|
h.renderNotFound(w, r, r.URL.Path)
|
||||||
|
}
|
||||||
|
|
||||||
|
// renderPageStatus renders a template with an explicit HTTP status code.
|
||||||
|
func (h *Handlers) renderPageStatus(w http.ResponseWriter, name string, status int, data any) {
|
||||||
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
|
w.WriteHeader(status)
|
||||||
|
if err := h.UI.tmpl.ExecuteTemplate(w, name, data); err != nil {
|
||||||
|
http.Error(w, "template error: "+err.Error(), 500)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// attachmentExt returns the lowercase file extension (without dot) of a
|
||||||
|
// filename, or "" when the name has none. Used by the Type display (#235).
|
||||||
|
func attachmentExt(filename string) string {
|
||||||
|
name := filename
|
||||||
|
if i := strings.LastIndexByte(name, '/'); i >= 0 {
|
||||||
|
name = name[i+1:]
|
||||||
|
}
|
||||||
|
i := strings.LastIndexByte(name, '.')
|
||||||
|
if i <= 0 || i == len(name)-1 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return strings.ToLower(name[i+1:])
|
||||||
|
}
|
||||||
|
|
||||||
func (h *Handlers) renderPaste(w http.ResponseWriter, row *store.PasteRow, justCreated bool, deletionToken string, readsRemaining *int) {
|
func (h *Handlers) renderPaste(w http.ResponseWriter, row *store.PasteRow, justCreated bool, deletionToken string, readsRemaining *int) {
|
||||||
lines := strings.Count(row.Content, "\n") + 1
|
lines := strings.Count(row.Content, "\n") + 1
|
||||||
gutter := ""
|
gutter := ""
|
||||||
@@ -175,21 +259,62 @@ func (h *Handlers) renderPaste(w http.ResponseWriter, row *store.PasteRow, justC
|
|||||||
if lang == "" {
|
if lang == "" {
|
||||||
lang = "text"
|
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 the summary size must come from the attachment blob,
|
||||||
|
// not len(row.Content), or the summary shows "0 B".
|
||||||
|
summarySize := len(row.Content)
|
||||||
|
if attachment != nil {
|
||||||
|
summarySize = int(attachment.Size)
|
||||||
|
}
|
||||||
|
// #235: column renamed to "Type". Text pastes keep the detected
|
||||||
|
// language; attachment pastes show the file extension instead.
|
||||||
|
attExt := ""
|
||||||
|
typeLabel := lang
|
||||||
|
if attachment != nil {
|
||||||
|
if ext := attachmentExt(attachment.Filename); ext != "" {
|
||||||
|
attExt = ext
|
||||||
|
typeLabel = ext
|
||||||
|
}
|
||||||
|
}
|
||||||
|
summary := fmt.Sprintf("%s · %s · %d views · %s", typeLabel, humanSize(summarySize), row.ViewCount, agoString(row.CreatedAt))
|
||||||
|
// #221: image attachments render the image, not a text/code box. Size
|
||||||
|
// comes from the attachment's actual file size, not the text content.
|
||||||
|
attImage := false
|
||||||
|
if attachment != nil {
|
||||||
|
switch attachment.Mime {
|
||||||
|
case "image/png", "image/jpeg", "image/gif", "image/webp":
|
||||||
|
attImage = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sizeHuman := humanSize(len(row.Content))
|
||||||
|
lineCount := lines
|
||||||
|
if attachment != nil {
|
||||||
|
sizeHuman = attachment.SizeHuman
|
||||||
|
lineCount = 1
|
||||||
|
}
|
||||||
data := map[string]any{
|
data := map[string]any{
|
||||||
"Page": "paste",
|
"Page": "paste",
|
||||||
"ID": row.ID,
|
"ID": row.ID,
|
||||||
"Title": row.Title.String,
|
"Title": row.Title.String,
|
||||||
"Language": row.Language.String,
|
"Language": typeLabel,
|
||||||
|
"TypeLabel": typeLabel,
|
||||||
|
"HasAttachment": attachment != nil,
|
||||||
|
"AttachmentExt": attExt,
|
||||||
"StatsSummary": summary,
|
"StatsSummary": summary,
|
||||||
"SizeHuman": humanSize(len(row.Content)),
|
"SizeHuman": sizeHuman,
|
||||||
"HasPassword": row.PasswordHash.Valid,
|
"HasPassword": row.PasswordHash.Valid,
|
||||||
"BurnAfterRead": row.BurnAfterRead,
|
"BurnAfterRead": row.BurnAfterRead,
|
||||||
"CustomSlug": row.CustomSlug.String,
|
"CustomSlug": row.CustomSlug.String,
|
||||||
"ContentHTML": template.HTML(langpkg.HighlightCode(row.Content, row.Language.String)), // safe: HighlightCode escapes all non-span text
|
"ContentHTML": template.HTML(langpkg.HighlightCode(row.Content, row.Language.String)), // safe: HighlightCode escapes all non-span text
|
||||||
"ContentAttr": row.Content,
|
"ContentAttr": row.Content,
|
||||||
"Gutter": strings.TrimSuffix(gutter, "\n"),
|
"Gutter": strings.TrimSuffix(gutter, "\n"),
|
||||||
"LineCount": lines,
|
"LineCount": lineCount,
|
||||||
"SizeBytes": len(row.Content),
|
"SizeBytes": len(row.Content),
|
||||||
"CreatedAgo": agoString(row.CreatedAt),
|
"CreatedAgo": agoString(row.CreatedAt),
|
||||||
"CreatedAtUnix": row.CreatedAt,
|
"CreatedAtUnix": row.CreatedAt,
|
||||||
@@ -202,6 +327,8 @@ func (h *Handlers) renderPaste(w http.ResponseWriter, row *store.PasteRow, justC
|
|||||||
"ReadsLeftN": readsRemaining, // *int: reads remaining after this view
|
"ReadsLeftN": readsRemaining, // *int: reads remaining after this view
|
||||||
"ReadsTotal": int(row.ReadsLimit.Int64),
|
"ReadsTotal": int(row.ReadsLimit.Int64),
|
||||||
"JustCreated": justCreated,
|
"JustCreated": justCreated,
|
||||||
|
"Attachment": attachment,
|
||||||
|
"AttachmentImage": attImage,
|
||||||
"Host": "this host",
|
"Host": "this host",
|
||||||
}
|
}
|
||||||
h.renderPage(w, "paste.html", data)
|
h.renderPage(w, "paste.html", data)
|
||||||
@@ -216,11 +343,14 @@ func (h *Handlers) HandlePasteView(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if row == nil {
|
if row == nil {
|
||||||
http.NotFound(w, r)
|
// #173: a missing paste ID gets the main UI with a friendly message,
|
||||||
|
// not a bare text 404 page.
|
||||||
|
h.renderNotFound(w, r, id)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if row.ExpiresAt.Valid && row.ExpiresAt.Int64 < time.Now().Unix() {
|
if row.ExpiresAt.Valid && row.ExpiresAt.Int64 < time.Now().Unix() {
|
||||||
http.Error(w, "paste expired", 404)
|
// #173: expired pastes render the same friendly not-found UI.
|
||||||
|
h.renderNotFound(w, r, id)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if row.PasswordHash.Valid {
|
if row.PasswordHash.Valid {
|
||||||
@@ -264,9 +394,15 @@ func (h *Handlers) HandlePasteView(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
justCreated := r.URL.Query().Get("created") == "1"
|
justCreated := r.URL.Query().Get("created") == "1"
|
||||||
token := r.URL.Query().Get("token")
|
// #143: the deletion token is no longer round-tripped through the URL
|
||||||
|
// (?token= leaks into access logs and history). The create flow sets a
|
||||||
|
// short-lived tok_<id> cookie; the paste view reads it once from there.
|
||||||
|
token := ""
|
||||||
|
if c, err := r.Cookie("tok_" + row.ID); err == nil {
|
||||||
|
token = c.Value
|
||||||
|
}
|
||||||
if justCreated && token != "" {
|
if justCreated && token != "" {
|
||||||
// one-time display of the deletion token via the created banner
|
// one-time display of the deletion token via sessionStorage (#143)
|
||||||
http.SetCookie(w, &http.Cookie{Name: "tok_" + row.ID, Value: token, Path: "/", MaxAge: 60, HttpOnly: true, SameSite: http.SameSiteLaxMode})
|
http.SetCookie(w, &http.Cookie{Name: "tok_" + row.ID, Value: token, Path: "/", MaxAge: 60, HttpOnly: true, SameSite: http.SameSiteLaxMode})
|
||||||
}
|
}
|
||||||
// Count the view for real page renders, deduped per-viewer within the
|
// Count the view for real page renders, deduped per-viewer within the
|
||||||
@@ -281,8 +417,8 @@ func (h *Handlers) HandlePasteView(w http.ResponseWriter, r *http.Request) {
|
|||||||
// Just-created first render does not count as a read for the creator.
|
// Just-created first render does not count as a read for the creator.
|
||||||
if !justCreated {
|
if !justCreated {
|
||||||
rem, admitted := h.Store.RegisterRead(row, h.ViewerID(r), h.BurnWindowMin())
|
rem, admitted := h.Store.RegisterRead(row, h.ViewerID(r), h.BurnWindowMin())
|
||||||
if !admitted { // #58: lost the burn claim; do not render content
|
if !admitted { // #58: lost the burn claim; #173: friendly not-found UI
|
||||||
http.NotFound(w, r)
|
h.renderNotFound(w, r, row.ID)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
h.renderPaste(w, row, false, "", rem)
|
h.renderPaste(w, row, false, "", rem)
|
||||||
@@ -297,9 +433,9 @@ func (h *Handlers) HandleNewPage(w http.ResponseWriter, r *http.Request) {
|
|||||||
h.renderPage(w, "new.html", map[string]any{"Page": "new"})
|
h.renderPage(w, "new.html", map[string]any{"Page": "new"})
|
||||||
}
|
}
|
||||||
|
|
||||||
// HandleHistoryPage serves /history.
|
// HandleHistoryPage serves /public.
|
||||||
func (h *Handlers) HandleHistoryPage(w http.ResponseWriter, r *http.Request) {
|
func (h *Handlers) HandleHistoryPage(w http.ResponseWriter, r *http.Request) {
|
||||||
h.renderPage(w, "history.html", map[string]any{"Page": "history"})
|
h.renderPage(w, "history.html", map[string]any{"Page": "public"})
|
||||||
}
|
}
|
||||||
|
|
||||||
// HandleSettingsPage serves /settings.
|
// HandleSettingsPage serves /settings.
|
||||||
@@ -316,9 +452,9 @@ func (h *Handlers) HandleSettingsPage(w http.ResponseWriter, r *http.Request) {
|
|||||||
h.renderPage(w, "settings.html", map[string]any{"Page": "settings", "Themes": themes})
|
h.renderPage(w, "settings.html", map[string]any{"Page": "settings", "Themes": themes})
|
||||||
}
|
}
|
||||||
|
|
||||||
// HandleMinePage serves /mine.
|
// HandleMinePage serves /saved.
|
||||||
func (h *Handlers) HandleMinePage(w http.ResponseWriter, r *http.Request) {
|
func (h *Handlers) HandleMinePage(w http.ResponseWriter, r *http.Request) {
|
||||||
h.renderPage(w, "mine.html", map[string]any{"Page": "mine"})
|
h.renderPage(w, "mine.html", map[string]any{"Page": "saved"})
|
||||||
}
|
}
|
||||||
|
|
||||||
// HandleAdminPage serves /admin.
|
// HandleAdminPage serves /admin.
|
||||||
@@ -331,8 +467,12 @@ func (u *UI) Handlers() *Handlers { return &Handlers{UI: u} }
|
|||||||
|
|
||||||
// #59: security headers for rendered HTML pages. Applied wherever the
|
// #59: security headers for rendered HTML pages. Applied wherever the
|
||||||
// response is text/html (page templates and the inline can page); JSON API
|
// response is text/html (page templates and the inline can page); JSON API
|
||||||
// responses and /raw content pass through untouched. script-src allows
|
// responses and /raw content pass through untouched.
|
||||||
// 'unsafe-inline' because the page templates carry inline scripts; CSP
|
// #139: script-src and style-src no longer allow 'unsafe-inline'. All
|
||||||
|
// previously-inline scripts moved to external files under static/ (page data
|
||||||
|
// reaches them via data-* attributes on the script tags), inline style
|
||||||
|
// attributes became CSS classes, and JS sets swatch colors via CSSOM. The
|
||||||
|
// img-src data: allowance stays: SVG data-URI backgrounds in app.css need it.
|
||||||
// default-src 'self' still blocks external content and object/frame embeds,
|
// default-src 'self' still blocks external content and object/frame embeds,
|
||||||
// and frame-ancestors 'none' closes the clickjacking gap flagged in the #34
|
// and frame-ancestors 'none' closes the clickjacking gap flagged in the #34
|
||||||
// pentest. Runs after the handler so the Content-Type is already set.
|
// pentest. Runs after the handler so the Content-Type is already set.
|
||||||
@@ -344,7 +484,7 @@ func SecurityHeaders(next http.Handler) http.Handler {
|
|||||||
// is harmless and arguably desirable.
|
// is harmless and arguably desirable.
|
||||||
h := w.Header()
|
h := w.Header()
|
||||||
h.Set("Content-Security-Policy",
|
h.Set("Content-Security-Policy",
|
||||||
"default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; frame-ancestors 'none'")
|
"default-src 'self'; script-src 'self'; style-src 'self'; img-src 'self' data:; frame-ancestors 'none'")
|
||||||
h.Set("Referrer-Policy", "no-referrer")
|
h.Set("Referrer-Policy", "no-referrer")
|
||||||
h.Set("X-Content-Type-Options", "nosniff")
|
h.Set("X-Content-Type-Options", "nosniff")
|
||||||
next.ServeHTTP(w, r)
|
next.ServeHTTP(w, r)
|
||||||
|
|||||||
@@ -0,0 +1,48 @@
|
|||||||
|
package web
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestResolvePreset(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
pair string
|
||||||
|
dark bool
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{"", false, "midnight-light"},
|
||||||
|
{"", true, "midnight"},
|
||||||
|
{"midnight", false, "midnight-light"},
|
||||||
|
{"midnight", true, "midnight"},
|
||||||
|
{"smooth", false, "smooth"},
|
||||||
|
{"smooth", true, "smooth-dark"},
|
||||||
|
{"pastel-lavender", true, "pastel-lavender-dark"},
|
||||||
|
{"pastel-peach", false, "pastel-peach"},
|
||||||
|
{"pastel-cloud", true, "pastel-cloud-dark"},
|
||||||
|
{"bogus", true, "midnight"},
|
||||||
|
{"bogus", false, "midnight-light"},
|
||||||
|
// explicit variant ids also resolve (URL ?theme= may pass them)
|
||||||
|
{"smooth-dark", true, "midnight"},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
if got := ResolvePreset(c.pair, c.dark); got != c.want {
|
||||||
|
t.Errorf("ResolvePreset(%q, %v) = %q, want %q", c.pair, c.dark, got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetDefaultDark(t *testing.T) {
|
||||||
|
for _, off := range []string{"false", "0", "off", "OFF", " false "} {
|
||||||
|
DefaultDark = true
|
||||||
|
SetDefaultDark(off)
|
||||||
|
if DefaultDark {
|
||||||
|
t.Errorf("SetDefaultDark(%q): want dark off", off)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, on := range []string{"true", "1", "on", "anything"} {
|
||||||
|
DefaultDark = false
|
||||||
|
SetDefaultDark(on)
|
||||||
|
if !DefaultDark {
|
||||||
|
t.Errorf("SetDefaultDark(%q): want dark on", on)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
DefaultDark = true
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user