[java-identity-provider COMMIT] in /branches/3.3: ./ idp-conf/src/main/resources/system/conf/legacy-relying-party-def...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar  7 21:10:23 2017
New Revision: 8670

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8670&view=rev
Log:
BPr8635 - IDP-1132 - Improper warning when using legacy relying-party format

Modified:
    branches/3.3/   (props changed)
    branches/3.3/idp-conf/src/main/resources/system/conf/legacy-relying-party-defaults.xml
    branches/3.3/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/BaseSAMLProfileConfigurationParser.java
    branches/3.3/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml

Modified: branches/3.3/idp-conf/src/main/resources/system/conf/legacy-relying-party-defaults.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.3/idp-conf/src/main/resources/system/conf/legacy-relying-party-defaults.xml?rev=8670&r1=8669&r2=8670&view=diff
==============================================================================
--- branches/3.3/idp-conf/src/main/resources/system/conf/legacy-relying-party-defaults.xml	(original)
+++ branches/3.3/idp-conf/src/main/resources/system/conf/legacy-relying-party-defaults.xml	Tue Mar  7 21:10:23 2017
@@ -11,40 +11,49 @@
         default-destroy-method="destroy">
 	
     <!--  SAML2 -->
+    <alias alias="shibboleth.SAML2.Artifact.ServletRequest" name="shibboleth.HttpServletRequest" />
     <bean id="shibboleth.SAML2.Artifact.InboundFlowId" class="java.lang.String"
         c:_0="security-policy/saml-soap" />
         
+    <alias alias="shibboleth.SAML2.Logout.ServletRequest" name="shibboleth.HttpServletRequest" />
     <bean id="shibboleth.SAML2.Logout.ArtifactServiceIndex" class="java.lang.String"
         c:_0="%{idp.artifact.endpointIndex:2}" />
     <bean id="shibboleth.SAML2.Logout.InboundFlowId" class="java.lang.String"
         c:_0="security-policy/saml2-slo" />
 
+    <alias alias="shibboleth.SAML2.AttributeQuery.ServletRequest" name="shibboleth.HttpServletRequest" />
     <bean id="shibboleth.SAML2.AttributeQuery.ArtifactServiceIndex" class="java.lang.String"
         c:_0="%{idp.artifact.endpointIndex:2}" />
     <bean id="shibboleth.SAML2.AttributeQuery.InboundFlowId" class="java.lang.String"
         c:_0="security-policy/saml-soap" />
 
+    <alias alias="shibboleth.SAML2.BrowserSSO.ServletRequest" name="shibboleth.HttpServletRequest" />
     <bean id="shibboleth.SAML2.BrowserSSO.ArtifactServiceIndex" class="java.lang.String"
         c:_0="%{idp.artifact.endpointIndex:2}" />
     <bean id="shibboleth.SAML2.BrowserSSO.InboundFlowId" class="java.lang.String"
         c:_0="security-policy/saml2-sso" />
-        
+
+    <alias alias="shibboleth.SAML2.ECP.ServletRequest" name="shibboleth.HttpServletRequest" />        
     <bean id="shibboleth.SAML2.ECP.InboundFlowId" class="java.lang.String"
         c:_0="security-policy/saml2-ecp" />
 
     <!--  SAML2 - Liberty -->
+    <alias alias="shibboleth.SAML2.SSOS.ServletRequest" name="shibboleth.HttpServletRequest" />
     <bean id="shibboleth.SAML2.SSOS.InboundFlowId" class="java.lang.String"
-        c:_0="security-policy/saml2-ssos" /><!-- TODO -->
+        c:_0="security-policy/saml2-ssos" />
 
     <!--  SAML1 -->
+    <alias alias="shibboleth.SAML1.Artifact.ServletRequest" name="shibboleth.HttpServletRequest" />
     <bean id="shibboleth.SAML1.Artifact.InboundFlowId" class="java.lang.String"
         c:_0="security-policy/saml-soap" />
-        
+    
+    <alias alias="shibboleth.SAML1.AttributeQuery.ServletRequest" name="shibboleth.HttpServletRequest" />
     <bean id="shibboleth.SAML1.AttributeQuery.ArtifactServiceIndex" class="java.lang.String"
         c:_0="%{idp.artifact.endpointIndex:2}" />
     <bean id="shibboleth.SAML1.AttributeQuery.InboundFlowId" class="java.lang.String"
         c:_0="security-policy/saml-soap" />
-        
+    
+    <alias alias="shibboleth.SAML1.BrowserSSO.ServletRequest" name="shibboleth.HttpServletRequest" />
     <bean id="shibboleth.SAML1.BrowserSSO.ArtifactServiceIndex" class="java.lang.String"
         c:_0="%{idp.artifact.endpointIndex:2}" />
     <bean id="shibboleth.SAML1.BrowserSSO.InboundFlowId" class="java.lang.String"

Modified: branches/3.3/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/BaseSAMLProfileConfigurationParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.3/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/BaseSAMLProfileConfigurationParser.java?rev=8670&r1=8669&r2=8670&view=diff
==============================================================================
--- branches/3.3/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/BaseSAMLProfileConfigurationParser.java	(original)
+++ branches/3.3/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/BaseSAMLProfileConfigurationParser.java	Tue Mar  7 21:10:23 2017
@@ -241,6 +241,9 @@
         // Install a defaulted flow ID for inbound security policy handling.

[... 149 lines stripped ...]