[java-idp-integration-tests COMMIT] in /trunk/src/test: conf/relying-party-with-consent.xml java/net/shibboleth/idp/t...

[noreply at shibboleth.net]

Author: tzeller
Date: Sat Dec 20 22:05:17 2014
New Revision: 44

URL: http://svn.shibboleth.net/view/java-idp-integration-tests?rev=44&view=rev
Log:
Rework integration tests with new default consent settings.

Added:
    trunk/src/test/java/net/shibboleth/idp/test/saml2/AbstractSAML2UnsolicitedSSOIntegrationTest.java   (with props)
    trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOPerAttributeConsentIntegrationTest.java   (with props)
    trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOTermsOfUseIntegrationTest.java   (with props)
Modified:
    trunk/src/test/conf/relying-party-with-consent.xml
    trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOIntegrationTest.java
    trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOIntegrationWithConsentTest.java

Modified: trunk/src/test/conf/relying-party-with-consent.xml
URL: http://svn.shibboleth.net/view/java-idp-integration-tests/trunk/src/test/conf/relying-party-with-consent.xml?rev=44&r1=43&r2=44&view=diff
==============================================================================
--- trunk/src/test/conf/relying-party-with-consent.xml (original)
+++ trunk/src/test/conf/relying-party-with-consent.xml Sat Dec 20 22:05:17 2014
@@ -12,8 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <context:property-placeholder />
-
     <!--
     Unverified RP configuration, defaults to no support for any profiles. Add <ref> elements to the list
     to enable specific default profile settings (as below), or create new beans inline to override defaults.
@@ -21,67 +19,51 @@
     "Unverified" typically means the IdP has no metadata, or equivalent way of assuring the identity and
     legitimacy of a requesting system. To run an "open" IdP, you can enable profiles here.
     -->
-    
     <bean id="shibboleth.UnverifiedRelyingParty" parent="RelyingParty">
         <property name="profileConfigurations">
-            <util:list>
+            <list>
             <!-- <bean parent="SAML2.SSO" p:encryptAssertions="false" /> -->
-            </util:list>
+            </list>
         </property>
     </bean>
 
-    <!-- Default configuration, with default settings applied for all profiles. -->
-
+    <!--
+    Default configuration, with default settings applied for all profiles, and enables
+    the attribute-release consent flow.
+    -->
     <bean id="shibboleth.DefaultRelyingParty" parent="RelyingParty">
         <property name="profileConfigurations">
-            <util:list>
-                <ref bean="Shibboleth.SSO" />
+            <list>
+                <bean parent="Shibboleth.SSO" p:postAuthenticationFlows="attribute-release" />
                 <ref bean="SAML1.AttributeQuery" />
                 <ref bean="SAML1.ArtifactResolution" />
-                <ref bean="SAML2.SSO" />
+                <bean parent="SAML2.SSO" p:postAuthenticationFlows="#{ {'terms-of-use', 'attribute-release'} }" />
                 <ref bean="SAML2.ECP" />
                 <ref bean="SAML2.Logout" />
                 <ref bean="SAML2.AttributeQuery" />
                 <ref bean="SAML2.ArtifactResolution" />
-            </util:list>
+            </list>
         </property>
     </bean>
 
+    <!-- Container for any overrides you want to add. -->
+
     <util:list id="shibboleth.RelyingPartyOverrides">
     
+        <!--
+        Override example that identifies a single RP by name and configures it
+        for SAML 2 SSO without encryption. This is a common "vendor" scenario.
+        -->
+        <!--
         <bean parent="RelyingPartyByName" c:relyingPartyIds="https://sp.example.org">
             <property name="profileConfigurations">
-                <util:list>
-                    <bean parent="Shibboleth.SSO" p:includeAttributeStatement="true">
-                        <!--
-                        <property name="defaultAuthenticationMethods">
-                            <util:list>
-                                <bean parent="shibboleth.SAML1AuthenticationMethod"
-                                    c:method="urn:oasis:names:tc:SAML:1.0:am:password" />
-                            </util:list>
-                        </property>
-                        -->
-                    </bean>
-                    <ref bean="SAML1.AttributeQuery" />
-                    <ref bean="SAML1.ArtifactResolution" />
-                    <bean parent="SAML2.SSO" p:postAuthenticationFlows="#{ {'terms-of-use', 'attribute-release'} }">
-                        <!--
-                        <property name="defaultAuthenticationMethods">
-                            <util:list>
-                                <bean parent="shibboleth.SAML2AuthnContextClassRef"
-                                    c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
-                            </util:list>
-                        </property>
-                        -->
-                    </bean>
-                    <ref bean="SAML2.ECP" />

[... 209 lines stripped ...]