Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(sdk): copy Java defaultHeaders and reject null entries at build

Yudhi Armyndharisf2261a4f33e2
diff --git a/sdk/java/src/main/java/com/rmyndharis/openwa/ClientConfig.java b/sdk/java/src/main/java/com/rmyndharis/openwa/ClientConfig.java
index 4bec59875..8f7dbc7ec 100644
--- a/sdk/java/src/main/java/com/rmyndharis/openwa/ClientConfig.java
+++ b/sdk/java/src/main/java/com/rmyndharis/openwa/ClientConfig.java
@@ -40,7 +40,13 @@ public final class ClientConfig {
this.baseUrl = url;
this.apiKey = key;
this.timeout = b.timeout != null ? b.timeout : Duration.ofSeconds(30);
- this.defaultHeaders = b.defaultHeaders != null ? b.defaultHeaders : Map.of();
+ // Copied so a later change to the caller's map cannot alter the headers of this client, and so
+ // a null key or value fails here instead of as a raw NullPointerException on the first request.
+ try {
+ this.defaultHeaders = b.defaultHeaders != null ? Map.copyOf(b.defaultHeaders) : Map.of();
+ } catch (NullPointerException e) {
+ throw new IllegalArgumentException("OpenWAClient: defaultHeaders must not contain null keys or values");
+ }
this.transport = b.transport;
}
diff --git a/sdk/java/src/test/java/com/rmyndharis/openwa/ConfigTest.java b/sdk/java/src/test/java/com/rmyndharis/openwa/ConfigTest.java
index f9e4ad178..74a829fed 100644
--- a/sdk/java/src/test/java/com/rmyndharis/openwa/ConfigTest.java
+++ b/sdk/java/src/test/java/com/rmyndharis/openwa/ConfigTest.java
@@ -10,6 +10,8 @@ import com.rmyndharis.openwa.http.HttpTransport;
import com.rmyndharis.openwa.model.SuccessResult;
import com.rmyndharis.openwa.support.MockTransport;
import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
import org.junit.jupiter.api.Test;
class ConfigTest {
@@ -46,6 +48,23 @@ class ConfigTest {
assertTrue(tx.lastRequest().url().startsWith("http://h/"));
}
+ @Test
+ void defaultHeadersAreCopiedAtBuildTime() {
+ Map<String, String> h = new HashMap<>(Map.of("X-Tenant", "a"));
+ MockTransport tx = new MockTransport().respond(200, "{\"valid\":true}");
+ OpenWAClient c = new OpenWAClient(base().defaultHeaders(h).transport(tx).build());
+ h.put("X-Tenant", "b");
+ c.auth();
+ assertEquals("a", tx.lastRequest().headers().get("X-Tenant"));
+ }
+
+ @Test
+ void rejectsNullDefaultHeaderValue() {
+ Map<String, String> h = new HashMap<>();
+ h.put("X-Trace", null);
+ assertThrows(IllegalArgumentException.class, () -> base().defaultHeaders(h).build());
+ }
+
@Test
void transportIllegalArgumentIsWrappedAsOpenWAError() {
HttpTransport bad = req -> {