Merge #2673 into 1.1.3

reactor · Jan 27, 2023 · 31b673e · 31b673e
2 parents 0dbe917 + ec43652
commit 31b673e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/client/HttpClientOperations.java b/reactor-netty-http/src/main/java/reactor/netty/http/client/HttpClientOperations.java
@@ -741,11 +741,19 @@ protected HttpMessage outboundHttpMessage() {
 
 	final boolean notRedirected(HttpResponse response) {
 		if (isFollowRedirect() && followRedirectPredicate.test(this, this)) {
+			try {
+				redirecting = new RedirectClientException(response.headers(), response.status());
+			}
+			catch (RuntimeException e) {
+				if (log.isDebugEnabled()) {
+					log.debug(format(channel(), "The request cannot be redirected"), e);
+				}
+				return true;
+			}
 			if (log.isDebugEnabled()) {
 				log.debug(format(channel(), "Received redirect location: {}"),
 						httpMessageLogFactory().debug(HttpMessageArgProviderFactory.create(response)));
 			}
-			redirecting = new RedirectClientException(response.headers(), response.status());
 			return false;
 		}
 		return true;

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/client/RedirectClientException.java b/reactor-netty-http/src/main/java/reactor/netty/http/client/RedirectClientException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2011-2023 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,8 +31,8 @@ final class RedirectClientException extends RuntimeException {
 	final HttpResponseStatus status;
 
 	RedirectClientException(HttpHeaders headers, HttpResponseStatus status) {
-		location = Objects.requireNonNull(headers.get(HttpHeaderNames.LOCATION));
-		this.status = Objects.requireNonNull(status);
+		location = Objects.requireNonNull(headers.get(HttpHeaderNames.LOCATION), "location");
+		this.status = Objects.requireNonNull(status, "status");
 	}
 
 	@Override

diff --git a/reactor-netty-http/src/test/java/reactor/netty/http/client/HttpRedirectTest.java b/reactor-netty-http/src/test/java/reactor/netty/http/client/HttpRedirectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2022 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2017-2023 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -798,4 +798,24 @@ void testHttp2Redirect() {
 		assertThat(response.getT2()).isEqualTo(200);
 		assertThat(response.getT1()).isEqualTo("OK");
 	}
+
+	@Test
+	void testIssue2670() {
+		disposableServer =
+				createServer()
+				        .handle((req, res) -> res.sendString(Mono.just("testIssue2670")))
+				        .bindNow();
+
+		createClient(disposableServer.port())
+		        .followRedirect((req, res) -> true)
+		        .get()
+		        .uri("/")
+		        .responseContent()
+		        .aggregate()
+		        .asString()
+		        .as(StepVerifier::create)
+		        .expectNext("testIssue2670")
+		        .expectComplete()
+		        .verify(Duration.ofSeconds(5));
+	}
 }