From af5baa999c14b2ef9a6e1adb17dd2f18103b5adb Mon Sep 17 00:00:00 2001 From: Thibault Piron Date: Tue, 9 Sep 2025 15:57:23 +0200 Subject: [PATCH 1/2] fix: display error page if note not found (#24) Fix panic when trying to access a non existing note with the "pretty" url (.html) Reviewed-on: https://git.riou.xyz/jriou/coller/pulls/24 Reviewed-by: Julien Riou Co-authored-by: Thibault Piron Co-committed-by: Thibault Piron --- src/server/server.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/server/server.go b/src/server/server.go index 419c553..20e91c0 100644 --- a/src/server/server.go +++ b/src/server/server.go @@ -377,6 +377,12 @@ func (h *GetProtectedWebNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Re return } + if note == nil { + h.PageData.Err = fmt.Errorf("Note doesn't exist or has been deleted") + h.Templates.ExecuteTemplate(w, templateName, h.PageData) + return + } + if password != "" && note.Encrypted { note.Content, err = internal.Decrypt(note.Content, password) if err != nil { From 401397241b9c93f42854eb411c8a391da011d81f Mon Sep 17 00:00:00 2001 From: Julien Riou Date: Wed, 10 Sep 2025 07:02:48 +0200 Subject: [PATCH 2/2] fix: Upload text files other than plain text Fixes #23 Signed-off-by: Julien Riou --- src/server/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/server.go b/src/server/server.go index 20e91c0..224c46e 100644 --- a/src/server/server.go +++ b/src/server/server.go @@ -246,7 +246,7 @@ func (h *CreateNoteWithFormHandler) ServeHTTP(w http.ResponseWriter, r *http.Req } h.logger.Debug("checking file content type") - if handler.Header.Get("Content-Type") != "text/plain" { + if !strings.HasPrefix(handler.Header.Get("Content-Type"), "text/") { h.PageData.Err = fmt.Errorf("text file expected (got %s)", handler.Header.Get("Content-Type")) h.Templates.ExecuteTemplate(w, templateName, h.PageData) return