Skip to content
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

[1.3] Update guava to address CVE-2023-2976 #3060

Merged
merged 6 commits into from
Jul 31, 2023
Merged

[1.3] Update guava to address CVE-2023-2976 #3060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cd27edc
Update guava to address CVE-2023-2976
jaguilar-atl Jul 27, 2023
074843f
Use latest version of guava
jaguilar-atl Jul 27, 2023
28fe6aa
Update SSLConnectionTestUtil.java
stephen-crawford Jul 31, 2023
a3387d5
Update HTTPJwtAuthenticatorTest.java
stephen-crawford Jul 31, 2023
99f0a8c
Update SSLConnectionTestUtil.java
stephen-crawford Jul 31, 2023
51c38d3
Update SSLConnectionTestUtilTests.java
stephen-crawford Jul 31, 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
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ configurations.all {
force "org.apache.commons:commons-lang3:3.4"
force "org.springframework:spring-core:5.3.28"
force "org.springframework:spring-expression:5.3.28"
force "com.google.guava:guava:30.0-jre"
force "com.google.guava:guava:32.1.1-jre"
force "com.fasterxml.woodstox:woodstox-core:6.4.0"
force "org.scala-lang:scala-library:2.13.9"
force "org.apache.bcel:bcel:6.6.0" // This line should be removed once Spotbugs is upgraded to 4.7.4
Expand All @@ -102,7 +102,7 @@ dependencies {
implementation 'jakarta.annotation:jakarta.annotation-api:1.3.5'
implementation "org.opensearch.plugin:transport-netty4-client:${opensearch_version}"
implementation "org.opensearch.client:opensearch-rest-high-level-client:${opensearch_version}"
implementation 'com.google.guava:guava:30.0-jre'
implementation 'com.google.guava:guava:32.1.1-jre'
implementation 'org.greenrobot:eventbus:3.2.0'
implementation 'commons-cli:commons-cli:1.3.1'
implementation 'org.bouncycastle:bcprov-jdk15to18:1.75'
Expand Down Expand Up @@ -417,4 +417,4 @@ task updateVersion {
}
ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true)
}
}
}
9 changes: 6 additions & 3 deletions src/test/java/com/amazon/dlic/auth/http/jwt/HTTPJwtAuthenticatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;

import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
Expand All @@ -36,7 +37,6 @@
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.internal.util.reflection.FieldSetter;

import org.opensearch.security.user.AuthCredentials;
import org.opensearch.security.util.FakeRestRequest;
Expand Down Expand Up @@ -192,14 +192,17 @@ public void testBasicAuthHeader() throws Exception {
Settings settings = Settings.builder().put("signing_key", BaseEncoding.base64().encode(secretKey)).build();
HTTPJwtAuthenticator jwtAuth = new HTTPJwtAuthenticator(settings, null);
JwtParser jwtParser = Mockito.spy(JwtParser.class);
FieldSetter.setField(jwtAuth, HTTPJwtAuthenticator.class.getDeclaredField("jwtParser"), jwtParser);

Field jwtParserField = HTTPJwtAuthenticator.class.getDeclaredField("jwtParser");
jwtParserField.setAccessible(true);
jwtParserField.set(jwtAuth, jwtParser);

String basicAuth = BaseEncoding.base64().encode("user:password".getBytes(StandardCharsets.UTF_8));
Map<String, String> headers = Collections.singletonMap(HttpHeaders.AUTHORIZATION, "Basic " + basicAuth);

AuthCredentials creds = jwtAuth.extractCredentials(new FakeRestRequest(headers, Collections.emptyMap()), null);
Assert.assertNull(creds);
Mockito.verifyZeroInteractions(jwtParser);
Mockito.verifyNoInteractions(jwtParser);
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/opensearch/security/ssl/util/SSLConnectionTestUtilTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public void testConnectionSSLNotAvailableIOException() throws Exception {
SSLConnectionTestResult result = connectionTestUtil.testConnection();

verifyClientHelloSend();
Mockito.verifyZeroInteractions(inputStreamReader);
Mockito.verifyNoMoreInteractions(inputStreamReader);
verifyOpenSearchPingSend();
Mockito.verify(socket, Mockito.times(2)).close();
Assert.assertEquals("Unexpected result for testConnection invocation", SSLConnectionTestResult.SSL_NOT_AVAILABLE, result);
Expand Down Expand Up @@ -152,7 +152,7 @@ public void testConnectionOpenSearchPingFailedIOException() throws Exception {

verifyClientHelloSend();
verifyOpenSearchPingSend();
Mockito.verifyZeroInteractions(inputStream);
Mockito.verifyNoInteractions(inputStream);
Mockito.verify(socket, Mockito.times(2)).close();
Assert.assertEquals("Unexpected result for testConnection invocation", SSLConnectionTestResult.OPENSEARCH_PING_FAILED, result);
}
Expand Down