Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions parameters/query_parameters.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ doneLooking:
switch ty {

case helpers.String:
validationErrors = v.validateSimpleParam(sch, ef, ef, params[p])
validationErrors = append(validationErrors, v.validateSimpleParam(sch, ef, ef, params[p])...)
case helpers.Integer, helpers.Number:
efF, err := strconv.ParseFloat(ef, 64)
if err != nil {
validationErrors = append(validationErrors,
errors.InvalidQueryParamNumber(params[p], ef, sch))
break
}
validationErrors = v.validateSimpleParam(sch, ef, efF, params[p])
validationErrors = append(validationErrors, v.validateSimpleParam(sch, ef, efF, params[p])...)
case helpers.Boolean:
if _, err := strconv.ParseBool(ef); err != nil {
validationErrors = append(validationErrors,
Expand Down
68 changes: 68 additions & 0 deletions parameters/query_parameters_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,74 @@ paths:
assert.NotNil(t, errors)
}

func TestMewValidator_QueryParamMultiStringField(t *testing.T) {
spec := `openapi: 3.1.0
paths:
/a/fishy/on/a/dishy:
get:
parameters:
- name: fishy
in: query
required: true
schema:
type: string
enum: [cod, halibut]
- name: dishy
in: query
required: true
schema:
type: string
operationId: locateFishy
`

doc, err := libopenapi.NewDocument([]byte(spec))
assert.Nil(t, err)

m, _ := doc.BuildV3Model()

v := NewParameterValidator(&m.Model)

request, _ := http.NewRequest(http.MethodGet, "https://things.com/a/fishy/on/a/dishy?fishy=doc&dishy=halibut", nil)

valid, errors := v.ValidateQueryParams(request)
assert.False(t, valid)
assert.NotNil(t, errors)
}

func TestMewValidator_QueryParamMultiNumberField(t *testing.T) {
spec := `openapi: 3.1.0
paths:
/a/fishy/on/a/dishy:
get:
parameters:
- name: fishy
in: query
required: true
schema:
type: number
enum: [1, 99]
- name: dishy
in: query
required: true
schema:
type: number
operationId: locateFishy
`

doc, err := libopenapi.NewDocument([]byte(spec))
assert.Nil(t, err)

m, _ := doc.BuildV3Model()

v := NewParameterValidator(&m.Model)

request, _ := http.NewRequest(http.MethodGet, "https://things.com/a/fishy/on/a/dishy?fishy=10&dishy=10", nil)

valid, errors := v.ValidateQueryParams(request)
assert.False(t, valid)
assert.NotNil(t, errors)
}

func TestNewValidator_QueryParamWrongTypeNumber(t *testing.T) {
spec := `openapi: 3.1.0
paths:
Expand Down