[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/relying-party.xml idp-conf/src/main/resou...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul 22 22:12:57 2014
New Revision: 6333

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6333&view=rev
Log:
IDP-442 / IDP-80: implement includeAttributeStatement check, and override for artifact.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/logic/IncludeAttributeStatementPredicate.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/relying-party.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/relying-party.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party.xml?rev=6333&r1=6332&r2=6333&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party.xml Tue Jul 22 22:12:57 2014
@@ -51,7 +51,7 @@
         <bean parent="RelyingPartyByName" c:relyingPartyIds="https://sp.example.org">
             <property name="profileConfigurations">
                 <util:list>
-                    <bean parent="Shibboleth.SSO">
+                    <bean parent="Shibboleth.SSO" p:includeAttributeStatement="true">
                         <!--
                         <property name="defaultAuthenticationMethods">
                             <util:list>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml?rev=6333&r1=6332&r2=6333&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml Tue Jul 22 22:12:57 2014
@@ -38,6 +38,14 @@
 
     <alias name="shibboleth.OutgoingSOAPBindings" alias="shibboleth.OutgoingBindings"/>
 
+    <bean id="AddAttributeStatementToAssertion"
+            class="net.shibboleth.idp.saml.saml1.profile.impl.AddAttributeStatementToAssertion" scope="prototype">
+        <property name="identifierGeneratorLookupStrategy">
+            <bean class="net.shibboleth.idp.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
+                p:defaultIdentifierGenerationStrategy-ref="shibboleth.DefaultIdentifierGenerationStrategy" />
+        </property>
+    </bean>
+
     <bean id="CopyNameIdentifierFromRequest"
             class="org.opensaml.saml.saml1.profile.impl.CopyNameIdentifierFromRequest" scope="prototype" />
 

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml?rev=6333&r1=6332&r2=6333&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml Tue Jul 22 22:12:57 2014
@@ -38,14 +38,6 @@
         </property>
     </bean>
 
-    <bean id="AddAttributeStatementToAssertion"
-            class="net.shibboleth.idp.saml.saml1.profile.impl.AddAttributeStatementToAssertion" scope="prototype">
-        <property name="identifierGeneratorLookupStrategy">
-            <bean class="net.shibboleth.idp.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
-                p:defaultIdentifierGenerationStrategy-ref="shibboleth.DefaultIdentifierGenerationStrategy" />
-        </property>
-    </bean>
-
     <bean id="InitializeOutboundMessageContextForError"
             class="net.shibboleth.idp.saml.profile.impl.InitializeOutboundMessageContextForError" scope="prototype">
         <property name="outboundBinding">

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml?rev=6333&r1=6332&r2=6333&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml Tue Jul 22 22:12:57 2014
@@ -31,6 +31,17 @@
 
     <bean id="ResolveAttributesPredicate"

[... 82 lines stripped ...]