diff --git a/internal/handler/attachment.go b/internal/handler/attachment.go index 5beaa2e..5c84400 100644 --- a/internal/handler/attachment.go +++ b/internal/handler/attachment.go @@ -3,6 +3,7 @@ package handler import ( "errors" "net/http" + "time" "github.com/go-chi/chi/v5" "github.com/google/uuid" @@ -43,11 +44,25 @@ func (h *AttachmentHandler) Upload(w http.ResponseWriter, r *http.Request) { return } + if deadline, ok := r.Context().Deadline(); ok { + controller := http.NewResponseController(w) + if err := controller.SetReadDeadline(deadline); err != nil { + httpx.WriteInternalError(w, requestID, err) + return + } + defer func() { _ = controller.SetReadDeadline(time.Time{}) }() + } + contentType := r.Header.Get("Content-Type") r.Body = http.MaxBytesReader(w, r.Body, int64(h.maxBytes)) att, err := h.service.Upload(r.Context(), userID, chatID, req.Filename, r.Body, contentType) switch { + case errors.Is(err, service.ErrUploadReadTimeout): + r.Close = true + w.Header().Set("Connection", "close") + httpx.WriteError(w, http.StatusRequestTimeout, dto.ErrorCodeInvalidRequest, "upload body read timed out", requestID) + return case errors.Is(err, service.ErrInvalidSize): httpx.WriteError(w, http.StatusRequestEntityTooLarge, dto.ErrorCodePayloadTooLarge, "file too large", requestID) return diff --git a/internal/middleware/logging.go b/internal/middleware/logging.go index ab28a61..7d7da2c 100644 --- a/internal/middleware/logging.go +++ b/internal/middleware/logging.go @@ -11,6 +11,10 @@ type responseWriter struct { status int } +func (w *responseWriter) Unwrap() http.ResponseWriter { + return w.ResponseWriter +} + func (w *responseWriter) WriteHeader(status int) { w.status = status w.ResponseWriter.WriteHeader(status) diff --git a/internal/service/attachment.go b/internal/service/attachment.go index 39de442..b0668fb 100644 --- a/internal/service/attachment.go +++ b/internal/service/attachment.go @@ -9,6 +9,7 @@ import ( _ "image/jpeg" _ "image/png" "io" + "net" "net/http" "os" @@ -24,6 +25,7 @@ var ( ErrAttachmentNotFound = errors.New("attachment not found") ErrInvalidImage = errors.New("invalid image") ErrInvalidSize = errors.New("invalid size") + ErrUploadReadTimeout = errors.New("upload body read timed out") ) type attachmentQueries interface { @@ -80,6 +82,10 @@ func (s *AttachmentService) Upload( if errors.As(err, &maxBytesErr) { return model.Attachment{}, ErrInvalidSize } + var networkErr net.Error + if errors.As(err, &networkErr) && networkErr.Timeout() { + return model.Attachment{}, ErrUploadReadTimeout + } return model.Attachment{}, err } if size > int64(s.maxBytes) {