[java-plugin-shibd] branch main updated: Add a check for issuer inheriting from Agent.
Codeberg
noreply at shibboleth.net
Wed Jul 1 16:57:57 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch main
in repository java-plugin-shibd.
View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd/commit/82831b7c5a1bec6939f321dfbc5cadd142e6777a
The following commit(s) were added to refs/heads/main by this push:
new 82831b7 Add a check for issuer inheriting from Agent.
82831b7 is described below
commit 82831b7c5a1bec6939f321dfbc5cadd142e6777a
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Wed Jul 1 12:57:46 2026 -0400
Add a check for issuer inheriting from Agent.
---
.../java/net/shibboleth/sp/service/AgentResolverTest.java | 14 ++++++++++++--
.../shibboleth/idp/module/conf/sp/agents-inheritance.xml | 2 ++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/sp-conf-impl/src/test/java/net/shibboleth/sp/service/AgentResolverTest.java b/sp-conf-impl/src/test/java/net/shibboleth/sp/service/AgentResolverTest.java
index e9c9cb7..f33bd73 100644
--- a/sp-conf-impl/src/test/java/net/shibboleth/sp/service/AgentResolverTest.java
+++ b/sp-conf-impl/src/test/java/net/shibboleth/sp/service/AgentResolverTest.java
@@ -123,7 +123,7 @@ public class AgentResolverTest extends AbstractTestNGSpringContextTests {
Assert.assertEquals(agent.getCredentials(), creds);
Assert.assertEquals(agent.getId(), "inherit.example.org");
- Assert.assertEquals(agent.getApplications().size(), 3);
+ Assert.assertEquals(agent.getApplications().size(), 4);
Assert.assertEquals(agent.getAllowedAddressRanges(),
CollectionSupport.singletonList(IPRange.parseCIDRBlock("192.168.0.0/16")));
@@ -187,7 +187,17 @@ public class AgentResolverTest extends AbstractTestNGSpringContextTests {
Assert.assertEquals(basic.getIssuer(null), "https://example.org/override2");
Assert.assertTrue(basic.getProfileConfigurations(null).isEmpty());
}
-
+
+ app = agent.getApplication("override-inherit-issuer");
+ assert app != null;
+ Assert.assertEquals(app.getId(), "override-inherit-issuer");
+ Assert.assertEquals(app.getApplicationId(), "override-inherit-issuer");
+ rpc = resolveRelyingParty(app, "https://idp.example.org");
+ assert rpc != null;
+ Assert.assertSame(app, rpc);
+ Assert.assertEquals(rpc.getIssuer(null), "https://example.org/sp");
+
+
// Check default vs. overridden RPC.
// These are still inherited because by default the globally defined Unverified and Override beans get injected.
rpc = resolveRelyingParty(app, "https://idp.example.org");
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 d6c66b4..c0a6973 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
@@ -39,6 +39,8 @@
<bean p:id="override2" parent="shibboleth.sp.Application.NoInheritance"
p:issuer="https://example.org/override2" />
+
+ <bean p:id="override-inherit-issuer" parent="shibboleth.sp.Application" />
</list>
</property>
</bean>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list