From 2575650f3e6029546cfa21c4c0ddf600eb923380 Mon Sep 17 00:00:00 2001
From: DingHao <dh.hiekn@gmail.com>
Date: Wed, 11 Sep 2024 12:01:19 +0800
Subject: [PATCH] Expose getRequiresAuthenticationRequestMatcher to subclass

Closes gh-15785
---
 ...tractPreAuthenticatedProcessingFilter.java |  6 ++-
 ...PreAuthenticatedProcessingFilterTests.java | 38 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java
index fb09d39e5d5..13a66d0e99c 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -339,6 +339,10 @@ public void setRequiresAuthenticationRequestMatcher(RequestMatcher requiresAuthe
 		this.requiresAuthenticationRequestMatcher = requiresAuthenticationRequestMatcher;
 	}
 
+	protected RequestMatcher getRequiresAuthenticationRequestMatcher() {
+		return this.requiresAuthenticationRequestMatcher;
+	}
+
 	/**
 	 * Sets the {@link SecurityContextHolderStrategy} to use. The default action is to use
 	 * the {@link SecurityContextHolderStrategy} stored in {@link SecurityContextHolder}.
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java
index 5598b5543d9..0b411442079 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -41,6 +41,7 @@
 import org.springframework.security.web.authentication.ForwardAuthenticationFailureHandler;
 import org.springframework.security.web.authentication.ForwardAuthenticationSuccessHandler;
 import org.springframework.security.web.context.SecurityContextRepository;
+import org.springframework.security.web.util.matcher.AndRequestMatcher;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -389,6 +390,41 @@ public void requestMatchesRequestMatcher() throws Exception {
 		verify(am).authenticate(any(PreAuthenticatedAuthenticationToken.class));
 	}
 
+	@Test
+	public void customMatchesRequestMatcherWhenMatchPath() throws Exception {
+		assertThat(customRequiresAuthenticationRequestMatcher("/test")).isNotNull();
+	}
+
+	@Test
+	public void customMatchesRequestMatcherWhenNoMatchPath() throws Exception {
+		assertThat(customRequiresAuthenticationRequestMatcher("/hello")).isNull();
+	}
+
+	private Authentication customRequiresAuthenticationRequestMatcher(String servletPath) throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setServletPath(servletPath);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockFilterChain chain = new MockFilterChain();
+		ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter() {
+			@Override
+			protected void initFilterBean() throws ServletException {
+				setRequiresAuthenticationRequestMatcher(new AndRequestMatcher(getRequiresAuthenticationRequestMatcher(),
+						new AntPathRequestMatcher("/test/**")));
+				super.initFilterBean();
+			}
+		};
+		filter.setAuthenticationManager((authentication) -> {
+			if (authentication instanceof PreAuthenticatedAuthenticationToken token) {
+				return new PreAuthenticatedAuthenticationToken(token.getPrincipal(), token.getCredentials(),
+						AuthorityUtils.createAuthorityList("ROLE_USER"));
+			}
+			return null;
+		});
+		filter.afterPropertiesSet();
+		filter.doFilter(request, response, chain);
+		return SecurityContextHolder.getContext().getAuthentication();
+	}
+
 	private void testDoFilter(boolean grantAccess) throws Exception {
 		MockHttpServletRequest req = new MockHttpServletRequest();
 		MockHttpServletResponse res = new MockHttpServletResponse();