Skip to content

Commit 97a77e9

Browse files
author
Milosz Tarka
committed
SWG-7517 updating the resolving options of swagger-parser-v3
1 parent e774827 commit 97a77e9

File tree

5 files changed

+23
-4
lines changed

5 files changed

+23
-4
lines changed

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/config/CodegenConfigurator.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,14 @@
3434
import java.nio.file.Path;
3535
import java.nio.file.Paths;
3636
import java.util.ArrayList;
37+
import java.util.Arrays;
38+
import java.util.Collections;
3739
import java.util.HashMap;
3840
import java.util.HashSet;
3941
import java.util.List;
4042
import java.util.Map;
43+
import java.util.Objects;
44+
import java.util.Optional;
4145
import java.util.Set;
4246
import java.util.function.Predicate;
4347

@@ -674,6 +678,21 @@ private ParseOptions buildParseOptions() {
674678
options.setFlatten(true);
675679
options.setFlattenComposedSchemas(flattenInlineSchema);
676680
options.setSkipMatches(this.skipInlineModelMatches);
681+
682+
if (Objects.equals(System.getenv("SAFELY_RESOLVE_URL"), "true")) {
683+
List<String> allowList = Optional.ofNullable(System.getenv("REMOTE_REF_ALLOW_LIST"))
684+
.map(str -> Arrays.asList(str.split(",")))
685+
.orElseGet(Collections::emptyList);
686+
687+
List<String> blockList = Optional.ofNullable(System.getenv("REMOTE_REF_BLOCK_LIST"))
688+
.map(str -> Arrays.asList(str.split(",")))
689+
.orElseGet(Collections::emptyList);
690+
691+
options.setSafelyResolveURL(true);
692+
options.setRemoteRefAllowList(allowList);
693+
options.setRemoteRefBlockList(blockList);
694+
}
695+
677696
return options;
678697
}
679698

pom.docker.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,7 @@
11161116
<swagger-codegen-generators-version>1.0.40-SNAPSHOT</swagger-codegen-generators-version>
11171117
<swagger-core-version>2.2.9</swagger-core-version>
11181118
<swagger-core-version-v1>1.6.10</swagger-core-version-v1>
1119-
<swagger-parser-version>2.1.13</swagger-parser-version>
1119+
<swagger-parser-version>2.1.14-SNAPSHOT</swagger-parser-version>
11201120
<swagger-parser-version-v1>1.0.65</swagger-parser-version-v1>
11211121
<jackson-version>2.14.2</jackson-version>
11221122
<jackson-databind-version>2.14.2</jackson-databind-version>

pom.java11.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,7 @@
12171217
<swagger-codegen-generators-version>1.0.40-SNAPSHOT</swagger-codegen-generators-version>
12181218
<swagger-core-version>2.2.9</swagger-core-version>
12191219
<swagger-core-version-v1>1.6.10</swagger-core-version-v1>
1220-
<swagger-parser-version>2.1.13</swagger-parser-version>
1220+
<swagger-parser-version>2.1.14-SNAPSHOT</swagger-parser-version>
12211221
<swagger-parser-version-v1>1.0.65</swagger-parser-version-v1>
12221222
<jackson-version>2.14.2</jackson-version>
12231223
<jackson-databind-version>2.14.2</jackson-databind-version>

pom.java8.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1220,7 +1220,7 @@
12201220
<swagger-codegen-generators-version>1.0.40-SNAPSHOT</swagger-codegen-generators-version>
12211221
<swagger-core-version>2.2.9</swagger-core-version>
12221222
<swagger-core-version-v1>1.6.10</swagger-core-version-v1>
1223-
<swagger-parser-version>2.1.13</swagger-parser-version>
1223+
<swagger-parser-version>2.1.14-SNAPSHOT</swagger-parser-version>
12241224
<swagger-parser-version-v1>1.0.65</swagger-parser-version-v1>
12251225
<jackson-version>2.14.2</jackson-version>
12261226
<jackson-databind-version>2.14.2</jackson-databind-version>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,7 @@
12171217
<swagger-codegen-generators-version>1.0.40-SNAPSHOT</swagger-codegen-generators-version>
12181218
<swagger-core-version>2.2.9</swagger-core-version>
12191219
<swagger-core-version-v1>1.6.10</swagger-core-version-v1>
1220-
<swagger-parser-version>2.1.13</swagger-parser-version>
1220+
<swagger-parser-version>2.1.14-SNAPSHOT</swagger-parser-version>
12211221
<swagger-parser-version-v1>1.0.65</swagger-parser-version-v1>
12221222
<jackson-version>2.14.2</jackson-version>
12231223
<jackson-databind-version>2.14.2</jackson-databind-version>

0 commit comments

Comments
 (0)