From 05d9bb0ff2ffd66efd9ba31a65d3952516bbe507 Mon Sep 17 00:00:00 2001 From: dizi Date: Fri, 30 Oct 2026 14:01:03 +0300 Subject: [PATCH] fix: validate message request fields --- internal/messenger/httpapi/handlers.go | 10 +++--- internal/messenger/httpapi/request.go | 20 +++++++++++ internal/messenger/httpapi/server_test.go | 41 +++++++++++++++++++++++ 3 files changed, 65 insertions(+), 6 deletions(-) diff --git a/internal/messenger/httpapi/handlers.go b/internal/messenger/httpapi/handlers.go index 72d307c..e4d4e8a 100644 --- a/internal/messenger/httpapi/handlers.go +++ b/internal/messenger/httpapi/handlers.go @@ -208,18 +208,16 @@ func (s *Server) messages(w http.ResponseWriter, r *http.Request) *apiError { if !valid { return invalidRequest() } - var input struct { - Text string `json:"text"` - AttachmentIDs []string `json:"attachment_ids"` - } + var input createMessageRequest if err := readJSON(w, r, &input); err != nil { return err } - if !validMessage(input.Text, input.AttachmentIDs) || !canonicalAttachmentIDs(input.AttachmentIDs) { + text, attachmentIDs, valid := input.values() + if !valid || !validMessage(text, attachmentIDs) || !canonicalAttachmentIDs(attachmentIDs) { return invalidRequest() } message, replay, err := s.messageRepository.CreateMessage( - r.Context(), chatID, user.ID, input.Text, input.AttachmentIDs, key, s.idempotencyTTL, + r.Context(), chatID, user.ID, text, attachmentIDs, key, s.idempotencyTTL, ) if errors.Is(err, model.ErrNotFound) { return notFound() diff --git a/internal/messenger/httpapi/request.go b/internal/messenger/httpapi/request.go index c0a5159..63cb694 100644 --- a/internal/messenger/httpapi/request.go +++ b/internal/messenger/httpapi/request.go @@ -20,6 +20,26 @@ const maxRequestBytes = 1 << 20 var idempotencyKeyPattern = regexp.MustCompile(`^[A-Za-z0-9._:-]{1,128}$`) +type createMessageRequest struct { + Text json.RawMessage `json:"text"` + AttachmentIDs json.RawMessage `json:"attachment_ids"` +} + +func (r createMessageRequest) values() (string, []string, bool) { + var text *string + if len(r.Text) == 0 || json.Unmarshal(r.Text, &text) != nil || text == nil { + return "", nil, false + } + if len(r.AttachmentIDs) == 0 { + return *text, nil, true + } + var attachmentIDs *[]string + if json.Unmarshal(r.AttachmentIDs, &attachmentIDs) != nil || attachmentIDs == nil { + return "", nil, false + } + return *text, *attachmentIDs, true +} + func readJSON(w http.ResponseWriter, r *http.Request, target any) *apiError { mediaType, params, err := mime.ParseMediaType(r.Header.Get("Content-Type")) if err != nil || mediaType != "application/json" || (params["charset"] != "" && !strings.EqualFold(params["charset"], "utf-8")) { diff --git a/internal/messenger/httpapi/server_test.go b/internal/messenger/httpapi/server_test.go index d11d1b2..d272bbe 100644 --- a/internal/messenger/httpapi/server_test.go +++ b/internal/messenger/httpapi/server_test.go @@ -259,6 +259,47 @@ func (s *MessengerSuite) TestMessageCreationValidatesIdempotencyKey() { } } +func (s *MessengerSuite) TestMessageCreationValidatesFieldPresenceAndTypes() { + store := messengerStoreStub{userByID: model.User{ID: "user-id"}} + server := s.newTestServer(store, sessionStub{userID: "user-id"}, passwordsStub{}) + attachmentID := "00000000-0000-0000-0000-000000000002" + invalidBodies := []string{ + `{"attachment_ids":["` + attachmentID + `"]}`, + `{"text":null,"attachment_ids":["` + attachmentID + `"]}`, + `{"text":"x","attachment_ids":null}`, + `{"text":1}`, + `{"text":"x","attachment_ids":{}}`, + } + for _, body := range invalidBodies { + response := createMessageRequestResponse(server, body) + s.Equal(http.StatusBadRequest, response.Code, body) + } + + validBodies := []string{ + `{"text":"message"}`, + `{"text":"message","attachment_ids":[]}`, + `{"text":"","attachment_ids":["` + attachmentID + `"]}`, + } + for _, body := range validBodies { + response := createMessageRequestResponse(server, body) + s.Equal(http.StatusCreated, response.Code, body) + } +} + +func createMessageRequestResponse(server *Server, body string) *httptest.ResponseRecorder { + request := httptest.NewRequest( + http.MethodPost, + "/api/v1/chats/00000000-0000-0000-0000-000000000001/messages", + strings.NewReader(body), + ) + request.Header.Set("Authorization", "Bearer valid-token") + request.Header.Set("Content-Type", "application/json") + request.Header.Set("Idempotency-Key", "message-key") + response := httptest.NewRecorder() + server.Handler().ServeHTTP(response, request) + return response +} + func (s *MessengerSuite) TestMessageCreationReturnsConflictForReusedKeyWithDifferentBody() { t := s.T() store := messengerStoreStub{