Polish AbstractAuthenticationTargetUrlRequestHandler

PR gh-16557 Signed-off-by: Max Batischev <[email protected]>
spring-projects · Mar 7, 2025 · c7673e8 · c7673e8
1 parent 56d2550
commit c7673e8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...gframework/security/web/authentication/AbstractAuthenticationTargetUrlRequestHandler.java b/...gframework/security/web/authentication/AbstractAuthenticationTargetUrlRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -195,8 +195,10 @@ protected String getTargetUrlParameter() {
 
 	/**
 	 * Allows overriding of the behaviour when redirecting to a target URL.
+	 * @param redirectStrategy {@link RedirectStrategy} to use
 	 */
 	public void setRedirectStrategy(RedirectStrategy redirectStrategy) {
+		Assert.notNull(redirectStrategy, "redirectStrategy cannot be null");
 		this.redirectStrategy = redirectStrategy;
 	}
 

diff --git a/...ework/security/web/authentication/AbstractAuthenticationTargetUrlRequestHandlerTests.java b/...ework/security/web/authentication/AbstractAuthenticationTargetUrlRequestHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.springframework.mock.web.MockHttpServletResponse;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
 /**
  * @author Dayan Kodippily
@@ -108,4 +109,9 @@ void returnDefaultTargetUrlIfUseRefererIsFalse() {
 		assertThat(this.handler.determineTargetUrl(this.request, this.response)).isEqualTo(DEFAULT_TARGET_URL);
 	}
 
+	@Test
+	void setRedirectStrategyWhenGivenNullThenThrowsException() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.handler.setRedirectStrategy(null));
+	}
+
 }