[java-idp-oidc] 01/02: Changes to support interface changes in oidc-common
Phil Smart
philip.smart at jisc.ac.uk
Wed Apr 19 09:22:51 UTC 2023
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch dev/JCOMOIDC-66
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=eb0a1f8d8437bbd1c30d6d6863a1ab3e048e88c9
commit eb0a1f8d8437bbd1c30d6d6863a1ab3e048e88c9
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Tue Mar 28 16:19:31 2023 +0100
Changes to support interface changes in oidc-common
- oidc-common branch JCOMOIDC-66
---
.../META-INF/net.shibboleth.idp/postconfig.xml | 2 +-
.../idp/service/relying-party/postconfig.xml | 32 +++++++++++-----------
.../op/authn/impl/JWTCredentialValidatorTest.java | 8 +++---
.../impl/CredentialMetadataValueResolverTest.java | 6 ++--
.../profile/impl/AddAttributesToClaimsSetTest.java | 30 ++++++++++----------
.../profile/impl/BaseOIDCResponseActionTest.java | 32 +++++++++++-----------
.../impl/ManipulateClaimsForIDTokenTest.java | 12 ++++----
.../impl/SetConsentToResponseContextTest.java | 18 ++++++------
...kenDeliveryAttributesToResponseContextTest.java | 26 +++++++++---------
.../op/profile/impl/ValidateGrantTypeTest.java | 15 +++++-----
.../oidc/op/profile/impl/ValidatePKCETest.java | 22 +++++++--------
11 files changed, 102 insertions(+), 101 deletions(-)
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index b32a87ac..3f2f0135 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -12,7 +12,7 @@
<!-- System beans needed for extension to function, loaded after global.xml -->
<bean id="shibboleth.JWKCredential" abstract="true"
- class="net.shibboleth.oidc.security.credential.impl.BasicJWKCredentialFactoryBean" />
+ class="net.shibboleth.oidc.security.credential.BasicJWKCredentialFactoryBean" />
<!-- OIDC authentication context class reference parent declaration -->
<bean id="shibboleth.OIDCAuthnContextClassReference" abstract="true"
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 21976c0e..67638435 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
@@ -21,14 +21,14 @@
-->
<bean id="OIDC.UserInfo" parent="AbstractOIDCProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.config.OIDCUserInfoConfiguration"
+ class="net.shibboleth.oidc.profile.config.impl.DefaultOIDCUserInfoConfiguration"
p:issuer-ref="shibboleth.oidc.issuer"
p:encryptionOptional="%{idp.oidc.encryptionOptional:true}"
p:deniedUserInfoAttributes="%{idp.oidc.deniedUserInfoAttributes:}"
p:issuedClaimsValidator-ref="DefaultUserInfoJWTClaimsValidator" />
<bean id="OIDC.Registration" parent="AbstractOIDCProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.config.OIDCDynamicRegistrationConfiguration"
+ class="net.shibboleth.oidc.profile.config.impl.DefaultOIDCDynamicRegistrationConfiguration"
p:issuer-ref="shibboleth.oidc.issuer"
p:registrationValidityPeriod="%{idp.oidc.dynreg.defaultRegistrationValidity:PT24H}"
p:secretExpirationPeriod="%{idp.oidc.dynreg.defaultSecretExpiration:0}"
@@ -37,30 +37,30 @@
p:metadataPolicyLookupStrategy-ref="shibboleth.oidc.dynreg.DefaultMetadataPolicyLookupStrategy" />
<bean id="OIDC.Configuration" parent="AbstractOIDCProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.config.OIDCProviderInformationConfiguration"
+ class="net.shibboleth.oidc.profile.config.impl.DefaultOIDCProviderInformationConfiguration"
p:issuer-ref="shibboleth.oidc.issuer" />
<bean id="OAUTH2.Token" parent="AbstractOIDCSSOProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenConfiguration"
+ class="net.shibboleth.oidc.profile.oauth2.config.impl.DefaultOAuth2TokenConfiguration"
p:grantTypes="%{idp.oauth2.grantTypes:authorization_code,refresh_token}"
p:enforceRefreshTokenRotation="%{idp.oauth2.enforceRefreshTokenRotation:false}" />
<bean id="OAUTH2.TokenAudience" parent="AbstractOIDCProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenAudienceConfiguration"
+ class="net.shibboleth.oidc.profile.oauth2.config.impl.DefaultOAuth2TokenAudienceConfiguration"
p:issuer-ref="shibboleth.oidc.issuer"
p:encryptionOptional="%{idp.oauth2.encryptionOptional:false}"
p:accessTokenType="%{idp.oauth2.accessToken.type:}"
p:accessTokenLifetime="%{idp.oauth2.accessToken.defaultLifetime:PT10M}" />
<bean id="OAUTH2.Introspection" parent="AbstractOIDCProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenIntrospectionConfiguration"
+ class="net.shibboleth.oidc.profile.oauth2.config.impl.DefaultOAuth2TokenIntrospectionConfiguration"
p:issuer-ref="shibboleth.oidc.issuer"
p:tokenEndpointAuthMethods="%{idp.oidc.dynreg.tokenEndpointAuthMethods:client_secret_basic,client_secret_post,client_secret_jwt,private_key_jwt}"
p:claimsValidator-ref="DefaultJWTClaimsValidator"
p:issuedClaimsValidator-ref="DefaultIntrospectionJWTClaimsValidator" />
<bean id="OAUTH2.Revocation" parent="AbstractOIDCProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenRevocationConfiguration"
+ class="net.shibboleth.oidc.profile.oauth2.config.impl.DefaultOAuth2TokenRevocationConfiguration"
p:issuer-ref="shibboleth.oidc.issuer"
p:tokenEndpointAuthMethods="%{idp.oidc.dynreg.tokenEndpointAuthMethods:client_secret_basic,client_secret_post,client_secret_jwt,private_key_jwt}"
p:claimsValidator-ref="DefaultJWTClaimsValidator"
@@ -229,7 +229,7 @@
</bean>
<bean id="OIDC.SSO.MDDriven" parent="AbstractMDDrivenOIDCSSOProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration">
+ class="net.shibboleth.oidc.profile.config.impl.DefaultOIDCAuthorizationConfiguration">
<property name="acrRequestAlwaysEssentialPredicate">
<bean class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="fromFunction">
<constructor-arg>
@@ -293,7 +293,7 @@
</bean>
<bean id="OIDC.UserInfo.MDDriven" parent="AbstractMDDrivenOIDCProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.config.OIDCUserInfoConfiguration">
+ class="net.shibboleth.oidc.profile.config.impl.DefaultOIDCUserInfoConfiguration">
<property name="issuerLookupStrategy">
<bean parent="shibboleth.MDDrivenStringProperty" p:propertyName="issuer" p:defaultValue-ref="shibboleth.oidc.issuer" />
</property>
@@ -330,7 +330,7 @@
</bean>
<bean id="OIDC.Registration.MDDriven" parent="AbstractMDDrivenOIDCFlowAwareProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.config.OIDCDynamicRegistrationConfiguration">
+ class="net.shibboleth.oidc.profile.config.impl.DefaultOIDCDynamicRegistrationConfiguration">
<property name="issuerLookupStrategy">
<bean parent="shibboleth.MDDrivenStringProperty" p:propertyName="issuer" p:defaultValue-ref="shibboleth.oidc.issuer" />
</property>
@@ -360,14 +360,14 @@
</bean>
<bean id="OIDC.Configuration.MDDriven" parent="AbstractMDDrivenOIDCProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.config.OIDCProviderInformationConfiguration">
+ class="net.shibboleth.oidc.profile.config.impl.DefaultOIDCProviderInformationConfiguration">
<property name="issuerLookupStrategy">
<bean parent="shibboleth.MDDrivenStringProperty" p:propertyName="issuer" p:defaultValue-ref="shibboleth.oidc.issuer" />
</property>
</bean>
<bean id="OIDC.Keyset.MDDriven" parent="AbstractMDDrivenOIDCProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.config.OIDCPublishKeySetConfiguration">
+ class="net.shibboleth.oidc.profile.config.impl.DefaultOIDCPublishKeySetConfiguration">
<property name="securityConfigurationLookupStrategy">
<bean parent="shibboleth.MDDrivenBeanProperty" p:propertyName="securityConfiguration"
p:propertyType="#{T(net.shibboleth.idp.profile.config.SecurityConfiguration)}"
@@ -376,7 +376,7 @@
</bean>
<bean id="OAUTH2.Token.MDDriven" parent="AbstractMDDrivenOIDCSSOProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenConfiguration">
+ class="net.shibboleth.oidc.profile.oauth2.config.impl.DefaultOAuth2TokenConfiguration">
<property name="grantTypesLookupStrategy">
<bean parent="shibboleth.MDDrivenSetProperty" p:propertyName="grantTypes">
<property name="defaultValue">
@@ -406,7 +406,7 @@
</bean>
<bean id="OAUTH2.TokenAudience.MDDriven" parent="AbstractMDDrivenOIDCProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenAudienceConfiguration">
+ class="net.shibboleth.oidc.profile.oauth2.config.impl.DefaultOAuth2TokenAudienceConfiguration">
<property name="issuerLookupStrategy">
<bean parent="shibboleth.MDDrivenStringProperty" p:propertyName="issuer" p:defaultValue-ref="shibboleth.oidc.issuer" />
</property>
@@ -437,7 +437,7 @@
</bean>
<bean id="OAUTH2.Introspection.MDDriven" parent="AbstractMDDrivenOAuthTokenValidatingProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenIntrospectionConfiguration">
+ class="net.shibboleth.oidc.profile.oauth2.config.impl.DefaultOAuth2TokenIntrospectionConfiguration">
<property name="tokenEndpointAuthMethodsLookupStrategy">
<bean parent="shibboleth.MDDrivenSetProperty" p:propertyName="tokenEndpointAuthMethods">
<property name="defaultValue">
@@ -456,7 +456,7 @@
</bean>
<bean id="OAUTH2.Revocation.MDDriven" parent="AbstractMDDrivenOAuthTokenValidatingProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenRevocationConfiguration">
+ class="net.shibboleth.oidc.profile.oauth2.config.impl.DefaultOAuth2TokenRevocationConfiguration">
<property name="tokenEndpointAuthMethodsLookupStrategy">
<bean parent="shibboleth.MDDrivenSetProperty" p:propertyName="tokenEndpointAuthMethods">
<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 64d629c4..915e218a 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
@@ -65,14 +65,14 @@ import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.authn.impl.ValidateCredentials;
import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
import net.shibboleth.idp.authn.principal.UsernamePrincipal;
-import net.shibboleth.oidc.authn.context.OAuth2ClientAuthenticationContext;
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.authn.context.OAuth2ClientAuthenticationContext;
import net.shibboleth.oidc.jwt.claims.ClaimsValidator;
import net.shibboleth.oidc.metadata.context.OIDCMetadataContext;
-import net.shibboleth.oidc.profile.oauth2.config.AbstractOAuth2ClientAuthenticableProfileConfiguration;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.impl.AbstractOAuth2ClientAuthenticableProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.impl.DefaultOAuth2TokenConfiguration;
import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.oidc.security.jwt.claims.impl.AudienceClaimsValidator;
import net.shibboleth.oidc.security.jwt.claims.impl.ChainingJWTClaimsValidator;
@@ -130,7 +130,7 @@ public class JWTCredentialValidatorTest extends BaseAuthenticationContextTest {
claimsValidator =
constructClaimsValidator((HttpServletRequest) src.getExternalContext().getNativeRequest(), replayCache);
- final OAuth2TokenConfiguration profile = new OAuth2TokenConfiguration();
+ final DefaultOAuth2TokenConfiguration profile = new DefaultOAuth2TokenConfiguration();
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/metadata/impl/CredentialMetadataValueResolverTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/CredentialMetadataValueResolverTest.java
index c40c38c2..39e46b10 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/CredentialMetadataValueResolverTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/CredentialMetadataValueResolverTest.java
@@ -36,8 +36,8 @@ import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
-import net.shibboleth.oidc.profile.config.OIDCProviderInformationConfiguration;
-import net.shibboleth.oidc.security.credential.impl.BasicJWKCredentialFactoryBean;
+import net.shibboleth.oidc.profile.config.impl.DefaultOIDCProviderInformationConfiguration;
+import net.shibboleth.oidc.security.credential.BasicJWKCredentialFactoryBean;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
@@ -63,7 +63,7 @@ public class CredentialMetadataValueResolverTest {
resolver.setId("mockId");
resolver.initialize();
final RelyingPartyContext rpCtx = profileRequestCtx.getSubcontext(RelyingPartyContext.class, true);
- final OIDCProviderInformationConfiguration profileConfig = new OIDCProviderInformationConfiguration();
+ final DefaultOIDCProviderInformationConfiguration profileConfig = new DefaultOIDCProviderInformationConfiguration();
final SecurityConfiguration secConfig = new SecurityConfiguration();
final SignatureSigningConfiguration signConfig = Mockito.mock(SignatureSigningConfiguration.class);
Mockito.when(signConfig.getSigningCredentials()).thenReturn(Arrays.asList(credential));
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAttributesToClaimsSetTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAttributesToClaimsSetTest.java
index 8a9390c1..070728fb 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAttributesToClaimsSetTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAttributesToClaimsSetTest.java
@@ -26,6 +26,18 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.opensaml.profile.action.EventIds;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.springframework.webflow.execution.Event;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import com.nimbusds.oauth2.sdk.ParseException;
+
import net.shibboleth.ext.spring.testing.MockApplicationContext;
import net.shibboleth.idp.attribute.AttributesMapContainer;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -43,22 +55,10 @@ import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder;
import net.shibboleth.oidc.attribute.transcoding.OIDCAttributeTranscoder;
import net.shibboleth.oidc.attribute.transcoding.impl.OIDCStringAttributeTranscoder;
-import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
+import net.shibboleth.oidc.profile.config.impl.DefaultOIDCAuthorizationConfiguration;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.test.service.MockReloadableService;
-import org.opensaml.profile.action.EventIds;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.springframework.webflow.execution.Event;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import com.nimbusds.oauth2.sdk.ParseException;
-
/** {@link AddAttributesToClaimsSet} unit test. */
public class AddAttributesToClaimsSetTest extends BaseOIDCResponseActionTest {
@@ -69,7 +69,7 @@ public class AddAttributesToClaimsSetTest extends BaseOIDCResponseActionTest {
@BeforeMethod
public void setup() throws ComponentInitializationException {
- ((OIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setAlwaysIncludedAttributes(
+ ((DefaultOIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setAlwaysIncludedAttributes(
Set.of("test1", "test3", "test4"));
registry = new AttributeTranscoderRegistryImpl();
@@ -157,7 +157,7 @@ public class AddAttributesToClaimsSetTest extends BaseOIDCResponseActionTest {
final ProfileRequestContext prc = new WebflowRequestContextProfileRequestContextLookup().apply(requestCtx);
final AttributeContext attributeCtx = new AttributeContext();
- final Collection<IdPAttribute> attributes = new ArrayList<IdPAttribute>();
+ final Collection<IdPAttribute> attributes = new ArrayList<>();
attributes.add(attribute1);
attributes.add(attribute2);
attributes.add(attribute3);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BaseOIDCResponseActionTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BaseOIDCResponseActionTest.java
index 1bed38c6..99ce1f9c 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BaseOIDCResponseActionTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/BaseOIDCResponseActionTest.java
@@ -30,20 +30,6 @@ import java.util.stream.Stream;
import javax.annotation.Nonnull;
-import net.shibboleth.idp.plugin.oidc.op.messaging.context.OIDCAuthenticationResponseContext;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
-import net.shibboleth.idp.profile.testing.RequestContextBuilder;
-import net.shibboleth.oidc.metadata.context.OIDCMetadataContext;
-import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
-import net.shibboleth.oidc.security.credential.impl.BasicJWKCredentialFactoryBean;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.security.DataSealer;
-import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
-import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
-import net.shibboleth.utilities.java.support.security.impl.SecureRandomIdentifierGenerationStrategy;
-
import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -52,6 +38,7 @@ import org.opensaml.storage.RevocationCache;
import org.springframework.core.io.ClassPathResource;
import org.springframework.webflow.execution.RequestContext;
import org.testng.annotations.BeforeMethod;
+
import com.nimbusds.jose.JOSEException;
import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.jose.JWSHeader;
@@ -72,6 +59,19 @@ import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
import net.shibboleth.ext.spring.resource.ResourceHelper;
+import net.shibboleth.idp.plugin.oidc.op.messaging.context.OIDCAuthenticationResponseContext;
+import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.oidc.metadata.context.OIDCMetadataContext;
+import net.shibboleth.oidc.profile.config.impl.DefaultOIDCAuthorizationConfiguration;
+import net.shibboleth.oidc.security.credential.BasicJWKCredentialFactoryBean;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.security.DataSealer;
+import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
+import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
+import net.shibboleth.utilities.java.support.security.impl.SecureRandomIdentifierGenerationStrategy;
/** base class for tests expecting to have inbound and outbound msg ctxs etc in place. */
public abstract class BaseOIDCResponseActionTest extends OpenSAMLInitBaseTestCase {
@@ -164,7 +164,7 @@ public abstract class BaseOIDCResponseActionTest extends OpenSAMLInitBaseTestCas
rpCtx = profileRequestCtx.getSubcontext(RelyingPartyContext.class, true);
rpCtx.setRelyingPartyId(clientId);
respCtx.setSubject(subject);
- rpCtx.setProfileConfig(new OIDCAuthorizationConfiguration());
+ rpCtx.setProfileConfig(new DefaultOIDCAuthorizationConfiguration());
}
protected void setAuthenticationRequest(final AuthenticationRequest req) {
@@ -180,7 +180,7 @@ public abstract class BaseOIDCResponseActionTest extends OpenSAMLInitBaseTestCas
}
protected void setIdTokenToResponseContext(final String iss, final String sub, final String aud, final Instant exp, final Instant iat) {
- final List<Audience> audience = new ArrayList<Audience>();
+ final List<Audience> audience = new ArrayList<>();
audience.add(new Audience(aud));
final IDTokenClaimsSet idToken = new IDTokenClaimsSet(new Issuer(iss), new Subject(sub), audience,
Date.from(exp), Date.from(iat));
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ManipulateClaimsForIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ManipulateClaimsForIDTokenTest.java
index 5dd088bb..51474ddb 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ManipulateClaimsForIDTokenTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ManipulateClaimsForIDTokenTest.java
@@ -22,11 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.function.BiFunction;
-import net.shibboleth.idp.profile.IdPEventIds;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.mockito.Mockito;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -39,6 +34,11 @@ import com.nimbusds.oauth2.sdk.id.Audience;
import com.nimbusds.openid.connect.sdk.claims.AMR;
import com.nimbusds.openid.connect.sdk.claims.IDTokenClaimsSet;
+import net.shibboleth.idp.profile.IdPEventIds;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.oidc.profile.config.impl.DefaultOIDCAuthorizationConfiguration;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
/** {@link ManipulateClaimsForIDToken} unit test. */
public class ManipulateClaimsForIDTokenTest extends BaseOIDCResponseActionTest {
@@ -52,7 +52,7 @@ public class ManipulateClaimsForIDTokenTest extends BaseOIDCResponseActionTest {
throws ComponentInitializationException {
action = new ManipulateClaimsForIDToken();
action.initialize();
- final OIDCAuthorizationConfiguration config = new OIDCAuthorizationConfiguration();
+ final DefaultOIDCAuthorizationConfiguration config = new DefaultOIDCAuthorizationConfiguration();
config.setIDTokenManipulationStrategy(strategy);
rpCtx.setProfileConfig(config);
}
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentToResponseContextTest.java
index c0f71eae..0461f9bc 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentToResponseContextTest.java
@@ -17,14 +17,6 @@
package net.shibboleth.idp.plugin.oidc.op.profile.impl;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.context.AttributeContext;
-import net.shibboleth.idp.plugin.oidc.op.messaging.context.OIDCAuthenticationResponseConsentContext;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import java.util.HashSet;
import java.util.Set;
@@ -34,6 +26,14 @@ import org.testng.annotations.Test;
import com.google.common.base.Predicates;
+import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.context.AttributeContext;
+import net.shibboleth.idp.plugin.oidc.op.messaging.context.OIDCAuthenticationResponseConsentContext;
+import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.oidc.profile.config.impl.DefaultOIDCAuthorizationConfiguration;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
/** {@link SetConsentToResponseContext} unit test. */
public class SetConsentToResponseContextTest extends BaseOIDCResponseActionTest {
@@ -48,7 +48,7 @@ public class SetConsentToResponseContextTest extends BaseOIDCResponseActionTest
attributes.add(new IdPAttribute("2"));
attributeCtx.setIdPAttributes(attributes);
rpCtx.addSubcontext(attributeCtx);
- ((OIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setEncodeConsentInTokens(encodeConsent);
+ ((DefaultOIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setEncodeConsentInTokens(encodeConsent);
action = new SetConsentToResponseContext();
action.setConsentEnabledPredicate(consentEnabled ? Predicates.alwaysTrue() : Predicates.alwaysFalse());
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java
index a42becbe..5449f881 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesToResponseContextTest.java
@@ -25,6 +25,15 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.springframework.webflow.execution.Event;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+
import net.shibboleth.ext.spring.testing.MockApplicationContext;
import net.shibboleth.idp.attribute.AttributesMapContainer;
import net.shibboleth.idp.attribute.IdPAttribute;
@@ -41,19 +50,10 @@ import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder;
import net.shibboleth.oidc.attribute.transcoding.OIDCAttributeTranscoder;
import net.shibboleth.oidc.attribute.transcoding.impl.OIDCStringAttributeTranscoder;
-import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
+import net.shibboleth.oidc.profile.config.impl.DefaultOIDCAuthorizationConfiguration;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.test.service.MockReloadableService;
-import org.springframework.webflow.execution.Event;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-
/** {@link SetTokenDeliveryAttributesToResponseContext} unit test. */
public class SetTokenDeliveryAttributesToResponseContextTest extends BaseOIDCResponseActionTest {
@@ -64,13 +64,13 @@ public class SetTokenDeliveryAttributesToResponseContextTest extends BaseOIDCRes
@BeforeMethod
public void setup() throws ComponentInitializationException {
- ((OIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setEncodedAttributes(
+ ((DefaultOIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setEncodedAttributes(
Set.of("test1", "test2", "test3", "test4"));
- ((OIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setAlwaysIncludedAttributes(
+ ((DefaultOIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setAlwaysIncludedAttributes(
Set.of("test2", "test3"));
- ((OIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setDeniedUserInfoAttributes(
+ ((DefaultOIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setDeniedUserInfoAttributes(
Set.of("test2", "test4"));
registry = new AttributeTranscoderRegistryImpl();
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 36ae3f25..185c5592 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
@@ -22,12 +22,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.oidc.metadata.context.OIDCMetadataContext;
-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;
import org.testng.annotations.Test;
@@ -41,6 +35,12 @@ import com.nimbusds.oauth2.sdk.token.RefreshToken;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
+import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.oidc.metadata.context.OIDCMetadataContext;
+import net.shibboleth.oidc.profile.core.OidcEventIds;
+import net.shibboleth.oidc.profile.oauth2.config.impl.DefaultOAuth2TokenConfiguration;
+
/** {@link ValidateGrantType} unit test. */
public class ValidateGrantTypeTest extends BaseOIDCResponseActionTest {
@@ -51,6 +51,7 @@ public class ValidateGrantTypeTest extends BaseOIDCResponseActionTest {
private OIDCClientMetadata metaData;
/** Set up method. */
+ @Override
@BeforeMethod
protected void setUp() throws Exception {
super.setUp();
@@ -100,7 +101,7 @@ public class ValidateGrantTypeTest extends BaseOIDCResponseActionTest {
profileRequestCtx.getInboundMessageContext().removeSubcontext(
profileRequestCtx.getInboundMessageContext().getSubcontext(OIDCMetadataContext.class));
- final OAuth2TokenConfiguration config = new OAuth2TokenConfiguration();
+ final DefaultOAuth2TokenConfiguration config = new DefaultOAuth2TokenConfiguration();
config.setGrantTypes(Collections.singleton(GrantType.AUTHORIZATION_CODE.toString()));
profileRequestCtx.getSubcontext(RelyingPartyContext.class).setProfileConfig(config);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java
index 6ba15f8e..153c787c 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidatePKCETest.java
@@ -21,12 +21,6 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.time.Instant;
-import net.shibboleth.idp.plugin.oidc.op.token.support.AuthorizeCodeClaimsSet;
-import net.shibboleth.idp.plugin.oidc.op.token.support.RefreshTokenClaimsSet;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-
import org.opensaml.profile.action.EventIds;
import org.springframework.webflow.execution.Event;
import org.testng.annotations.BeforeMethod;
@@ -45,6 +39,12 @@ import com.nimbusds.oauth2.sdk.pkce.CodeVerifier;
import com.nimbusds.oauth2.sdk.token.RefreshToken;
import com.nimbusds.openid.connect.sdk.claims.ACR;
+import net.shibboleth.idp.plugin.oidc.op.token.support.AuthorizeCodeClaimsSet;
+import net.shibboleth.idp.plugin.oidc.op.token.support.RefreshTokenClaimsSet;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.oidc.profile.config.impl.DefaultOIDCAuthorizationConfiguration;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
/** {@link ValidatePKCE} unit test. */
public class ValidatePKCETest extends BaseOIDCResponseActionTest {
@@ -52,7 +52,7 @@ public class ValidatePKCETest extends BaseOIDCResponseActionTest {
private ValidatePKCE action;
/** Code verifier. */
- private String codeVerifier = "1234567812345678123456781234567812345678123456781234567812345678";
+ private final String codeVerifier = "1234567812345678123456781234567812345678123456781234567812345678";
@BeforeMethod
private void init() throws ComponentInitializationException, URISyntaxException, ParseException {
@@ -140,7 +140,7 @@ public class ValidatePKCETest extends BaseOIDCResponseActionTest {
*/
@Test
public void testSuccessPlain() throws URISyntaxException {
- ((OIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setAllowPKCEPlain(true);
+ ((DefaultOIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setAllowPKCEPlain(true);
final AuthorizeCodeClaimsSet claims = new AuthorizeCodeClaimsSet.Builder()
.setJWTID(idGenerator)
.setClientID(new ClientID())
@@ -168,7 +168,7 @@ public class ValidatePKCETest extends BaseOIDCResponseActionTest {
*/
@Test
public void testFailPlain() throws URISyntaxException {
- ((OIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setAllowPKCEPlain(true);
+ ((DefaultOIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setAllowPKCEPlain(true);
final AuthorizeCodeClaimsSet claims = new AuthorizeCodeClaimsSet.Builder()
.setJWTID(idGenerator)
.setClientID(new ClientID())
@@ -224,7 +224,7 @@ public class ValidatePKCETest extends BaseOIDCResponseActionTest {
*/
@Test
public void testFailureNoPKCE() throws URISyntaxException {
- ((OIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setForcePKCE(true);
+ ((DefaultOIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setForcePKCE(true);
final TokenRequest req = new TokenRequest(new URI("https://client.com/callback"), new ClientID(clientId),
new AuthorizationCodeGrant(new AuthorizationCode("mockCode"), new URI("https://client.com/callback")));
setTokenRequest(req);
@@ -268,7 +268,7 @@ public class ValidatePKCETest extends BaseOIDCResponseActionTest {
*/
@Test
public void testSuccessNoAuthzCode() throws URISyntaxException {
- ((OIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setForcePKCE(true);
+ ((DefaultOIDCAuthorizationConfiguration) rpCtx.getProfileConfig()).setForcePKCE(true);
final TokenRequest req = new TokenRequest(new URI("https://client.com/callback"), new ClientID(clientId),
new RefreshTokenGrant(new RefreshToken()));
setTokenRequest(req);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list