Skip to content

Commit 51e8247

Browse files
authored
[fix][sec] Mitigate CVE-2024-53990 by disabling AsyncHttpClient CookieStore (apache#23725)
1 parent 4606385 commit 51e8247

File tree

6 files changed

+6
-0
lines changed

6 files changed

+6
-0
lines changed

pulsar-broker-auth-oidc/src/main/java/org/apache/pulsar/broker/authentication/oidc/AuthenticationProviderOpenID.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ public void initialize(Context context) throws IOException {
183183
.build();
184184
}
185185
AsyncHttpClientConfig clientConfig = new DefaultAsyncHttpClientConfig.Builder()
186+
.setCookieStore(null)
186187
.setConnectTimeout(connectionTimeout)
187188
.setReadTimeout(readTimeout)
188189
.setSslContext(sslContext)

pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,6 +1142,7 @@ public void onThrowable(Throwable t) {
11421142

11431143
private AsyncHttpClient getHttpClient(String version) {
11441144
DefaultAsyncHttpClientConfig.Builder confBuilder = new DefaultAsyncHttpClientConfig.Builder();
1145+
confBuilder.setCookieStore(null);
11451146
confBuilder.setUseProxyProperties(true);
11461147
confBuilder.setFollowRedirect(true);
11471148
confBuilder.setUserAgent(version);

pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ private void configureAsyncHttpClientConfig(ClientConfigurationData conf, int co
159159
if (conf.getConnectionMaxIdleSeconds() > 0) {
160160
confBuilder.setPooledConnectionIdleTimeout(conf.getConnectionMaxIdleSeconds() * 1000);
161161
}
162+
confBuilder.setCookieStore(null);
162163
confBuilder.setUseProxyProperties(true);
163164
confBuilder.setFollowRedirect(false);
164165
confBuilder.setRequestTimeout(conf.getRequestTimeoutMs());

pulsar-client/src/main/java/org/apache/pulsar/client/impl/ControlledClusterFailover.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ private ControlledClusterFailover(ControlledClusterFailoverBuilderImpl builder)
8585

8686
private AsyncHttpClient buildHttpClient() {
8787
DefaultAsyncHttpClientConfig.Builder confBuilder = new DefaultAsyncHttpClientConfig.Builder();
88+
confBuilder.setCookieStore(null);
8889
confBuilder.setUseProxyProperties(true);
8990
confBuilder.setFollowRedirect(true);
9091
confBuilder.setMaxRedirects(DEFAULT_MAX_REDIRECTS);

pulsar-client/src/main/java/org/apache/pulsar/client/impl/HttpClient.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ protected HttpClient(ClientConfigurationData conf, EventLoopGroup eventLoopGroup
7474
this.serviceNameResolver.updateServiceUrl(conf.getServiceUrl());
7575

7676
DefaultAsyncHttpClientConfig.Builder confBuilder = new DefaultAsyncHttpClientConfig.Builder();
77+
confBuilder.setCookieStore(null);
7778
confBuilder.setUseProxyProperties(true);
7879
confBuilder.setFollowRedirect(true);
7980
confBuilder.setMaxRedirects(conf.getMaxLookupRedirects());

pulsar-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenClient.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public TokenClient(URL tokenUrl) {
5353
TokenClient(URL tokenUrl, AsyncHttpClient httpClient) {
5454
if (httpClient == null) {
5555
DefaultAsyncHttpClientConfig.Builder confBuilder = new DefaultAsyncHttpClientConfig.Builder();
56+
confBuilder.setCookieStore(null);
5657
confBuilder.setUseProxyProperties(true);
5758
confBuilder.setFollowRedirect(true);
5859
confBuilder.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT_IN_SECONDS * 1000);

0 commit comments

Comments
 (0)