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

Jump to bottom

openapi3filter: RegisterBodyDecoder for application/zip #730

Merged
merged 17 commits into from
Jan 4, 2023
Merged

openapi3filter: RegisterBodyDecoder for application/zip #730

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8546b3b
Append zip file upload test
k2tzumi Jan 3, 2023
19f04c1
Fix lint
k2tzumi Jan 3, 2023
5197d88
Fix yaml
k2tzumi Jan 3, 2023
5eed939
Fixing `request body has an error: failed to decode request body: pat…
k2tzumi Jan 3, 2023
7d571c3
Append ZipFileBodyDecoder
k2tzumi Jan 3, 2023
d14b803
Convert io.ReaderAt
k2tzumi Jan 3, 2023
84a2aa3
Fix zip data
k2tzumi Jan 3, 2023
18c593b
Fixing unhandled value
k2tzumi Jan 3, 2023
cfeb922
Appned error case
k2tzumi Jan 3, 2023
16f5311
Fix comment
k2tzumi Jan 3, 2023
1561634
Sorted block lines.
k2tzumi Jan 3, 2023
289a16e
Use testify/require
k2tzumi Jan 3, 2023
09849a2
Set initial slice capacity
k2tzumi Jan 3, 2023
b11b6a5
Fix goimports
k2tzumi Jan 3, 2023
d10ac34
fix
k2tzumi Jan 3, 2023
5361b9b
Execute a defer statement for each loop in a for loop
k2tzumi Jan 3, 2023
fa0fca6
Return error
k2tzumi Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 20 additions & 16 deletions openapi3filter/req_resp_decoder.go
View file
Open in desktop
Expand Up @@ -1243,24 +1243,28 @@ func ZipFileBodyDecoder(body io.Reader, header http.Header, schema *openapi3.Sch
buffer := make([]byte, bufferSize)

for _, f := range zr.File {
rc, err := f.Open()
if err != nil {
return nil, err
}
defer rc.Close()

for {
n, err := rc.Read(buffer)
if 0 < n {
content = append(content, buffer...)
}
if err == io.EOF {
break
}
func() {
rc, err := f.Open()
if err != nil {
return nil, err
panic(err)
fenollp marked this conversation as resolved.
Show resolved Hide resolved
}
}
defer func() {
_ = rc.Close()
}()

for {
n, err := rc.Read(buffer)
if 0 < n {
content = append(content, buffer...)
}
if err == io.EOF {
break
}
if err != nil {
panic(err)
}
}
}()
}

return string(content), nil
Expand Down
33 changes: 12 additions & 21 deletions openapi3filter/zip_file_upload_test.go
View file
Open in desktop
Expand Up @@ -44,17 +44,13 @@ paths:

loader := openapi3.NewLoader()
doc, err := loader.LoadFromData([]byte(spec))
if err != nil {
require.NoError(t, err)
}
if err = doc.Validate(loader.Context); err != nil {
require.NoError(t, err)
}
require.NoError(t, err)

err = doc.Validate(loader.Context)
require.NoError(t, err)

router, err := gorillamux.NewRouter(doc)
if err != nil {
require.NoError(t, err)
}
require.NoError(t, err)

tests := []struct {
zipData []byte
Expand Down Expand Up @@ -83,26 +79,21 @@ paths:
h.Set("Content-Type", "application/zip")

fw, err := writer.CreatePart(h)
if err != nil {
require.NoError(t, err)
}
if _, err = io.Copy(fw, bytes.NewReader(tt.zipData)); err != nil {
require.NoError(t, err)
}
require.NoError(t, err)
_, err = io.Copy(fw, bytes.NewReader(tt.zipData))

require.NoError(t, err)
}

writer.Close()

req, err := http.NewRequest(http.MethodPost, "/test", bytes.NewReader(body.Bytes()))
if err != nil {
require.NoError(t, err)
}
require.NoError(t, err)

req.Header.Set("Content-Type", writer.FormDataContentType())

route, pathParams, err := router.FindRoute(req)
if err != nil {
require.NoError(t, err)
}
require.NoError(t, err)

if err = openapi3filter.ValidateRequestBody(
context.Background(),
Expand Down