Skip to content

🐛 Fix in:cookie in apiKey security schemes #624

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 16, 2018
Merged

🐛 Fix in:cookie in apiKey security schemes #624

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
17 changes: 8 additions & 9 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 @@ -56,6 +56,7 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand Down Expand Up @@ -1577,14 +1578,12 @@ public SecurityScheme getSecurityScheme(ObjectNode node, String location, ParseR
securityScheme.setName(value);
}

value = getString("in", node, inRequired, location, result);
if (StringUtils.isNotBlank(value)) {
if (QUERY_PARAMETER.equals(value)) {
securityScheme.setIn(SecurityScheme.In.QUERY);
} else if (HEADER_PARAMETER.equals(value)) {
securityScheme.setIn(SecurityScheme.In.HEADER);
}
}
final String securitySchemeIn = getString("in", node, inRequired, location, result);
final Optional<SecurityScheme.In> matchingIn = Arrays.stream(SecurityScheme.In.values())
.filter(in -> in.toString().equals(securitySchemeIn))
.findFirst();

securityScheme.setIn(matchingIn.orElse(null));

value = getString("scheme", node, schemeRequired, location, result);
if (StringUtils.isNotBlank(value)) {
Expand Down Expand Up @@ -2578,4 +2577,4 @@ public Location(String location, String key) {
}
}

}
}
9 changes: 7 additions & 2 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 @@ -810,7 +810,7 @@ public void readSecuritySchemesObject(JsonNode rootNode) throws Exception {

final Map<String, SecurityScheme> securitySchemes = openAPI.getComponents().getSecuritySchemes();
Assert.assertNotNull(securitySchemes);
Assert.assertEquals(securitySchemes.size(),9);
Assert.assertEquals(securitySchemes.size(),10);

SecurityScheme securityScheme = securitySchemes.get("reference");
assertTrue(securityScheme.get$ref().equals("#/components/securitySchemes/api_key"));
Expand All @@ -832,7 +832,12 @@ public void readSecuritySchemesObject(JsonNode rootNode) throws Exception {

securityScheme = securitySchemes.get("api_key");
assertTrue(securityScheme.getType()== SecurityScheme.Type.APIKEY);

assertTrue(securityScheme.getIn()== SecurityScheme.In.HEADER);

securityScheme = securitySchemes.get("api_key_cookie");
assertTrue(securityScheme.getType()== SecurityScheme.Type.APIKEY);
assertTrue(securityScheme.getIn()== SecurityScheme.In.COOKIE);

securityScheme = securitySchemes.get("http");
assertTrue(securityScheme.getType()== SecurityScheme.Type.HTTP);

Expand Down
4 changes: 4 additions & 0 deletions modules/swagger-parser-v3/src/test/resources/oas3.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,10 @@ components:
type: apiKey
name: api_key
in: header
api_key_cookie:
type: apiKey
name: api_key
in: cookie
http:
type: http
scheme: Basic
Expand Down