Skip to content

MONIT-30797: CVE-2021-20293 (6.1) - wavefront-proxy (resteasy-jaxrs) #844

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 9 commits into from
May 4, 2023
Merged

MONIT-30797: CVE-2021-20293 (6.1) - wavefront-proxy (resteasy-jaxrs) #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c4d7ad8
MONIT-30797: CVE-2021-20293 (6.1) - wavefront-proxy (resteasy-jaxrs)
Apr 13, 2023
36d19c3
Merge branch 'dev' into nchaparyan/MONIT-30797
laullon Apr 17, 2023
6d0f512
Changes were based on code review.
Apr 20, 2023
e0716f2
Merge branch 'nchaparyan/MONIT-30797' of github.com:Norayr25/wavefron…
Apr 20, 2023
fd82733
Changes were based on code review.
May 2, 2023
5e16fb7
Merge branch 'dev' into nchaparyan/MONIT-30797
May 2, 2023
160b981
Merge branch 'dev' into nchaparyan/MONIT-30797
laullon May 4, 2023
eb29b99
Empty-Commit
May 4, 2023
5fee8db
Merge branch 'nchaparyan/MONIT-30797' of github.com:Norayr25/wavefron…
May 4, 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
2 changes: 1 addition & 1 deletion proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-bom</artifactId>
<version>3.15.3.Final</version>
<version>5.0.6.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
14 changes: 7 additions & 7 deletions proxy/src/main/java/com/wavefront/agent/api/APIContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
import org.apache.logging.log4j.Logger;
import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
import org.jboss.resteasy.client.jaxrs.ResteasyClient;
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient4Engine;
import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine;
import org.jboss.resteasy.client.jaxrs.internal.LocalResteasyProviderFactory;
import org.jboss.resteasy.plugins.interceptors.encoding.AcceptEncodingGZIPFilter;
import org.jboss.resteasy.plugins.interceptors.encoding.GZIPDecodingInterceptor;
import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;
import org.jboss.resteasy.plugins.interceptors.AcceptEncodingGZIPFilter;
import org.jboss.resteasy.plugins.interceptors.GZIPDecodingInterceptor;
import org.jboss.resteasy.plugins.providers.jackson.ResteasyJackson2Provider;
import org.jboss.resteasy.spi.ResteasyProviderFactory;

Expand Down Expand Up @@ -340,10 +340,10 @@ protected boolean handleAsIdempotent(HttpRequest request) {
.setSocketTimeout(proxyConfig.getHttpRequestTimeout())
.build())
.build();
final ApacheHttpClient4Engine httpEngine = new ApacheHttpClient4Engine(httpClient, true);
final ApacheHttpClient43Engine httpEngine = new ApacheHttpClient43Engine(httpClient, true);
// avoid using disk at all
httpEngine.setFileUploadInMemoryThresholdLimit(100);
httpEngine.setFileUploadMemoryUnit(ApacheHttpClient4Engine.MemoryUnit.MB);
httpEngine.setFileUploadMemoryUnit(ApacheHttpClient43Engine.MemoryUnit.MB);
return httpEngine;
}

Expand All @@ -366,7 +366,7 @@ private <T> T createServiceInternal(
Class<T> apiClass,
ResteasyProviderFactory resteasyProviderFactory) {
ResteasyClient client =
new ResteasyClientBuilder()
new ResteasyClientBuilderImpl()
.httpEngine(clientHttpEngine)
.providerFactory(resteasyProviderFactory)
.build();
Expand Down
12 changes: 7 additions & 5 deletions proxy/src/test/java/com/wavefront/agent/HttpClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.protocol.HttpContext;
import org.jboss.resteasy.client.jaxrs.ResteasyClient;
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient4Engine;
import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine;
import org.jboss.resteasy.client.jaxrs.internal.LocalResteasyProviderFactory;
import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;
import org.jboss.resteasy.plugins.providers.jackson.ResteasyJackson2Provider;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
import org.junit.Test;
Expand Down Expand Up @@ -63,7 +64,8 @@ public void run() {

@Test(expected = ProcessingException.class)
public void httpClientTimeoutsWork() throws Exception {
ResteasyProviderFactory factory = ResteasyProviderFactory.getInstance();
ResteasyProviderFactory factory =
new LocalResteasyProviderFactory(ResteasyProviderFactory.getInstance());
factory.registerProvider(JsonNodeWriter.class);
factory.registerProvider(ResteasyJackson2Provider.class);

Expand Down Expand Up @@ -116,8 +118,8 @@ public Socket connectSocket(
.build();

ResteasyClient client =
new ResteasyClientBuilder()
.httpEngine(new ApacheHttpClient4Engine(httpClient, true))
new ResteasyClientBuilderImpl()
.httpEngine(new ApacheHttpClient43Engine(httpClient, true))
.providerFactory(factory)
.build();

Expand Down
2 changes: 1 addition & 1 deletion proxy/src/test/java/com/wavefront/agent/PushAgentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPOutputStream;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.NotThreadSafe;
import javax.net.SocketFactory;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import junit.framework.AssertionFailedError;
import net.jcip.annotations.NotThreadSafe;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
import org.apache.http.client.HttpClient;
Expand Down