Skip to content

BE: Respect system proxy settings in WebClient #4042

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 3 commits into from
Jul 24, 2023
Merged

BE: Respect system proxy settings in WebClient #4042

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87b1885
Respect system proxy settings in WebClient
Khrol Jul 18, 2023
e459c9e
Create HttpClient once and DRY code a bit
Khrol Jul 18, 2023
30aab39
Merge branch 'master' into bugfix/always_respect_proxy_settings
Haarolean Jul 24, 2023
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
12 changes: 5 additions & 7 deletions kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
public class WebClientConfigurator {

private final WebClient.Builder builder = WebClient.builder();
private HttpClient httpClient = HttpClient
.create()
.proxyWithSystemProperties();

public WebClientConfigurator() {
configureObjectMapper(defaultOM());
Expand Down Expand Up @@ -90,12 +93,7 @@ private WebClientConfigurator configureSsl(
// Create webclient
SslContext context = contextBuilder.build();

var httpClient = HttpClient
.create()
.secure(t -> t.sslContext(context))
.proxyWithSystemProperties();

builder.clientConnector(new ReactorClientHttpConnector(httpClient));
httpClient = httpClient.secure(t -> t.sslContext(context));
return this;
}

Expand Down Expand Up @@ -131,6 +129,6 @@ public WebClientConfigurator configureCodecs(Consumer<ClientCodecConfigurer> con
}

public WebClient build() {
return builder.build();
return builder.clientConnector(new ReactorClientHttpConnector(httpClient)).build();
}
}