Skip to content

ref #998 - limit YAML input #999

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 30, 2019
Merged

ref #998 - limit YAML input #999

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
40 changes: 20 additions & 20 deletions modules/swagger-parser/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,38 @@
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>${swagger-core-version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testng-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io-version}</version>
</dependency>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
<version>${jmockit-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>${swagger-core-version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>swagger-core</artifactId>
Expand All @@ -58,21 +73,6 @@
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
Expand Down
6 changes: 5 additions & 1 deletion modules/swagger-parser/src/main/java/io/swagger/parser/ResolverCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ else if(rootPath != null) {
}

//a definition path is defined, meaning we need to "dig down" through the JSON tree and get the desired entity
JsonNode tree = DeserializationUtils.deserializeIntoTree(contents, file);
JsonNode tree = deserialize(contents, file);

String[] jsonPathElements = definitionPath.split("/");
for (String jsonPathElement : jsonPathElements) {
Expand All @@ -155,6 +155,10 @@ else if(rootPath != null) {
return result;
}

protected JsonNode deserialize(String contents, String file) {
return DeserializationUtils.deserializeIntoTree(contents, file);
}

protected <T> void updateLocalRefs(String file, T result) {
if(result instanceof Response) {
Response response = (Response) result;
Expand Down
8 changes: 6 additions & 2 deletions modules/swagger-parser/src/main/java/io/swagger/parser/Swagger20Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public SwaggerDeserializationResult readWithInfo(String location, List<Authoriza
ObjectMapper mapper = Json.mapper();
rootNode = mapper.readTree(data);
} else {
rootNode = DeserializationUtils.readYamlTree(data);
rootNode = deserializeYaml(data);
}
return readWithInfo(rootNode);
}
Expand All @@ -79,6 +79,10 @@ public SwaggerDeserializationResult readWithInfo(String location, List<Authoriza
}
}

protected JsonNode deserializeYaml(String data) throws IOException{
return DeserializationUtils.readYamlTree(data);
}

@Override
public Swagger read(String location, List<AuthorizationValue> auths) throws IOException {
LOGGER.info("reading from " + location);
Expand Down Expand Up @@ -118,7 +122,7 @@ private Swagger convertToSwagger(String data) throws IOException {
ObjectMapper mapper = Json.mapper();
rootNode = mapper.readTree(data);
} else {
rootNode = DeserializationUtils.readYamlTree(data);
rootNode = deserializeYaml(data);
}

if (System.getProperty("debugParser") != null) {
Expand Down
6 changes: 5 additions & 1 deletion modules/swagger-parser/src/main/java/io/swagger/parser/SwaggerParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ public SwaggerDeserializationResult readWithInfo(String swaggerAsString) {
return readWithInfo(swaggerAsString, Boolean.TRUE);
}

protected JsonNode deserializeYaml(String data) throws IOException{
return DeserializationUtils.readYamlTree(data);
}

public SwaggerDeserializationResult readWithInfo(String swaggerAsString, boolean resolve) {
if (swaggerAsString == null || swaggerAsString.trim().isEmpty()) {
return new SwaggerDeserializationResult().message("empty or null swagger supplied");
Expand All @@ -104,7 +108,7 @@ public SwaggerDeserializationResult readWithInfo(String swaggerAsString, boolean
ObjectMapper mapper = Json.mapper();
node = mapper.readTree(swaggerAsString);
} else {
node = DeserializationUtils.readYamlTree(swaggerAsString);
node = deserializeYaml(swaggerAsString);
}

SwaggerDeserializationResult result = new Swagger20Parser().readWithInfo(node);
Expand Down
Loading