فهرست منبع

SEC-722: Add Open ID Namespace Support
http://jira.springframework.org/browse/SEC-722. Added check for MAIN_ENTRY_POINT bean when resolving entry points. If this has been set during parsing it will be used.

Luke Taylor 17 سال پیش
والد
کامیت
acc22b2745
1فایلهای تغییر یافته به همراه5 افزوده شده و 1 حذف شده
  1. 5 1
      core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java

+ 5 - 1
core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java

@@ -152,7 +152,11 @@ public class HttpSecurityConfigPostProcessor implements BeanFactoryPostProcessor
         if (entryPoints.size() == 1) {
             mainEntryPoint = (AuthenticationEntryPoint) entryPoints.get(0);
         } else {
-            mainEntryPoint = (AuthenticationEntryPoint) entryPointMap.get(BeanIds.FORM_LOGIN_ENTRY_POINT);
+            mainEntryPoint = (AuthenticationEntryPoint) entryPointMap.get(BeanIds.MAIN_ENTRY_POINT);
+            
+            if (mainEntryPoint == null) {
+            	mainEntryPoint = (AuthenticationEntryPoint) entryPointMap.get(BeanIds.FORM_LOGIN_ENTRY_POINT);
+            }
 
             if (mainEntryPoint == null) {
                 mainEntryPoint = (AuthenticationEntryPoint) entryPointMap.get(BeanIds.BASIC_AUTHENTICATION_ENTRY_POINT);