Skip to content

Commit 0dfbed1

Browse files
committed
feat(client): add opt-in GET redirect following and expose via transport config
- Add GetBuilder.followRedirects(boolean) to A2AHttpClient; JDK, Vert.x, and Android implement one SDK-managed hop filtered by RedirectHeaderPolicy - JdkA2AHttpClient unconditionally bypasses native redirects for GET, DELETE, and SSE regardless of the supplied HttpClient policy - Add followRedirects(boolean) to JSONRPCTransportConfigBuilder and RestTransportConfigBuilder and propagate through the transport chain - A2ACardResolver enables GET redirect following for agent-card discovery Signed-off-by: Emmanuel Hugonnet <ehugonne@redhat.com>
1 parent 7e225e8 commit 0dfbed1

23 files changed

Lines changed: 462 additions & 60 deletions

File tree

‎client/transport/jsonrpc/src/main/java/org/a2aproject/sdk/client/transport/jsonrpc/JSONRPCTransport.java‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public class JSONRPCTransport implements ClientTransport {
7575
private final AgentInterface agentInterface;
7676
private final @Nullable List<ClientCallInterceptor> interceptors;
7777
private final @Nullable AgentCard agentCard;
78+
private final boolean followRedirects;
7879

7980
public JSONRPCTransport(String agentUrl) {
8081
this(null, null, new AgentInterface("JSONRPC", agentUrl), null);
@@ -86,10 +87,17 @@ public JSONRPCTransport(AgentCard agentCard) {
8687

8788
public JSONRPCTransport(@Nullable A2AHttpClient httpClient, @Nullable AgentCard agentCard,
8889
AgentInterface agentInterface, @Nullable List<ClientCallInterceptor> interceptors) {
90+
this(httpClient, agentCard, agentInterface, interceptors, false);
91+
}
92+
93+
public JSONRPCTransport(@Nullable A2AHttpClient httpClient, @Nullable AgentCard agentCard,
94+
AgentInterface agentInterface, @Nullable List<ClientCallInterceptor> interceptors,
95+
boolean followRedirects) {
8996
this.httpClient = httpClient == null ? A2AHttpClientFactory.create(A2AHttpClientConfiguration.DEFAULT) : httpClient;
9097
this.agentCard = agentCard;
9198
this.agentInterface = agentInterface;
9299
this.interceptors = interceptors;
100+
this.followRedirects = followRedirects;
93101
}
94102

95103
@Override
@@ -121,7 +129,8 @@ public void sendMessageStreaming(MessageSendParams request, Consumer<StreamingEv
121129
SSEEventListener sseEventListener = new SSEEventListener(eventConsumer, errorConsumer);
122130

123131
try {
124-
A2AHttpClient.PostBuilder builder = createPostBuilder(agentInterface.url(), payloadAndHeaders, SEND_STREAMING_MESSAGE_METHOD);
132+
A2AHttpClient.PostBuilder builder = createPostBuilder(
133+
agentInterface.url(), payloadAndHeaders, SEND_STREAMING_MESSAGE_METHOD, false);
125134
ref.set(builder.postAsyncSSE(
126135
event -> sseEventListener.onMessage(event, ref.get()),
127136
throwable -> sseEventListener.onError(throwable, ref.get()),
@@ -271,7 +280,8 @@ public void subscribeToTask(TaskIdParams request, Consumer<StreamingEventKind> e
271280
SSEEventListener sseEventListener = new SSEEventListener(eventConsumer, errorConsumer);
272281

273282
try {
274-
A2AHttpClient.PostBuilder builder = createPostBuilder(agentInterface.url(), payloadAndHeaders, SUBSCRIBE_TO_TASK_METHOD);
283+
A2AHttpClient.PostBuilder builder = createPostBuilder(
284+
agentInterface.url(), payloadAndHeaders, SUBSCRIBE_TO_TASK_METHOD, false);
275285
ref.set(builder.postAsyncSSE(
276286
event -> sseEventListener.onMessage(event, ref.get()),
277287
throwable -> sseEventListener.onError(throwable, ref.get()),
@@ -324,7 +334,7 @@ private PayloadAndHeaders applyInterceptors(String methodName, @Nullable Object
324334
}
325335

326336
private String sendPostRequest(String url, PayloadAndHeaders payloadAndHeaders, String method) throws IOException, InterruptedException, JsonProcessingException {
327-
A2AHttpClient.PostBuilder builder = createPostBuilder(url, payloadAndHeaders, method);
337+
A2AHttpClient.PostBuilder builder = createPostBuilder(url, payloadAndHeaders, method, followRedirects);
328338
A2AHttpResponse response = builder.post();
329339
if (!response.success()) {
330340
int status = response.status();
@@ -334,11 +344,14 @@ private String sendPostRequest(String url, PayloadAndHeaders payloadAndHeaders,
334344
return response.body();
335345
}
336346

337-
private A2AHttpClient.PostBuilder createPostBuilder(String url, PayloadAndHeaders payloadAndHeaders, String method) throws JsonProcessingException {
347+
private A2AHttpClient.PostBuilder createPostBuilder(
348+
String url, PayloadAndHeaders payloadAndHeaders, String method, boolean followRedirects)
349+
throws JsonProcessingException {
338350
A2AHttpClient.PostBuilder postBuilder = httpClient.createPost()
339351
.url(url)
340352
.addHeader("Content-Type", "application/json")
341353
.addHeader(A2AHeaders.A2A_VERSION, AgentInterface.CURRENT_PROTOCOL_VERSION)
354+
.followRedirects(followRedirects)
342355
.body(JSONRPCUtils.toJsonRPCRequest(null, method, (MessageOrBuilder) payloadAndHeaders.getPayload()));
343356

344357
if (payloadAndHeaders.getHeaders() != null) {

‎client/transport/jsonrpc/src/main/java/org/a2aproject/sdk/client/transport/jsonrpc/JSONRPCTransportConfig.java‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
public class JSONRPCTransportConfig extends ClientTransportConfig<JSONRPCTransport> {
5252

5353
private final @Nullable A2AHttpClient httpClient;
54+
private final boolean followRedirects;
5455

5556
/**
5657
* Create a JSON-RPC transport configuration with the default HTTP client.
@@ -59,7 +60,7 @@ public class JSONRPCTransportConfig extends ClientTransportConfig<JSONRPCTranspo
5960
* {@link JSONRPCTransportConfigBuilder} instead for a more fluent API.
6061
*/
6162
public JSONRPCTransportConfig() {
62-
this.httpClient = null;
63+
this(null, false);
6364
}
6465

6566
/**
@@ -70,7 +71,18 @@ public JSONRPCTransportConfig() {
7071
* @param httpClient the HTTP client to use for JSON-RPC requests
7172
*/
7273
public JSONRPCTransportConfig(A2AHttpClient httpClient) {
74+
this(httpClient, false);
75+
}
76+
77+
/**
78+
* Create a JSON-RPC transport configuration with a custom HTTP client and redirect policy.
79+
*
80+
* @param httpClient the HTTP client to use for JSON-RPC requests
81+
* @param followRedirects whether POST requests may follow a single redirect
82+
*/
83+
public JSONRPCTransportConfig(@Nullable A2AHttpClient httpClient, boolean followRedirects) {
7384
this.httpClient = httpClient;
85+
this.followRedirects = followRedirects;
7486
}
7587

7688
/**
@@ -81,4 +93,13 @@ public JSONRPCTransportConfig(A2AHttpClient httpClient) {
8193
public @Nullable A2AHttpClient getHttpClient() {
8294
return httpClient;
8395
}
96+
97+
/**
98+
* Whether POST requests issued by this transport may follow a redirect.
99+
*
100+
* @return {@code true} when redirect following is enabled
101+
*/
102+
public boolean isFollowRedirects() {
103+
return followRedirects;
104+
}
84105
}

‎client/transport/jsonrpc/src/main/java/org/a2aproject/sdk/client/transport/jsonrpc/JSONRPCTransportConfigBuilder.java‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public class JSONRPCTransportConfigBuilder extends ClientTransportConfigBuilder<
6767

6868
private @Nullable A2AHttpClient httpClient;
6969
private A2AHttpClientConfiguration httpClientConfiguration = A2AHttpClientConfiguration.DEFAULT;
70+
private boolean followRedirects;
7071

7172
/**
7273
* Set the HTTP client to use for JSON-RPC requests.
@@ -107,6 +108,23 @@ public JSONRPCTransportConfigBuilder httpClientConfiguration(A2AHttpClientConfig
107108
return this;
108109
}
109110

111+
/**
112+
* Enables explicit, one-hop redirect following for non-streaming POST requests.
113+
*
114+
* <p>Disabled by default. The configured {@link A2AHttpClient} remains responsible for
115+
* applying its redirect-header policy. When using {@code JdkA2AHttpClient} with a supplied
116+
* JDK client, that JDK client must have native redirects disabled.
117+
*
118+
* <p>Streaming SSE requests are never redirected.
119+
*
120+
* @param followRedirects whether non-streaming POST requests may follow a redirect
121+
* @return this builder for method chaining
122+
*/
123+
public JSONRPCTransportConfigBuilder followRedirects(boolean followRedirects) {
124+
this.followRedirects = followRedirects;
125+
return this;
126+
}
127+
110128
/**
111129
* Build the JSON-RPC transport configuration.
112130
* <p>
@@ -122,7 +140,7 @@ public JSONRPCTransportConfig build() {
122140
httpClient = A2AHttpClientFactory.create(httpClientConfiguration);
123141
}
124142

125-
JSONRPCTransportConfig config = new JSONRPCTransportConfig(httpClient);
143+
JSONRPCTransportConfig config = new JSONRPCTransportConfig(httpClient, followRedirects);
126144
config.setInterceptors(this.interceptors);
127145
return config;
128146
}

‎client/transport/jsonrpc/src/main/java/org/a2aproject/sdk/client/transport/jsonrpc/JSONRPCTransportProvider.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public JSONRPCTransport create(@Nullable JSONRPCTransportConfig clientTransportC
1818
currentClientTransportConfig = new JSONRPCTransportConfig(
1919
A2AHttpClientFactory.create(A2AHttpClientConfiguration.DEFAULT));
2020
}
21-
return new JSONRPCTransport(currentClientTransportConfig.getHttpClient(), agentCard, agentInterface, currentClientTransportConfig.getInterceptors());
21+
return new JSONRPCTransport(currentClientTransportConfig.getHttpClient(), agentCard, agentInterface,
22+
currentClientTransportConfig.getInterceptors(), currentClientTransportConfig.isFollowRedirects());
2223
}
2324

2425
@Override

‎client/transport/jsonrpc/src/test/java/org/a2aproject/sdk/client/transport/jsonrpc/JSONRPCTransportTest.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,16 @@ public void tearDown() {
8888
server.stop();
8989
}
9090

91+
@Test
92+
public void configBuilderDisablesRedirectFollowingByDefault() {
93+
assertFalse(new JSONRPCTransportConfigBuilder().build().isFollowRedirects());
94+
}
95+
96+
@Test
97+
public void configBuilderEnablesRedirectFollowing() {
98+
assertTrue(new JSONRPCTransportConfigBuilder().followRedirects(true).build().isFollowRedirects());
99+
}
100+
91101
@Test
92102
public void testA2AClientSendMessage() throws Exception {
93103
this.server.when(
@@ -794,4 +804,4 @@ public void testVersionNotSupportedErrorUnmarshalling() throws Exception {
794804
assertTrue(versionError.getMessage().contains("1.0"));
795805
}
796806
}
797-
}
807+
}

‎client/transport/rest/src/main/java/org/a2aproject/sdk/client/transport/rest/RestTransport.java‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,25 @@ public class RestTransport implements ClientTransport {
7171
private final AgentInterface agentInterface;
7272
private @Nullable final List<ClientCallInterceptor> interceptors;
7373
private final AgentCard agentCard;
74+
private final boolean followRedirects;
7475

7576
public RestTransport(AgentCard agentCard) {
7677
this(null, agentCard, Utils.getFavoriteInterface(agentCard), null);
7778
}
7879

7980
public RestTransport(@Nullable A2AHttpClient httpClient, AgentCard agentCard,
8081
AgentInterface agentInterface, @Nullable List<ClientCallInterceptor> interceptors) {
82+
this(httpClient, agentCard, agentInterface, interceptors, false);
83+
}
84+
85+
public RestTransport(@Nullable A2AHttpClient httpClient, AgentCard agentCard,
86+
AgentInterface agentInterface, @Nullable List<ClientCallInterceptor> interceptors,
87+
boolean followRedirects) {
8188
this.httpClient = httpClient == null ? A2AHttpClientFactory.create(A2AHttpClientConfiguration.DEFAULT) : httpClient;
8289
this.agentCard = agentCard;
8390
this.agentInterface = agentInterface;
8491
this.interceptors = interceptors;
92+
this.followRedirects = followRedirects;
8593
}
8694

8795
@Override
@@ -117,7 +125,10 @@ public void sendMessageStreaming(MessageSendParams messageSendParams, Consumer<S
117125
AtomicReference<CompletableFuture<Void>> ref = new AtomicReference<>();
118126
SSEEventListener sseEventListener = new SSEEventListener(eventConsumer, errorConsumer);
119127
try {
120-
A2AHttpClient.PostBuilder postBuilder = createPostBuilder(Utils.buildBaseUrl(agentInterface, messageSendParams.tenant()) + "/message:stream", payloadAndHeaders);
128+
A2AHttpClient.PostBuilder postBuilder = createPostBuilder(
129+
Utils.buildBaseUrl(agentInterface, messageSendParams.tenant()) + "/message:stream",
130+
payloadAndHeaders,
131+
false);
121132
ref.set(postBuilder.postAsyncSSE(
122133
event -> sseEventListener.onMessage(event, ref.get()),
123134
throwable -> sseEventListener.onError(throwable, ref.get()),
@@ -378,7 +389,7 @@ public void subscribeToTask(TaskIdParams request, Consumer<StreamingEventKind> e
378389
SSEEventListener sseEventListener = new SSEEventListener(eventConsumer, errorConsumer);
379390
try {
380391
String url = Utils.buildBaseUrl(agentInterface, request.tenant()) + String.format("/tasks/%1s:subscribe", request.id());
381-
A2AHttpClient.PostBuilder postBuilder = createPostBuilder(url, payloadAndHeaders);
392+
A2AHttpClient.PostBuilder postBuilder = createPostBuilder(url, payloadAndHeaders, false);
382393
ref.set(postBuilder.postAsyncSSE(
383394
event -> sseEventListener.onMessage(event, ref.get()),
384395
throwable -> sseEventListener.onError(throwable, ref.get()),
@@ -438,7 +449,7 @@ private String sendPostRequest(String url, PayloadAndHeaders payloadAndHeaders)
438449
if (LOGGER.isLoggable(Level.FINE)) {
439450
LOGGER.fine(body);
440451
}
441-
A2AHttpClient.PostBuilder builder = buildPost(url, payloadAndHeaders, body);
452+
A2AHttpClient.PostBuilder builder = buildPost(url, payloadAndHeaders, body, followRedirects);
442453
A2AHttpResponse response = builder.post();
443454
if (!response.success()) {
444455
if (LOGGER.isLoggable(Level.FINE)) {
@@ -449,19 +460,24 @@ private String sendPostRequest(String url, PayloadAndHeaders payloadAndHeaders)
449460
return response.body();
450461
}
451462

452-
private A2AHttpClient.PostBuilder createPostBuilder(String url, PayloadAndHeaders payloadAndHeaders) throws JsonProcessingException, InvalidProtocolBufferException {
463+
private A2AHttpClient.PostBuilder createPostBuilder(
464+
String url, PayloadAndHeaders payloadAndHeaders, boolean followRedirects)
465+
throws JsonProcessingException, InvalidProtocolBufferException {
453466
String body = ProtoJsonUtils.toJson(JsonFormat.printer(), (MessageOrBuilder) payloadAndHeaders.getPayload());
454467
if (LOGGER.isLoggable(Level.FINE)) {
455468
LOGGER.fine(body);
456469
}
457-
return buildPost(url, payloadAndHeaders, body);
470+
return buildPost(url, payloadAndHeaders, body, followRedirects);
458471
}
459472

460-
private A2AHttpClient.PostBuilder buildPost(String url, PayloadAndHeaders payloadAndHeaders, String body) throws JsonProcessingException {
473+
private A2AHttpClient.PostBuilder buildPost(
474+
String url, PayloadAndHeaders payloadAndHeaders, String body, boolean followRedirects)
475+
throws JsonProcessingException {
461476
A2AHttpClient.PostBuilder postBuilder = httpClient.createPost()
462477
.url(url)
463478
.addHeader("Content-Type", "application/json")
464479
.addHeader(A2AHeaders.A2A_VERSION, AgentInterface.CURRENT_PROTOCOL_VERSION)
480+
.followRedirects(followRedirects)
465481
.body(body);
466482

467483
if (payloadAndHeaders.getHeaders() != null) {

‎client/transport/rest/src/main/java/org/a2aproject/sdk/client/transport/rest/RestTransportConfig.java‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
public class RestTransportConfig extends ClientTransportConfig<RestTransport> {
5252

5353
private final @Nullable A2AHttpClient httpClient;
54+
private final boolean followRedirects;
5455

5556
/**
5657
* Create a REST transport configuration with the default HTTP client.
@@ -59,7 +60,7 @@ public class RestTransportConfig extends ClientTransportConfig<RestTransport> {
5960
* {@link RestTransportConfigBuilder} instead for a more fluent API.
6061
*/
6162
public RestTransportConfig() {
62-
this.httpClient = null;
63+
this(null, false);
6364
}
6465

6566
/**
@@ -70,7 +71,18 @@ public RestTransportConfig() {
7071
* @param httpClient the HTTP client to use for REST requests
7172
*/
7273
public RestTransportConfig(A2AHttpClient httpClient) {
74+
this(httpClient, false);
75+
}
76+
77+
/**
78+
* Create a REST transport configuration with a custom HTTP client and redirect policy.
79+
*
80+
* @param httpClient the HTTP client to use for REST requests
81+
* @param followRedirects whether POST requests may follow a single redirect
82+
*/
83+
public RestTransportConfig(@Nullable A2AHttpClient httpClient, boolean followRedirects) {
7384
this.httpClient = httpClient;
85+
this.followRedirects = followRedirects;
7486
}
7587

7688
/**
@@ -81,4 +93,13 @@ public RestTransportConfig(A2AHttpClient httpClient) {
8193
public @Nullable A2AHttpClient getHttpClient() {
8294
return httpClient;
8395
}
84-
}
96+
97+
/**
98+
* Whether POST requests issued by this transport may follow a redirect.
99+
*
100+
* @return {@code true} when redirect following is enabled
101+
*/
102+
public boolean isFollowRedirects() {
103+
return followRedirects;
104+
}
105+
}

‎client/transport/rest/src/main/java/org/a2aproject/sdk/client/transport/rest/RestTransportConfigBuilder.java‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public class RestTransportConfigBuilder extends ClientTransportConfigBuilder<Res
6767

6868
private @Nullable A2AHttpClient httpClient;
6969
private A2AHttpClientConfiguration httpClientConfiguration = A2AHttpClientConfiguration.DEFAULT;
70+
private boolean followRedirects;
7071

7172
/**
7273
* Set the HTTP client to use for REST requests.
@@ -107,6 +108,23 @@ public RestTransportConfigBuilder httpClientConfiguration(A2AHttpClientConfigura
107108
return this;
108109
}
109110

111+
/**
112+
* Enables explicit, one-hop redirect following for non-streaming POST requests.
113+
*
114+
* <p>Disabled by default. The configured {@link A2AHttpClient} remains responsible for
115+
* applying its redirect-header policy. When using {@code JdkA2AHttpClient} with a supplied
116+
* JDK client, that JDK client must have native redirects disabled.
117+
*
118+
* <p>Streaming SSE requests are never redirected.
119+
*
120+
* @param followRedirects whether non-streaming POST requests may follow a redirect
121+
* @return this builder for method chaining
122+
*/
123+
public RestTransportConfigBuilder followRedirects(boolean followRedirects) {
124+
this.followRedirects = followRedirects;
125+
return this;
126+
}
127+
110128
/**
111129
* Build the REST transport configuration.
112130
* <p>
@@ -122,7 +140,7 @@ public RestTransportConfig build() {
122140
httpClient = A2AHttpClientFactory.create(httpClientConfiguration);
123141
}
124142

125-
RestTransportConfig config = new RestTransportConfig(httpClient);
143+
RestTransportConfig config = new RestTransportConfig(httpClient, followRedirects);
126144
config.setInterceptors(this.interceptors);
127145
return config;
128146
}

‎client/transport/rest/src/main/java/org/a2aproject/sdk/client/transport/rest/RestTransportProvider.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public RestTransport create(RestTransportConfig clientTransportConfig, AgentCard
2121
if (transportConfig == null) {
2222
transportConfig = new RestTransportConfig(A2AHttpClientFactory.create(A2AHttpClientConfiguration.DEFAULT));
2323
}
24-
return new RestTransport(transportConfig.getHttpClient(), agentCard, agentInterface, transportConfig.getInterceptors());
24+
return new RestTransport(transportConfig.getHttpClient(), agentCard, agentInterface,
25+
transportConfig.getInterceptors(), transportConfig.isFollowRedirects());
2526
}
2627

2728
@Override

0 commit comments

Comments
 (0)