Skip to content

fixing parsing of empty securityRequirement - refs #492 #615

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 1 commit into from
Jan 6, 2018
Merged

fixing parsing of empty securityRequirement - refs #492 #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 17 additions & 15 deletions modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2384,28 +2384,30 @@ public List<SecurityRequirement> getSecurityRequirementsList(ArrayNode nodes, St
if (node.getNodeType().equals(JsonNodeType.OBJECT)) {
SecurityRequirement securityRequirement = new SecurityRequirement();
Set<String> keys = getKeys((ObjectNode) node);
for (String key : keys) {
if (key != null) {
JsonNode value = node.get(key);
if (key != null && JsonNodeType.ARRAY.equals(value.getNodeType())) {
ArrayNode arrayNode = (ArrayNode)value;
List<String> scopes = Stream
.generate(arrayNode.elements()::next)
.map((n) -> n.asText())
.limit(arrayNode.size())
.collect(Collectors.toList());
securityRequirement.addList(key,scopes);
if (securityRequirement.size() > 0){
securityRequirements.add(securityRequirement);
if (keys.size() == 0){
securityRequirements.add(securityRequirement);
}else {
for (String key : keys) {
if (key != null) {
JsonNode value = node.get(key);
if (key != null && JsonNodeType.ARRAY.equals(value.getNodeType())) {
ArrayNode arrayNode = (ArrayNode) value;
List<String> scopes = Stream
.generate(arrayNode.elements()::next)
.map((n) -> n.asText())
.limit(arrayNode.size())
.collect(Collectors.toList());
securityRequirement.addList(key, scopes);
if (securityRequirement.size() > 0) {
securityRequirements.add(securityRequirement);
}
}
}
}
}
}
}



return securityRequirements;

}
Expand Down
19 changes: 19 additions & 0 deletions ...es/swagger-parser-v3/src/test/java/io/swagger/v3/parser/util/OpenAPIDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,25 @@ public void readMissingServerObject() throws Exception {
assertEquals(openAPI.getServers().get(0).getUrl(),"/");
}

@Test
public void readEmptySecurityRequirement() throws Exception {
final ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
final JsonNode rootNode = mapper.readTree(Files.readAllBytes(java.nio.file.Paths.get(getClass().getResource("/oas.yaml").toURI())));

final OpenAPIDeserializer deserializer = new OpenAPIDeserializer();
final SwaggerParseResult result = deserializer.deserialize(rootNode);

Assert.assertNotNull(result);

final OpenAPI openAPI = result.getOpenAPI();
Assert.assertNotNull(openAPI);

SecurityRequirement securityRequirement = openAPI.getSecurity().get(0);

assertTrue(securityRequirement.isEmpty());
assertEquals(openAPI.getSecurity().size(), 4);
}

@Test
public void readEmptyServerObject() throws Exception {
final ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
Expand Down
6 changes: 6 additions & 0 deletions modules/swagger-parser-v3/src/test/resources/oas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
openapi: 3.0.1
"security": [
{},
{"oauth": […]},
{"token-1": []},
{"token-2": []}
]
paths:
/pet:
summary: "summary"
Expand Down