Skip to content

fix: honor rest api ssl cert verification setting #351

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
Aug 27, 2023
Merged

fix: honor rest api ssl cert verification setting #351

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
8 changes: 1 addition & 7 deletions ...oder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Base64;
import java.util.HashMap;
Expand Down Expand Up @@ -94,7 +93,6 @@
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.http.client.reactive.ClientHttpRequest;
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
import org.springframework.util.MultiValueMap;
import org.springframework.web.reactive.function.BodyInserter;
import org.springframework.web.reactive.function.BodyInserters;
Expand All @@ -109,7 +107,6 @@
import lombok.Builder;
import lombok.Getter;
import reactor.core.publisher.Mono;
import reactor.netty.http.client.HttpClient;

@Extension
public class RestApiExecutor implements QueryExecutor<RestApiDatasourceConfig, Object, RestApiQueryExecutionContext> {
Expand Down Expand Up @@ -244,6 +241,7 @@ public Mono<QueryExecutionResult> executeQuery(Object webClientFilter, RestApiQu
WebClient.Builder webClientBuilder = WebClientBuildHelper.builder()
.disallowedHosts(commonConfig.getDisallowedHosts())
.sslConfig(context.getSslConfig())
.timeoutMs(context.getTimeoutMs())
.toWebClientBuilder();

Map<String, String> allHeaders = context.getHeaders();
Expand All @@ -260,13 +258,9 @@ public Mono<QueryExecutionResult> executeQuery(Object webClientFilter, RestApiQu
webClientBuilder.filter(new BufferingFilter());
}

HttpClient httpClient = HttpClient.create()
.responseTimeout(Duration.ofMillis(context.getTimeoutMs()));

webClientBuilder.defaultCookies(injectCookies(context));
WebClient client = webClientBuilder
.exchangeStrategies(exchangeStrategies)
.clientConnector(new ReactorClientHttpConnector(httpClient))
.build();

BodyInserter<?, ? super ClientHttpRequest> bodyInserter = buildBodyInserter(
Expand Down
12 changes: 12 additions & 0 deletions ...i-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/WebClientBuildHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.time.Duration;
import java.util.Set;

import javax.net.ssl.SSLException;
Expand Down Expand Up @@ -33,6 +34,7 @@ public class WebClientBuildHelper {
private SslConfig sslConfig;
private Set<String> disallowedHosts;
private boolean systemProxy;
private Long timeoutMs;

static {
proxyHost = System.getProperty("http.proxyHost");
Expand Down Expand Up @@ -61,12 +63,22 @@ public WebClientBuildHelper systemProxy() {
return this;
}

public WebClientBuildHelper timeoutMs(long milliseconds) {
this.timeoutMs = milliseconds;
return this;
}

public WebClient build() {
return toWebClientBuilder().build();
}

public Builder toWebClientBuilder() {
HttpClient httpClient = HttpClient.create();
if (timeoutMs != null)
{
httpClient.responseTimeout(Duration.ofMillis(timeoutMs));
}

if (sslConfig != null) {
if (sslConfig instanceof DisableVerifySslConfig) {
httpClient = httpClient.secure(sslProviderWithoutCertVerify());
Expand Down