[java-plugin-shibd-saml] branch main updated: Reorganize flows and flow IDs.
Scott Cantor
cantor.2 at osu.edu
Thu Sep 12 19:18:26 UTC 2024
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-plugin-shibd-saml.
View the commit online:
http://git.shibboleth.net/view/?p=java-plugin-shibd-saml.git;a=commit;h=90c30b9e83ad7215067f803dd1133e3ca86a34e5
The following commit(s) were added to refs/heads/main by this push:
new 90c30b9 Reorganize flows and flow IDs.
90c30b9 is described below
commit 90c30b9e83ad7215067f803dd1133e3ca86a34e5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 12 15:18:23 2024 -0400
Reorganize flows and flow IDs.
---
.../META-INF/net.shibboleth.idp/postconfig.xml | 8 ++---
.../artifact-beans.xml} | 0
.../artifact-flow.xml} | 2 +-
.../post-simplesign-beans.xml} | 0
.../post-simplesign-flow.xml} | 0
.../{saml2-post-beans.xml => post/post-beans.xml} | 0
.../{saml2-post-flow.xml => post/post-flow.xml} | 2 +-
.../{saml2-abstract-beans.xml => saml2-beans.xml} | 6 ++--
.../{saml2-abstract-flow.xml => saml2-flow.xml} | 0
.../idp/flows/sp/initiator/saml2/saml2-beans.xml | 6 ++--
.../idp/module/conf/sp/saml-test-agents.xml | 41 +++++++++-------------
11 files changed, 26 insertions(+), 39 deletions(-)
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index 092b011..b62b312 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -15,7 +15,7 @@
<!-- Token consumer descriptors for each SAML binding. -->
- <bean p:id="sp/consumer/saml2-post" class="net.shibboleth.sp.profile.BasicTokenConsumerFlowDescriptor">
+ <bean p:id="sp/consumer/saml2/post" class="net.shibboleth.sp.profile.BasicTokenConsumerFlowDescriptor">
<property name="activationCondition">
<bean class="net.shibboleth.sp.profile.context.logic.HttpSeevletRequestPredicate"
p:allowedMethods="POST"
@@ -24,7 +24,7 @@
</property>
</bean>
- <bean p:id="sp/consumer/saml2-post-simplesign" class="net.shibboleth.sp.profile.BasicTokenConsumerFlowDescriptor">
+ <bean p:id="sp/consumer/saml2/post-simplesign" class="net.shibboleth.sp.profile.BasicTokenConsumerFlowDescriptor">
<property name="activationCondition">
<bean class="net.shibboleth.sp.profile.context.logic.HttpSeevletRequestPredicate"
p:allowedMethods="POST"
@@ -33,10 +33,10 @@
</property>
</bean>
- <bean p:id="sp/consumer/saml2-artifact" class="net.shibboleth.sp.profile.BasicTokenConsumerFlowDescriptor">
+ <bean p:id="sp/consumer/saml2/artifact" class="net.shibboleth.sp.profile.BasicTokenConsumerFlowDescriptor">
<property name="activationCondition">
<bean class="net.shibboleth.sp.profile.context.logic.HttpSeevletRequestPredicate"
- p:allowedMethods="#{{ 'GET', POST' }}"
+ p:allowedMethods="#{{ 'GET', 'POST' }}"
p:allowedContentTypes="application/x-www-form-urlencoded"
p:allowNullContentType="true"
p:requiredParameters="SAMLart" />
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-artifact-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/artifact/artifact-beans.xml
similarity index 100%
rename from sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-artifact-beans.xml
rename to sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/artifact/artifact-beans.xml
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-artifact-flow.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/artifact/artifact-flow.xml
similarity index 92%
rename from sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-artifact-flow.xml
rename to sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/artifact/artifact-flow.xml
index f9dc154..e63c001 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-artifact-flow.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/artifact/artifact-flow.xml
@@ -1,7 +1,7 @@
<flow xmlns="http://www.springframework.org/schema/webflow"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
- parent="sp/consumer/saml2-abstract">
+ parent="sp/consumer/saml2">
<!-- The file really exists in this directory, but it's referenced from extending flow-directories -->
<bean-import resource="classpath:/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-artifact-beans.xml" />
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-post-simplesign-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/post-simplesign/post-simplesign-beans.xml
similarity index 100%
rename from sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-post-simplesign-beans.xml
rename to sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/post-simplesign/post-simplesign-beans.xml
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-post-simplesign-flow.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/post-simplesign/post-simplesign-flow.xml
similarity index 100%
rename from sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-post-simplesign-flow.xml
rename to sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/post-simplesign/post-simplesign-flow.xml
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-post-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/post/post-beans.xml
similarity index 100%
rename from sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-post-beans.xml
rename to sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/post/post-beans.xml
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-post-flow.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/post/post-flow.xml
similarity index 92%
rename from sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-post-flow.xml
rename to sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/post/post-flow.xml
index c8a42ee..ab811fc 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-post-flow.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/post/post-flow.xml
@@ -1,7 +1,7 @@
<flow xmlns="http://www.springframework.org/schema/webflow"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
- parent="sp/consumer/saml2-abstract">
+ parent="sp/consumer/saml2">
<!-- The file really exists in this directory, but it's referenced from extending flow-directories -->
<bean-import resource="classpath:/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-post-beans.xml" />
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-abstract-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-beans.xml
similarity index 97%
rename from sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-abstract-beans.xml
rename to sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-beans.xml
index 452bdf5..2850af4 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-abstract-beans.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-beans.xml
@@ -59,11 +59,9 @@
</property>
</bean>
- <bean id="AppAwareIssuerLookupFunction" class="net.shibboleth.sp.profile.context.navigate.IssuerLookupFunction" />
-
<bean id="PopulateDecryptionParameters"
class="org.opensaml.profile.action.impl.PopulateDecryptionParameters" scope="prototype"
- p:recipientLookupStrategy-ref="AppAwareIssuerLookupFunction"
+ p:recipientLookupStrategy-ref="shibboleth.IssuerLookup.Simple"
p:configurationLookupStrategy-ref="shibboleth.DecryptionConfigurationLookup"
p:decryptionParametersResolver-ref="shibboleth.DecryptionParametersResolver" />
@@ -165,6 +163,6 @@
<bean id="ExtractSAMLAttributes"
class="net.shibboleth.sp.saml.saml2.profile.impl.ExtractSAMLAttributes" scope="prototype"
p:responderLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple"
- p:requesterLookupStrategy-ref="AppAwareIssuerLookupFunction" />
+ p:requesterLookupStrategy-ref="shibboleth.IssuerLookup.Simple" />
</beans>
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-abstract-flow.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-flow.xml
similarity index 100%
rename from sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-abstract-flow.xml
rename to sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/saml2/saml2-flow.xml
diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/saml2/saml2-beans.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/saml2/saml2-beans.xml
index cab72f7..276429e 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/saml2/saml2-beans.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/saml2/saml2-beans.xml
@@ -52,11 +52,9 @@
class="net.shibboleth.idp.profile.impl.SelectProfileConfiguration" scope="prototype"
p:profileId="#{T(net.shibboleth.saml.saml2.profile.config.BrowserSSOProfileConfiguration).PROFILE_ID}" />
- <bean id="AppAwareIssuerLookupFunction" class="net.shibboleth.sp.profile.context.navigate.IssuerLookupFunction" />
-
<bean id="InitializeOutboundMessageContext"
class="net.shibboleth.idp.saml.profile.impl.InitializeOutboundMessageContext" scope="prototype"
- p:selfIdentityLookupStrategy-ref="AppAwareIssuerLookupFunction" />
+ p:selfIdentityLookupStrategy-ref="shibboleth.IssuerLookup.Simple" />
<bean id="InitializeMessageChannelSecurityContext"
class="org.opensaml.profile.action.impl.StaticMessageChannelSecurity" scope="prototype"
@@ -103,7 +101,7 @@
<bean id="AddAuthnRequest"
class="net.shibboleth.sp.saml.saml2.profile.impl.AddAuthnRequest" scope="prototype"
p:overwriteExisting="true"
- p:issuerLookupStrategy-ref="AppAwareIssuerLookupFunction"
+ p:issuerLookupStrategy-ref="shibboleth.IssuerLookup.Simple"
p:nameIDLookupStrategy="#{getObject('%{sp.authn.SAML.NameIDLookupStrategy:}'.trim())}">
<property name="identifierGeneratorLookupStrategy">
<bean class="net.shibboleth.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
diff --git a/sp-saml-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/saml-test-agents.xml b/sp-saml-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/saml-test-agents.xml
index 514cd58..bac6623 100644
--- a/sp-saml-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/saml-test-agents.xml
+++ b/sp-saml-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/saml-test-agents.xml
@@ -18,56 +18,47 @@
<bean p:id="default" parent="shibboleth.Application"
p:issuer="https://testsp.example.org"
p:authenticatingAuthority="https://idp.example.org"
- p:defaultConfiguration-ref="test.DefaultRelyingParty" />
+ p:profileConfigurations-ref="test.ProfileConfigurations" />
<bean p:id="feature-blocking" parent="shibboleth.Application"
p:issuer="https://testsp.example.org"
p:authenticatingAuthority="https://idp.example.org"
- p:defaultConfiguration-ref="test.featureBlockingDefaultRelyingParty" />
+ p:profileConfigurations-ref="test.featureBlockingProfileConfigurations" />
<bean p:id="no-metadata" parent="shibboleth.Application"
p:issuer="https://testsp.example.org"
p:authenticatingAuthority="https://unknown.example.org"
- p:defaultConfiguration-ref="test.DefaultRelyingParty" />
+ p:profileConfigurations-ref="test.ProfileConfigurations" />
<bean p:id="no-profile" parent="shibboleth.Application"
p:issuer="https://testsp.example.org"
- p:authenticatingAuthority="https://idp.example.org"
- p:defaultConfiguration-ref="shibboleth.DefaultRelyingParty" />
+ p:authenticatingAuthority="https://idp.example.org" />
<bean p:id="no-endpoint" parent="shibboleth.Application"
p:issuer="https://testsp.example.org"
p:authenticatingAuthority="https://noendpoint.example.org"
- p:defaultConfiguration-ref="test.DefaultRelyingParty" />
+ p:profileConfigurations-ref="test.ProfileConfigurations" />
<bean p:id="no-initiators" parent="shibboleth.Application"
p:issuer="https://testsp.example.org"
p:authenticatingAuthority="https://idp.example.org"
- p:defaultConfiguration-ref="test.DefaultRelyingParty"
+ p:profileConfigurations-ref="test.ProfileConfigurations"
p:sessionInitiators="#{{}}" />
</set>
</property>
</bean>
- <bean id="test.DefaultRelyingParty" parent="RelyingParty">
- <property name="profileConfigurations">
- <list>
- <ref bean="SAML2.SSO" />
- <ref bean="SAML2.ECP" />
- <ref bean="SAML2.Logout" />
- </list>
- </property>
- </bean>
+ <util:list id="test.ProfileConfigurations">
+ <ref bean="SAML2.SSO" />
+ <ref bean="SAML2.ECP" />
+ <ref bean="SAML2.Logout" />
+ </util:list>
- <bean id="test.featureBlockingDefaultRelyingParty" parent="RelyingParty">
- <property name="profileConfigurations">
- <list>
- <bean parent="SAML2.SSO" p:disallowedFeatures="0x1F" />
- <ref bean="SAML2.ECP" />
- <ref bean="SAML2.Logout" />
- </list>
- </property>
- </bean>
+ <util:list id="test.featureBlockingProfileConfigurations">
+ <bean parent="SAML2.SSO" p:disallowedFeatures="0x1F" />
+ <ref bean="SAML2.ECP" />
+ <ref bean="SAML2.Logout" />
+ </util:list>
<import resource="saml-credentials.xml" />
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list