[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows/saml/saml2: idwsf-ssos-beans.xml i...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Aug 19 21:36:48 2015
New Revision: 7691

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7691&view=rev
Log:
Checkpoint work on wiring Liberty delegation flow and related beans.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-security-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-security-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml?rev=7691&r1=7690&r2=7691&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml	Wed Aug 19 21:36:48 2015
@@ -58,5 +58,5 @@
             </util:list>
         </property>
     </bean>
-    
+
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-security-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-security-beans.xml?rev=7691&r1=7690&r2=7691&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-security-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-security-beans.xml	Wed Aug 19 21:36:48 2015
@@ -17,22 +17,16 @@
 
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     
-    <bean id="SAMLMDClientCertAuthSecurityHandler"
-            class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
-            c:executionDirection="INBOUND">
-        <constructor-arg name="messageHandler">
-            <bean class="org.opensaml.saml.common.binding.security.impl.SAMLMDClientCertAuthSecurityHandler" scope="prototype"
-                    p:httpServletRequest-ref="shibboleth.HttpServletRequest" 
-                    p:entityContextClass="org.opensaml.saml.common.messaging.context.SAMLPresenterEntityContext" />
-        </constructor-arg>
-        <property name="activationCondition">
-            <bean class="com.google.common.base.Predicates" factory-method="not"
-                c:predicate-ref="shibboleth.Conditions.BrowserProfile" />
-        </property>
-        <property name="errorEvent">
-            <util:constant static-field="org.opensaml.profile.action.EventIds.MESSAGE_AUTHN_ERROR" />
-        </property>
-    </bean>
+    <import resource="../security-beans.xml" />
+    
+    <!-- TODO: these 2 constants are copied over from commons-beans.xml for now, pending where everything winds up. -->
+    <util:constant id="shibboleth.MetadataLookup.Protocol"
+        static-field="org.opensaml.saml.common.xml.SAMLConstants.SAML20P_NS" />
+
+    <util:constant id="shibboleth.MetadataLookup.Role"
+        static-field="org.opensaml.saml.saml2.metadata.SPSSODescriptor.DEFAULT_ELEMENT_NAME" />
+    
+    <!-- TODO: these probably don't belong here. -->
     
     <bean id="ProcessFrameworkHandler"
             class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
@@ -97,5 +91,65 @@
             <util:constant static-field="org.opensaml.profile.action.EventIds.INVALID_MESSAGE" />
         </property>
     </bean>
+    
+    <bean id="SAMLProtocolAndRoleForPresenter"
+            class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
+            c:executionDirection="INBOUND">
+        <constructor-arg name="messageHandler">
+            <bean class="org.opensaml.saml.common.binding.impl.SAMLProtocolAndRoleHandler" scope="prototype"
+                p:entityContextClass="org.opensaml.saml.common.messaging.context.SAMLPresenterEntityContext"
+                p:protocol-ref="shibboleth.MetadataLookup.Protocol"
+                p:role-ref="shibboleth.MetadataLookup.Role" />
+        </constructor-arg>
+    </bean>
+    
+    <bean id="SAMLMetadataLookupForPresenter"
+            class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
+            c:executionDirection="INBOUND">
+        <constructor-arg name="messageHandler">
+            <bean class="org.opensaml.saml.common.binding.impl.SAMLMetadataLookupHandler" scope="prototype"
+                p:entityContextClass="org.opensaml.saml.common.messaging.context.SAMLPresenterEntityContext">
+                <property name="roleDescriptorResolver">
+                    <bean class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"
+                        c:mdResolver-ref="shibboleth.MetadataResolver" />
+                </property>
+            </bean>
+        </constructor-arg>
+    </bean>
+    

[... 76 lines stripped ...]