Skip to content

fix(dynamodb): Add TCP keep-alive permissions to SecurityManager test #6974

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

Open
joviegas wants to merge 4 commits into
base: dongie/apache5-as-default
Choose a base branch
from
+8 −9
Open

fix(dynamodb): Add TCP keep-alive permissions to SecurityManager test #6974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c11d5f2
fix(dynamodb): Add TCP keep-alive permissions to SecurityManager test…
joviegas May 16, 2026
0250c92
Fix ResponseInputStreamTimeoutIntegrationTest to update it to Apache5…
joviegas May 16, 2026
8e2bc0f
Remove apache5-client test scope from s3/pom.xml to restore runtime t…
joviegas May 17, 2026
11e36e1
Dumy commit to trigger integ test
joviegas May 18, 2026
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
5 changes: 5 additions & 0 deletions ...est/resources/software/amazon/awssdk/services/dynamodb/security-manager-integ-test.policy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ grant {
permission "javax.net.ssl.SSLPermission" "setDefaultSSLContext";
permission "java.net.SocketPermission" "*", "connect,resolve";

// Needed for Apache5 HTTP Client TCP keep-alive socket options
permission jdk.net.NetworkPermission "setOption.TCP_KEEPIDLE";
permission jdk.net.NetworkPermission "setOption.TCP_KEEPINTERVAL";
permission jdk.net.NetworkPermission "setOption.TCP_KEEPCOUNT";

// Needed for test to remove the security manager
permission java.lang.RuntimePermission "setSecurityManager";

Expand Down
6 changes: 0 additions & 6 deletions services/s3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,6 @@
<version>${awsjavasdk.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache5-client</artifactId>
<version>${awsjavasdk.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions ...it/java/software/amazon/awssdk/services/s3/ResponseInputStreamTimeoutIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import java.io.IOException;
import java.time.Duration;
import org.apache.http.conn.ConnectionPoolTimeoutException;
import org.apache.hc.core5.http.ConnectionRequestTimeoutException;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down Expand Up @@ -74,8 +74,8 @@ public void defaultTimeout_firstStreamNotConsumed_secondRequestTimesOut() {
s3Client.getObject(getObjectRequest);

assertThatThrownBy(() -> s3Client.getObject(getObjectRequest))
.hasRootCauseInstanceOf(ConnectionPoolTimeoutException.class)
.hasMessageContaining("Timeout waiting for connection from pool");
.hasRootCauseInstanceOf(ConnectionRequestTimeoutException.class)
.hasMessageContaining("Timeout deadline");
}

@Test
Expand Down
Loading