From 2c797b72957971413616ef45d4b64f48512b1dd7 Mon Sep 17 00:00:00 2001
From: lengleng <wangiegie@163.com>
Date: Fri, 19 Feb 2021 13:10:49 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=20BUG=20|=20#2386=20?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E7=99=BB=E5=BD=95=E5=A4=B1=E8=B4=A5=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E4=BA=8B=E4=BB=B6=E8=A7=A6=E5=8F=91=E4=BA=86?=
 =?UTF-8?q?3=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AuthenticationFailureEventListener.java      | 12 +++++++++---
 .../mobile/MobileAuthenticationFilter.java       | 16 +++-------------
 .../mobile/MobileSecurityConfigurer.java         |  5 -----
 .../common/xss/core/XssCleanInterceptor.java     |  3 ++-
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationFailureEventListener.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationFailureEventListener.java
index 14c185f7b..2e1e383f9 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationFailureEventListener.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationFailureEventListener.java
@@ -17,18 +17,19 @@
 
 package com.pig4cloud.pigx.common.security.listener;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import com.pig4cloud.pigx.common.security.handler.AuthenticationFailureHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent;
+import org.springframework.security.authentication.event.AuthenticationFailureProviderNotFoundEvent;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * @author lengleng
  * @date 2020/03/25 认证失败事件监听器
@@ -44,6 +45,11 @@ public class AuthenticationFailureEventListener implements ApplicationListener<A
 	 */
 	@Override
 	public void onApplicationEvent(AbstractAuthenticationFailureEvent event) {
+		// 此类型事件不传递处理 #2386
+		if (event instanceof AuthenticationFailureProviderNotFoundEvent) {
+			return;
+		}
+
 		ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder
 				.getRequestAttributes();
 		HttpServletRequest request = requestAttributes.getRequest();
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileAuthenticationFilter.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileAuthenticationFilter.java
index 2fcc11e33..50b07f354 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileAuthenticationFilter.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileAuthenticationFilter.java
@@ -17,25 +17,22 @@
 
 package com.pig4cloud.pigx.common.security.mobile;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.SneakyThrows;
 import org.springframework.http.HttpMethod;
-import org.springframework.security.authentication.AuthenticationEventPublisher;
 import org.springframework.security.authentication.AuthenticationServiceException;
-import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
-import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * @author lengleng
  * @date 2018/1/9 手机号登录验证filter
@@ -52,10 +49,6 @@ public class MobileAuthenticationFilter extends AbstractAuthenticationProcessing
 	@Setter
 	private boolean postOnly = true;
 
-	@Getter
-	@Setter
-	private AuthenticationEventPublisher eventPublisher;
-
 	@Getter
 	@Setter
 	private AuthenticationEntryPoint authenticationEntryPoint;
@@ -95,9 +88,6 @@ public class MobileAuthenticationFilter extends AbstractAuthenticationProcessing
 			SecurityContextHolder.clearContext();
 			logger.debug("Authentication request failed: " + failed);
 
-			eventPublisher.publishAuthenticationFailure(new BadCredentialsException(failed.getMessage(), failed),
-					new PreAuthenticatedAuthenticationToken("access-token", "N/A"));
-
 			try {
 				authenticationEntryPoint.commence(request, response,
 						new UsernameNotFoundException(failed.getMessage(), failed));
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileSecurityConfigurer.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileSecurityConfigurer.java
index dff52c7aa..7bc70ae1d 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileSecurityConfigurer.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileSecurityConfigurer.java
@@ -23,7 +23,6 @@ import com.pig4cloud.pigx.common.security.service.PigxUserDetailsService;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationEventPublisher;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -42,9 +41,6 @@ public class MobileSecurityConfigurer extends SecurityConfigurerAdapter<DefaultS
 	@Autowired
 	private ObjectMapper objectMapper;
 
-	@Autowired
-	private AuthenticationEventPublisher defaultAuthenticationEventPublisher;
-
 	@Autowired
 	private AuthenticationSuccessHandler mobileLoginSuccessHandler;
 
@@ -56,7 +52,6 @@ public class MobileSecurityConfigurer extends SecurityConfigurerAdapter<DefaultS
 		MobileAuthenticationFilter mobileAuthenticationFilter = new MobileAuthenticationFilter();
 		mobileAuthenticationFilter.setAuthenticationManager(http.getSharedObject(AuthenticationManager.class));
 		mobileAuthenticationFilter.setAuthenticationSuccessHandler(mobileLoginSuccessHandler);
-		mobileAuthenticationFilter.setEventPublisher(defaultAuthenticationEventPublisher);
 		mobileAuthenticationFilter.setAuthenticationEntryPoint(new PigxCommenceAuthExceptionEntryPoint(objectMapper));
 
 		MobileAuthenticationProvider mobileAuthenticationProvider = new MobileAuthenticationProvider();
diff --git a/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/core/XssCleanInterceptor.java b/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/core/XssCleanInterceptor.java
index 391708931..3ad9f3c09 100755
--- a/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/core/XssCleanInterceptor.java
+++ b/pigx-common/pigx-common-xss/src/main/java/com/pig4cloud/pigx/common/xss/core/XssCleanInterceptor.java
@@ -71,7 +71,8 @@ public class XssCleanInterceptor extends HandlerInterceptorAdapter {
 	}
 
 	@Override
-	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
+			throws Exception {
 		XssHolder.remove();
 	}