Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ module {{moduleName}}
out << "\"#{name}\" must be >= #{rules[:minimum]}" if rules[:minimum] && value.is_a?(Numeric) && value < rules[:minimum]
out << "\"#{name}\" too many items (max #{rules[:max_items]})" if rules[:max_items] && value.respond_to?(:length) && value.length > rules[:max_items]
out << "\"#{name}\" too few items (min #{rules[:min_items]})" if rules[:min_items] && value.respond_to?(:length) && value.length < rules[:min_items]
out << "\"#{name}\" does not match #{rules[:pattern]}" if rules[:pattern] && value !~ rules[:pattern]
out << "\"#{name}\" does not match #{rules[:pattern]}" if rules[:pattern] && (!value.is_a?(String) || value !~ rules[:pattern])
out
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -556,4 +556,28 @@ public void testResourceAccessorsUseFinalOperationIdsAndAvoidObjectMethods() thr
org.openapitools.codegen.TestUtils.assertFileContains(
target.resolve("lib/petstore/api/stables/ponies.rb"), "class Stables::Ponies");
}

@Test
public void testPatternValidationGuardsNonStringValue() throws Exception {
Path target = Files.createTempDirectory("test");
target.toFile().deleteOnExit();
ClientOptInput input =
new CodegenConfigurator()
.setGeneratorName("ruby-nextgen")
.setInputSpec(
"src/test/resources/3_0/ruby-nextgen/pattern-validation.yaml")
.setOutputDir(target.toString())
.addAdditionalProperty("gemName", "petstore")
.addAdditionalProperty("moduleName", "Petstore")
.toClientOptInput();
new DefaultGenerator(false).opts(input).generate();

TestUtils.assertFileContains(
target.resolve("lib/petstore/validations.rb"),
"out << \"\\\"#{name}\\\" does not match #{rules[:pattern]}\" if"
+ " rules[:pattern] && (!value.is_a?(String) || value !~"
+ " rules[:pattern])");
TestUtils.assertFileContains(
target.resolve("lib/petstore/models/pet.rb"), "pattern: /^[a-z]+$/");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
openapi: 3.0.3
info:
title: Pattern validation
version: 1.0.0
paths:
/pets:
get:
operationId: listPets
responses:
'200':
description: OK
content:
application/json:
schema:
type: array
items:
$ref: '#/components/schemas/Pet'
components:
schemas:
Pet:
type: object
properties:
birthday:
type: string
format: date
code:
type: string
pattern: '^[a-z]+$'
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def validate_attribute(name, attr, value)
out << "\"#{name}\" must be >= #{rules[:minimum]}" if rules[:minimum] && value.is_a?(Numeric) && value < rules[:minimum]
out << "\"#{name}\" too many items (max #{rules[:max_items]})" if rules[:max_items] && value.respond_to?(:length) && value.length > rules[:max_items]
out << "\"#{name}\" too few items (min #{rules[:min_items]})" if rules[:min_items] && value.respond_to?(:length) && value.length < rules[:min_items]
out << "\"#{name}\" does not match #{rules[:pattern]}" if rules[:pattern] && value !~ rules[:pattern]
out << "\"#{name}\" does not match #{rules[:pattern]}" if rules[:pattern] && (!value.is_a?(String) || value !~ rules[:pattern])
out
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def validate_attribute(name, attr, value)
out << "\"#{name}\" must be >= #{rules[:minimum]}" if rules[:minimum] && value.is_a?(Numeric) && value < rules[:minimum]
out << "\"#{name}\" too many items (max #{rules[:max_items]})" if rules[:max_items] && value.respond_to?(:length) && value.length > rules[:max_items]
out << "\"#{name}\" too few items (min #{rules[:min_items]})" if rules[:min_items] && value.respond_to?(:length) && value.length < rules[:min_items]
out << "\"#{name}\" does not match #{rules[:pattern]}" if rules[:pattern] && value !~ rules[:pattern]
out << "\"#{name}\" does not match #{rules[:pattern]}" if rules[:pattern] && (!value.is_a?(String) || value !~ rules[:pattern])
out
end
end
Expand Down
Loading