Do not send sent events to the server for multipart messages with inv…

…alid ID
NdoleStudio · Nov 28, 2023 · f333120 · f333120
1 parent b751051
commit f333120
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/api/pkg/handlers/message_handler.go b/api/pkg/handlers/message_handler.go
@@ -296,6 +296,7 @@ func (h *MessageHandler) PostEvent(c *fiber.Ctx) error {
 		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
@@ -11,6 +11,8 @@ import (
 
 // MessageEvent is the payload for sending and SMS message
 type MessageEvent struct {
+	request
+
 	// Timestamp is the time when the event was emitted, Please send the timestamp in UTC with as much precision as possible
 	Timestamp time.Time `json:"timestamp" example:"2022-06-05T14:26:09.527976+03:00"`
 
@@ -26,8 +28,14 @@ type MessageEvent struct {
 	MessageID string `json:"messageID" swaggerignore:"true"` // used internally for validation
 }
 
+// Sanitize the message event
+func (input *MessageEvent) Sanitize() *MessageEvent {
+	input.MessageID = input.sanitizeMessageID(input.MessageID)
+	return input
+}
+
 // ToMessageStoreEventParams converts MessageEvent to services.MessageStoreEventParams
-func (input MessageEvent) ToMessageStoreEventParams(source string) services.MessageStoreEventParams {
+func (input *MessageEvent) ToMessageStoreEventParams(source string) services.MessageStoreEventParams {
 	return services.MessageStoreEventParams{
 		MessageID:    uuid.MustParse(input.MessageID),
 		Source:       source,

diff --git a/api/pkg/requests/request.go b/api/pkg/requests/request.go
@@ -77,6 +77,17 @@ func (input *request) removeStringDuplicates(values []string) []string {
 	return result
 }
 
+func (input *request) sanitizeMessageID(value string) string {
+	id := strings.Builder{}
+	for _, char := range value {
+		if char == '.' {
+			return id.String()
+		}
+		id.WriteRune(char)
+	}
+	return id.String()
+}
+
 // getLimit gets the take as a string
 func (input *request) getBool(value string) bool {
 	if value == "true" {