Skip to content

sanitize specification url, so it works for all types of OS. Fix for Wind… #10886

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 4 commits into from
Mar 23, 2021
Merged

sanitize specification url, so it works for all types of OS. Fix for Wind… #10886

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
335299c
sanitize specification, so it works for all types of OS. Fix for Wind…
Feb 1, 2021
ffa2996
Merge branch '3.0.0' into 3.0.0
SlavchoArsovski Feb 2, 2021
b66ea6d
Merge branch '3.0.0' into 3.0.0
SlavchoArsovski Feb 9, 2021
c7b3222
Merge branch '3.0.0' into 3.0.0
SlavchoArsovski Mar 4, 2021
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
21 changes: 13 additions & 8 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/config/CodegenConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ public CodegenConfigurator setResolveFully(boolean resolveFully) {
}

public String loadSpecContent(String location, List<AuthorizationValue> auths) throws Exception{
location = location.replaceAll("\\\\","/");
location = sanitizeSpecificationUrl(location);
String data = "";
if (location.toLowerCase().startsWith("http")) {
data = RemoteUrl.urlToString(location, auths);
Expand All @@ -453,6 +453,10 @@ public String loadSpecContent(String location, List<AuthorizationValue> auths) t
return data;
}

private String sanitizeSpecificationUrl(String specificationUrl) {
return specificationUrl.replaceAll("\\\\","/");
}

public ClientOptInput toClientOptInput() {

Validate.notEmpty(lang, "language must be specified");
Expand Down Expand Up @@ -494,36 +498,37 @@ public ClientOptInput toClientOptInput() {
LOGGER.debug("getClientOptInput - parsed inputSpec");
} else {
String specContent = null;
String sanitizedSpecificationUrl = sanitizeSpecificationUrl(inputSpecURL);
try {
specContent = loadSpecContent(inputSpecURL, authorizationValues);
specContent = loadSpecContent(sanitizedSpecificationUrl, authorizationValues);
} catch (Exception e) {
String msg = "Unable to read URL: " + inputSpecURL;
String msg = "Unable to read URL: " + sanitizedSpecificationUrl;
LOGGER.error(msg, e);
throw new IllegalArgumentException(msg);
}

if (StringUtils.isBlank(specContent)) {
String msg = "Empty content found in URL: " + inputSpecURL;
String msg = "Empty content found in URL: " + sanitizedSpecificationUrl;
LOGGER.error(msg);
throw new IllegalArgumentException(msg);
}
config.setInputSpec(specContent);
config.setInputURL(inputSpecURL);
config.setInputURL(sanitizedSpecificationUrl);
ParseOptions options = new ParseOptions();
options.setResolve(true);
options.setResolveFully(resolveFully);
options.setFlatten(true);
options.setFlattenComposedSchemas(flattenInlineSchema);
SwaggerParseResult result = new OpenAPIParser().readLocation(inputSpecURL, authorizationValues, options);
SwaggerParseResult result = new OpenAPIParser().readLocation(sanitizedSpecificationUrl, authorizationValues, options);
OpenAPI openAPI = result.getOpenAPI();
LOGGER.debug("getClientOptInput - parsed inputSpecURL " + inputSpecURL);
LOGGER.debug("getClientOptInput - parsed inputSpecURL " + sanitizedSpecificationUrl);
input.opts(new ClientOpts())
.openAPI(openAPI);

if (config.needsUnflattenedSpec()) {
ParseOptions optionsUnflattened = new ParseOptions();
optionsUnflattened.setResolve(true);
SwaggerParseResult resultUnflattened = new OpenAPIParser().readLocation(inputSpecURL, authorizationValues, optionsUnflattened);
SwaggerParseResult resultUnflattened = new OpenAPIParser().readLocation(sanitizedSpecificationUrl, authorizationValues, optionsUnflattened);
OpenAPI openAPIUnflattened = resultUnflattened.getOpenAPI();
config.setUnflattenedOpenAPI(openAPIUnflattened);
}
Expand Down