[java-idp-oidc] branch main updated: JOIDC-15 - Reduce manual configuration integration touchpoints with IdP

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-idp-oidc.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=156ec4f156c53dc893743e5424b47767b6641569

The following commit(s) were added to refs/heads/main by this push:
       new  156ec4f1  JOIDC-15 - Reduce manual configuration integration touchpoints with IdP
156ec4f1 is described below

commit 156ec4f156c53dc893743e5424b47767b6641569
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Dec 16 18:33:32 2020 -0500

    JOIDC-15 - Reduce manual configuration integration touchpoints with IdP
    
    https://issues.shibboleth.net/jira/browse/JOIDC-15
    
    Finish MDDriven relying party wiring for existing options.
---
 .../idp/service/relying-party/postconfig.xml       | 38 +++++++++++++++++++++-
 .../src/test/resources/conf/relying-party.xml      | 10 +++---
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index 43f8e4cc..6ef9a115 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -216,8 +216,44 @@
             <bean parent="shibboleth.MDDrivenStringProperty" p:propertyName="issuer" p:defaultValue-ref="issuer" />
         </property>
     </bean>
+
+    <bean id="OIDC.Keyset.MDDriven" parent="AbstractMDDrivenOIDCProfile" lazy-init="true"
+            class="org.geant.idpextension.oidc.config.OIDCPublishKeySetConfiguration">
+        <property name="securityConfigurationLookupStrategy">
+            <bean parent="shibboleth.MDDrivenBeanProperty" p:propertyName="securityConfiguration"
+                p:propertyType="#{T(net.shibboleth.idp.profile.config.SecurityConfiguration)}"
+                p:defaultValue-ref="shibboleth.oidc.PublishKeySetSecurityConfiguration" />
+        </property>
+    </bean>
             
-    
+    <bean id="OAUTH2.Revocation.MDDriven" parent="AbstractMDDrivenOIDCProfile" lazy-init="true"
+            class="org.geant.idpextension.oauth2.config.OAuth2TokenRevocationConfiguration">
+        <property name="tokenEndpointAuthMethodsLookupStrategy">
+            <bean parent="shibboleth.MDDrivenListProperty" p:propertyName="tokenEndpointAuthMethods">
+                <property name="defaultValue">
+                    <bean parent="shibboleth.CommaDelimStringArray">
+                        <constructor-arg type="java.lang.String"
+                            value="%{idp.oidc.dynreg.tokenEndpointAuthMethods:client_secret_basic,client_secret_post,client_secret_jwt,private_key_jwt}" />
+                    </bean>
+                </property>
+            </bean>
+        </property>
+    </bean>
+
+    <bean id="OAUTH2.Introspection.MDDriven" parent="AbstractMDDrivenOIDCProfile" lazy-init="true"
+            class="org.geant.idpextension.oauth2.config.OAuth2TokenIntrospectionConfiguration">
+        <property name="tokenEndpointAuthMethodsLookupStrategy">
+            <bean parent="shibboleth.MDDrivenListProperty" p:propertyName="tokenEndpointAuthMethods">
+                <property name="defaultValue">
+                    <bean parent="shibboleth.CommaDelimStringArray">
+                        <constructor-arg type="java.lang.String"
+                            value="%{idp.oidc.dynreg.tokenEndpointAuthMethods:client_secret_basic,client_secret_post,client_secret_jwt,private_key_jwt}" />
+                    </bean>
+                </property>
+            </bean>
+        </property>
+    </bean>
+        
     <!--
     Security Configuration Defaults. These settings establish the default security
     configurations for signatures and loads the default credentials used.
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/relying-party.xml b/idp-oidc-extension-impl/src/test/resources/conf/relying-party.xml
index 7691c02e..0852e317 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/relying-party.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/relying-party.xml
@@ -23,7 +23,7 @@
     <bean id="shibboleth.UnverifiedRelyingParty" parent="RelyingParty">
         <property name="profileConfigurations">
             <list>
-                <ref bean="OIDC.Keyset" />
+                <ref bean="OIDC.Keyset.MDDriven" />
                 <ref bean="OIDC.Registration.MDDriven" />
                 <ref bean="OIDC.Configuration.MDDriven" />
             </list>
@@ -43,10 +43,10 @@
                 <ref bean="SAML2.Logout.MDDriven" />
                 <ref bean="SAML2.AttributeQuery.MDDriven" />
                 <ref bean="SAML2.ArtifactResolution.MDDriven" />
-                <ref bean="OIDC.SSO.MDDriven"/>
-                <ref bean="OIDC.UserInfo.MDDriven"/>
-                <ref bean="OAUTH2.Revocation"/>
-                <ref bean="OAUTH2.Introspection"/>
+                <ref bean="OIDC.SSO.MDDriven" />
+                <ref bean="OIDC.UserInfo.MDDriven" />
+                <ref bean="OAUTH2.Revocation.MDDriven" />
+                <ref bean="OAUTH2.Introspection.MDDriven" />
             </list>
         </property>
     </bean>

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