Commit f0ee6cc

authored

fix: honor rest api ssl cert verification setting (#351)

1 parent d9debc7 commit f0ee6ccCopy full SHA for f0ee6cc

File tree

2 files changed

+13

-7

lines changed

server/api-service
- lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi
  - RestApiExecutor.java
- lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient
  - WebClientBuildHelper.java

2 files changed

+13

-7

lines changed

`‎server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiExecutor.java‎`

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@`
`47`	`47`	`import java.net.URISyntaxException;`
`48`	`48`	`import java.nio.charset.StandardCharsets;`
`49`	`49`	`import java.text.ParseException;`
`50`		`-import java.time.Duration;`
`51`	`50`	`import java.util.ArrayList;`
`52`	`51`	`import java.util.Base64;`
`53`	`52`	`import java.util.HashMap;`
`@@ -94,7 +93,6 @@`
`94`	`93`	`import org.springframework.http.MediaType;`
`95`	`94`	`import org.springframework.http.ResponseEntity;`
`96`	`95`	`import org.springframework.http.client.reactive.ClientHttpRequest;`
`97`		`-import org.springframework.http.client.reactive.ReactorClientHttpConnector;`
`98`	`96`	`import org.springframework.util.MultiValueMap;`
`99`	`97`	`import org.springframework.web.reactive.function.BodyInserter;`
`100`	`98`	`import org.springframework.web.reactive.function.BodyInserters;`
`@@ -109,7 +107,6 @@`
`109`	`107`	`import lombok.Builder;`
`110`	`108`	`import lombok.Getter;`
`111`	`109`	`import reactor.core.publisher.Mono;`
`112`		`-import reactor.netty.http.client.HttpClient;`
`113`	`110`
`114`	`111`	`@Extension`
`115`	`112`	`public class RestApiExecutor implements QueryExecutor<RestApiDatasourceConfig, Object, RestApiQueryExecutionContext> {`
`@@ -244,6 +241,7 @@ public Mono<QueryExecutionResult> executeQuery(Object webClientFilter, RestApiQu`
`244`	`241`	`WebClient.Builder webClientBuilder = WebClientBuildHelper.builder()`
`245`	`242`	`.disallowedHosts(commonConfig.getDisallowedHosts())`
`246`	`243`	`.sslConfig(context.getSslConfig())`
	`244`	`+ .timeoutMs(context.getTimeoutMs())`
`247`	`245`	`.toWebClientBuilder();`
`248`	`246`
`249`	`247`	`Map<String, String> allHeaders = context.getHeaders();`
`@@ -260,13 +258,9 @@ public Mono<QueryExecutionResult> executeQuery(Object webClientFilter, RestApiQu`
`260`	`258`	`webClientBuilder.filter(new BufferingFilter());`
`261`	`259`	`}`
`262`	`260`
`263`		`- HttpClient httpClient = HttpClient.create()`
`264`		`- .responseTimeout(Duration.ofMillis(context.getTimeoutMs()));`
`265`		`-`
`266`	`261`	`webClientBuilder.defaultCookies(injectCookies(context));`
`267`	`262`	`WebClient client = webClientBuilder`
`268`	`263`	`.exchangeStrategies(exchangeStrategies)`
`269`		`- .clientConnector(new ReactorClientHttpConnector(httpClient))`
`270`	`264`	`.build();`
`271`	`265`
`272`	`266`	`BodyInserter<?, ? super ClientHttpRequest> bodyInserter = buildBodyInserter(`

`‎server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/WebClientBuildHelper.java‎`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import java.security.cert.CertificateException;`
`4`	`4`	`import java.security.cert.X509Certificate;`
	`5`	`+import java.time.Duration;`
`5`	`6`	`import java.util.Set;`
`6`	`7`
`7`	`8`	`import javax.net.ssl.SSLException;`
`@@ -33,6 +34,7 @@ public class WebClientBuildHelper {`
`33`	`34`	`private SslConfig sslConfig;`
`34`	`35`	`private Set<String> disallowedHosts;`
`35`	`36`	`private boolean systemProxy;`
	`37`	`+ private Long timeoutMs;`
`36`	`38`
`37`	`39`	`static {`
`38`	`40`	`proxyHost = System.getProperty("http.proxyHost");`
`@@ -61,12 +63,22 @@ public WebClientBuildHelper systemProxy() {`
`61`	`63`	`return this;`
`62`	`64`	`}`
`63`	`65`
	`66`	`+ public WebClientBuildHelper timeoutMs(long milliseconds) {`
	`67`	`+ this.timeoutMs = milliseconds;`
	`68`	`+ return this;`
	`69`	`+ }`
	`70`	`+`
`64`	`71`	`public WebClient build() {`
`65`	`72`	`return toWebClientBuilder().build();`
`66`	`73`	`}`
`67`	`74`
`68`	`75`	`public Builder toWebClientBuilder() {`
`69`	`76`	`HttpClient httpClient = HttpClient.create();`
	`77`	`+ if (timeoutMs != null)`
	`78`	`+ {`
	`79`	`+ httpClient.responseTimeout(Duration.ofMillis(timeoutMs));`
	`80`	`+ }`
	`81`	`+`
`70`	`82`	`if (sslConfig != null) {`
`71`	`83`	`if (sslConfig instanceof DisableVerifySslConfig) {`
`72`	`84`	`httpClient = httpClient.secure(sslProviderWithoutCertVerify());`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit f0ee6cc

File tree

2 files changed

2 files changed

`‎server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiExecutor.java‎`

`‎server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/WebClientBuildHelper.java‎`

0 commit comments