tapiron/coller
1
0
Fork 0
forked from jriou/coller
Code Pull requests Activity

Compare commits

base: tapiron:e03aa6b87abcba0e2b929a922de4ef5b87eca664
Branches Tags
tapiron:main
tapiron:fix/missing_returns_in_handler
tapiron:fix/use_more_secure_innerText_instead_of_innerHTML
jriou:main
tapiron:1.0.0
jriou:1.3.1
jriou:1.3.0
jriou:1.2.0
jriou:1.1.0
jriou:1.0.0
..
compare: tapiron:4b01308125e0a96a1180b7c68a9e43d2b866e929
Branches Tags
tapiron:fix/missing_returns_in_handler
tapiron:fix/use_more_secure_innerText_instead_of_innerHTML
tapiron:main
jriou:main
tapiron:1.0.0
jriou:1.3.1
jriou:1.3.0
jriou:1.2.0
jriou:1.1.0
jriou:1.0.0

2 commits
e03aa6b87a ... 4b01308125

Author SHA1 Message Date
Julien Riou
4b01308125
 		style: Use lowercase for errors 
Signed-off-by: Julien Riou <julien@riou.xyz>
 2025-09-15 18:30:59 +02:00
tapiron
e2d3146222 fix: display error page instead of panic on non existant note (#30) 
Same that jriou/coller#24 but for non password protected notes

Co-authored-by: Thibault Piron <thibault.a.piron@gmail.com>
Reviewed-on: jriou/coller#30
Reviewed-by: Julien Riou <jriou@monitoring@riou.xyz>
Co-authored-by: tapiron <tapiron@monitoring@riou.xyz>
Co-committed-by: tapiron <tapiron@monitoring@riou.xyz>
 2025-09-15 18:30:03 +02:00
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/server/server.go
View file

@ -341,6 +341,12 @@ func (h *GetWebNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return 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 note.Encrypted { if note.Encrypted {
h.PageData.Err = fmt.Errorf("note is encrypted") h.PageData.Err = fmt.Errorf("note is encrypted")
h.Templates.ExecuteTemplate(w, templateName, h.PageData) h.Templates.ExecuteTemplate(w, templateName, h.PageData)
@ -377,7 +383,7 @@ func (h *GetProtectedWebNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Re
} }
if note == nil { if note == nil {
h.PageData.Err = fmt.Errorf("Note doesn't exist or has been deleted") h.PageData.Err = fmt.Errorf("note doesn't exist or has been deleted")
h.Templates.ExecuteTemplate(w, templateName, h.PageData) h.Templates.ExecuteTemplate(w, templateName, h.PageData)
return return
} }