Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure request body availability after openapi3 filter validation #22

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Ensure request body availability after openapi3 filter validation #22

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fe0b42
Fix request body availability after middleware processing
ikattey Jul 24, 2024
f303faf
Check that body exists before copying
ikattey Jul 25, 2024
e48910b
Merge pull request #1 from ikattey/ensure_body_exists
ikattey Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions oapi_validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
package nethttpmiddleware

import (
"bytes"
"errors"
"fmt"
"io"
"log"
"net/http"
"strings"
Expand Down Expand Up @@ -70,6 +72,16 @@ func OapiRequestValidatorWithOptions(swagger *openapi3.T, options *Options) func
// validateRequest is called from the middleware above and actually does the work
// of validating a request.
func validateRequest(r *http.Request, router routers.Router, options *Options) (int, error) {
var body []byte
if r.Body != nil {
// Read and store the body, then reset for further reads
var err error
body, err = io.ReadAll(r.Body)
if err != nil {
return http.StatusInternalServerError, fmt.Errorf("error reading request body: %v", err)
}
r.Body = io.NopCloser(bytes.NewReader(body))
}

// Find route
route, pathParams, err := router.FindRoute(r)
Expand Down Expand Up @@ -111,6 +123,11 @@ func validateRequest(r *http.Request, router routers.Router, options *Options) (
}
}

// Ensure that request body is reset before returning
if body != nil {
r.Body = io.NopCloser(bytes.NewReader(body))
}

return http.StatusOK, nil
}

Expand Down