[java-idp-plugin-oidc-rp] branch main updated: JOIDCRP-41 - Upgrade for IdP V5 compatibility
Phil Smart
philip.smart at jisc.ac.uk
Mon Jul 17 14:33:23 UTC 2023
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-idp-plugin-oidc-rp.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-oidc-rp.git;a=commit;h=273635cd3367a006f2639fad3261a9b120894f94
The following commit(s) were added to refs/heads/main by this push:
new 273635c JOIDCRP-41 - Upgrade for IdP V5 compatibility
273635c is described below
commit 273635cd3367a006f2639fad3261a9b120894f94
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Jul 17 15:33:20 2023 +0100
JOIDCRP-41 - Upgrade for IdP V5 compatibility
- Update more deprecated method calls
https://shibboleth.atlassian.net/browse/JOIDCRP-41
---
.../idp/plugin/authn/oidc/rp/impl/AuthorizationController.java | 1 -
.../InitializeOutboundAuthorizationRequestMessageContext.java | 2 +-
.../authn/oidc/rp/impl/PrepareOIDCInboundMessageContext.java | 2 +-
.../oidc/rp/impl/SimpleOIDCSubjectIdentifierCanonicalization.java | 2 +-
.../idp/plugin/authn/oidc/rp/impl/ValidateOIDCAuthentication.java | 2 +-
.../authn/oidc/rp/messaging/impl/AddRequestedClaimsHandler.java | 5 +++--
.../plugin/authn/oidc/rp/impl/AuthorizationControllerTest.java | 4 ++--
.../plugin/authn/oidc/rp/impl/ExchangeCodeForAccessTokenTest.java | 8 ++++----
.../authn/test/flow/AbstractAuthnXmlFlowExecutionTests.java | 4 ++--
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AuthorizationController.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AuthorizationController.java
index c48963b..25b8c9b 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AuthorizationController.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AuthorizationController.java
@@ -53,7 +53,6 @@ import net.shibboleth.oidc.profile.messaging.context.OIDCPeerEntityContext;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.component.ComponentSupport;
import net.shibboleth.shared.logic.Constraint;
/**
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/InitializeOutboundAuthorizationRequestMessageContext.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/InitializeOutboundAuthorizationRequestMessageContext.java
index be355e0..a22a8e3 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/InitializeOutboundAuthorizationRequestMessageContext.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/InitializeOutboundAuthorizationRequestMessageContext.java
@@ -139,7 +139,7 @@ public class InitializeOutboundAuthorizationRequestMessageContext extends Abstra
final MessageContext msgCtx = new MessageContext();
profileRequestContext.setOutboundMessageContext(msgCtx);
- final OIDCPeerEntityContext outboundPeerContext = msgCtx.getSubcontext(OIDCPeerEntityContext.class, true);
+ final OIDCPeerEntityContext outboundPeerContext = msgCtx.ensureSubcontext(OIDCPeerEntityContext.class);
outboundPeerContext.setIdentifier(peerEntityCtx.getIdentifier());
final OIDCProviderMetadataContext inboundProviderMetadata =
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/PrepareOIDCInboundMessageContext.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/PrepareOIDCInboundMessageContext.java
index 39c847c..af902ed 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/PrepareOIDCInboundMessageContext.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/PrepareOIDCInboundMessageContext.java
@@ -148,7 +148,7 @@ public class PrepareOIDCInboundMessageContext extends AbstractProfileAction {
profileRequestContext.setInboundMessageContext(msgCtx);
}
- final OIDCPeerEntityContext peerContext = msgCtx.getSubcontext(OIDCPeerEntityContext.class, true);
+ final OIDCPeerEntityContext peerContext = msgCtx.ensureSubcontext(OIDCPeerEntityContext.class);
peerContext.setIdentifier(identifier);
log.debug("{} Initialized inbound context for OIDC authentication message to {}", getLogPrefix(), identifier);
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/SimpleOIDCSubjectIdentifierCanonicalization.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/SimpleOIDCSubjectIdentifierCanonicalization.java
index b2d5dc5..62fd1a5 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/SimpleOIDCSubjectIdentifierCanonicalization.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/SimpleOIDCSubjectIdentifierCanonicalization.java
@@ -108,7 +108,7 @@ public class SimpleOIDCSubjectIdentifierCanonicalization extends AbstractSubject
}
if (input != null) {
final SubjectCanonicalizationContext c14nContext =
- input.getSubcontext(SubjectCanonicalizationContext.class, false);
+ input.getSubcontext(SubjectCanonicalizationContext.class);
if (c14nContext != null) {
return apply(input, c14nContext, false);
}
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateOIDCAuthentication.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateOIDCAuthentication.java
index a9b1d1d..2fd8e77 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateOIDCAuthentication.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateOIDCAuthentication.java
@@ -336,7 +336,7 @@ public class ValidateOIDCAuthentication extends AbstractValidationAction {
if (attributeContext == null) {
attributeContext = profileRequestContext
.getSubcontext(RelyingPartyContext.class)
- .getSubcontext(AttributeContext.class, true);
+ .ensureSubcontext(AttributeContext.class);
}
final Collection<IdPAttribute> attributes = new ArrayList<>(attributeContext.getIdPAttributes().values());
final Collection<IdPAttribute> newAttributes = attributeExtractionStrategy.apply(profileRequestContext);
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/messaging/impl/AddRequestedClaimsHandler.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/messaging/impl/AddRequestedClaimsHandler.java
index b23fceb..0c2a50b 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/messaging/impl/AddRequestedClaimsHandler.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/messaging/impl/AddRequestedClaimsHandler.java
@@ -30,8 +30,9 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.openid.connect.sdk.OIDCClaimsRequest;
-import net.shibboleth.shared.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.logic.FunctionSupport;
+import net.shibboleth.shared.logic.FunctionSupport;
+
+
/**
* A message handler that adds requested claims to the under constructions authentication request.
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AuthorizationControllerTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AuthorizationControllerTest.java
index b9d6c92..7e8e23c 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AuthorizationControllerTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AuthorizationControllerTest.java
@@ -348,7 +348,7 @@ public class AuthorizationControllerTest extends AbstractTestNGSpringContextTest
*/
private void addSecurityParametersContext(@Nonnull final ProfileRequestContext prc) throws Exception {
// Create a sec context under the nested prc outbound msg context
- final var secContext = prc.getOutboundMessageContext().getSubcontext(SecurityParametersContext.class, true);
+ final var secContext = prc.getOutboundMessageContext().ensureSubcontext(SecurityParametersContext.class);
final var sigParams = new SignatureSigningParameters();
sigParams.setSignatureAlgorithm("HS256");
@@ -421,7 +421,7 @@ public class AuthorizationControllerTest extends AbstractTestNGSpringContextTest
final OIDCPeerEntityContext peerEntity = new OIDCPeerEntityContext();
peerEntity.setIdentifier(ISSUER);
- final OAuth2ClientContext clientContext = peerEntity.getSubcontext(OAuth2ClientContext.class, true);
+ final OAuth2ClientContext clientContext = peerEntity.ensureSubcontext(OAuth2ClientContext.class);
prc.getOutboundMessageContext().addSubcontext(peerEntity);
return rootPrc;
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ExchangeCodeForAccessTokenTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ExchangeCodeForAccessTokenTest.java
index ac55c91..3ff5183 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ExchangeCodeForAccessTokenTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ExchangeCodeForAccessTokenTest.java
@@ -92,8 +92,8 @@ public class ExchangeCodeForAccessTokenTest extends AbstractOIDCTest {
Mockito.when(httpResponse.getCode()).thenReturn(200);
Mockito.when(httpResponse.getEntity()).thenReturn(
new StringEntity(ACCESS_TOKEN_RESPONSE, ContentType.parse(MediaType.APPLICATION_JSON_VALUE)));
- Mockito.when(httpClient.execute((HttpUriRequest) Mockito.any(), (HttpContext) Mockito.any()))
- .thenReturn(httpResponse);
+ Mockito.when(httpClient.executeOpen((HttpHost) Mockito.any(), (HttpUriRequest) Mockito.any(),
+ (HttpContext) Mockito.any())).thenReturn(httpResponse);
// create new client with mock response
exchangeAction.setHttpClient(httpClient);
@@ -188,8 +188,8 @@ public class ExchangeCodeForAccessTokenTest extends AbstractOIDCTest {
Mockito.when(httpResponse.getCode()).thenReturn(400);
Mockito.when(httpResponse.getEntity()).thenReturn(
new StringEntity(TOKEN_RESPONSE_ERROR, ContentType.parse(MediaType.APPLICATION_JSON_VALUE)));
- Mockito.when(httpClient.execute((HttpUriRequest) Mockito.any(), (HttpContext) Mockito.any()))
- .thenReturn(httpResponse);
+ Mockito.when(httpClient.executeOpen((HttpHost) Mockito.any(), (HttpUriRequest) Mockito.any(), (
+ HttpContext) Mockito.any())).thenReturn(httpResponse);
// create new client with mock response
exchangeAction.setHttpClient(httpClient);
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/test/flow/AbstractAuthnXmlFlowExecutionTests.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/test/flow/AbstractAuthnXmlFlowExecutionTests.java
index c13e827..9b02851 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/test/flow/AbstractAuthnXmlFlowExecutionTests.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/test/flow/AbstractAuthnXmlFlowExecutionTests.java
@@ -385,14 +385,14 @@ public abstract class AbstractAuthnXmlFlowExecutionTests extends CustomAbstractX
.addConstructorArgValue(net.shibboleth.idp.authn.context.AuthenticationContext.class).getBeanDefinition());
addBeanDefinition(builderContext, "shibboleth.Functions.ProxyProfileRequestAuthenticationContext",BeanDefinitionBuilder.
- genericBeanDefinition(net.shibboleth.utilities.java.support.logic.FunctionSupport.class)
+ genericBeanDefinition(FunctionSupport.class)
.setParentName("shibboleth.Functions.Compose")
.addConstructorArgReference("shibboleth.ChildLookup.ProfileRequestContext")
.addConstructorArgReference("shibboleth.ChildLookup.AuthenticationContext")
.getBeanDefinition());
addBeanDefinition(builderContext, "shibboleth.ChildLookup.ProxyProfileRequestContext",BeanDefinitionBuilder.
- genericBeanDefinition(net.shibboleth.utilities.java.support.logic.FunctionSupport.class)
+ genericBeanDefinition(FunctionSupport.class)
.setParentName("shibboleth.Functions.Compose")
.addConstructorArgReference("shibboleth.Functions.ProxyProfileRequestAuthenticationContext")
.addConstructorArgValue(new WebflowRequestContextProfileRequestContextLookup()).getBeanDefinition());
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list