Skip to content

#1305 fixing parsing of empty securityRequirement #1306

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 3 commits into from
Jan 31, 2020
Merged

#1305 fixing parsing of empty securityRequirement #1306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01ec1b9
#1305 fixing parsing of empty securityRequirement
wsalembi Jan 22, 2020
d8385f4
#1305 fixing parsing of empty securityRequirement (use empty map inst…
wsalembi Jan 22, 2020
00ea24a
Merge branch 'v1' into issue-1305
gracekarina Jan 31, 2020
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
10 changes: 7 additions & 3 deletions modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,9 +420,13 @@ public Operation operation(ObjectNode obj, String location, ParseResult result)
List<SecurityRequirement> security = securityRequirements(array, location, result);
if (security != null) {
List<Map<String, List<String>>> ss = new ArrayList<>();
for (SecurityRequirement s : security) {
if (s.getRequirements() != null && s.getRequirements().size() > 0) {
ss.add(s.getRequirements());
for(SecurityRequirement s : security) {
if(s.getRequirements() != null) {
if (s.getRequirements().size() > 0) {
ss.add(s.getRequirements());
} else {
ss.add(Collections.<String, List<String>>emptyMap());
}
}
}
output.setSecurity(ss);
Expand Down
75 changes: 75 additions & 0 deletions modules/swagger-parser/src/test/java/io/swagger/parser/util/SwaggerDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,36 @@ public void testSecurity() {
Assert.assertTrue(requirements.contains("write:pets"));
}

@Test
public void testSecurityWithEmpty() {
String json = "{\n" +
" \"swagger\": \"2.0\",\n" +
" \"security\": [\n" +
" {},\n" +
" {\n" +
" \"petstore_auth\": [\n" +
" \"write:pets\",\n" +
" \"read:pets\"\n" +
" ]\n" +
" }\n" +
" ]\n" +
"}";
SwaggerParser parser = new SwaggerParser();

SwaggerDeserializationResult result = parser.readWithInfo(json);

Swagger swagger = result.getSwagger();

assertNotNull(swagger.getSecurity());
List<SecurityRequirement> security = swagger.getSecurity();
Assert.assertTrue(security.size() == 2);
Assert.assertTrue(security.get(0).getRequirements().size() == 0);
Assert.assertTrue(security.get(1).getRequirements().size() == 1);

List<String> requirement = security.get(1).getRequirements().get("petstore_auth");
Assert.assertTrue(requirement.size() == 2);
}

@Test
public void testSecurityDefinition() {
String json = "{\n" +
Expand Down Expand Up @@ -566,6 +596,51 @@ public void testPaths() {
assertTrue(scopes.contains("read:pets"));
assertTrue(scopes.contains("write:pets"));
}

@Test
public void testOperationSecurityWithEmpty() {
String json = "{\n" +
" \"swagger\": \"2.0\",\n" +
" \"paths\": {\n" +
" \"/pet\": {\n" +
" \"foo\": \"bar\",\n" +
" \"get\": {\n" +
" \"security\": [\n" +
" {},\n" +
" {\n" +
" \"petstore_auth\": [\n" +
" \"write:pets\",\n" +
" \"read:pets\"\n" +
" ]\n" +
" }\n" +
" ]\n" +
" }\n" +
" }\n" +
" }\n" +
"}";
SwaggerParser parser = new SwaggerParser();

SwaggerDeserializationResult result = parser.readWithInfo(json);
List<String> messageList = result.getMessages();
Set<String> messages = new HashSet<String>(messageList);
assertTrue(messages.contains("attribute paths.'/pet'.foo is unexpected"));
Swagger swagger = result.getSwagger();

Path path = swagger.getPath("/pet");
assertNotNull(path);
Operation operation = path.getGet();
assertNotNull(operation);
List<Map<String, List<String>>> security = operation.getSecurity();

assertTrue(security.size() == 2);

Map<String, List<String>> requirement1 = security.get(0);
assertTrue(requirement1.isEmpty());

Map<String, List<String>> requirement2 = security.get(1);
assertTrue(requirement2.containsKey("petstore_auth"));
assertFalse(requirement2.get("petstore_auth").isEmpty());
}

@Test
public void testPathsWithRefResponse() {
Expand Down