[java-plugin-shibd] branch main updated: "Final?" revamp of some of the core agent beans for simplicity.
Scott Cantor
cantor.2 at osu.edu
Mon Sep 8 17:23:03 UTC 2025
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-plugin-shibd.
View the commit online:
http://git.shibboleth.net/view/?p=java-plugin-shibd.git;a=commit;h=30cb0436360ab925683126fe6c1b1acc9d8aedd6
The following commit(s) were added to refs/heads/main by this push:
new 30cb043 "Final?" revamp of some of the core agent beans for simplicity.
30cb043 is described below
commit 30cb0436360ab925683126fe6c1b1acc9d8aedd6
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 8 13:23:01 2025 -0400
"Final?" revamp of some of the core agent beans for simplicity.
---
.../net/shibboleth/idp/module/conf/sp/agents.xml | 37 +++++++++-------------
.../net/shibboleth/sp/conf/agents-system.xml | 5 ++-
.../idp/module/conf/sp/agents-inheritance.xml | 33 ++++++++-----------
.../net/shibboleth/idp/module/conf/sp/agents.xml | 34 ++++++++------------
4 files changed, 45 insertions(+), 64 deletions(-)
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/agents.xml b/sp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/agents.xml
index 7ab9090..35a7f3f 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/agents.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/agents.xml
@@ -16,7 +16,7 @@
This is a master file defining the Agents, Applications, and RelyingParty configurations to use.
You can add any number of additional imported files to organize your configuration.
- By default, the RelyingParty definitions below are used for all Applications unless overridden.
+ By default, the Profile and RelyingParty definitions below are used for all Applications unless overridden.
This is an "empty" example in that it assumes neither SAML, OpenID, or any other protocols.
-->
@@ -28,39 +28,32 @@
<!-- ============ Profile defaults ============ -->
- <!-- Used for all applications by default to provide a baseline for profile settings. -->
+ <!-- Used for all Applications by default to provide a baseline for profile settings. -->
<util:list id="shibboleth.sp.DefaultProfileConfigurations">
<!-- Your profiles here. -->
</util:list>
-
- <!-- ============ RelyingParty defaults ============ -->
-
- <!--
- These beans are wired into *all* applications across all agents by default. You can create
- customized alternatives in whatever combination you require to plug into specific application
- beans.
- -->
-
<!--
Unverified RP configuration, defaults to no support for any profiles.
- "Unverified" typically means the SP has no metadata, or equivalent way of assuring the identity and
- legitimacy of an IdP system. To run an "open" SP, you can enable profiles here.
+ "Unverified" typically means the Hub has no metadata, or equivalent way of assuring the identity and
+ legitimacy of an authenticating system. Some profiles may simply be designed to operate this way.
-->
- <bean id="shibboleth.sp.UnverifiedRelyingParty" parent="RelyingParty">
- <property name="profileConfigurations">
- <list>
- <!-- Your profiles here. -->
- </list>
- </property>
- </bean>
+ <util:list id="shibboleth.sp.UnverifiedProfileConfigurations">
+ <!-- Your profiles here. -->
+ </util:list>
- <!-- Container for any overrides you want to add, again used for all applications by default. -->
+ <!-- ============ RelyingParty Overrides ============ -->
+
+ <!--
+ These overrides are wired into *all* Applications across all Agents by default. You can create
+ customized alternatives in whatever combination you require to plug into specific Application
+ beans.
+ -->
<util:list id="shibboleth.sp.RelyingPartyOverrides">
-
+ <!-- Your RelyingParty overrides here. -->
</util:list>
</beans>
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/agents-system.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/agents-system.xml
index ffd26ff..fb99553 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/agents-system.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/agents-system.xml
@@ -42,7 +42,7 @@
p:detailedErrorsPredicate="%{sp.errors.detailed:false}"
p:securityConfiguration-ref="#{'%{sp.security.config:shibboleth.sp.DefaultSecurityConfiguration}'.trim()}"
p:profileConfigurations-ref="shibboleth.sp.DefaultProfileConfigurations"
- p:unverifiedConfiguration-ref="shibboleth.sp.UnverifiedRelyingParty"
+ p:unverifiedConfiguration-ref="DefaultUnverifiedRelyingPartyConfiguration"
p:relyingPartyConfigurations-ref="shibboleth.sp.RelyingPartyOverrides"
p:sessionInitiators-ref="shibboleth.sp.SessionInitiators"
p:tokenConsumers-ref="shibboleth.sp.TokenConsumers"
@@ -77,6 +77,9 @@
p:securityConfiguration-ref="#{'%{sp.security.config:shibboleth.sp.DefaultSecurityConfiguration}'.trim()}"
p:profileConfigurations-ref="shibboleth.sp.DefaultProfileConfigurations" />
+ <bean id="DefaultUnverifiedRelyingPartyConfiguration" parent="RelyingParty"
+ p:profileConfigurations-ref="shibboleth.sp.UnverifiedProfileConfigurations" />
+
<!-- Parent bean for RelyingParty overrides based on activation by name(s). -->
<bean id="RelyingPartyByName" abstract="true" parent="RelyingParty"
class="net.shibboleth.saml.relyingparty.RelyingPartyConfigurationSupport" factory-method="byName" />
diff --git a/sp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/agents-inheritance.xml b/sp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/agents-inheritance.xml
index 1995ef1..c4199ba 100644
--- a/sp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/agents-inheritance.xml
+++ b/sp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/agents-inheritance.xml
@@ -52,31 +52,24 @@
<!-- Your profiles here. -->
</util:list>
-
- <!-- ============ RelyingParty defaults ============ -->
-
<!--
- These beans are wired into *all* applications across all agents by default. You can create
- customized alternatives in whatever combination you require to plug into specific application
- beans.
+ Unverified RP configuration, defaults to no support for any profiles.
+
+ "Unverified" typically means the Hub has no metadata, or equivalent way of assuring the identity and
+ legitimacy of an authenticating system. Some profiles may simply be designed to operate this way.
-->
+ <util:list id="shibboleth.sp.UnverifiedProfileConfigurations">
+ <!-- Your profiles here. -->
+ </util:list>
- <!--
- Unverified RP configuration, defaults to no support for any profiles. Add <ref> elements to the list
- to enable specific default profile settings (as below), or create new beans inline to override defaults.
+
+ <!-- ============ RelyingParty Overrides ============ -->
- "Unverified" typically means the SP has no metadata, or equivalent way of assuring the identity and
- legitimacy of an IdP system. To run an "open" SP, you can enable profiles here.
+ <!--
+ These overrides are wired into *all* Applications across all Agents by default. You can create
+ customized alternatives in whatever combination you require to plug into specific Application
+ beans.
-->
- <bean id="shibboleth.sp.UnverifiedRelyingParty" parent="RelyingParty">
- <property name="profileConfigurations">
- <list>
- <!-- Your profiles here. -->
- </list>
- </property>
- </bean>
-
- <!-- Container for any overrides you want to add. -->
<util:list id="shibboleth.sp.RelyingPartyOverrides">
diff --git a/sp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/agents.xml b/sp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/agents.xml
index b0d12c8..7353cb0 100644
--- a/sp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/agents.xml
+++ b/sp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/agents.xml
@@ -34,34 +34,26 @@
<!-- Your profiles here. -->
</util:list>
-
- <!-- ============ RelyingParty defaults ============ -->
-
<!--
- These beans are wired into *all* applications across all agents by default. You can create
- customized alternatives in whatever combination you require to plug into specific application
- beans.
+ Unverified RP configuration, defaults to no support for any profiles.
+
+ "Unverified" typically means the Hub has no metadata, or equivalent way of assuring the identity and
+ legitimacy of an authenticating system. Some profiles may simply be designed to operate this way.
-->
+ <util:list id="shibboleth.sp.UnverifiedProfileConfigurations">
+ <!-- Your profiles here. -->
+ </util:list>
- <!--
- Unverified RP configuration, defaults to no support for any profiles. Add <ref> elements to the list
- to enable specific default profile settings (as below), or create new beans inline to override defaults.
+ <!-- ============ RelyingParty Overrides ============ -->
- "Unverified" typically means the SP has no metadata, or equivalent way of assuring the identity and
- legitimacy of an IdP system. To run an "open" SP, you can enable profiles here.
+ <!--
+ These overrides are wired into *all* Applications across all Agents by default. You can create
+ customized alternatives in whatever combination you require to plug into specific Application
+ beans.
-->
- <bean id="shibboleth.sp.UnverifiedRelyingParty" parent="RelyingParty">
- <property name="profileConfigurations">
- <list>
- <!-- Your profiles here. -->
- </list>
- </property>
- </bean>
-
- <!-- Container for any overrides you want to add. -->
<util:list id="shibboleth.sp.RelyingPartyOverrides">
-
+ <!-- Your RelyingParty overrides here. -->
</util:list>
</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list