From 2d8d7efbcbc06f74b3eb722076ebd2127746b427 Mon Sep 17 00:00:00 2001 From: Julien Riou Date: Thu, 2 Oct 2025 07:35:48 +0200 Subject: [PATCH 01/10] feat: Add JSON logging format Fixes #40. Signed-off-by: Julien Riou --- src/cmd/coller/main.go | 9 ++++++++- src/cmd/collerd/main.go | 9 ++++++++- src/cmd/copier/main.go | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/cmd/coller/main.go b/src/cmd/coller/main.go index bb820d2..e213740 100644 --- a/src/cmd/coller/main.go +++ b/src/cmd/coller/main.go @@ -61,6 +61,7 @@ func handleMain() int { quiet := flag.Bool("quiet", false, "Log errors only") verbose := flag.Bool("verbose", false, "Print more logs") debug := flag.Bool("debug", false, "Print even more logs") + jsonFormat := flag.Bool("json", false, "Print logs in JSON format") configFile := flag.String("config", filepath.Join(homeDir, ".config", AppName+".json"), "Configuration file") reconfigure := flag.Bool("reconfigure", false, "Re-create configuration file") url := flag.String("url", "", "URL of the coller API") @@ -102,7 +103,13 @@ func handleMain() int { if *quiet { level = slog.LevelError } - logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level})) + + var logger *slog.Logger + if *jsonFormat { + logger = slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: level})) + } else { + logger = slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level})) + } if *url == "" { if _, err = os.Stat(*configFile); errors.Is(err, os.ErrNotExist) || *reconfigure { diff --git a/src/cmd/collerd/main.go b/src/cmd/collerd/main.go index 265fe73..2837dd4 100644 --- a/src/cmd/collerd/main.go +++ b/src/cmd/collerd/main.go @@ -27,6 +27,7 @@ func handleMain() int { quiet := flag.Bool("quiet", false, "Log errors only") verbose := flag.Bool("verbose", false, "Print more logs") debug := flag.Bool("debug", false, "Print even more logs") + jsonFormat := flag.Bool("json", false, "Print logs in JSON format") configFileName := flag.String("config", "", "Configuration file name") flag.Parse() @@ -46,7 +47,13 @@ func handleMain() int { if *quiet { level = slog.LevelError } - logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level})) + + var logger *slog.Logger + if *jsonFormat { + logger = slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: level})) + } else { + logger = slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level})) + } if *configFileName != "" { err = internal.ReadConfig(*configFileName, config) diff --git a/src/cmd/copier/main.go b/src/cmd/copier/main.go index 17dd9e5..8223d33 100644 --- a/src/cmd/copier/main.go +++ b/src/cmd/copier/main.go @@ -41,6 +41,7 @@ func handleMain() int { quiet := flag.Bool("quiet", false, "Log errors only") verbose := flag.Bool("verbose", false, "Print more logs") debug := flag.Bool("debug", false, "Print even more logs") + jsonFormat := flag.Bool("json", false, "Print logs in JSON format") encryptionKey := flag.String("encryption-key", os.Getenv("COLLER_ENCRYPTION_KEY"), "Key to decrypt the note") askEncryptionKey := flag.Bool("ask-encryption-key", false, "Read encryption key from input") fileName := flag.String("file", "", "Write content of the note to a file") @@ -72,7 +73,13 @@ func handleMain() int { if *quiet { level = slog.LevelError } - logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level})) + + var logger *slog.Logger + if *jsonFormat { + logger = slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: level})) + } else { + logger = slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level})) + } if *askEncryptionKey { fmt.Print("Encryption key: ") From b316c6ef67723771fef7fbcdbe895cfd41644bbb Mon Sep 17 00:00:00 2001 From: Julien Riou Date: Thu, 2 Oct 2025 09:23:40 +0200 Subject: [PATCH 02/10] 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}}
    +
  • + +
    • +
  • + +
  • raw @@ -20,6 +26,65 @@ {{end}}
+ + + + + {{if .DisableEditor}} 
@@ -28,7 +93,8 @@
{{else}}
-
+