introduce AllowExtraSiblingFields

Signed-off-by: Pierre Fenoll <[email protected]>
getkin · Jan 1, 2023 · e819a65 · e819a65
1 parent c988603
commit e819a65
Show file tree

Hide file tree

Showing 25 changed files with 231 additions and 45 deletions.
diff --git a/openapi3/components.go b/openapi3/components.go
@@ -224,7 +224,7 @@ func (components *Components) Validate(ctx context.Context, opts ...ValidationOp
 		}
 	}
 
-	return validateExtensions(components.Extensions)
+	return validateExtensions(ctx, components.Extensions)
 }
 
 const identifierPattern = `^[a-zA-Z0-9._-]+$`

diff --git a/openapi3/discriminator.go b/openapi3/discriminator.go
@@ -43,7 +43,7 @@ func (discriminator *Discriminator) UnmarshalJSON(data []byte) error {
 
 // Validate returns an error if Discriminator does not comply with the OpenAPI spec.
 func (discriminator *Discriminator) Validate(ctx context.Context, opts ...ValidationOption) error {
-	// ctx = WithValidationOptions(ctx, opts...)
+	ctx = WithValidationOptions(ctx, opts...)
 
-	return validateExtensions(discriminator.Extensions)
+	return validateExtensions(ctx, discriminator.Extensions)
 }
diff --git a/openapi3/encoding.go b/openapi3/encoding.go
@@ -132,5 +132,5 @@ func (encoding *Encoding) Validate(ctx context.Context, opts ...ValidationOption
 		return fmt.Errorf("serialization method with style=%q and explode=%v is not supported by media type", sm.Style, sm.Explode)
 	}
 
-	return validateExtensions(encoding.Extensions)
+	return validateExtensions(ctx, encoding.Extensions)
 }
diff --git a/openapi3/example.go b/openapi3/example.go
@@ -80,7 +80,7 @@ func (example *Example) UnmarshalJSON(data []byte) error {
 
 // Validate returns an error if Example does not comply with the OpenAPI spec.
 func (example *Example) Validate(ctx context.Context, opts ...ValidationOption) error {
-	// ctx = WithValidationOptions(ctx, opts...)
+	ctx = WithValidationOptions(ctx, opts...)
 
 	if example.Value != nil && example.ExternalValue != "" {
 		return errors.New("value and externalValue are mutually exclusive")
@@ -89,5 +89,5 @@ func (example *Example) Validate(ctx context.Context, opts ...ValidationOption)
 		return errors.New("no value or externalValue field")
 	}
 
-	return validateExtensions(example.Extensions)
+	return validateExtensions(ctx, example.Extensions)
 }
diff --git a/openapi3/extension.go b/openapi3/extension.go
@@ -1,21 +1,24 @@
 package openapi3
 
 import (
+	"context"
 	"fmt"
 	"sort"
 	"strings"
 )
 
-func validateExtensions(extensions map[string]interface{}) error { // FIXME: newtype + Validate(...)
+func validateExtensions(ctx context.Context, extensions map[string]interface{}) error { // FIXME: newtype + Validate(...)
 	var unknowns []string
 	for k := range extensions {
 		if !strings.HasPrefix(k, "x-") {
 			unknowns = append(unknowns, k)
 		}
 	}
+
 	if len(unknowns) != 0 {
 		sort.Strings(unknowns)
 		return fmt.Errorf("extra sibling fields: %+v", unknowns)
 	}
+
 	return nil
 }
diff --git a/openapi3/external_docs.go b/openapi3/external_docs.go
@@ -48,7 +48,7 @@ func (e *ExternalDocs) UnmarshalJSON(data []byte) error {
 
 // Validate returns an error if ExternalDocs does not comply with the OpenAPI spec.
 func (e *ExternalDocs) Validate(ctx context.Context, opts ...ValidationOption) error {
-	// ctx = WithValidationOptions(ctx, opts...)
+	ctx = WithValidationOptions(ctx, opts...)
 
 	if e.URL == "" {
 		return errors.New("url is required")
@@ -57,5 +57,5 @@ func (e *ExternalDocs) Validate(ctx context.Context, opts ...ValidationOption) e
 		return fmt.Errorf("url is incorrect: %w", err)
 	}
 
-	return validateExtensions(e.Extensions)
+	return validateExtensions(ctx, e.Extensions)
 }
diff --git a/openapi3/info.go b/openapi3/info.go
@@ -84,7 +84,7 @@ func (info *Info) Validate(ctx context.Context, opts ...ValidationOption) error
 		return errors.New("value of title must be a non-empty string")
 	}
 
-	return validateExtensions(info.Extensions)
+	return validateExtensions(ctx, info.Extensions)
 }
 
 // Contact is specified by OpenAPI/Swagger standard version 3.
@@ -132,9 +132,9 @@ func (contact *Contact) UnmarshalJSON(data []byte) error {
 
 // Validate returns an error if Contact does not comply with the OpenAPI spec.
 func (contact *Contact) Validate(ctx context.Context, opts ...ValidationOption) error {
-	// ctx = WithValidationOptions(ctx, opts...)
+	ctx = WithValidationOptions(ctx, opts...)
 
-	return validateExtensions(contact.Extensions)
+	return validateExtensions(ctx, contact.Extensions)
 }
 
 // License is specified by OpenAPI/Swagger standard version 3.
@@ -175,11 +175,11 @@ func (license *License) UnmarshalJSON(data []byte) error {
 
 // Validate returns an error if License does not comply with the OpenAPI spec.
 func (license *License) Validate(ctx context.Context, opts ...ValidationOption) error {
-	// ctx = WithValidationOptions(ctx, opts...)
+	ctx = WithValidationOptions(ctx, opts...)
 
 	if license.Name == "" {
 		return errors.New("value of license name must be a non-empty string")
 	}
 
-	return validateExtensions(license.Extensions)
+	return validateExtensions(ctx, license.Extensions)
 }
diff --git a/openapi3/issue513_test.go b/openapi3/issue513_test.go
@@ -131,3 +131,43 @@ components:
 	err = doc.Validate(sl.Context)
 	require.ErrorContains(t, err, `extra sibling fields: [description]`)
 }
+
+func TestIssue513KOMixesRefAlongWithOtherFieldsAllowed(t *testing.T) {
+	spec := `
+openapi: "3.0.3"
+info:
+  title: 'My app'
+  version: 1.0.0
+  description: 'An API'
+
+paths:
+  /v1/operation:
+    delete:
+      summary: Delete something
+      responses:
+        200:
+          description: A sibling field that the spec says is ignored
+          $ref: '#/components/responses/SomeResponseBody'
+components:
+  responses:
+    SomeResponseBody:
+      description: Success
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Error'
+  schemas:
+    Error:
+      type: object
+      description: An error response body.
+      properties:
+        message:
+          description: A detailed message describing the error.
+          type: string
+`[1:]
+	sl := NewLoader()
+	doc, err := sl.LoadFromData([]byte(spec))
+	require.NoError(t, err)
+	err = doc.Validate(sl.Context, AllowExtraSiblingFields("description"))
+	require.NoError(t, err)
+}
diff --git a/openapi3/link.go b/openapi3/link.go
@@ -88,7 +88,7 @@ func (link *Link) UnmarshalJSON(data []byte) error {
 
 // Validate returns an error if Link does not comply with the OpenAPI spec.
 func (link *Link) Validate(ctx context.Context, opts ...ValidationOption) error {
-	// ctx = WithValidationOptions(ctx, opts...)
+	ctx = WithValidationOptions(ctx, opts...)
 
 	if link.OperationID == "" && link.OperationRef == "" {
 		return errors.New("missing operationId or operationRef on link")
@@ -97,5 +97,5 @@ func (link *Link) Validate(ctx context.Context, opts ...ValidationOption) error
 		return fmt.Errorf("operationId %q and operationRef %q are mutually exclusive", link.OperationID, link.OperationRef)
 	}
 
-	return validateExtensions(link.Extensions)
+	return validateExtensions(ctx, link.Extensions)
 }
diff --git a/openapi3/media_type.go b/openapi3/media_type.go
@@ -142,7 +142,7 @@ func (mediaType *MediaType) Validate(ctx context.Context, opts ...ValidationOpti
 		}
 	}
 
-	return validateExtensions(mediaType.Extensions)
+	return validateExtensions(ctx, mediaType.Extensions)
 }
 
 // JSONLookup implements github.com/go-openapi/jsonpointer#JSONPointable

diff --git a/openapi3/openapi3.go b/openapi3/openapi3.go
@@ -152,5 +152,5 @@ func (doc *T) Validate(ctx context.Context, opts ...ValidationOption) error {
 		}
 	}
 
-	return validateExtensions(doc.Extensions)
+	return validateExtensions(ctx, doc.Extensions)
 }
diff --git a/openapi3/operation.go b/openapi3/operation.go
@@ -212,5 +212,5 @@ func (operation *Operation) Validate(ctx context.Context, opts ...ValidationOpti
 		}
 	}
 
-	return validateExtensions(operation.Extensions)
+	return validateExtensions(ctx, operation.Extensions)
 }
diff --git a/openapi3/parameter.go b/openapi3/parameter.go
@@ -414,5 +414,5 @@ func (parameter *Parameter) Validate(ctx context.Context, opts ...ValidationOpti
 		}
 	}
 
-	return validateExtensions(parameter.Extensions)
+	return validateExtensions(ctx, parameter.Extensions)
 }
diff --git a/openapi3/path_item.go b/openapi3/path_item.go
@@ -207,5 +207,5 @@ func (pathItem *PathItem) Validate(ctx context.Context, opts ...ValidationOption
 		}
 	}
 
-	return validateExtensions(pathItem.Extensions)
+	return validateExtensions(ctx, pathItem.Extensions)
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
-    	return validateExtensions(components.Extensions)
+    	return validateExtensions(ctx, components.Extensions)
     }
     const identifierPattern = `^[a-zA-Z0-9._-]+$`
@@ Expand Down @@