From b316c6ef67723771fef7fbcdbe895cfd41644bbb Mon Sep 17 00:00:00 2001 From: Julien Riou Date: Thu, 2 Oct 2025 09:23:40 +0200 Subject: [PATCH] feat: Add copier and curl links Signed-off-by: Julien Riou --- src/cmd/copier/main.go | 2 +- src/server/handlers_api.go | 8 +++- src/server/handlers_web.go | 2 + src/server/templates/note.html | 68 +++++++++++++++++++++++++++++++++- 4 files changed, 77 insertions(+), 3 deletions(-) diff --git a/src/cmd/copier/main.go b/src/cmd/copier/main.go index 8223d33..fc59e23 100644 --- a/src/cmd/copier/main.go +++ b/src/cmd/copier/main.go @@ -119,7 +119,7 @@ func handleMain() int { var req *http.Request if *password != "" { body := &NotePayload{ - Password: *password, + Password: internal.Encode([]byte(*password)), } payload, err := json.Marshal(body) if err != nil { diff --git a/src/server/handlers_api.go b/src/server/handlers_api.go index d41a254..74000b3 100644 --- a/src/server/handlers_api.go +++ b/src/server/handlers_api.go @@ -213,8 +213,14 @@ func (h *GetProtectedNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Reque } } + password, err := internal.Decode(body.Password) + if err != nil { + APIError(w, logger, ErrCouldNotDecodePassword, err) + return + } + if len(note.PasswordHash) > 0 { - err := bcrypt.CompareHashAndPassword(note.PasswordHash, []byte(body.Password)) + err := bcrypt.CompareHashAndPassword(note.PasswordHash, password) if err != nil { APIErrorBadRequest(w, logger, ErrInvalidPassword, err) return diff --git a/src/server/handlers_web.go b/src/server/handlers_web.go index ba39258..c1a38ac 100644 --- a/src/server/handlers_web.go +++ b/src/server/handlers_web.go @@ -34,6 +34,7 @@ type PageData struct { AceDirectory string BootstrapDirectory string DisableEditor bool + Password string // Not stored in the database } func WebError(w http.ResponseWriter, pageData PageData, templates *template.Template, templateName string, logger *slog.Logger, topLevelErr error, err error) { @@ -439,6 +440,7 @@ func (h *GetProtectedWebNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Re } } + h.PageData.Password = password h.PageData.Note = note logger.Debug("rendering page") diff --git a/src/server/templates/note.html b/src/server/templates/note.html index 7972a3e..498aea2 100644 --- a/src/server/templates/note.html +++ b/src/server/templates/note.html @@ -6,6 +6,12 @@
Note {{.Note.ID}}
+ + + + + {{if .DisableEditor}}
@@ -28,7 +93,8 @@
     
{{else}}
-
+