[java-identity-provider] branch main updated: Fix parented beans by removing duplicative parameters.
Scott Cantor
cantor.2 at osu.edu
Tue Feb 14 21:44:38 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=4df5d867011f1b66d8ffe2d9191a26f756dc6adc
The following commit(s) were added to refs/heads/main by this push:
new 4df5d8670 Fix parented beans by removing duplicative parameters.
4df5d8670 is described below
commit 4df5d867011f1b66d8ffe2d9191a26f756dc6adc
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 14 16:44:35 2023 -0500
Fix parented beans by removing duplicative parameters.
---
idp-conf-impl/pom.xml | 7 ++++++-
.../shibboleth/idp/flows/admin/admin-abstract-beans.xml | 8 +++-----
.../net/shibboleth/idp/flows/admin/hello-beans.xml | 14 ++++++--------
.../net/shibboleth/idp/flows/admin/mdquery-beans.xml | 4 +---
.../shibboleth/idp/flows/admin/reload-metadata-beans.xml | 4 +---
.../shibboleth/idp/flows/admin/reload-service-beans.xml | 4 +---
.../net/shibboleth/idp/flows/admin/resolvertest-beans.xml | 4 +---
7 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/idp-conf-impl/pom.xml b/idp-conf-impl/pom.xml
index edca98625..e3d9ff210 100644
--- a/idp-conf-impl/pom.xml
+++ b/idp-conf-impl/pom.xml
@@ -90,6 +90,12 @@
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-profile-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
<groupId>net.shibboleth</groupId>
<artifactId>shib-metadata-spring</artifactId>
@@ -99,7 +105,6 @@
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-messaging-impl</artifactId>
- <version>${opensaml.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml
index 3076efe74..36adb04fe 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml
@@ -81,11 +81,9 @@
p:operationLookupStrategy="#{getObject('shibboleth.AdminOperationLookupStrategy') ?: getObject('DefaultOperationLookupStrategy')}"
p:resourceLookupStrategy="#{getObject('shibboleth.AdminResourceLookupStrategy') ?: getObject('DefaultResourceLookupStrategy')}" />
- <bean id="DescriptorPolicyLookupStrategy"
- class="net.shibboleth.profile.context.navigate.SpringExpressionContextLookupFunction"
- c:inClass="#{T(org.opensaml.profile.context.ProfileRequestContext)}"
- c:outputType="#{T(java.lang.String)}"
- c:expression="#input.getSubcontext(T(net.shibboleth.profile.context.RelyingPartyContext)).getProfileConfig().getPolicyName(#input)" />
+ <bean id="DescriptorPolicyLookupStrategy" parent="shibboleth.ContextFunctions.Expression"
+ c:expression="#input.getSubcontext(T(net.shibboleth.profile.context.RelyingPartyContext)).getProfileConfig().getPolicyName(#input)"
+ c:outputType="#{T(java.lang.String)}" />
<!-- Default operation/resource suppliers for access checks. -->
<bean id="DefaultOperationLookupStrategy" parent="shibboleth.Functions.Constant">
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml
index e889d364f..a2fd50f50 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml
@@ -22,16 +22,14 @@
<bean id="shibboleth.AdminOperationLookupStrategy" parent="shibboleth.Functions.Constant" c:target="hello" />
- <bean id="shibboleth.AdminResourceLookupStrategy"
- class="net.shibboleth.profile.context.navigate.SpringExpressionContextLookupFunction"
- c:inClass="#{T(org.opensaml.profile.context.ProfileRequestContext)}"
+ <bean id="shibboleth.AdminResourceLookupStrategy" parent="shibboleth.ContextFunctions.Expression"
c:outputType="#{T(java.lang.String)}"
c:expression="'subject/' + #custom.apply(#input)">
- <property name="customObject">
- <bean parent="shibboleth.Functions.Compose"
- c:g-ref="shibboleth.PrincipalNameLookup.Subject"
- c:f-ref="shibboleth.ChildLookup.SubjectContext" />
- </property>
+ <property name="customObject">
+ <bean parent="shibboleth.Functions.Compose"
+ c:g-ref="shibboleth.PrincipalNameLookup.Subject"
+ c:f-ref="shibboleth.ChildLookup.SubjectContext" />
+ </property>
</bean>
<!-- Work beans. -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml
index e2dfa3625..bc5109649 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml
@@ -23,9 +23,7 @@
<bean id="shibboleth.AdminOperationLookupStrategy" parent="shibboleth.Functions.Constant" c:target="read" />
- <bean id="shibboleth.AdminResourceLookupStrategy"
- class="net.shibboleth.profile.context.navigate.SpringExpressionContextLookupFunction"
- c:inClass="#{T(org.opensaml.profile.context.ProfileRequestContext)}"
+ <bean id="shibboleth.AdminResourceLookupStrategy" parent="shibboleth.ContextFunctions.Expression"
c:outputType="#{T(java.lang.String)}"
c:expression="#input.getInboundMessageContext().getMessage().getEntityID()" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml
index a3d916fd9..b3c1ca69c 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml
@@ -23,9 +23,7 @@
<bean id="shibboleth.AdminOperationLookupStrategy" parent="shibboleth.Functions.Constant" c:target="reload" />
- <bean id="shibboleth.AdminResourceLookupStrategy"
- class="net.shibboleth.profile.context.navigate.SpringExpressionContextLookupFunction"
- c:inClass="#{T(org.opensaml.profile.context.ProfileRequestContext)}"
+ <bean id="shibboleth.AdminResourceLookupStrategy" parent="shibboleth.ContextFunctions.Expression"
c:outputType="#{T(java.lang.String)}"
c:expression="#input.getSubcontext(T(net.shibboleth.idp.profile.context.SpringRequestContext)).getRequestContext().getFlowScope().get('resolverId')" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml
index 4a588e9cc..9c04d9fbe 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml
@@ -23,9 +23,7 @@
<bean id="shibboleth.AdminOperationLookupStrategy" parent="shibboleth.Functions.Constant" c:target="reload" />
- <bean id="shibboleth.AdminResourceLookupStrategy"
- class="net.shibboleth.profile.context.navigate.SpringExpressionContextLookupFunction"
- c:inClass="#{T(org.opensaml.profile.context.ProfileRequestContext)}"
+ <bean id="shibboleth.AdminResourceLookupStrategy" parent="shibboleth.ContextFunctions.Expression"
c:outputType="#{T(java.lang.String)}"
c:expression="#input.getSubcontext(T(net.shibboleth.idp.profile.context.SpringRequestContext)).getRequestContext().getFlowScope().get('serviceId')" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml
index a2e602939..ce7f208a8 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml
@@ -23,9 +23,7 @@
<bean id="shibboleth.AdminOperationLookupStrategy" parent="shibboleth.Functions.Constant" c:target="read" />
- <bean id="shibboleth.AdminResourceLookupStrategy"
- class="net.shibboleth.profile.context.navigate.SpringExpressionContextLookupFunction"
- c:inClass="#{T(org.opensaml.profile.context.ProfileRequestContext)}"
+ <bean id="shibboleth.AdminResourceLookupStrategy" parent="shibboleth.ContextFunctions.Expression"
c:outputType="#{T(java.lang.String)}"
c:expression="'subject/' + #input.getInboundMessageContext().getMessage().getPrincipal() + '/attributes'" />
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list