libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-18264 Fix SamlLogoutTest with different consumer and provider url

Browse source
This commit is contained in:
Michal Hajas 2021-05-27 10:31:01 +02:00 committed by Hynek Mlnařík
parent 4dcb69596b
commit b216b9579c
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java
View file

@ -71,8 +71,8 @@ import static org.keycloak.testsuite.admin.ApiUtil.resetUserPassword;
import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_EMAIL; import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_EMAIL;
import static org.keycloak.testsuite.broker.BrokerTestTools.encodeUrl; import static org.keycloak.testsuite.broker.BrokerTestTools.encodeUrl;
import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot;
import static org.keycloak.testsuite.broker.BrokerTestTools.getProviderRoot;
import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage;
import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad;
/** /**
* No test methods there. Just some useful common functionality * No test methods there. Just some useful common functionality
@ -343,10 +343,16 @@ public abstract class AbstractBaseBrokerTest extends AbstractKeycloakTest {
protected URI getConsumerSamlEndpoint(String realm) throws IllegalArgumentException, UriBuilderException { protected URI getConsumerSamlEndpoint(String realm) throws IllegalArgumentException, UriBuilderException {
return getSamlEndpoint(getConsumerRoot(), realm);
}
protected URI getProviderSamlEndpoint(String realm) throws IllegalArgumentException, UriBuilderException {
return getSamlEndpoint(getProviderRoot(), realm);
}
protected URI getSamlEndpoint(String fromUri, String realm) {
return RealmsResource return RealmsResource
.protocolUrl(UriBuilder.fromUri(getConsumerRoot()).path("auth")) .protocolUrl(UriBuilder.fromUri(fromUri).path("auth"))
.build(realm, SamlProtocol.LOGIN_PROTOCOL); .build(realm, SamlProtocol.LOGIN_PROTOCOL);
} }
} }

4
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlLogoutTest.java
View file

@ -118,7 +118,7 @@ public class KcSamlLogoutTest extends AbstractInitializedBaseBrokerTest {
.build() .build()
// Login using a different client to the provider realm, should be already logged in // Login using a different client to the provider realm, should be already logged in
.authnRequest(getConsumerSamlEndpoint(bc.providerRealmName()), PROVIDER_SAML_CLIENT_ID, PROVIDER_SAML_CLIENT_ID + "saml", POST).build() .authnRequest(getProviderSamlEndpoint(bc.providerRealmName()), PROVIDER_SAML_CLIENT_ID, PROVIDER_SAML_CLIENT_ID + "saml", POST).build()
.followOneRedirect() .followOneRedirect()
// Process saml response and store reference to nameId and sessionIndex so that we can initiate logout for the session // Process saml response and store reference to nameId and sessionIndex so that we can initiate logout for the session
@ -141,7 +141,7 @@ public class KcSamlLogoutTest extends AbstractInitializedBaseBrokerTest {
.build() .build()
// Send logout request to provider realm // Send logout request to provider realm
.logoutRequest(getConsumerSamlEndpoint(bc.providerRealmName()), PROVIDER_SAML_CLIENT_ID, POST) .logoutRequest(getProviderSamlEndpoint(bc.providerRealmName()), PROVIDER_SAML_CLIENT_ID, POST)
.nameId(nameIdRef::get) .nameId(nameIdRef::get)
.sessionIndex(sessionIndexRef::get) .sessionIndex(sessionIndexRef::get)
.build() .build()