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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 19 22:35:25 2014
New Revision: 7209

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7209&view=rev
Log:
- Clean up excess content from r-p.xml
- Enable attribute-release flow by default, uncover revoke box on example login page

Modified:
    trunk/idp-conf/src/main/resources/conf/relying-party.xml
    trunk/idp-conf/src/main/resources/views/login.vm

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=7209&r1=7208&r2=7209&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party.xml Fri Dec 19 22:35:25 2014
@@ -19,66 +19,50 @@
     "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="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">
-                        <!--
-                        <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" />
-                    <ref bean="SAML2.Logout" />
-                    <ref bean="SAML2.AttributeQuery" />
-                    <ref bean="SAML2.ArtifactResolution" />
-                </util:list>
+                <list>
+                    <bean parent="SAML2.SSO" p:encryptAssertions="false" />
+                </list>
             </property>
         </bean>
+        -->
         
     </util:list>
 

Modified: trunk/idp-conf/src/main/resources/views/login.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/login.vm?rev=7209&r1=7208&r2=7209&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/login.vm (original)

[... 15 lines stripped ...]