[java-identity-provider] 05/19: IDP-1793 Use Suppliers for HttpRequest/Response
Rod Widdowson
rdw at steadingsoftware.com
Wed Aug 10 13:16:57 UTC 2022
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch maint-4
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=426a23d7e12263a085623c54903aa3bd925b11ab
commit 426a23d7e12263a085623c54903aa3bd925b11ab
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jul 30 11:13:43 2022 +0100
IDP-1793 Use Suppliers for HttpRequest/Response
https://shibboleth.atlassian.net/browse/IDP-1793
AbstractProfileAction now has a setter for Suppliers for
HttpServletRequest & Repsonse
Make the tests use them
---
.../idp/admin/impl/DoStorageOperationTest.java | 6 +++--
...ializeAdministrativeProfileContextTreeTest.java | 6 ++++-
.../ExtractDuoAuthenticationFromHeadersTest.java | 10 ++++++--
.../idp/authn/impl/ExtractRemoteUserTest.java | 8 ++++--
.../authn/impl/ExtractUserAgentAddressTest.java | 7 ++++-
.../authn/impl/ExtractUserAgentIdentifierTest.java | 7 ++++-
.../ExtractUsernamePasswordFromBasicAuthTest.java | 7 ++++-
...ExtractUsernamePasswordFromFormRequestTest.java | 7 ++++-
.../ExtractX509CertificateFromRequestTest.java | 6 ++++-
.../impl/HTPasswdCredentialValidatorTest.java | 7 +++--
.../authn/impl/JAASCredentialValidatorTest.java | 7 +++--
.../authn/impl/LDAPCredentialValidatorTest.java | 8 ++++--
.../impl/PreserveAuthenticationFlowStateTest.java | 9 +++++--
.../idp/authn/impl/ValidateCredentialsTest.java | 8 ++++--
.../impl/ValidateExternalAuthenticationTest.java | 5 +++-
.../idp/authn/impl/ValidateRemoteUserTest.java | 6 +++--
.../authn/impl/ValidateUserAgentAddressTest.java | 8 ++++--
.../X509CertificateCredentialValidatorTest.java | 7 +++--
.../proxy/impl/ExtractDiscoveryResponseTest.java | 7 ++++-
.../idp/consent/flow/impl/ExtractConsentTest.java | 11 +++++---
.../idp/profile/audit/impl/WriteAuditLogTest.java | 4 ++-
.../relyingparty/metadata/ReloadMetadataTest.java | 9 ++++---
.../metadata/ReloadServiceConfigurationTest.java | 5 ++--
.../AddAuthenticationStatementToAssertionTest.java | 5 +++-
.../impl/DecorateDelegatedAssertionTest.java | 3 ++-
.../impl/AddAuthnStatementToAssertionTest.java | 5 +++-
.../ProcessAssertionsForAuthenticationTest.java | 8 ++++--
.../session/impl/PopulateSessionContextTest.java | 30 ++++++++++++----------
.../idp/session/impl/ProcessLogoutTest.java | 11 +++++---
29 files changed, 165 insertions(+), 62 deletions(-)
diff --git a/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/DoStorageOperationTest.java b/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/DoStorageOperationTest.java
index 02d8700e8..83c466c1b 100644
--- a/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/DoStorageOperationTest.java
+++ b/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/DoStorageOperationTest.java
@@ -21,8 +21,10 @@ import java.io.IOException;
import java.text.ParseException;
import java.time.Duration;
import java.util.Map;
+import java.util.function.Supplier;
import javax.annotation.Nonnull;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.joda.time.Instant;
@@ -89,8 +91,8 @@ public class DoStorageOperationTest {
mapper.setSerializationInclusion(Include.NON_NULL);
action = new DoStorageOperation();
- action.setHttpServletRequest(request);
- action.setHttpServletResponse(response);
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
+ action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() {return response;}});
action.setStorageService(storageService);
action.setObjectMapper(mapper);
action.initialize();
diff --git a/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTreeTest.java b/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTreeTest.java
index eb5042a56..b772a6366 100644
--- a/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTreeTest.java
+++ b/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTreeTest.java
@@ -18,6 +18,7 @@
package net.shibboleth.idp.admin.impl;
import java.util.Collections;
+import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
@@ -68,7 +69,10 @@ public class InitializeAdministrativeProfileContextTreeTest extends OpenSAMLInit
action = new InitializeAdministrativeProfileContextTree();
action.setAdministrativeFlowDescriptor(descriptor);
- action.setHttpServletRequest((HttpServletRequest) src.getExternalContext().getNativeRequest());
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() {
+ return (HttpServletRequest) src.getExternalContext().getNativeRequest();
+ }
+ });
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/duo/impl/ExtractDuoAuthenticationFromHeadersTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/duo/impl/ExtractDuoAuthenticationFromHeadersTest.java
index 66aa0e182..107c186ff 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/duo/impl/ExtractDuoAuthenticationFromHeadersTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/duo/impl/ExtractDuoAuthenticationFromHeadersTest.java
@@ -26,6 +26,10 @@ import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.webflow.execution.Event;
import org.testng.Assert;
@@ -41,7 +45,8 @@ public class ExtractDuoAuthenticationFromHeadersTest extends BaseAuthenticationC
super.setUp();
action = new ExtractDuoAuthenticationFromHeaders();
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
@@ -60,7 +65,8 @@ public class ExtractDuoAuthenticationFromHeadersTest extends BaseAuthenticationC
@Test public void testNoAuto() throws ComponentInitializationException {
action = new ExtractDuoAuthenticationFromHeaders();
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.setAutoAuthenticationSupported(false);
action.initialize();
final Event event = action.execute(src);
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java
index e983ceed9..c791dbd34 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java
@@ -19,6 +19,9 @@ package net.shibboleth.idp.authn.impl;
import java.util.Arrays;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
@@ -43,7 +46,8 @@ public class ExtractRemoteUserTest extends BaseAuthenticationContextTest {
super.setUp();
action = new ExtractRemoteUser();
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
}
@Test public void testNoConfig() {
@@ -57,7 +61,7 @@ public class ExtractRemoteUserTest extends BaseAuthenticationContextTest {
}
@Test public void testNoServlet() throws ComponentInitializationException {
- action.setHttpServletRequest(null);
+ action.setHttpServletRequestSupplier(null);
action.initialize();
final Event event = action.execute(src);
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddressTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddressTest.java
index a93ee65fa..0b023c336 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddressTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddressTest.java
@@ -25,6 +25,10 @@ import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.webflow.execution.Event;
import org.testng.Assert;
@@ -40,7 +44,8 @@ public class ExtractUserAgentAddressTest extends BaseAuthenticationContextTest {
super.setUp();
action = new ExtractUserAgentAddress();
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdentifierTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdentifierTest.java
index 654ea9546..23a12139f 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdentifierTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdentifierTest.java
@@ -25,6 +25,10 @@ import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.webflow.execution.Event;
import org.testng.Assert;
@@ -40,7 +44,8 @@ public class ExtractUserAgentIdentifierTest extends BaseAuthenticationContextTes
super.setUp();
action = new ExtractUserAgentIdentifier();
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuthTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuthTest.java
index 7572ac17c..417708fa8 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuthTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuthTest.java
@@ -18,6 +18,10 @@
package net.shibboleth.idp.authn.impl;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.webflow.execution.Event;
import org.testng.Assert;
@@ -42,7 +46,8 @@ public class ExtractUsernamePasswordFromBasicAuthTest extends BaseAuthentication
super.setUp();
action = new ExtractUsernamePasswordFromBasicAuth();
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}}); action.initialize();
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequestTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequestTest.java
index 8f5f88b13..41d4ee44f 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequestTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequestTest.java
@@ -25,6 +25,10 @@ import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.webflow.execution.Event;
import org.testng.Assert;
@@ -42,7 +46,8 @@ public class ExtractUsernamePasswordFromFormRequestTest extends BaseAuthenticati
action = new ExtractUsernamePasswordFromFormRequest();
action.setUsernameFieldName("j_username");
action.setPasswordFieldName("j_password");
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractX509CertificateFromRequestTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractX509CertificateFromRequestTest.java
index a8aa42e27..7ba6b16f9 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractX509CertificateFromRequestTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractX509CertificateFromRequestTest.java
@@ -20,6 +20,9 @@ package net.shibboleth.idp.authn.impl;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
@@ -89,7 +92,8 @@ public class ExtractX509CertificateFromRequestTest extends BaseAuthenticationCon
super.setUp();
action = new ExtractX509CertificateFromRequest();
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidatorTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidatorTest.java
index f808ca7be..863461775 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidatorTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/HTPasswdCredentialValidatorTest.java
@@ -22,9 +22,11 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.function.Supplier;
import java.util.regex.Pattern;
import javax.security.auth.login.LoginException;
+import javax.servlet.http.HttpServletRequest;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
@@ -70,7 +72,8 @@ public class HTPasswdCredentialValidatorTest extends BaseAuthenticationContextTe
mappings.put(AuthnEventIds.UNKNOWN_USERNAME, Collections.singleton(AuthnEventIds.UNKNOWN_USERNAME));
action.setClassifiedMessages(mappings);
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
}
@Test public void testMissingFlow() throws ComponentInitializationException {
@@ -326,7 +329,7 @@ public class HTPasswdCredentialValidatorTest extends BaseAuthenticationContextTe
private void doExtract() throws ComponentInitializationException {
final ExtractUsernamePasswordFromFormRequest extract = new ExtractUsernamePasswordFromFormRequest();
- extract.setHttpServletRequest(action.getHttpServletRequest());
+ extract.setHttpServletRequestSupplier(action.getHttpServletRequestSupplier());
extract.initialize();
extract.execute(src);
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/JAASCredentialValidatorTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/JAASCredentialValidatorTest.java
index 966162686..560bac7c4 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/JAASCredentialValidatorTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/JAASCredentialValidatorTest.java
@@ -26,9 +26,11 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.function.Supplier;
import java.util.regex.Pattern;
import javax.security.auth.login.LoginException;
+import javax.servlet.http.HttpServletRequest;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
@@ -107,7 +109,8 @@ public class JAASCredentialValidatorTest extends BaseAuthenticationContextTest {
mappings.put("InvalidPassword", Collections.singleton("INVALID_CREDENTIALS"));
action.setClassifiedMessages(mappings);
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
}
@Test public void testMissingFlow() throws ComponentInitializationException {
@@ -403,7 +406,7 @@ public class JAASCredentialValidatorTest extends BaseAuthenticationContextTest {
private void doExtract() throws ComponentInitializationException {
final ExtractUsernamePasswordFromFormRequest extract = new ExtractUsernamePasswordFromFormRequest();
- extract.setHttpServletRequest(action.getHttpServletRequest());
+ extract.setHttpServletRequestSupplier(action.getHttpServletRequestSupplier());
extract.initialize();
extract.execute(src);
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidatorTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidatorTest.java
index b7b491521..6280b4107 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidatorTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/LDAPCredentialValidatorTest.java
@@ -24,8 +24,11 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
+import java.util.function.Supplier;
import java.util.regex.Pattern;
+import javax.servlet.http.HttpServletRequest;
+
import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.TemplateSearchDnResolver;
@@ -134,7 +137,8 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
mappings.put("ExpiringPassword", Collections.singleton("ACCOUNT_WARNING"));
mappings.put("ExpiredPassword", Arrays.asList("PASSWORD_EXPIRED", "CHANGE_AFTER_RESET"));
action.setClassifiedMessages(mappings);
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
}
@Test public void testMissingFlow() throws ComponentInitializationException {
@@ -679,7 +683,7 @@ public class LDAPCredentialValidatorTest extends BaseAuthenticationContextTest {
private void doExtract() throws ComponentInitializationException {
final ExtractUsernamePasswordFromFormRequest extract = new ExtractUsernamePasswordFromFormRequest();
- extract.setHttpServletRequest(action.getHttpServletRequest());
+ extract.setHttpServletRequestSupplier(action.getHttpServletRequestSupplier());
extract.initialize();
extract.execute(src);
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowStateTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowStateTest.java
index 66cc0d7a1..e13b6a150 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowStateTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PreserveAuthenticationFlowStateTest.java
@@ -24,6 +24,9 @@ import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import java.util.Arrays;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.webflow.execution.Event;
@@ -40,7 +43,8 @@ public class PreserveAuthenticationFlowStateTest extends BaseAuthenticationConte
super.setUp();
action = new PreserveAuthenticationFlowState();
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.setParameterNames(Arrays.asList("foo", "foo2"));
action.initialize();
}
@@ -57,7 +61,8 @@ public class PreserveAuthenticationFlowStateTest extends BaseAuthenticationConte
@Test public void testNoParameters() throws ComponentInitializationException {
action = new PreserveAuthenticationFlowState();
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
final Event event = action.execute(src);
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateCredentialsTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateCredentialsTest.java
index 6a810ad7a..99fab93aa 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateCredentialsTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateCredentialsTest.java
@@ -23,6 +23,9 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
import net.shibboleth.idp.authn.AuthenticationResult;
import net.shibboleth.idp.authn.AuthnEventIds;
@@ -130,7 +133,8 @@ public class ValidateCredentialsTest extends BaseAuthenticationContextTest {
mappings.put("ExpiringPassword", Collections.singleton("ACCOUNT_WARNING"));
mappings.put("ExpiredPassword", Arrays.asList("PASSWORD_EXPIRED", "CHANGE_AFTER_RESET"));
action.setClassifiedMessages(mappings);
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
}
@Test public void testBadUsername() throws ComponentInitializationException {
@@ -340,7 +344,7 @@ public class ValidateCredentialsTest extends BaseAuthenticationContextTest {
private void doExtract() throws ComponentInitializationException {
final ExtractUsernamePasswordFromFormRequest extract = new ExtractUsernamePasswordFromFormRequest();
- extract.setHttpServletRequest(action.getHttpServletRequest());
+ extract.setHttpServletRequestSupplier(action.getHttpServletRequestSupplier());
extract.initialize();
extract.execute(src);
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthenticationTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthenticationTest.java
index 140b73a11..8e2e45a77 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthenticationTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthenticationTest.java
@@ -20,6 +20,7 @@ package net.shibboleth.idp.authn.impl;
import java.time.Instant;
import java.util.Arrays;
import java.util.Set;
+import java.util.function.Supplier;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
@@ -37,6 +38,7 @@ import net.shibboleth.idp.authn.testing.TestPrincipal;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.webflow.execution.Event;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
@@ -57,7 +59,8 @@ public class ValidateExternalAuthenticationTest extends BaseAuthenticationContex
ext = new ExternalAuthenticationImpl();
action = new ValidateExternalAuthentication();
- action.setHttpServletRequest((HttpServletRequest) src.getExternalContext().getNativeRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateRemoteUserTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateRemoteUserTest.java
index 0759bd1b2..5f62bd190 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateRemoteUserTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateRemoteUserTest.java
@@ -19,6 +19,7 @@ package net.shibboleth.idp.authn.impl;
import java.util.Arrays;
+import java.util.function.Supplier;
import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
@@ -48,7 +49,8 @@ public class ValidateRemoteUserTest extends BaseAuthenticationContextTest {
action.setAllowedUsernames(Arrays.asList("bar", "baz"));
action.setDeniedUsernames(Arrays.asList("foo"));
action.setMatchExpression(Pattern.compile("^ba(r|z|n)$"));
- action.setHttpServletRequest((HttpServletRequest) src.getExternalContext().getNativeRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
@@ -129,7 +131,7 @@ public class ValidateRemoteUserTest extends BaseAuthenticationContextTest {
private void doExtract() throws ComponentInitializationException {
final ExtractRemoteUser extract = new ExtractRemoteUser();
- extract.setHttpServletRequest(action.getHttpServletRequest());
+ extract.setHttpServletRequestSupplier(action.getHttpServletRequestSupplier());
extract.initialize();
extract.execute(src);
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUserAgentAddressTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUserAgentAddressTest.java
index de8716312..06f0048f0 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUserAgentAddressTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUserAgentAddressTest.java
@@ -22,6 +22,9 @@ import java.security.Principal;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
@@ -52,7 +55,8 @@ public class ValidateUserAgentAddressTest extends BaseAuthenticationContextTest
action.setMappings(Collections.<String,Collection<IPRange>>singletonMap(
"foo", Arrays.asList(IPRange.parseCIDRBlock("192.168.1.0/24"))));
action.setSupportedPrincipals(Arrays.asList(new TestPrincipal("UserAgentAuthentication")));
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
@@ -132,7 +136,7 @@ public class ValidateUserAgentAddressTest extends BaseAuthenticationContextTest
private void doExtract() throws ComponentInitializationException {
final ExtractUserAgentAddress extract = new ExtractUserAgentAddress();
- extract.setHttpServletRequest(action.getHttpServletRequest());
+ extract.setHttpServletRequestSupplier(action.getHttpServletRequestSupplier());
extract.initialize();
extract.execute(src);
}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509CertificateCredentialValidatorTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509CertificateCredentialValidatorTest.java
index 734aa48b8..bae3d57c5 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509CertificateCredentialValidatorTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509CertificateCredentialValidatorTest.java
@@ -21,8 +21,10 @@ package net.shibboleth.idp.authn.impl;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.Collections;
+import java.util.function.Supplier;
import javax.security.auth.x500.X500Principal;
+import javax.servlet.http.HttpServletRequest;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
@@ -102,7 +104,8 @@ public class X509CertificateCredentialValidatorTest extends BaseAuthenticationCo
action = new ValidateCredentials();
action.setValidators(Collections.singletonList(validator));
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
@@ -191,7 +194,7 @@ public class X509CertificateCredentialValidatorTest extends BaseAuthenticationCo
private void doExtract() throws ComponentInitializationException, CertificateException {
final ExtractX509CertificateFromRequest extract = new ExtractX509CertificateFromRequest();
- extract.setHttpServletRequest(action.getHttpServletRequest());
+ extract.setHttpServletRequestSupplier(action.getHttpServletRequestSupplier());
extract.initialize();
extract.execute(src);
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/ExtractDiscoveryResponseTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/ExtractDiscoveryResponseTest.java
index 8d8f04164..5d6b85c0c 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/ExtractDiscoveryResponseTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/proxy/impl/ExtractDiscoveryResponseTest.java
@@ -24,6 +24,10 @@ import net.shibboleth.idp.authn.impl.testing.BaseAuthenticationContextTest;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.webflow.execution.Event;
import org.testng.Assert;
@@ -39,7 +43,8 @@ public class ExtractDiscoveryResponseTest extends BaseAuthenticationContextTest
super.setUp();
action = new ExtractDiscoveryResponse();
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/ExtractConsentTest.java b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/ExtractConsentTest.java
index 66a7bdbbb..83158a123 100644
--- a/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/ExtractConsentTest.java
+++ b/idp-consent-impl/src/test/java/net/shibboleth/idp/consent/flow/impl/ExtractConsentTest.java
@@ -22,6 +22,10 @@ import net.shibboleth.idp.consent.context.ConsentContext;
import net.shibboleth.idp.consent.impl.ConsentTestingSupport;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.opensaml.profile.action.EventIds;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.webflow.execution.Event;
@@ -57,7 +61,8 @@ public class ExtractConsentTest extends AbstractConsentActionTest {
@Test public void testNoUserInput() throws Exception {
action = new ExtractConsent();
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
final Event event = action.execute(src);
@@ -79,7 +84,7 @@ public class ExtractConsentTest extends AbstractConsentActionTest {
httpServletRequest.setParameter(ExtractConsent.CONSENT_IDS_REQUEST_PARAMETER, "consent1");
action = new ExtractConsent();
- action.setHttpServletRequest(httpServletRequest);
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return httpServletRequest;}});
action.initialize();
final Event event = action.execute(src);
@@ -102,7 +107,7 @@ public class ExtractConsentTest extends AbstractConsentActionTest {
httpServletRequest.addParameter(ExtractConsent.CONSENT_IDS_REQUEST_PARAMETER, "consent2");
action = new ExtractConsent();
- action.setHttpServletRequest(httpServletRequest);
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return httpServletRequest;}});
action.initialize();
final Event event = action.execute(src);
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLogTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLogTest.java
index a09e004bf..0b5fc33c3 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLogTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLogTest.java
@@ -19,8 +19,10 @@ package net.shibboleth.idp.profile.audit.impl;
import java.util.Collections;
import java.util.List;
+import java.util.function.Supplier;
import javax.annotation.Nonnull;
+import javax.servlet.http.HttpServletRequest;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -60,7 +62,7 @@ public class WriteAuditLogTest {
mock.setRequestURI("/path/to/foo");
action = new FilteringAction();
- action.setHttpServletRequest(mock);
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return mock;}});
}
@Test public void testNoRules() throws Exception {
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadMetadataTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadMetadataTest.java
index 56812de37..1f9607061 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadMetadataTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadMetadataTest.java
@@ -18,6 +18,7 @@
package net.shibboleth.idp.profile.spring.relyingparty.metadata;
import java.io.IOException;
+import java.util.function.Supplier;
import javax.servlet.http.HttpServletResponse;
@@ -72,7 +73,7 @@ public class ReloadMetadataTest extends AbstractMetadataParserTest {
final ReloadMetadata action = new ReloadMetadata();
action.setMetadataResolver(service);
- action.setHttpServletResponse(response);
+ action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return response;}});
action.initialize();
final Event event = action.execute(src);
@@ -85,7 +86,7 @@ public class ReloadMetadataTest extends AbstractMetadataParserTest {
final ReloadMetadata action = new ReloadMetadata();
action.setMetadataResolver(service);
- action.setHttpServletResponse(response);
+ action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return response;}});
action.initialize();
src.getFlowScope().put(ReloadMetadata.RESOLVER_ID, "foo");
@@ -100,7 +101,7 @@ public class ReloadMetadataTest extends AbstractMetadataParserTest {
src.getFlowScope().put(ReloadMetadata.RESOLVER_ID, "fileEntity");
final ReloadMetadata action = new ReloadMetadata();
- action.setHttpServletResponse(response);
+ action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return response;}});
action.setMetadataResolver(service);
action.initialize();
@@ -116,7 +117,7 @@ public class ReloadMetadataTest extends AbstractMetadataParserTest {
src.getFlowScope().put(ReloadMetadata.RESOLVER_ID, "fileEntity2");
final ReloadMetadata action = new ReloadMetadata();
- action.setHttpServletResponse(response);
+ action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return response;}});
action.setMetadataResolver(chainingservice);
action.initialize();
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadServiceConfigurationTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadServiceConfigurationTest.java
index 72a2bb07b..46b7700e5 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadServiceConfigurationTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadServiceConfigurationTest.java
@@ -19,6 +19,7 @@ package net.shibboleth.idp.profile.spring.relyingparty.metadata;
import java.io.IOException;
import java.time.Instant;
+import java.util.function.Supplier;
import javax.servlet.http.HttpServletResponse;
@@ -77,7 +78,7 @@ public class ReloadServiceConfigurationTest extends AbstractMetadataParserTest {
final MockHttpServletResponse response = new MockHttpServletResponse();
final ReloadServiceConfiguration action = new ReloadServiceConfiguration();
- action.setHttpServletResponse(response);
+ action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return response;}});
action.setServiceLookupStrategy(FunctionSupport.constant(null));
action.initialize();
@@ -93,7 +94,7 @@ public class ReloadServiceConfigurationTest extends AbstractMetadataParserTest {
final MockHttpServletResponse response = new MockHttpServletResponse();
final ReloadServiceConfiguration action = new ReloadServiceConfiguration();
- action.setHttpServletResponse(response);
+ action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return response;}});
action.setServiceLookupStrategy(FunctionSupport.constant(service));
action.initialize();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertionTest.java
index 30fbcc7a6..ba8c9edfd 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertionTest.java
@@ -18,8 +18,10 @@
package net.shibboleth.idp.saml.saml1.profile.impl;
import java.time.Instant;
+import java.util.function.Supplier;
import javax.security.auth.Subject;
+import javax.servlet.http.HttpServletRequest;
import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
import net.shibboleth.idp.authn.AuthenticationResult;
@@ -66,7 +68,8 @@ public class AddAuthenticationStatementToAssertionTest extends OpenSAMLInitBaseT
prc = new WebflowRequestContextProfileRequestContextLookup().apply(rc);
action = new AddAuthenticationStatementToAssertion();
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java
index e1afd0a2f..b0e87b5e8 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java
@@ -23,6 +23,7 @@ import java.security.PublicKey;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import java.util.function.Supplier;
import javax.servlet.http.HttpServletRequest;
@@ -179,7 +180,7 @@ public class DecorateDelegatedAssertionTest extends OpenSAMLInitBaseTestCase {
rpcContext.setRelyingPartyIdContextTree(peerContext);
action = new DecorateDelegatedAssertion();
- action.setHttpServletRequest(servletRequest);
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return servletRequest;}});
action.setLibertySSOSEndpointURL(ssosURL);
action.setKeyInfoGeneratorManager(DefaultSecurityConfigurationBootstrap.buildBasicKeyInfoGeneratorManager());
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java
index af300e935..6a7f15eac 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java
@@ -20,8 +20,10 @@ package net.shibboleth.idp.saml.saml2.profile.impl;
import java.time.Duration;
import java.time.Instant;
import java.util.List;
+import java.util.function.Supplier;
import javax.security.auth.Subject;
+import javax.servlet.http.HttpServletRequest;
import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
import net.shibboleth.idp.authn.AuthenticationResult;
@@ -73,7 +75,8 @@ public class AddAuthnStatementToAssertionTest extends OpenSAMLInitBaseTestCase {
prc = new WebflowRequestContextProfileRequestContextLookup().apply(rc);
action = new AddAuthnStatementToAssertion();
- action.setHttpServletRequest(new MockHttpServletRequest());
+ final MockHttpServletRequest request = new MockHttpServletRequest();
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return request;}});
action.initialize();
}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessAssertionsForAuthenticationTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessAssertionsForAuthenticationTest.java
index 7a558ebc1..95d2c302b 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessAssertionsForAuthenticationTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessAssertionsForAuthenticationTest.java
@@ -22,6 +22,10 @@ import java.time.Instant;
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.opensaml.core.testing.OpenSAMLInitBaseTestCase;
import org.opensaml.core.xml.util.XMLObjectSupport;
@@ -70,8 +74,8 @@ public class ProcessAssertionsForAuthenticationTest extends OpenSAMLInitBaseTest
httpResponse = new MockHttpServletResponse();
action = new ProcessAssertionsForAuthentication();
- action.setHttpServletRequest(httpRequest);
- action.setHttpServletResponse(httpResponse);
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return httpRequest;}});
+ action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return httpResponse;}});
samlResponse = SAML2ActionTestingSupport.buildResponse();
diff --git a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/PopulateSessionContextTest.java b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/PopulateSessionContextTest.java
index b2507ed0e..9ccb2857e 100644
--- a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/PopulateSessionContextTest.java
+++ b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/PopulateSessionContextTest.java
@@ -17,16 +17,11 @@
package net.shibboleth.idp.session.impl;
-import javax.servlet.http.Cookie;
+import java.util.function.Supplier;
-import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
-import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.idp.profile.testing.RequestContextBuilder;
-import net.shibboleth.idp.session.SessionException;
-import net.shibboleth.idp.session.context.SessionContext;
-import net.shibboleth.idp.session.impl.testing.SessionManagerBaseTestCase;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.net.HttpServletRequestResponseContext;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.opensaml.profile.context.ProfileRequestContext;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -37,6 +32,15 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
+import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.idp.session.SessionException;
+import net.shibboleth.idp.session.context.SessionContext;
+import net.shibboleth.idp.session.impl.testing.SessionManagerBaseTestCase;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.net.HttpServletRequestResponseContext;
+
/** {@link PopulateSessionContext} unit test. */
@SuppressWarnings("javadoc")
public class PopulateSessionContextTest extends SessionManagerBaseTestCase {
@@ -52,8 +56,8 @@ public class PopulateSessionContextTest extends SessionManagerBaseTestCase {
prc = new WebflowRequestContextProfileRequestContextLookup().apply(src);
action = new PopulateSessionContext();
- action.setHttpServletRequest(requestProxy);
- action.setHttpServletResponse(responseProxy);
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return requestProxy;}});
+ action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return responseProxy;}});
action.setSessionResolver(sessionManager);
action.initialize();
}
@@ -121,8 +125,8 @@ public class PopulateSessionContextTest extends SessionManagerBaseTestCase {
@Test public void testAddressLookup() throws ComponentInitializationException, SessionException {
action = new PopulateSessionContext();
- action.setHttpServletRequest(requestProxy);
- action.setHttpServletResponse(responseProxy);
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return requestProxy;}});
+ action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return responseProxy;}});
action.setSessionResolver(sessionManager);
action.setAddressLookupStrategy(input -> requestProxy.getHeader("User-Agent"));
action.initialize();
diff --git a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/ProcessLogoutTest.java b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/ProcessLogoutTest.java
index 57ab0f10b..3f658bb42 100644
--- a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/ProcessLogoutTest.java
+++ b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/ProcessLogoutTest.java
@@ -20,8 +20,11 @@ package net.shibboleth.idp.session.impl;
import java.time.Duration;
import java.time.Instant;
import java.util.Collections;
+import java.util.function.Supplier;
import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import net.shibboleth.idp.authn.context.SubjectContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
@@ -65,8 +68,8 @@ public class ProcessLogoutTest extends SessionManagerBaseTestCase {
prc = new WebflowRequestContextProfileRequestContextLookup().apply(src);
action = new ProcessLogout();
- action.setHttpServletRequest(requestProxy);
- action.setHttpServletResponse(responseProxy);
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return requestProxy;}});
+ action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return responseProxy;}});
action.setSessionResolver(sessionManager);
action.initialize();
}
@@ -188,8 +191,8 @@ public class ProcessLogoutTest extends SessionManagerBaseTestCase {
@Test public void testAddressLookup() throws ComponentInitializationException, SessionException, ResolverException {
action = new ProcessLogout();
- action.setHttpServletRequest(requestProxy);
- action.setHttpServletResponse(responseProxy);
+ action.setHttpServletRequestSupplier(new Supplier<> () {public HttpServletRequest get() { return requestProxy;}});
+ action.setHttpServletResponseSupplier(new Supplier<> () {public HttpServletResponse get() { return responseProxy;}});
action.setSessionResolver(sessionManager);
action.setAddressLookupStrategy(input -> requestProxy.getHeader("User-Agent"));
action.initialize();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list