[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/idp.properties idp-conf/src/main/resource...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep  2 04:46:38 2014
New Revision: 6493

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6493&view=rev
Log:
IDP-224 - finalize work on extending RP contexts

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/session-manager.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
    trunk/idp-session-impl/pom.xml
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateMultiRPContextFromLogoutContext.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/ProcessLogoutRelyingParties.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/PopulateMultiRPContextFromLogoutContextTest.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/ProcessLogoutRelyingPartiesText.java

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6493&r1=6492&r2=6493&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Tue Sep  2 04:46:38 2014
@@ -138,6 +138,10 @@
 # doesn't match the identity in a pre-existing session.
 #idp.authn.identitySwitchIsError = false
 
+# Whether to lookup metadata, etc. for every SP involved in a logout
+# for use by user interface logic; adds overhead so off by default.
+#idp.logout.elaboration = false
+
 # Reload "failfast" (stop the IdP if a configuration is bad)
 # and reload check interval (0 == never reload).
 #idp.service.logging.failFast=true

Modified: trunk/idp-conf/src/main/resources/conf/session-manager.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/session-manager.xml?rev=6493&r1=6492&r2=6493&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/session-manager.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/session-manager.xml Tue Sep  2 04:46:38 2014
@@ -10,7 +10,6 @@
 	default-init-method="initialize" default-destroy-method="destroy">
 
     <!-- Modify only to add extension types associated with non-built-in SSO protocols. -->
-    
     <bean id="shibboleth.SPSessionSerializerRegistry" parent="shibboleth.DefaultSPSessionSerializerRegistry">
         <property name="mappings">
             <map merge="true">
@@ -18,4 +17,14 @@
         </property>
     </bean>
 
+    <!-- Includes defaults for SAML session types. -->
+    <util:map id="shibboleth.SessionTypeProtocolMap" >
+        <entry key="#{T(net.shibboleth.idp.saml.session.SAML1SPSession)}">
+            <util:constant static-field="org.opensaml.saml.common.xml.SAMLConstants.SAML11P_NS" />
+        </entry>
+        <entry key="#{T(net.shibboleth.idp.saml.session.SAML2SPSession)}">
+            <util:constant static-field="org.opensaml.saml.common.xml.SAMLConstants.SAML20P_NS" />
+        </entry>
+    </util:map>
+    
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml?rev=6493&r1=6492&r2=6493&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml Tue Sep  2 04:46:38 2014
@@ -36,6 +36,12 @@
         class="net.shibboleth.idp.profile.audit.impl.PopulateAuditContext" scope="prototype"
         p:fieldExtractors-ref="shibboleth.LogoutAuditExtractors"
         p:format="%{idp.service.logging.audit:%T|%b|%I|%SP|%P|%IDP|%bb|%III|%u|%ac|%attr|%n|%i}" />
+        
+    <bean id="PopulateMultiRPContextFromLogoutContext"
+        class="net.shibboleth.idp.session.impl.PopulateMultiRPContextFromLogoutContext" scope="prototype"
+        p:activationCondition="%{idp.logout.elaboration:false}"
+        p:roleDescriptorResolver-ref="shibboleth.RoleDescriptorResolver"
+        p:sessionTypeProtocolMap-ref="shibboleth.SessionTypeProtocolMap" />
     
     <bean id="WriteAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
         p:format="%{idp.service.logging.audit:%T|%b|%I|%SP|%P|%IDP|%bb|%III|%u|%ac|%attr|%n|%i}" />

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml?rev=6493&r1=6492&r2=6493&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml (original)

[... 228 lines stripped ...]