Skip to content

Commit 556ec29

Browse files
Haaroleaniliax
andcommitted
BE: Make webclients use system proxy (#3881)
Co-authored-by: Ilya Kuramshin <[email protected]> (cherry picked from commit f19abb2)
1 parent 2b334d5 commit 556ec29

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/GithubReleaseInfo.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.google.common.annotations.VisibleForTesting;
44
import java.time.Duration;
55
import lombok.extern.slf4j.Slf4j;
6-
import org.springframework.web.reactive.function.client.WebClient;
76
import reactor.core.publisher.Mono;
87

98
@Slf4j
@@ -31,7 +30,7 @@ public GithubReleaseInfo() {
3130

3231
@VisibleForTesting
3332
GithubReleaseInfo(String url) {
34-
this.refreshMono = WebClient.create()
33+
this.refreshMono = new WebClientConfigurator().build()
3534
.get()
3635
.uri(url)
3736
.exchangeToMono(resp -> resp.bodyToMono(GithubReleaseDto.class))

kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
66
import com.provectus.kafka.ui.config.ClustersProperties;
77
import com.provectus.kafka.ui.exception.ValidationException;
8-
import io.netty.buffer.ByteBufAllocator;
9-
import io.netty.handler.ssl.JdkSslContext;
108
import io.netty.handler.ssl.SslContext;
119
import io.netty.handler.ssl.SslContextBuilder;
12-
import io.netty.handler.ssl.SslProvider;
1310
import java.io.FileInputStream;
1411
import java.security.KeyStore;
1512
import java.util.function.Consumer;
@@ -93,7 +90,12 @@ private WebClientConfigurator configureSsl(
9390
// Create webclient
9491
SslContext context = contextBuilder.build();
9592

96-
builder.clientConnector(new ReactorClientHttpConnector(HttpClient.create().secure(t -> t.sslContext(context))));
93+
var httpClient = HttpClient
94+
.create()
95+
.secure(t -> t.sslContext(context))
96+
.proxyWithSystemProperties();
97+
98+
builder.clientConnector(new ReactorClientHttpConnector(httpClient));
9799
return this;
98100
}
99101

0 commit comments

Comments
 (0)