Change logging to be json comaptible

2026-05-03 22:42:43 +02:00
parent d1f6782c96
commit 1a82f21202
14 changed files with 501 additions and 35 deletions
--- a/internal/web/config.go
+++ b/internal/web/config.go
@@ -1,6 +1,7 @@
 package web

 import (
+	"ResendIt/internal/api/middleware"
 	"ResendIt/internal/config"
 	"net/http"
 	"strconv"
@@ -30,6 +31,10 @@ type ConfigPageData struct {

 // ConfigPage renders a modular admin config screen.
 func (h *Handler) ConfigPage(c *gin.Context) {
+	log := middleware.StructuredLog(c).With().
+		Str("event", "config_page_view").
+		Logger()
+
 	cfg := h.configService

 	maxBytes := cfg.GetInt64Default(config.KeyUploadMaxFileSizeBytes, config.DefaultUploadMaxFileSizeBytes)
@@ -48,10 +53,16 @@ func (h *Handler) ConfigPage(c *gin.Context) {
 		NtfyTopic:               cfg.GetStringDefault(config.KeyNtfyTopic, config.DefaultNtfyTopic),
 	}

+	log.Debug().Msg("Config page viewed")
+
 	c.HTML(http.StatusOK, "config.html", data)
 }

 func (h *Handler) ConfigSave(c *gin.Context) {
+	log := middleware.StructuredLog(c).With().
+		Str("event", "config_save").
+		Logger()
+
 	cfg := h.configService

 	// Parse + validate.
@@ -87,22 +98,26 @@ func (h *Handler) ConfigSave(c *gin.Context) {

 	newMODT, err := strconv.Unquote(`"` + c.PostForm("site_modt") + `"`)
 	if err != nil {
+		log.Warn().Str("reason", "invalid_modtext").Msg("Config save failed")
 		h.renderConfigError(c, "invalid modtext")
 		return
 	}

 	maxMB, err := parseInt64("upload_max_file_size_mb", 1, 1024*1024)
 	if err != nil {
+		log.Warn().Str("key", "upload_max_file_size_mb").Msg("Config save failed - invalid value")
 		h.renderConfigError(c, "invalid max file size")
 		return
 	}
 	maxFiles, err := parseInt("upload_multi_max_files", 1, 500)
 	if err != nil {
+		log.Warn().Str("key", "upload_multi_max_files").Msg("Config save failed - invalid value")
 		h.renderConfigError(c, "invalid max files")
 		return
 	}
 	maxHours, err := parseInt("upload_max_hours", 1, 24*365)
 	if err != nil {
+		log.Warn().Str("key", "upload_max_hours").Msg("Config save failed - invalid value")
 		h.renderConfigError(c, "invalid max hours")
 		return
 	}
@@ -110,27 +125,32 @@ func (h *Handler) ConfigSave(c *gin.Context) {
 	// Rate limits: stored, but not applied dynamically yet.
 	loginPerMin, err := parseInt("ratelimit_login_per_minute", 1, 10000)
 	if err != nil {
+		log.Warn().Str("key", "ratelimit_login_per_minute").Msg("Config save failed - invalid value")
 		h.renderConfigError(c, "invalid login rate")
 		return
 	}
 	loginBurst, err := parseInt("ratelimit_login_burst", 1, 10000)
 	if err != nil {
+		log.Warn().Str("key", "ratelimit_login_burst").Msg("Config save failed - invalid value")
 		h.renderConfigError(c, "invalid login burst")
 		return
 	}
 	apiPerMin, err := parseInt("ratelimit_api_per_minute", 1, 100000)
 	if err != nil {
+		log.Warn().Str("key", "ratelimit_api_per_minute").Msg("Config save failed - invalid value")
 		h.renderConfigError(c, "invalid api rate")
 		return
 	}
 	apiBurst, err := parseInt("ratelimit_api_burst", 1, 100000)
 	if err != nil {
+		log.Warn().Str("key", "ratelimit_api_burst").Msg("Config save failed - invalid value")
 		h.renderConfigError(c, "invalid api burst")
 		return
 	}

 	useNTFY, err := strconv.ParseBool(c.PostForm("ntfy_use"))
 	if err != nil {
+		log.Warn().Str("key", "ntfy_use").Msg("Config save failed - invalid value")
 		h.renderConfigError(c, "invalid ntfy use value")
 		return
 	}
@@ -139,14 +159,17 @@ func (h *Handler) ConfigSave(c *gin.Context) {

 	// Persist.
 	if err := cfg.SetString(config.KeyUploadMaxFileSizeBytes, strconv.FormatInt(maxMB*1024*1024, 10)); err != nil {
+		log.Error().Err(err).Str("key", config.KeyUploadMaxFileSizeBytes).Msg("Config save failed")
 		h.renderConfigError(c, err.Error())
 		return
 	}
 	if err := cfg.SetString(config.KeyUploadMultiMaxFiles, strconv.Itoa(maxFiles)); err != nil {
+		log.Error().Err(err).Str("key", config.KeyUploadMultiMaxFiles).Msg("Config save failed")
 		h.renderConfigError(c, err.Error())
 		return
 	}
 	if err := cfg.SetString(config.KeyUploadMaxHours, strconv.Itoa(maxHours)); err != nil {
+		log.Error().Err(err).Str("key", config.KeyUploadMaxHours).Msg("Config save failed")
 		h.renderConfigError(c, err.Error())
 		return
 	}
@@ -167,6 +190,13 @@ func (h *Handler) ConfigSave(c *gin.Context) {
 	_ = cfg.SetString(config.KeyNtfyUrl, ntfyUrl)
 	_ = cfg.SetString(config.KeyNtfyTopic, ntfyTopic)

+	log.Info().
+		Str("modtext", newMODT).
+		Int64("max_file_size_mb", maxMB).
+		Int("max_files", maxFiles).
+		Int("max_hours", maxHours).
+		Msg("Config saved successfully")
+
 	c.Redirect(http.StatusFound, "/config?saved=1")
 }

@@ -183,4 +213,4 @@ func (h *Handler) renderConfigError(c *gin.Context, msg string) {
 		RateLimitApiBurst:       h.configService.GetIntDefault(config.KeyRateLimitApiBurst, config.DefaultRateLimitApiBurst),
 	}
 	c.HTML(http.StatusBadRequest, "config.html", data)
-}
+}
--- a/internal/web/handler.go
+++ b/internal/web/handler.go
@@ -1,6 +1,7 @@
 package web

 import (
+	"ResendIt/internal/api/middleware"
 	"ResendIt/internal/buildinfo"
 	"ResendIt/internal/config"
 	"ResendIt/internal/file"
@@ -51,16 +52,23 @@ func (h *Handler) LoginPage(c *gin.Context) {
 }

 func (h *Handler) FileView(c *gin.Context) {
+	log := middleware.StructuredLog(c).With().
+		Str("event", "file_view_page").
+		Logger()
+
 	id := c.Param("id")

 	fileRecord, err := h.fileService.GetFileByViewID(id)
 	if err != nil {
+		log.Warn().Str("view_id", id).Err(err).Msg("File view failed - not found")
 		c.HTML(404, "error.html", gin.H{
 			"MODT": h.configService.GetStringDefault(config.KeyModtext, config.DefaultModt),
 		})
 		return
 	}

+	log.Info().Str("view_id", id).Str("filename", fileRecord.Filename).Msg("File view page rendered")
+
 	downloadKey := fileRecord.ID
 	deleteKey := fileRecord.DeletionID

@@ -73,6 +81,10 @@ func (h *Handler) FileView(c *gin.Context) {
 }

 func (h *Handler) AdminPage(c *gin.Context) {
+	log := middleware.StructuredLog(c).With().
+		Str("event", "admin_page_view").
+		Logger()
+
 	pageStr := c.Query("page")
 	page, err := strconv.Atoi(pageStr)
 	if err != nil || page < 1 {
@@ -84,6 +96,7 @@ func (h *Handler) AdminPage(c *gin.Context) {

 	files, totalCount, err := h.fileService.GetPaginatedFiles(limit, offset)
 	if err != nil {
+		log.Error().Err(err).Msg("Failed to load files for admin page")
 		c.HTML(500, "admin.html", gin.H{
 			"error": err.Error(),
 		})
@@ -117,6 +130,8 @@ func (h *Handler) AdminPage(c *gin.Context) {

 	totalPages := (totalCount + limit - 1) / limit

+	log.Debug().Int("page", page).Int("total_files", totalCount).Msg("Admin page viewed")
+
 	c.HTML(200, "admin.html", gin.H{
 		"Files":       adminFiles,
 		"Page":        page,
@@ -126,10 +141,16 @@ func (h *Handler) AdminPage(c *gin.Context) {
 }

 func (h *Handler) Logout(c *gin.Context) {
+	log := middleware.StructuredLog(c).With().
+		Str("event", "logout").
+		Logger()
+
+	log.Info().Msg("User logged out")
+
 	c.SetCookie("auth_token", "", -1, "/", "", false, true)
 	c.Redirect(302, "/")
 }

 func (h *Handler) ChangePasswordPage(c *gin.Context) {
 	c.HTML(200, "changePassword.html", nil)
-}
+}