[java-oidc-common] 06/06: Remove oidc-commons properties file

[Phil Smart]

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

philsmart pushed a commit to branch dev/JCOMOIDC-48
in repository java-oidc-common.

View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=9797996da63feb11affd5fdce1961f505c8e9d97

commit 9797996da63feb11affd5fdce1961f505c8e9d97
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Feb 2 14:48:42 2023 +0000

    Remove oidc-commons properties file
    
     - tidy postconfig.xml
---
 .../oidc/common/conf/authn/oidc-common.properties         | 15 ---------------
 .../net/shibboleth/oidc/common/module.properties          | 13 ++++++-------
 .../shibboleth/idp/service/relying-party/postconfig.xml   | 15 ++++++---------
 3 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/conf/authn/oidc-common.properties b/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/conf/authn/oidc-common.properties
deleted file mode 100644
index 5a85c92..0000000
--- a/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/conf/authn/oidc-common.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-## Default, global, security configuration
-#idp.security.oidc.config = shibboleth.oidc.DefaultSecurityConfiguration
-## For the default security configuration. Will have no effect if the security configuration was overridden
-#idp.oidc.encryption.config = shibboleth.oidc.EncryptionConfiguration
-#idp.oidc.decryption.config = shibboleth.oidc.DecryptionConfiguration
-#idp.oidc.validation.config = shibboleth.oidc.SignatureValidationConfiguration
-#idp.oidc.signing.config = shibboleth.oidc.SigningConfiguration
-
-## How often keysets should be fetched from either a downstream relying party or upstream provider
-#idp.oidc.provider.keyfetch.interval = PT30M
-
-## Signing and encryption/decryption keys for request objects, id tokens, and userinfo response
-#idp.signing.oidc.rs.key = %{idp.home}/credentials/idp-signing-rs.jwk
-#idp.signing.oidc.es.key = %{idp.home}/credentials/idp-signing-es.jwk
-#idp.signing.oidc.rsa.enc.key = %{idp.home}/credentials/idp-encryption-rsa.jwk
\ No newline at end of file
diff --git a/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/module.properties b/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/module.properties
index dc1fa1e..3aaeacc 100644
--- a/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/module.properties
+++ b/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/module.properties
@@ -10,12 +10,11 @@ idp.oidc.common.3.name = Module to provide common OIDC processing
 idp.oidc.common.3.desc = Module that provides common OIDC processing functions for other plugins to use
 idp.oidc.common.3.url = /OIDCCommon
 
-idp.oidc.common.3.1.src =  /net/shibboleth/oidc/common/conf/authn/oidc-common.properties
-idp.oidc.common.3.1.dest = conf/authn/oidc-common.properties
+idp.oidc.common.3.1.src =  /net/shibboleth/oidc/common/conf/authn/oidc-credentials.xml
+idp.oidc.common.3.1.dest = conf/oidc-credentials.xml
+idp.oidc.common.3.1.replace = false
 
-idp.oidc.common.3.2.src =  /net/shibboleth/oidc/common/conf/authn/oidc-credentials.xml
-idp.oidc.common.3.2.dest = conf/oidc-credentials.xml
-
-idp.oidc.common.3.3.src = /net/shibboleth/oidc/common/conf/attributes/oidc-claim-rules.xml
-idp.oidc.common.3.3.dest = conf/attributes/oidc-claim-rules.xml
+idp.oidc.common.3.2.src = /net/shibboleth/oidc/common/conf/attributes/oidc-claim-rules.xml
+idp.oidc.common.3.2.dest = conf/attributes/oidc-claim-rules.xml
+idp.oidc.common.3.2.replace = false
 
diff --git a/oidc-common-profile-api/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/oidc-common-profile-api/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index 821e6ea..b59c919 100644
--- a/oidc-common-profile-api/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/oidc-common-profile-api/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -36,11 +36,11 @@
     <bean id="AbstractOIDCProfile" abstract="true"
         p:securityConfiguration-ref="%{idp.security.oidc.config:shibboleth.oidc.DefaultSecurityConfiguration}" />
 
+<!-- p:claimsValidator-ref="DefaultJWTClaimsValidator" -->
     <bean id="AbstractOIDCSSOProfile" parent="AbstractOIDCProfile" abstract="true" 
-        p:issuer-ref="issuer"
-        
+        p:issuer-ref="issuer"        
         p:tokenEndpointAuthMethods="%{idp.oidc.tokenEndpointAuthMethods:client_secret_basic,client_secret_poster,client_secret_jwt,private_key_jwt}"
-        p:claimsValidator-ref="DefaultJWTClaimsValidator"
+        p:claimsValidator="#{getObject('shibboleth.oidc.DefaultJWTClaimsValidator')}"
         p:encryptionOptional="%{idp.oidc.encryptionOptional:true}"
         p:forcePKCE="%{idp.oidc.forcePKCE:false}"
         p:allowPKCEPlain="%{idp.oidc.allowPKCEPlain:false}"
@@ -48,21 +48,18 @@
         p:accessTokenType="%{idp.oauth2.accessToken.type:}"
         p:accessTokenLifetime="%{idp.oidc.accessToken.defaultLifetime:PT10M}"
         p:refreshTokenLifetime="%{idp.oidc.refreshToken.defaultLifetime:PT2H}"
-        p:alwaysIncludedAttributes="%{idp.oidc.alwaysIncludedAttributes:}"
-        
+        p:alwaysIncludedAttributes="%{idp.oidc.alwaysIncludedAttributes:}"        
         p:tokenEndpointAuthMethod="%{idp.authn.oidc.rp.client.authenticationMethod:client_secret_basic}"
         p:responseMode="%{idp.authn.oidc.rp.client.responseMode:#{null}}"
         p:clientId="#{%{idp.authn.oidc.rp.provider.discoveryRequired:false} == true ? null : '%{idp.authn.oidc.rp.client.clientId:}'}"
         p:clientCredential="#{%{idp.authn.oidc.rp.provider.discoveryRequired:false} == true ? {null} : getObject('shibboleth.authn.oidc.rp.DefaultCredential')}"/>
 
    <bean id="OIDC.SSO" parent="AbstractOIDCSSOProfile" lazy-init="true"
-        class="net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration"
-        
+        class="net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration"        
         p:authorizeCodeLifetime="%{idp.oidc.authorizeCode.defaultLifetime:PT5M}"
         p:encodeConsentInTokens="%{idp.oidc.encodeConsentInTokens:false}"
         p:encodedAttributes="%{idp.oidc.encodedAttributes:%{idp.oidc.embeddedAttributes:}}"
-        p:deniedUserInfoAttributes="%{idp.oidc.deniedUserInfoAttributes:}"
-        
+        p:deniedUserInfoAttributes="%{idp.oidc.deniedUserInfoAttributes:}"        
         p:httpRequestMethod="%{idp.authn.oidc.rp.httpRequestMethod:GET}"       
         p:retrieveUserInfoEndpointClaims="%{idp.authn.oidc.rp.client.userinfo.enabled:true}"        
         p:redirectUriOverride="%{idp.authn.oidc.rp.client.redirectURI:#{null}}"

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