[java-idp-oidc] branch main updated: Move imported relying party content into service postconfig.xml

Scott Cantor cantor.2 at osu.edu
Fri Nov 13 16:41:09 UTC 2020


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=7c931765a3651dce993c984658e2715ed676cc2f

The following commit(s) were added to refs/heads/main by this push:
       new  7c931765  Move imported relying party content into service postconfig.xml
7c931765 is described below

commit 7c931765a3651dce993c984658e2715ed676cc2f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Nov 13 11:41:05 2020 -0500

    Move imported relying party content into service postconfig.xml
---
 .../.settings/org.eclipse.core.resources.prefs     |   1 -
 .../idp/service/relying-party/postconfig.xml       |  33 +--
 .../src/test/resources/conf/attribute-resolver.xml |   2 +-
 .../src/test/resources/conf/oidc-relying-party.xml | 265 ---------------------
 .../src/test/resources/conf/relying-party.xml      |   2 -
 5 files changed, 18 insertions(+), 285 deletions(-)

diff --git a/idp-oidc-extension-api/.settings/org.eclipse.core.resources.prefs b/idp-oidc-extension-api/.settings/org.eclipse.core.resources.prefs
index 29abf999..cdfe4f1b 100644
--- a/idp-oidc-extension-api/.settings/org.eclipse.core.resources.prefs
+++ b/idp-oidc-extension-api/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/idp-oidc-extension-distribution/src/main/resources/conf/oidc-relying-party.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
similarity index 93%
rename from idp-oidc-extension-distribution/src/main/resources/conf/oidc-relying-party.xml
rename to idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index 3d8de1e3..b35e0153 100644
--- a/idp-oidc-extension-distribution/src/main/resources/conf/oidc-relying-party.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -1,31 +1,31 @@
 <?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">
+    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"
 
-    <!-- This is one of the few properties we rely on that has no default. -->
-    <!-- needed to share common credentials.xml file with saml -->
-    <bean id="entityID" class="java.lang.String" c:_0="%{idp.entityID}" />
+    default-init-method="initialize" default-destroy-method="destroy">
 
-    <!-- This is one of the few properties we rely on that has no default. -->
     <bean id="issuer" class="java.lang.String" c:_0="%{idp.oidc.issuer}" />
-
+    
     <!-- Configure profiles that need to use issuer instead of entity id as responder id. -->
     <util:map id="profileResponders">
-        <entry key-ref="OIDC.SSO" value="#{getObject('issuer')}" />
-        <entry key-ref="OIDC.Registration" value="#{getObject('issuer')}" />
-        <entry key-ref="OIDC.Configuration" value="#{getObject('issuer')}" />
+        <entry key-ref="OIDC.SSO" value-ref="issuer" />
+        <entry key-ref="OIDC.Registration" value-ref="issuer" />
+        <entry key-ref="OIDC.Configuration" value-ref="issuer" />
     </util:map>
 
     <!-- Lookup method to select responder id -->
     <bean id="profileResponderIdLookupFunction"
         class="org.geant.idpextension.oidc.profile.context.navigate.ProfileResponderIdLookupFunction"
-        p:defaultResponder="#{getObject('entityID')}" p:profileResponders-ref="profileResponders" />
+        p:defaultResponder-ref="entityID" p:profileResponders-ref="profileResponders" />
 
-    <!-- OIDC Profile Configurations. -->
+    <!-- OIDC Profile Configurations. TODO: MDDriven variants -->
     <bean id="OIDC.SSO" class="org.geant.idpextension.oidc.config.OIDCCoreProtocolConfiguration"
         p:securityConfiguration-ref="%{idp.security.oidc.config:shibboleth.oidc.DefaultSecurityConfiguration}"
         p:iDTokenLifetime="%{idp.oidc.idToken.defaultLifetime:PT1H}"
@@ -51,6 +51,7 @@
         p:securityConfiguration-ref="%{idp.security.oidc.config:shibboleth.oidc.DefaultSecurityConfiguration}"
         p:tokenEndpointAuthMethods="%{idp.oidc.dynreg.tokenEndpointAuthMethods:client_secret_basic,client_secret_post,client_secret_jwt,private_key_jwt}" />
 
+    
     <!-- Security Configuration Defaults. These settings establish the default security configurations for signatures and 
         loads the default credentials used. -->
 
@@ -261,5 +262,5 @@
     <!--  Encryption keys to publish. -->    
     <bean id="shibboleth.oidc.PublishKeySetRequestObjectDecryptionConfiguration" parent="shibboleth.BasicEncryptionConfiguration"
         p:keyTransportEncryptionCredentials-ref="shibboleth.oidc.EncryptionCredentialsToPublish"/>
-
-</beans>
+    
+</beans>
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/attribute-resolver.xml b/idp-oidc-extension-impl/src/test/resources/conf/attribute-resolver.xml
index 0b08b188..a9085161 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/attribute-resolver.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/attribute-resolver.xml
@@ -98,7 +98,7 @@
         generatedAttributeID="subjectId"
         salt="%{idp.oidc.subject.salt}"
         algorithm="%{idp.oidc.subject.algorithm:SHA}"
-        encoding="%{idp.oidc.subject.encoding:BASE32}">
+        encoding="BASE32">
         <InputAttributeDefinition ref="%{idp.oidc.subject.sourceAttribute}"/>
     </DataConnector>   
 </AttributeResolver>
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/oidc-relying-party.xml b/idp-oidc-extension-impl/src/test/resources/conf/oidc-relying-party.xml
deleted file mode 100644
index d7afb00c..00000000
--- a/idp-oidc-extension-impl/src/test/resources/conf/oidc-relying-party.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?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">
-
-    <!-- This is one of the few properties we rely on that has no default. -->
-    <!-- needed to share common credentials.xml file with saml -->
-    <bean id="entityID" class="java.lang.String" c:_0="%{idp.entityID}" />
-
-    <!-- This is one of the few properties we rely on that has no default. -->
-    <bean id="issuer" class="java.lang.String" c:_0="%{idp.oidc.issuer}" />
-
-    <!-- Configure profiles that need to use issuer instead of entity id as responder id. -->
-    <util:map id="profileResponders">
-        <entry key-ref="OIDC.SSO" value="#{getObject('issuer')}" />
-        <entry key-ref="OIDC.Registration" value="#{getObject('issuer')}" />
-        <entry key-ref="OIDC.Configuration" value="#{getObject('issuer')}" />
-    </util:map>
-
-    <!-- Lookup method to select responder id -->
-    <bean id="profileResponderIdLookupFunction"
-        class="org.geant.idpextension.oidc.profile.context.navigate.ProfileResponderIdLookupFunction"
-        p:defaultResponder="#{getObject('entityID')}" p:profileResponders-ref="profileResponders" />
-
-    <!-- OIDC Profile Configurations. -->
-    <bean id="OIDC.SSO" class="org.geant.idpextension.oidc.config.OIDCCoreProtocolConfiguration"
-        p:securityConfiguration-ref="%{idp.security.oidc.config:shibboleth.oidc.DefaultSecurityConfiguration}"
-        p:iDTokenLifetime="%{idp.oidc.idToken.defaultLifetime:PT1H}"
-        p:accessTokenLifetime="%{idp.oidc.accessToken.defaultLifetime:PT10M}"
-        p:authorizeCodeLifetime="%{idp.oidc.authorizeCode.defaultLifetime:PT5M}"
-        p:refreshTokenLifetime="%{idp.oidc.refreshToken.defaultLifetime:PT2H}"
-        p:tokenEndpointAuthMethods="%{idp.oidc.tokenEndpointAuthMethods:client_secret_basic,client_secret_post,client_secret_jwt,private_key_jwt}"
-        p:forcePKCE="%{idp.oidc.forcePKCE:false}"
-        p:allowPKCEPlain="%{idp.oidc.allowPKCEPlain:false}"/>
-    <bean id="OIDC.UserInfo" class="org.geant.idpextension.oidc.config.OIDCUserInfoConfiguration"
-        p:securityConfiguration-ref="%{idp.security.oidc.config:shibboleth.oidc.DefaultSecurityConfiguration}" />
-    <bean id="OIDC.Registration" class="org.geant.idpextension.oidc.config.OIDCDynamicRegistrationConfiguration"
-        p:securityConfiguration-ref="%{idp.security.oidc.config:shibboleth.oidc.DefaultSecurityConfiguration}"
-        p:tokenEndpointAuthMethods="%{idp.oidc.dynreg.tokenEndpointAuthMethods:client_secret_basic,client_secret_post,client_secret_jwt,private_key_jwt}" />
-    <bean id="OIDC.Configuration" class="org.geant.idpextension.oidc.config.OIDCProviderInformationConfiguration"
-        p:securityConfiguration-ref="%{idp.security.oidc.config:shibboleth.oidc.DefaultSecurityConfiguration}" />
-    <bean id="OAUTH2.Revocation" class="org.geant.idpextension.oauth2.config.OAuth2TokenRevocationConfiguration"
-        p:securityConfiguration-ref="%{idp.security.oidc.config:shibboleth.oidc.DefaultSecurityConfiguration}" />
-    <bean id="OIDC.Keyset" class="org.geant.idpextension.oidc.config.OIDCPublishKeySetConfiguration"
-        p:securityConfiguration-ref="shibboleth.oidc.PublishKeySetSecurityConfiguration" />
-    <bean id="OAUTH2.Introspection" class="org.geant.idpextension.oauth2.config.OAuth2TokenIntrospectionConfiguration"
-        p:securityConfiguration-ref="%{idp.security.oidc.config:shibboleth.oidc.DefaultSecurityConfiguration}"
-        p:tokenEndpointAuthMethods="%{idp.oidc.dynreg.tokenEndpointAuthMethods:client_secret_basic,client_secret_post,client_secret_jwt,private_key_jwt}"
-       />
-
-    <!-- Security Configuration Defaults. These settings establish the default security configurations for signatures and 
-        loads the default credentials used. -->
-
-    <bean id="shibboleth.oidc.DefaultSecurityConfiguration"
-        class="org.geant.idpextension.oidc.profile.api.OIDCSecurityConfiguration">
-        <property name="signatureSigningConfiguration">
-            <ref bean="#{'%{idp.oidc.signing.config:shibboleth.oidc.SigningConfiguration}'.trim()}" />
-        </property>
-        <property name="encryptionConfiguration">
-            <ref bean="#{'%{idp.oidc.encryption.config:shibboleth.oidc.EncryptionConfiguration}'.trim()}" />
-        </property>
-        <property name="requestObjectDecryptionConfiguration">
-            <ref bean="#{'%{idp.oidc.rodecrypt.config:shibboleth.oidc.requestObjectDecryptionConfiguration}'.trim()}" />
-        </property>
-        <property name="requestObjectSignatureValidationConfiguration">
-            <ref bean="#{'%{idp.oidc.rovalid.config:shibboleth.oidc.requestObjectSignatureValidationConfiguration}'.trim()}" />
-        </property>
-        <property name="tokenEndpointJwtSignatureValidationConfiguration">
-            <ref bean="#{'%{idp.oidc.rovalid.config:shibboleth.oidc.tokenEndpointJwtSignatureValidationConfiguration}'.trim()}" />
-        </property>
-    </bean>
-        
-    <!-- Configuration for credentials and supported algorithms for ID Token and UserInfo response signing. -->    
-    <bean id="shibboleth.oidc.SigningConfiguration" parent="shibboleth.BasicSignatureSigningConfiguration"
-        p:signingCredentials-ref="shibboleth.oidc.SigningCredentials">
-        <property name="signatureAlgorithms">
-            <list>
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
-
-                <!-- 
-                  Not supported by the default P-256 EC key. P-384 and P-512 need to be added as credential if activated.
-                  
-                <util:constant 
-                     static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" /> 
-                <util:constant 
-                     static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" /> 
-                -->
-
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
-            </list>
-        </property>
-    </bean>
-
-    <!-- Configuration for supported algorithms for ID Token and UserInfo response encryption. -->
-    <bean id="shibboleth.oidc.EncryptionConfiguration" parent="shibboleth.BasicEncryptionConfiguration">
-        <property name="keyTransportEncryptionAlgorithms">
-            <list>
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_1_5" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_KW" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_KW" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_KW" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_GCM_KW" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_GCM_KW" />
-            </list>
-        </property>
-        <property name="dataEncryptionAlgorithms">
-            <list>
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192GCM" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM" />
-            </list>
-        </property>
-    </bean>
-    
-    <!-- Configuration for credentials and supported algorithms for request object decryption. -->
-    <bean id="shibboleth.oidc.requestObjectDecryptionConfiguration" parent="shibboleth.BasicEncryptionConfiguration"
-    p:keyTransportEncryptionCredentials-ref="shibboleth.oidc.EncryptionCredentials">
-        <property name="keyTransportEncryptionAlgorithms">
-            <list>
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_1_5" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_KW" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_KW" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_KW" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_GCM_KW" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_GCM_KW" />
-            </list>
-        </property>
-        <property name="dataEncryptionAlgorithms">
-            <list>
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192GCM" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM" />
-            </list>
-        </property>
-    </bean>
-    
-    <!-- Configuration for supported algorithms for request object signature validation. -->
-    <bean id="shibboleth.oidc.requestObjectSignatureValidationConfiguration" parent="shibboleth.BasicSignatureSigningConfiguration">
-        <property name="signatureAlgorithms">
-            <list>
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
-                <util:constant 
-                     static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" /> 
-                <util:constant 
-                     static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" /> 
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
-            </list>
-        </property>
-    </bean>
-
-    <!-- Configuration for supported algorithms for token endpoint authentication JWT signature validation. -->
-    <bean id="shibboleth.oidc.tokenEndpointJwtSignatureValidationConfiguration" parent="shibboleth.BasicSignatureSigningConfiguration">
-        <property name="signatureAlgorithms">
-            <list>
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
-                <util:constant 
-                     static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" /> 
-                <util:constant 
-                     static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" /> 
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
-                <util:constant
-                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
-            </list>
-        </property>
-    </bean>
-    
-    <!--  Configuration for publishing key set. -->
-    <bean id="shibboleth.oidc.PublishKeySetSecurityConfiguration"
-        class="org.geant.idpextension.oidc.profile.api.OIDCSecurityConfiguration">
-        <property name="signatureSigningConfiguration">
-            <ref bean="shibboleth.oidc.PublishKeySetSigningConfiguration" />
-        </property>
-        <property name="requestObjectDecryptionConfiguration">
-            <ref bean="shibboleth.oidc.PublishKeySetRequestObjectDecryptionConfiguration" />
-        </property>
-    </bean>
-    
-    <!--  Signing keys to publish. -->
-    <bean id="shibboleth.oidc.PublishKeySetSigningConfiguration" parent="shibboleth.BasicSignatureSigningConfiguration"
-        p:signingCredentials-ref="shibboleth.oidc.SigningCredentialsToPublish"/>
-        
-    <!--  Encryption keys to publish. -->    
-    <bean id="shibboleth.oidc.PublishKeySetRequestObjectDecryptionConfiguration" parent="shibboleth.BasicEncryptionConfiguration"
-        p:keyTransportEncryptionCredentials-ref="shibboleth.oidc.EncryptionCredentialsToPublish"/>
-
-</beans>
\ No newline at end of file
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 975cbbca..5c1f2e5b 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
@@ -20,8 +20,6 @@
     legitimacy of a requesting system. To run an "open" IdP, you can enable profiles here.
     -->
     
-    <import resource="oidc-relying-party.xml"/>
-    
     <bean id="shibboleth.UnverifiedRelyingParty" p:responderIdLookupStrategy-ref="profileResponderIdLookupFunction" parent="RelyingParty">
         <property name="profileConfigurations">
             <list>

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


More information about the commits mailing list