[java-oidfed-common] 04/05: Move generic oidfed configuration files from java-idp-plugin-oidc-op-oidfed.

Codeberg noreply at shibboleth.net
Fri May 22 10:52:51 UTC 2026


This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository java-oidfed-common.

View the commit online:
https://codeberg.org/Shibboleth/java-oidfed-common/commit/e3b03bb2592a081248278e41e2b310d13faa3fd7

commit e3b03bb2592a081248278e41e2b310d13faa3fd7
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri May 22 12:19:28 2026 +0300

    Move generic oidfed configuration files from java-idp-plugin-oidc-op-oidfed.
---
 .../oidfed/oidfed-entity-configuration-claims.xml  | 18 ++++++++++
 .../oidfed-entity-configuration-metadata.json      |  7 ++++
 .../oidfed/conf/oidfed/oidfed-trust-anchors.json   |  1 +
 .../conf/oidfed/oidfed-trustchain-resolver.xml     | 38 ++++++++++++++++++++++
 .../net/shibboleth/oidfed/module.properties        | 16 +++++++++
 5 files changed, 80 insertions(+)

diff --git a/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-entity-configuration-claims.xml b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-entity-configuration-claims.xml
new file mode 100644
index 0000000..67452e6
--- /dev/null
+++ b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-entity-configuration-claims.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+    xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+    default-init-method="initialize" default-destroy-method="destroy">
+
+    <!-- TODO: document with examples once the structure is settled -->
+    <util:map id="shibboleth.oidfed.EntityConfigurationClaimsLookupStrategies"
+        value-type="java.util.function.Function">
+        <entry key="trust_anchor_hints" value-ref="#{'%{idp.oidfed.entity-configuration.trustAnchoHintsLookup:DefaultTrustAnchorHintsLookupStrategy}'.trim()}"/>
+    </util:map>
+
+</beans>
\ No newline at end of file
diff --git a/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-entity-configuration-metadata.json b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-entity-configuration-metadata.json
new file mode 100644
index 0000000..f412263
--- /dev/null
+++ b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-entity-configuration-metadata.json
@@ -0,0 +1,7 @@
+{
+    "federation_entity": {
+        "organization_name" : "Example organization",
+        "organization_uri" : "https://org.example.org",
+        "contacts" : [ "contact at example.org" ]
+    }
+}
\ No newline at end of file
diff --git a/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-trust-anchors.json b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-trust-anchors.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-trust-anchors.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-trustchain-resolver.xml b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-trustchain-resolver.xml
new file mode 100644
index 0000000..948897c
--- /dev/null
+++ b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/conf/oidfed/oidfed-trustchain-resolver.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+    xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+    default-init-method="initialize" default-destroy-method="destroy">
+
+    <!--
+        The default function for fetching the map of trusted entities for trust chain resolution via resolve entity API.
+        The map is keyed with entityId of trusted entities whose federation_resolve_endpoint is used as the API endpoint.
+        The entity configuration is used as a trusted source for the endpoint. The map value is a list of trust anchors
+        that will be used for the trust_anchor paramter(s) in the API request.
+        
+        The default function may be overridden via 'shibboleth.oidfed.TrustedRemoteResolverEntitiesLookupStrategy' bean
+        that must implement Function<ProfileRequestContext, List<TrustedRemoteResolverEntity>>.
+    -->
+    <bean id="shibboleth.oidfed.DefaultTrustedRemoteResolverEntitiesLookupStrategy" parent="shibboleth.Functions.Constant">
+        <constructor-arg name="target">
+            <util:list value-type="net.shibboleth.oidfed.profile.TrustedRemoteResolverEntity">
+                <!-- 
+                    Example entry for a trusted entity 'https://trust-anchor.federation.local'
+                    its 'federation_resolve_endpoint' is exploited with the configured trust_anchor parameters:
+                    '...&trust_anchor=https://trust-anchor.federation.local&trust_anchor=https://another.federation.local'
+                -->
+                <!--
+                <bean class="net.shibboleth.idp.plugin.oidc.op.oidfed.profile.TrustedRemoteResolverEntity"
+                    c:entity="https://trust-anchor.federation.local"
+                    c:anchors="https://trust-anchor.federation.local,https://another.federation.local" />
+                -->
+            </util:list>
+        </constructor-arg>
+    </bean>
+
+</beans>
diff --git a/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/module.properties b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/module.properties
index 230ef99..2035cba 100644
--- a/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/module.properties
+++ b/oidfed-common-impl/src/main/resources/net/shibboleth/oidfed/module.properties
@@ -7,3 +7,19 @@ idp.oidfed.common.plugin = net.shibboleth.oidfed.common
 idp.oidfed.common.name = OIDFed Common Library
 idp.oidfed.common.desc = Module that provides common OpenID Federation processing functions for other plugins to use
 idp.oidfed.common.url = /OIDFedCommon
+
+idp.oidfed.common.1.src =  /net/shibboleth/oidfed/conf/oidfed/oidfed-trust-anchors.json
+idp.oidfed.common.1.dest = conf/oidfed/oidfed-trust-anchors.json
+idp.oidfed.common.1.replace = false
+
+idp.oidfed.common.2.src =  /net/shibboleth/oidfed/conf/oidfed/oidfed-entity-configuration-metadata.json
+idp.oidfed.common.2.dest = conf/oidfed/oidfed-entity-configuration-metadata.json
+idp.oidfed.common.2.replace = false
+
+idp.oidfed.common.3.src =  /net/shibboleth/oidfed/conf/oidfed/oidfed-trustchain-resolver.xml
+idp.oidfed.common.3.dest = conf/oidfed/oidfed-trustchain-resolver.xml
+idp.oidfed.common.3.replace = false
+
+idp.oidfed.common.4.src =  /net/shibboleth/oidfed/conf/oidfed/oidfed-entity-configuration-claims.xml
+idp.oidfed.common.4.dest = conf/oidfed/oidfed-entity-configuration-claims.xml
+idp.oidfed.common.4.replace = false

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list