[java-idp-plugin-oidc-rp] branch main updated: Fix tests
Phil Smart
philip.smart at jisc.ac.uk
Fri Dec 16 17:27:32 UTC 2022
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=6ba2740b778eb90d094378b306dc0e814e9195f8
The following commit(s) were added to refs/heads/main by this push:
new 6ba2740 Fix tests
6ba2740 is described below
commit 6ba2740b778eb90d094378b306dc0e814e9195f8
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Dec 16 17:27:29 2022 +0000
Fix tests
---
.../oidc/rp/impl/AuthorizationControllerTest.java | 6 +++---
.../plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java | 22 +++++++++++-----------
2 files changed, 14 insertions(+), 14 deletions(-)
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 0c8b6a3..29b9a58 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
@@ -211,12 +211,12 @@ public class AuthorizationControllerTest extends AbstractTestNGSpringContextTest
assertNull(extContext.getAuthnError());
//basic check of the redirection URL.
assertTrue(result.getResponse().getRedirectedUrl().contains(ENDPOINT_URI));
- assertTrue(result.getResponse().getRedirectedUrl().contains(URLEncoder.encode(REDIRECT_URI, "UTF-8")));
assertTrue(result.getResponse().getRedirectedUrl().contains("client_id"));
assertTrue(result.getResponse().getRedirectedUrl().contains("response_type"));
assertTrue(result.getResponse().getRedirectedUrl().contains("scope"));
assertTrue(result.getResponse().getRedirectedUrl().contains("request"));
- assertTrue(result.getResponse().getRedirectedUrl().contains("state"));
+ // TODO state must be inside RequestObject. validate the request object
+ //assertTrue(result.getResponse().getRedirectedUrl().contains("state"));
}
/**
@@ -250,7 +250,7 @@ public class AuthorizationControllerTest extends AbstractTestNGSpringContextTest
final FlowExecutionRepository mockFlowExecutionRepo = Mockito.mock(FlowExecutionRepository.class);
final FlowExecution mockFlowExecution = Mockito.mock(FlowExecution.class);
- final MutableAttributeMap<Object> map = new LocalAttributeMap<Object>();
+ final MutableAttributeMap<Object> map = new LocalAttributeMap<>();
final var prc = buildProfileRequestContext();
map.put(ProfileRequestContext.BINDING_KEY, prc);
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
index 0f647da..bcd4815 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
@@ -488,7 +488,7 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
mockOPServer.start(9918);
- final LocalAttributeMap<Object> inputMap = new LocalAttributeMap<Object>();
+ final LocalAttributeMap<Object> inputMap = new LocalAttributeMap<>();
inputMap.put("calledAsSubflow", true);
final FlowExecution flowExecution = getFlowExecutionFactory().createFlowExecution(getFlowDefinition());
@@ -529,7 +529,7 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
mockOPServer.start(9919);
- final LocalAttributeMap<Object> inputMap = new LocalAttributeMap<Object>();
+ final LocalAttributeMap<Object> inputMap = new LocalAttributeMap<>();
inputMap.put("calledAsSubflow", true);
final ProfileRequestContext prc = buildProfileRequestContext("authn/OIDCRelyingParty",false,true);
@@ -576,7 +576,7 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
mockOPServer.start(9921);
- final LocalAttributeMap<Object> inputMap = new LocalAttributeMap<Object>();
+ final LocalAttributeMap<Object> inputMap = new LocalAttributeMap<>();
inputMap.put("calledAsSubflow", true);
final ProfileRequestContext prc = buildProfileRequestContext("authn/OIDCRelyingParty",false,true);
@@ -618,7 +618,7 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
mockOPServer.start(9920);
- final LocalAttributeMap<Object> inputMap = new LocalAttributeMap<Object>();
+ final LocalAttributeMap<Object> inputMap = new LocalAttributeMap<>();
inputMap.put("calledAsSubflow", true);
final ProfileRequestContext prc = buildProfileRequestContext("authn/OIDCRelyingParty",false,true);
@@ -654,7 +654,7 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
mockOPServer.start(9918);
- final LocalAttributeMap<Object> inputMap = new LocalAttributeMap<Object>();
+ final LocalAttributeMap<Object> inputMap = new LocalAttributeMap<>();
inputMap.put("calledAsSubflow", true);
final FlowExecution flowExecution = getFlowExecutionFactory().createFlowExecution(getFlowDefinition());
@@ -703,7 +703,7 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
mockOPServer.enqueue(new MockResponse().setResponseCode(200)
.setHeader("content-type", "application/json")
.setBody(TestTokenHelper.createAccessTokenResponseJSONWithHMACIDToken(
- OP_ISSUER_ID, CLIENT_ID, List.of(CLIENT_ID, "demo_rp2"), CLIENT_SECRET)));
+ OP_ISSUER_ID, CLIENT_ID, List.of(CLIENT_ID), CLIENT_SECRET)));
// Second is plain userInfo
mockOPServer.enqueue(new MockResponse().setResponseCode(200)
.setHeader("content-type", "application/json")
@@ -753,7 +753,7 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
mockOPServer.enqueue(new MockResponse().setResponseCode(200)
.setHeader("content-type", "application/json")
.setBody(TestTokenHelper.createAccessTokenResponseJSONWithHMACIDToken(
- OP_ISSUER_ID, CLIENT_ID, List.of(CLIENT_ID, "demo_rp2"), CLIENT_SECRET)));
+ OP_ISSUER_ID, CLIENT_ID, List.of(CLIENT_ID), CLIENT_SECRET)));
// Second is plain userInfo
mockOPServer.enqueue(new MockResponse().setResponseCode(200)
.setHeader("content-type", "application/json")
@@ -802,7 +802,7 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
mockOPServer.enqueue(new MockResponse().setResponseCode(200)
.setHeader("content-type", "application/json")
.setBody(TestTokenHelper.createAccessTokenResponseJSONWithHMACIDToken(
- OP_ISSUER_ID, CLIENT_ID, List.of(CLIENT_ID, "demo_rp2"), CLIENT_SECRET)));
+ OP_ISSUER_ID, CLIENT_ID, List.of(CLIENT_ID), CLIENT_SECRET)));
// Second is userInfo
final var userInfoToken = TestTokenHelper.createHMACSignedUserInfoJWTResponseJSON(
OP_ISSUER_ID,CLIENT_ID, List.of(CLIENT_ID), CLIENT_SECRET);
@@ -850,7 +850,7 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
mockOPServer.enqueue(new MockResponse().setResponseCode(200)
.setHeader("content-type", "application/json")
.setBody(TestTokenHelper.createAccessTokenResponseJSONIDTokenSignedAndDirEncrypted(
- OP_ISSUER_ID, CLIENT_ID, List.of(CLIENT_ID, "demo_rp2"), CLIENT_SECRET)));
+ OP_ISSUER_ID, CLIENT_ID, List.of(CLIENT_ID), CLIENT_SECRET)));
// Second is userInfo
final var userInfoTokenAndKey =
TestTokenHelper.createAsymetricSignedAndAsymetricEncryptedUserInfoJWTResponse(
@@ -1068,7 +1068,7 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
mockOPServer.enqueue(new MockResponse().setResponseCode(200)
.setHeader("content-type", "application/json")
.setBody(TestTokenHelper.createAccessTokenResponseJSONWithHMACIDToken(
- OP_ISSUER_ID, CLIENT_ID, List.of(CLIENT_ID, "demo_rp2"), CLIENT_SECRET)));
+ OP_ISSUER_ID, CLIENT_ID, List.of(CLIENT_ID), CLIENT_SECRET)));
// Second is userInfo
mockOPServer.enqueue(new MockResponse().setResponseCode(200)
.setHeader("content-type", "application/jwt")
@@ -1116,7 +1116,7 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
mockOPServer.enqueue(new MockResponse().setResponseCode(200)
.setHeader("content-type", "application/json")
.setBody(TestTokenHelper.createAccessTokenResponseJSONWithHMACIDToken(
- OP_ISSUER_ID, CLIENT_ID, List.of(CLIENT_ID, "demo_rp2"), CLIENT_SECRET)));
+ OP_ISSUER_ID, CLIENT_ID, List.of(CLIENT_ID), CLIENT_SECRET)));
// Second is userInfo
final var userInfoToken = TestTokenHelper.createHMACSignedUserInfoJWTResponseJSON(
OP_ISSUER_ID,CLIENT_ID, List.of(CLIENT_ID), CLIENT_SECRET);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list