Skip to content

Read relayState from authenticationRequest #19629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cfcromn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Read relayState from authenticationRequest #19629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...mework/security/saml2/provider/service/web/CacheSaml2AuthenticationRequestRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public final class CacheSaml2AuthenticationRequestRepository
public void saveAuthenticationRequest(AbstractSaml2AuthenticationRequest authenticationRequest,
HttpServletRequest request, HttpServletResponse response) {
Assert.notNull(authenticationRequest, "authenticationRequest must not be null");
String relayState = request.getParameter(Saml2ParameterNames.RELAY_STATE);
String relayState = authenticationRequest.getRelayState();
Assert.notNull(relayState, "relayState must not be null");
this.cache.put(relayState, authenticationRequest);
}
Expand Down
25 changes: 18 additions & 7 deletions ...k/security/saml2/provider/service/web/CacheSaml2AuthenticationRequestRepositoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,25 @@ class CacheSaml2AuthenticationRequestRepositoryTests {

@Test
void loadAuthenticationRequestWhenCachedThenReturns() {
MockHttpServletRequest request = new MockHttpServletRequest();
request.setParameter(Saml2ParameterNames.RELAY_STATE, "test");
Saml2PostAuthenticationRequest authenticationRequest = TestSaml2PostAuthenticationRequests.create();
String relayState = authenticationRequest.getRelayState();
MockHttpServletRequest request = new MockHttpServletRequest();
request.setParameter(Saml2ParameterNames.RELAY_STATE, relayState);
this.repository.saveAuthenticationRequest(authenticationRequest, request, null);
assertThat(this.repository.loadAuthenticationRequest(request)).isEqualTo(authenticationRequest);
this.repository.removeAuthenticationRequest(request, null);
assertThat(this.repository.loadAuthenticationRequest(request)).isNull();
}

@Test
void saveAuthenticationRequestWhenRelayStateOnlyInAuthenticationRequestThenSaves() {
Saml2PostAuthenticationRequest authenticationRequest = TestSaml2PostAuthenticationRequests.create();
MockHttpServletRequest request = new MockHttpServletRequest();
this.repository.saveAuthenticationRequest(authenticationRequest, request, null);
request.setParameter(Saml2ParameterNames.RELAY_STATE, authenticationRequest.getRelayState());
assertThat(this.repository.loadAuthenticationRequest(request)).isEqualTo(authenticationRequest);
}

@Test
void loadAuthenticationRequestWhenNoRelayStateThenException() {
MockHttpServletRequest request = new MockHttpServletRequest();
Expand All @@ -77,15 +87,16 @@ void repositoryWhenCustomCacheThenUses() {
CacheSaml2AuthenticationRequestRepository repository = new CacheSaml2AuthenticationRequestRepository();
Cache cache = spy(new ConcurrentMapCache("requests"));
repository.setCache(cache);
MockHttpServletRequest request = new MockHttpServletRequest();
request.setParameter(Saml2ParameterNames.RELAY_STATE, "test");
Saml2PostAuthenticationRequest authenticationRequest = TestSaml2PostAuthenticationRequests.create();
String relayState = authenticationRequest.getRelayState();
MockHttpServletRequest request = new MockHttpServletRequest();
request.setParameter(Saml2ParameterNames.RELAY_STATE, relayState);
repository.saveAuthenticationRequest(authenticationRequest, request, null);
verify(cache).put(eq("test"), any());
verify(cache).put(eq(relayState), any());
repository.loadAuthenticationRequest(request);
verify(cache).get("test", AbstractSaml2AuthenticationRequest.class);
verify(cache).get(relayState, AbstractSaml2AuthenticationRequest.class);
repository.removeAuthenticationRequest(request, null);
verify(cache).evict("test");
verify(cache).evict(relayState);
}

}