Skip to content

Fix failfast flag handling #284

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

Merged
merged 2 commits into from
Jan 5, 2021
Merged

Fix failfast flag handling #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6fc28d
repro
fenollp Jan 5, 2021
5132fdb
fix
fenollp Jan 5, 2021
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
32 changes: 19 additions & 13 deletions openapi3/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,8 +794,6 @@ func (schema *Schema) visitJSON(settings *schemaValidationSettings, value interf
}

func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, value interface{}) (err error) {
var oldfailfast bool

if enum := schema.Enum; len(enum) != 0 {
for _, v := range enum {
if value == v {
Expand All @@ -818,9 +816,12 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
if v == nil {
return foundUnresolvedRef(ref.Ref)
}
var oldfailfast bool
oldfailfast, settings.failfast = settings.failfast, true
if err := v.visitJSON(settings, value); err == nil {
if oldfailfast {
err := v.visitJSON(settings, value)
settings.failfast = oldfailfast
if err == nil {
if settings.failfast {
return errSchema
}
return &SchemaError{
Expand All @@ -829,7 +830,6 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
SchemaField: "not",
}
}
settings.failfast = oldfailfast
}

if v := schema.OneOf; len(v) > 0 {
Expand All @@ -839,11 +839,13 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
if v == nil {
return foundUnresolvedRef(item.Ref)
}
var oldfailfast bool
oldfailfast, settings.failfast = settings.failfast, true
if err := v.visitJSON(settings, value); err == nil {
err := v.visitJSON(settings, value)
settings.failfast = oldfailfast
if err == nil {
ok++
}
settings.failfast = oldfailfast
}
if ok != 1 {
if settings.failfast {
Expand All @@ -864,12 +866,14 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
if v == nil {
return foundUnresolvedRef(item.Ref)
}
var oldfailfast bool
oldfailfast, settings.failfast = settings.failfast, true
if err := v.visitJSON(settings, value); err == nil {
err := v.visitJSON(settings, value)
settings.failfast = oldfailfast
if err == nil {
ok = true
break
}
settings.failfast = oldfailfast
}
if !ok {
if settings.failfast {
Expand All @@ -888,9 +892,12 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
if v == nil {
return foundUnresolvedRef(item.Ref)
}
var oldfailfast bool
oldfailfast, settings.failfast = settings.failfast, false
if err := v.visitJSON(settings, value); err != nil {
if oldfailfast {
err := v.visitJSON(settings, value)
settings.failfast = oldfailfast
if err != nil {
if settings.failfast {
return errSchema
}
return &SchemaError{
Expand All @@ -900,7 +907,6 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
Origin: err,
}
}
settings.failfast = oldfailfast
}
return
}
Expand Down Expand Up @@ -1494,7 +1500,7 @@ func (err *SchemaError) Error() string {
buf.WriteByte('/')
buf.WriteString(reversePath[i])
}
buf.WriteString(`":`)
buf.WriteString(`": `)
}
reason := err.Reason
if reason == "" {
Expand Down
27 changes: 27 additions & 0 deletions openapi3/schema_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,3 +1192,30 @@ var schemaMultiErrorExamples = []schemaMultiErrorExample{
},
},
}

func TestIssue283(t *testing.T) {
const api = `
openapi: "3.0.1"
components:
schemas:
Test:
properties:
name:
type: string
ownerName:
not:
type: boolean
type: object
`
data := map[string]interface{}{
"name": "kin-openapi",
"ownerName": true,
}
s, err := NewSwaggerLoader().LoadSwaggerFromData([]byte(api))
require.NoError(t, err)
require.NotNil(t, s)
err = s.Components.Schemas["Test"].Value.VisitJSON(data)
require.NotNil(t, err)
require.NotEqual(t, errSchema, err)
require.Contains(t, err.Error(), `Error at "/ownerName": Doesn't match schema "not"`)
}