Fix sanitization of state

AchoArnold · AchoArnold · commit 1d6d7852eaf4 · 2023-11-28T21:01:41.000+02:00
diff --git a/api/pkg/handlers/message_handler.go b/api/pkg/handlers/message_handler.go
@@ -290,13 +290,12 @@ func (h *MessageHandler) PostEvent(c *fiber.Ctx) error {
 	}
 
 	request.MessageID = c.Params("messageID")
-	if errors := h.validator.ValidateMessageEvent(ctx, request); len(errors) != 0 {
+	if errors := h.validator.ValidateMessageEvent(ctx, request.Sanitize()); len(errors) != 0 {
 		msg := fmt.Sprintf("validation errors [%s], while storing event [%s] for message [%s]", spew.Sdump(errors), c.Body(), request.MessageID)
 		ctxLogger.Warn(stacktrace.NewError(msg))
 		return h.responseUnprocessableEntity(c, errors, "validation errors while storing event")
 	}
 
-	request.Sanitize()
 	message, err := h.service.GetMessage(ctx, h.userIDFomContext(c), uuid.MustParse(request.MessageID))
 	if err != nil && stacktrace.GetCode(err) == repositories.ErrCodeNotFound {
 		return h.responseNotFound(c, fmt.Sprintf("cannot find message with ID [%s]", request.MessageID))
diff --git a/api/pkg/requests/message_event_request.go b/api/pkg/requests/message_event_request.go
@@ -29,9 +29,9 @@ type MessageEvent struct {
 }
 
 // Sanitize the message event
-func (input *MessageEvent) Sanitize() *MessageEvent {
+func (input *MessageEvent) Sanitize() MessageEvent {
 	input.MessageID = input.sanitizeMessageID(input.MessageID)
-	return input
+	return *input
 }
 
 // ToMessageStoreEventParams converts MessageEvent to services.MessageStoreEventParams

Original file line number	Diff line number	Diff line change
`@@ -290,13 +290,12 @@ func (h MessageHandler) PostEvent(c fiber.Ctx) error {`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`request.MessageID = c.Params("messageID")`
`293`		`- if errors := h.validator.ValidateMessageEvent(ctx, request); len(errors) != 0 {`
	`293`	`+ if errors := h.validator.ValidateMessageEvent(ctx, request.Sanitize()); len(errors) != 0 {`
`294`	`294`	`msg := fmt.Sprintf("validation errors [%s], while storing event [%s] for message [%s]", spew.Sdump(errors), c.Body(), request.MessageID)`
`295`	`295`	`ctxLogger.Warn(stacktrace.NewError(msg))`
`296`	`296`	`return h.responseUnprocessableEntity(c, errors, "validation errors while storing event")`
`297`	`297`	`}`
`298`	`298`
`299`		`- request.Sanitize()`
`300`	`299`	`message, err := h.service.GetMessage(ctx, h.userIDFomContext(c), uuid.MustParse(request.MessageID))`
`301`	`300`	`if err != nil && stacktrace.GetCode(err) == repositories.ErrCodeNotFound {`
`302`	`301`	`return h.responseNotFound(c, fmt.Sprintf("cannot find message with ID [%s]", request.MessageID))`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ type MessageEvent struct {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// Sanitize the message event`
`32`		`-func (input MessageEvent) Sanitize() MessageEvent {`
	`32`	`+func (input *MessageEvent) Sanitize() MessageEvent {`
`33`	`33`	`input.MessageID = input.sanitizeMessageID(input.MessageID)`
`34`		`- return input`
	`34`	`+ return *input`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// ToMessageStoreEventParams converts MessageEvent to services.MessageStoreEventParams`