[java-shib-idp2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/shibboleth/i...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jun  5 22:42:03 2012
New Revision: 3107

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3107&view=rev
Log:
SIDP-549 - Incorrect handling of returned authn error in SSO profile handlers

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=3107&r1=3106&r2=3107&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Tue Jun  5 22:42:03 2012
@@ -1,3 +1,7 @@
+Changes since Release 2.3.6
+=============================================
+[SIDP-549] - Incorrect handling of returned authn error in SSO profile handlers
+
 Changes in Release 2.3.6
 =============================================
 [SIDP-532] - ExternalAuthnSystemLoginHandler incorrectly logs as RemoteUserLoginHandler

Modified: branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java?rev=3107&r1=3106&r2=3107&view=diff
==============================================================================
--- branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java (original)
+++ branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java Tue Jun  5 22:42:03 2012
@@ -128,12 +128,6 @@
                 return;
             }
             
-            if(!loginContext.isPrincipalAuthenticated()){
-                log.debug("Incoming request contains a login context but principal was not authenticated, processing first leg of request");
-                performAuthentication(inTransport, outTransport);
-                return;
-            }
-            
             if(loginContext.isPrincipalAuthenticated()){
                 log.debug("Incoming request contains a login context and indicates principal was authenticated, processing second leg of request");
                 completeAuthenticationRequest((ShibbolethSSOLoginContext)loginContext, inTransport, outTransport);
@@ -145,6 +139,10 @@
                 completeAuthenticationRequest((ShibbolethSSOLoginContext)loginContext, inTransport, outTransport);
                 return;
             }
+
+            log.debug("Incoming request contains a login context but principal was not authenticated, processing first leg of request");
+            performAuthentication(inTransport, outTransport);
+            return;
         }
         
         log.debug("Incoming request does not contain a login context, processing as first leg of request");

Modified: branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java?rev=3107&r1=3106&r2=3107&view=diff
==============================================================================
--- branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java (original)
+++ branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java Tue Jun  5 22:42:03 2012
@@ -165,13 +165,7 @@
                 performAuthentication(inTransport, outTransport);
                 return;
             }
-            
-            if(!loginContext.isPrincipalAuthenticated()){
-                log.debug("Incoming request contains a login context but principal was not authenticated, processing first leg of request");
-                performAuthentication(inTransport, outTransport);
-                return;
-            }
-            
+                        
             if(loginContext.isPrincipalAuthenticated()){
                 log.debug("Incoming request contains a login context and indicates principal was authenticated, processing second leg of request");
                 completeAuthenticationRequest((Saml2LoginContext)loginContext, inTransport, outTransport);
@@ -183,6 +177,10 @@
                 completeAuthenticationRequest((Saml2LoginContext)loginContext, inTransport, outTransport);
                 return;
             }
+
+            log.debug("Incoming request contains a login context but principal was not authenticated, processing first leg of request");
+            performAuthentication(inTransport, outTransport);
+            return;
         }
         
         log.debug("Incoming request does not contain a login context, processing as first leg of request");