Merge branch 'main' into byte-buf-fix

azkrishpy · web-flow · commit 4c2bf2dd9f45 · 2026-03-12T12:28:38.000-07:00
diff --git a/crt/aws-c-auth b/crt/aws-c-auth
@@ -1 +1 @@
-Subproject commit a4409b95dad40a45b81e5fc9ff96f41386845e4f
+Subproject commit 5aefd277cfbf049933df13b1ee8439edccbf0964
diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream
@@ -1 +1 @@
-Subproject commit f43a3d24a7c1f8b50f709ccb4fdf4c7fd2827fff
+Subproject commit c741f95e9050a1a4bed4b3aa7543bd3e024f6e56
diff --git a/crt/aws-c-http b/crt/aws-c-http
@@ -1 +1 @@
-Subproject commit a9745ea9998f679cd7456e7d23cc8820e38c97d4
+Subproject commit 0d8e1a933f46b8af984dfc8168ebcdf32748c184
diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt
@@ -1 +1 @@
-Subproject commit 1d512d92709f60b74e2cafa018e69a2e647f28e9
+Subproject commit 41b6a7d6d566a56eff69743df66c077d56a80c9d
diff --git a/crt/aws-lc b/crt/aws-lc
@@ -1 +1 @@
-Subproject commit ae0cd62f49db4c32b77cb8ed080013bfb44ed90d
+Subproject commit e50a5f29ee416a7c99be4e72957e8f96aa51dbb9
diff --git a/crt/s2n b/crt/s2n
@@ -1 +1 @@
-Subproject commit 3276a0876054e9efbeab4a42f34ef60b0bf58c91
+Subproject commit f5e5e83031be60691f22442373fb8371274fcd56
diff --git a/src/main/java/software/amazon/awssdk/crt/CRT.java b/src/main/java/software/amazon/awssdk/crt/CRT.java
@@ -492,16 +492,16 @@ private static native void awsCrtInit(int memoryTracingLevel, boolean debugWait,
      * Given an error code, get a boolean to check if an error is transient or not.
      *
      * Transient errors are defined as IO level errors where we are unable to read an HTTP response.
-     * This can occur due to connect timeouts, read timeouts, or the server closing the connection without 
+     * This can occur due to connect timeouts, read timeouts, or the server closing the connection without
      * sending a response. This method helps identify CRT error codes that are not generic or widely adopted.
      *
-     * This is not the complete logic to identify transient or retryable errors, this includes only IO level 
+     * This is not the complete logic to identify transient or retryable errors, this includes only IO level
      * errors that are transient.
      *
      * @param errorCode An error code returned from an exception or other native function call
      * @return A boolean for if the error is transient or not
      */
-    public static native Boolean awsIsTransientError(int errorCode);
+    public static native boolean awsIsTransientError(int errorCode);
 
     /**
      * @return The number of bytes allocated in native resources. If
diff --git a/src/main/java/software/amazon/awssdk/crt/http/HttpClientConnectionManager.java b/src/main/java/software/amazon/awssdk/crt/http/HttpClientConnectionManager.java
@@ -62,6 +62,24 @@ private HttpClientConnectionManager(HttpClientConnectionManagerOptions options)
                 if (HTTPS.equals(uri.getScheme())) { port = DEFAULT_HTTPS_PORT; }
             }
         }
+        /**
+         * Per RFC 3986 Section 3.2.2, IPv6 addresses in URIs MUST be enclosed in square brackets
+         * (e.g., "http://[2001:db8::1]:8080/path"). However, when connecting to a host, the brackets
+         * must be removed to get the actual IPv6 address.
+         * 
+         * Since Java's URI.getHost() returns IPv6 addresses WITH brackets (e.g., "[2001:db8::1]"),
+         * but the underlying CRT library expects the hostname WITHOUT brackets (e.g., "2001:db8::1").
+         * Manually strip the brackets before passing the hostname to CRT.
+         * 
+         * Note: Different language implementations handle bracket stripping inconsistently eg: Python
+         * (urlparse().hostname) strip brackets automatically, while Java (URI.getHost()) keeps brackets, 
+         * thus we strip the brackets based on the language behavior.
+         */
+
+        String host = uri.getHost();
+        if (host.startsWith("[") && host.endsWith("]")) {
+            host = host.substring(1, host.length() - 1);
+        }
 
         HttpProxyOptions proxyOptions = options.getProxyOptions();
 
@@ -115,7 +133,7 @@ private HttpClientConnectionManager(HttpClientConnectionManagerOptions options)
                                             useTls && tlsContext!=null ? tlsContext.getNativeHandle() : 0,
                                             useTls && tlsConnectionOptions!=null ? tlsConnectionOptions.getNativeHandle() : 0,
                                             windowSize,
-                                            uri.getHost().getBytes(UTF8),
+                                            host.getBytes(UTF8),
                                             port,
                                             maxConnections,
                                             proxyConnectionType,
diff --git a/src/native/crt.c b/src/native/crt.c
@@ -713,7 +713,7 @@ void JNICALL Java_software_amazon_awssdk_crt_CRT_awsCrtInit(
 }
 
 JNIEXPORT
-bool JNICALL
+jboolean JNICALL
     Java_software_amazon_awssdk_crt_CRT_awsIsTransientError(JNIEnv *env, jclass jni_crt_class, jint error_code) {
     (void)env;
     (void)jni_crt_class;
diff --git a/src/native/http_connection_manager.c b/src/native/http_connection_manager.c
@@ -96,7 +96,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_http_HttpClientConnectio
     jlong jni_tls_ctx,
     jlong jni_tls_connection_options,
     jlong jni_window_size,
-    jbyteArray jni_endpoint,
+    jbyteArray jni_host,
     jint jni_port,
     jint jni_max_conns,
     jint jni_proxy_connection_type,
@@ -141,7 +141,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_http_HttpClientConnectio
     }
 
     struct aws_allocator *allocator = aws_jni_get_allocator();
-    struct aws_byte_cursor endpoint = aws_jni_byte_cursor_from_jbyteArray_acquire(env, jni_endpoint);
+    struct aws_byte_cursor host = aws_jni_byte_cursor_from_jbyteArray_acquire(env, jni_host);
 
     size_t window_size;
     if (aws_size_t_from_java(env, &window_size, jni_window_size, "Initial window size")) {
@@ -161,7 +161,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_http_HttpClientConnectio
     AWS_ZERO_STRUCT(tls_conn_options);
     if (new_tls_conn_opts) {
         aws_tls_connection_options_init_from_ctx(&tls_conn_options, tls_ctx);
-        aws_tls_connection_options_set_server_name(&tls_conn_options, allocator, &endpoint);
+        aws_tls_connection_options_set_server_name(&tls_conn_options, allocator, &host);
         tls_connection_options = &tls_conn_options;
     }
 
@@ -180,7 +180,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_http_HttpClientConnectio
     manager_options.initial_window_size = window_size;
     manager_options.socket_options = socket_options;
     manager_options.tls_connection_options = tls_connection_options;
-    manager_options.host = endpoint;
+    manager_options.host = host;
     manager_options.port = port;
     manager_options.max_connections = (size_t)jni_max_conns;
     manager_options.shutdown_complete_callback = &s_on_http_conn_manager_shutdown_complete_callback;
@@ -257,7 +257,7 @@ JNIEXPORT jlong JNICALL Java_software_amazon_awssdk_crt_http_HttpClientConnectio
     }
 
 cleanup:
-    aws_jni_byte_cursor_from_jbyteArray_release(env, jni_endpoint, endpoint);
+    aws_jni_byte_cursor_from_jbyteArray_release(env, jni_host, host);
 
     if (binding->manager == NULL) {
         s_destroy_manager_binding(binding, env);
diff --git a/src/native/mqtt5_packets.c b/src/native/mqtt5_packets.c
@@ -1136,7 +1136,7 @@ struct aws_mqtt5_packet_publish_view_java_jni *aws_mqtt5_packet_publish_view_cre
             mqtt5_publish_packet_properties.publish_payload_field_id,
             s_publish_packet_string,
             "payload",
-            &java_packet->correlation_data_buf,
+            &java_packet->payload_buf,
             &java_packet->payload_cursor,
             true,
             &was_value_set) == AWS_OP_ERR) {
diff --git a/src/test/java/software/amazon/awssdk/crt/test/ClientBootstrapTest.java b/src/test/java/software/amazon/awssdk/crt/test/ClientBootstrapTest.java
@@ -6,8 +6,7 @@
 package software.amazon.awssdk.crt.test;
 
 import org.junit.Test;
-import software.amazon.awssdk.crt.CrtResource;
-import software.amazon.awssdk.crt.CrtRuntimeException;
+
 import software.amazon.awssdk.crt.io.ClientBootstrap;
 import software.amazon.awssdk.crt.io.EventLoopGroup;
 import software.amazon.awssdk.crt.io.HostResolver;
@@ -18,7 +17,7 @@
 
 public class ClientBootstrapTest extends CrtTestFixture {
     public ClientBootstrapTest() {}
-    
+
     @Test
     public void testCreateDestroy() throws ExecutionException, InterruptedException {
         EventLoopGroup elg = new EventLoopGroup(1);
diff --git a/src/test/java/software/amazon/awssdk/crt/test/CrtStaticTest.java b/src/test/java/software/amazon/awssdk/crt/test/CrtStaticTest.java
@@ -0,0 +1,90 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+package software.amazon.awssdk.crt.test;
+
+import org.junit.Test;
+import software.amazon.awssdk.crt.CRT;
+
+import static org.junit.Assert.*;
+
+/**
+ * Test suite for static methods in CRT class.
+ */
+public class CrtStaticTest extends CrtTestFixture {
+
+    public CrtStaticTest() {
+    }
+
+    /**
+     * Test that AWS_CRT_SUCCESS (0) is not considered a transient error.
+     */
+    @Test
+    public void testAwsIsTransientErrorWithSuccess() {
+        assertFalse("Success code should not be transient", CRT.awsIsTransientError(CRT.AWS_CRT_SUCCESS));
+    }
+
+    /**
+     * Test that the method returns a valid boolean for various error codes.
+     */
+    @Test
+    public void testAwsIsTransientErrorWithVariousErrorCodes() {
+        // Test with a range of error codes to ensure the method doesn't crash
+        int[] testErrorCodes = {0, 1, 1024, 2048, 3072, 4096};
+
+        for (int errorCode : testErrorCodes) {
+            // The method should return a valid boolean without throwing an exception
+            boolean result = CRT.awsIsTransientError(errorCode);
+            // Just verify the call completes successfully - the actual result depends on native implementation
+            assertNotNull("Should return a valid boolean", Boolean.valueOf(result));
+        }
+    }
+
+    /**
+     * Test that the method handles invalid error codes gracefully.
+     */
+    @Test
+    public void testAwsIsTransientErrorWithInvalidCodes() {
+        // Test with invalid error codes
+        assertFalse("Negative error code should not be transient", CRT.awsIsTransientError(-1));
+        assertFalse("Large error code should not be transient", CRT.awsIsTransientError(999999));
+    }
+
+    /**
+     * Test awsLastError returns a valid error code.
+     */
+    @Test
+    public void testAwsLastError() {
+        int lastError = CRT.awsLastError();
+        // The error code should be non-negative
+        assertTrue("Last error should be non-negative", lastError >= 0);
+    }
+
+    /**
+     * Test awsErrorString returns a non-null string for valid error codes.
+     */
+    @Test
+    public void testAwsErrorString() {
+        String errorString = CRT.awsErrorString(0);
+        assertNotNull("Error string should not be null", errorString);
+
+        // Test with a non-zero error code
+        errorString = CRT.awsErrorString(1);
+        assertNotNull("Error string should not be null", errorString);
+    }
+
+    /**
+     * Test awsErrorName returns a non-null string for valid error codes.
+     */
+    @Test
+    public void testAwsErrorName() {
+        String errorName = CRT.awsErrorName(0);
+        assertNotNull("Error name should not be null", errorName);
+
+        // Test with a non-zero error code
+        errorName = CRT.awsErrorName(1);
+        assertNotNull("Error name should not be null", errorName);
+    }
+}
diff --git a/src/test/java/software/amazon/awssdk/crt/test/HttpClientConnectionManagerTest.java b/src/test/java/software/amazon/awssdk/crt/test/HttpClientConnectionManagerTest.java
@@ -1,6 +1,7 @@
 package software.amazon.awssdk.crt.test;
 
 import java.net.URI;
+import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -17,11 +18,13 @@
 import software.amazon.awssdk.crt.CrtResource;
 import software.amazon.awssdk.crt.CrtRuntimeException;
 import software.amazon.awssdk.crt.http.*;
+import software.amazon.awssdk.crt.utils.ByteBufferUtils;
 import software.amazon.awssdk.crt.io.ClientBootstrap;
 import software.amazon.awssdk.crt.io.EventLoopGroup;
 import software.amazon.awssdk.crt.io.HostResolver;
 import software.amazon.awssdk.crt.io.SocketOptions;
 import software.amazon.awssdk.crt.io.TlsContext;
+import software.amazon.awssdk.crt.io.TlsContextOptions;
 import software.amazon.awssdk.crt.io.TlsConnectionOptions;
 import software.amazon.awssdk.crt.Log;
 
@@ -294,4 +297,77 @@ public void testCancelAcquire() throws Exception {
             conn.close();
         }
     }
+
+    @Test
+    public void testIPv6URIBracketsStripped() throws Exception {
+        skipIfAndroid();
+        skipIfLocalhostUnavailable();
+
+        // IPv6 localhost with brackets - same as HOST but using [::1] instead of localhost
+        URI uri = new URI("https://[::1]:8082");
+        String bodyToSend = "test IPv6 echo body";
+        final ByteBuffer bodyBytes = ByteBuffer.wrap(bodyToSend.getBytes(UTF8));
+
+        HttpRequestBodyStream bodyStream = new HttpRequestBodyStream() {
+            @Override
+            public boolean sendRequestBody(ByteBuffer outBuffer) {
+                ByteBufferUtils.transferData(bodyBytes, outBuffer);
+                return bodyBytes.remaining() == 0;
+            }
+
+            @Override
+            public boolean resetPosition() {
+                bodyBytes.position(0);
+                return true;
+            }
+        };
+
+        try (EventLoopGroup eventLoopGroup = new EventLoopGroup(1);
+             HostResolver resolver = new HostResolver(eventLoopGroup);
+             ClientBootstrap bootstrap = new ClientBootstrap(eventLoopGroup, resolver);
+             SocketOptions sockOpts = new SocketOptions();
+             TlsContextOptions tlsOpts = TlsContextOptions.createDefaultClient().withVerifyPeer(false);
+             TlsContext tlsContext = new TlsContext(tlsOpts)) {
+
+            HttpClientConnectionManagerOptions options = new HttpClientConnectionManagerOptions()
+                    .withClientBootstrap(bootstrap)
+                    .withSocketOptions(sockOpts)
+                    .withTlsContext(tlsContext)
+                    .withUri(uri)
+                    .withMaxConnections(1);
+
+            try (HttpClientConnectionManager connectionPool = HttpClientConnectionManager.create(options)) {
+                HttpClientConnection conn = connectionPool.acquireConnection().get(60, TimeUnit.SECONDS);
+
+                HttpHeader[] requestHeaders = new HttpHeader[]{
+                    new HttpHeader("Host", uri.getHost()),
+                    new HttpHeader("Content-Length", Integer.toString(bodyToSend.getBytes(UTF8).length))
+                };
+                HttpRequest request = new HttpRequest("POST", "/echo", requestHeaders, bodyStream);
+
+                CompletableFuture<Integer> statusFuture = new CompletableFuture<>();
+                HttpStream stream = conn.makeRequest(request, new HttpStreamResponseHandler() {
+                    @Override
+                    public void onResponseHeaders(HttpStream stream, int responseStatusCode, int blockType, HttpHeader[] nextHeaders) {
+                        statusFuture.complete(responseStatusCode);
+                    }
+                    @Override
+                    public void onResponseComplete(HttpStream stream, int errorCode) {
+                        if (!statusFuture.isDone()) {
+                            statusFuture.completeExceptionally(new RuntimeException("Request failed with error: " + errorCode));
+                        }
+                        stream.close();
+                        connectionPool.releaseConnection(conn);
+                    }
+                });
+                stream.activate();
+
+                int status = statusFuture.get(60, TimeUnit.SECONDS);
+                Assert.assertEquals(200, status);
+            }
+        }
+
+        CrtResource.logNativeResources();
+        CrtResource.waitForNoResources();
+    }
 }
diff --git a/src/test/java/software/amazon/awssdk/crt/test/Mqtt5ClientTest.java b/src/test/java/software/amazon/awssdk/crt/test/Mqtt5ClientTest.java

Original file line number	Diff line number	Diff line change
`@@ -492,16 +492,16 @@ private static native void awsCrtInit(int memoryTracingLevel, boolean debugWait,`
`492`	`492`	`* Given an error code, get a boolean to check if an error is transient or not.`
`493`	`493`	`*`
`494`	`494`	`* Transient errors are defined as IO level errors where we are unable to read an HTTP response.`
`495`		`- * This can occur due to connect timeouts, read timeouts, or the server closing the connection without`
	`495`	`+ * This can occur due to connect timeouts, read timeouts, or the server closing the connection without`
`496`	`496`	`* sending a response. This method helps identify CRT error codes that are not generic or widely adopted.`
`497`	`497`	`*`
`498`		`- * This is not the complete logic to identify transient or retryable errors, this includes only IO level`
	`498`	`+ * This is not the complete logic to identify transient or retryable errors, this includes only IO level`
`499`	`499`	`* errors that are transient.`
`500`	`500`	`*`
`501`	`501`	`* @param errorCode An error code returned from an exception or other native function call`
`502`	`502`	`* @return A boolean for if the error is transient or not`
`503`	`503`	`*/`
`504`		`- public static native Boolean awsIsTransientError(int errorCode);`
	`504`	`+ public static native boolean awsIsTransientError(int errorCode);`
`505`	`505`
`506`	`506`	`/**`
`507`	`507`	`* @return The number of bytes allocated in native resources. If`
Original file line number	Diff line number	Diff line change
`@@ -713,7 +713,7 @@ void JNICALL Java_software_amazon_awssdk_crt_CRT_awsCrtInit(`
`713`	`713`	`}`
`714`	`714`
`715`	`715`	`JNIEXPORT`
`716`		`-bool JNICALL`
	`716`	`+jboolean JNICALL`
`717`	`717`	`Java_software_amazon_awssdk_crt_CRT_awsIsTransientError(JNIEnv *env, jclass jni_crt_class, jint error_code) {`
`718`	`718`	`(void)env;`
`719`	`719`	`(void)jni_crt_class;`