[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: Wed Nov  7 15:27:41 2012
New Revision: 3120

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3120&view=rev
Log:
SIDP-559 - Allow for designators in SAML 1 queries, and fix request message propagation

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.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=3120&r1=3119&r2=3120&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Wed Nov  7 15:27:41 2012
@@ -2,6 +2,7 @@
 =============================================
 [SIDP-545] - Automatic reloading of relying-party.xml results in errors
 [SIDP-557] - aacli.sh Exception (again)
+[SIDP-559] - Attribute queries are ignoring input designators
 
 Changes in Release 2.3.8
 =============================================

Modified: branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java?rev=3120&r1=3119&r2=3120&view=diff
==============================================================================
--- branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java (original)
+++ branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java Wed Nov  7 15:27:41 2012
@@ -37,6 +37,7 @@
 import org.opensaml.saml1.core.Conditions;
 import org.opensaml.saml1.core.ConfirmationMethod;
 import org.opensaml.saml1.core.NameIdentifier;
+import org.opensaml.saml1.core.Request;
 import org.opensaml.saml1.core.RequestAbstractType;
 import org.opensaml.saml1.core.Response;
 import org.opensaml.saml1.core.ResponseAbstractType;
@@ -516,20 +517,20 @@
         SAML1AttributeAuthority attributeAuthority = profileConfiguration.getAttributeAuthority();
 
         try {
-            AttributeStatement statment;
-            if (requestContext.getInboundSAMLMessage() instanceof AttributeQuery) {
-                statment = attributeAuthority.buildAttributeStatement((AttributeQuery) requestContext
-                        .getInboundSAMLMessage(), requestContext.getAttributes().values());
+            AttributeStatement statement;
+            if (requestContext.getInboundSAMLMessage() instanceof Request) {
+                statement = attributeAuthority.buildAttributeStatement(((Request) requestContext
+                        .getInboundSAMLMessage()).getAttributeQuery(), requestContext.getAttributes().values());
             } else {
-                statment = attributeAuthority.buildAttributeStatement(null, requestContext.getAttributes().values());
-            }
-
-            if (statment != null) {
+                statement = attributeAuthority.buildAttributeStatement(null, requestContext.getAttributes().values());
+            }
+
+            if (statement != null) {
                 Subject statementSubject = buildSubject(requestContext, subjectConfMethod);
-                statment.setSubject(statementSubject);
-            }
-
-            return statment;
+                statement.setSubject(statementSubject);
+            }
+
+            return statement;
         } catch (AttributeRequestException e) {
             requestContext.setFailureStatus(buildStatus(StatusCode.RESPONDER, null, "Error resolving attributes"));
             String msg = "Error encoding attributes for principal " + requestContext.getPrincipalName();

Modified: branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java?rev=3120&r1=3119&r2=3120&view=diff
==============================================================================
--- branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java (original)
+++ branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java Wed Nov  7 15:27:41 2012
@@ -23,6 +23,7 @@
 import org.opensaml.common.binding.BasicEndpointSelector;
 import org.opensaml.common.binding.decoding.SAMLMessageDecoder;
 import org.opensaml.common.xml.SAMLConstants;
+import org.opensaml.saml2.core.Attribute;
 import org.opensaml.saml2.core.AttributeQuery;
 import org.opensaml.saml2.core.AttributeStatement;
 import org.opensaml.saml2.core.NameID;
@@ -96,15 +97,19 @@
             } else {

[... 28 lines stripped ...]