[java-idp-oidc] branch main updated: Relocate/rename token profile config.
Scott Cantor
cantor.2 at osu.edu
Wed Feb 16 18:13:05 UTC 2022
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=27e2178258a75e9388b73a550b98479c6c30b038
The following commit(s) were added to refs/heads/main by this push:
new 27e21782 Relocate/rename token profile config.
27e21782 is described below
commit 27e2178258a75e9388b73a550b98479c6c30b038
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Feb 16 13:13:02 2022 -0500
Relocate/rename token profile config.
---
.../META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml | 2 +-
.../META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml | 4 ++--
.../idp/plugin/oidc/op/authn/impl/JWTCredentialValidatorTest.java | 4 ++--
.../idp/plugin/oidc/op/profile/impl/ValidateGrantTypeTest.java | 4 ++--
.../oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
index 96f6559d..26b35001 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
@@ -8,7 +8,7 @@
default-init-method="initialize" default-destroy-method="destroy">
<bean id="shibboleth.oidc.profileId" class="java.lang.String"
- c:_0="#{T(net.shibboleth.oidc.profile.config.OIDCTokenConfiguration).PROFILE_ID}" />
+ c:_0="#{T(net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenConfiguration).PROFILE_ID}" />
<bean id="shibboleth.oidc.legacyProfileId" class="java.lang.String"
c:_0="#{T(net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration).PROFILE_ID}" />
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 ba46804f..f8f5954a 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
@@ -62,7 +62,7 @@
p:securityConfiguration-ref="shibboleth.oidc.PublishKeySetSecurityConfiguration" />
<bean id="OAUTH2.Token" parent="AbstractOIDCSSOProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.config.OIDCTokenConfiguration"
+ class="net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenConfiguration"
p:grantTypes="%{idp.oauth2.grantTypes:authorization_code,refresh_token}" />
<bean id="OAUTH2.TokenAudience" parent="AbstractOIDCProfile" lazy-init="true"
@@ -352,7 +352,7 @@
</bean>
<bean id="OAUTH2.Token.MDDriven" parent="AbstractMDDrivenOIDCSSOProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.config.OIDCTokenConfiguration">
+ class="net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenConfiguration">
<property name="grantTypesLookupStrategy">
<bean parent="shibboleth.MDDrivenSetProperty" p:propertyName="grantTypes">
<property name="defaultValue">
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidatorTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidatorTest.java
index 6eb3e0dd..4aefc003 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidatorTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidatorTest.java
@@ -74,8 +74,8 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.RelyingPartyIdLookupFunction;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.oidc.jwt.claims.ClaimsValidator;
-import net.shibboleth.oidc.profile.config.OIDCTokenConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.AbstractOAuth2ClientAuthenticableProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenConfiguration;
import net.shibboleth.oidc.security.credential.BasicJWKCredential;
import net.shibboleth.oidc.security.impl.OIDCSignatureValidationParameters;
import net.shibboleth.oidc.security.jwt.claims.impl.AudienceClaimsValidator;
@@ -133,7 +133,7 @@ public class JWTCredentialValidatorTest extends BaseAuthenticationContextTest {
claimsValidator =
constructClaimsValidator((HttpServletRequest) src.getExternalContext().getNativeRequest(), replayCache);
- final OIDCTokenConfiguration profile = new OIDCTokenConfiguration();
+ final OAuth2TokenConfiguration profile = new OAuth2TokenConfiguration();
profile.setClaimsValidator(claimsValidator);
prc.getSubcontext(RelyingPartyContext.class).setProfileConfig(profile);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTypeTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTypeTest.java
index 8cfc8eed..4d74e5f1 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTypeTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrantTypeTest.java
@@ -25,8 +25,8 @@ import java.util.Set;
import net.shibboleth.idp.plugin.oidc.op.messaging.context.OIDCMetadataContext;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.oidc.profile.config.OIDCTokenConfiguration;
import net.shibboleth.oidc.profile.core.OidcEventIds;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenConfiguration;
import org.springframework.webflow.execution.Event;
import org.testng.annotations.BeforeMethod;
@@ -100,7 +100,7 @@ public class ValidateGrantTypeTest extends BaseOIDCResponseActionTest {
profileRequestCtx.getInboundMessageContext().removeSubcontext(
profileRequestCtx.getInboundMessageContext().getSubcontext(OIDCMetadataContext.class));
- final OIDCTokenConfiguration config = new OIDCTokenConfiguration();
+ final OAuth2TokenConfiguration config = new OAuth2TokenConfiguration();
config.setGrantTypes(Collections.singleton(GrantType.AUTHORIZATION_CODE.toString()));
profileRequestCtx.getSubcontext(RelyingPartyContext.class).setProfileConfig(config);
diff --git a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml
index cd68e8fa..f67ccdfc 100644
--- a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml
+++ b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/oidc/metadata/impl/EntityDescriptor-with-oidcmd-clientsecret.xml
@@ -2,7 +2,7 @@
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" entityID="mockSamlClientId">
<md:Extensions xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<mdattr:EntityAttributes>
- <saml:Attribute Name="http://shibboleth.net/ns/profiles/oidc/token/alwaysIncludedAttributes"
+ <saml:Attribute Name="http://shibboleth.net/ns/profiles/oauth2/token/alwaysIncludedAttributes"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<saml:AttributeValue>mail</saml:AttributeValue>
</saml:Attribute>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list