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

KEYCLOAK-18406 SAMLServletAdapterTest failures

Browse source
This commit is contained in:
Martin Bartoš 2021-06-14 10:36:24 +02:00 committed by Pavel Drozd
parent 6db1c8204a
commit 333d279d7a
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java
View file

@ -109,6 +109,7 @@ import org.keycloak.admin.client.resource.RoleScopeResource;
import org.keycloak.admin.client.resource.UserResource; import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.common.util.Base64; import org.keycloak.common.util.Base64;
import org.keycloak.common.util.KeyUtils; import org.keycloak.common.util.KeyUtils;
import org.keycloak.common.util.MultivaluedHashMap;
import org.keycloak.common.util.PemUtils; import org.keycloak.common.util.PemUtils;
import org.keycloak.dom.saml.v2.metadata.EntityDescriptorType; import org.keycloak.dom.saml.v2.metadata.EntityDescriptorType;
import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType;
@ -493,6 +494,7 @@ public class SAMLServletAdapterTest extends AbstractSAMLServletAdapterTest {
private void assertSuccessfulLogin(AbstractPage page, UserRepresentation user, Login loginPage, String expectedString) { private void assertSuccessfulLogin(AbstractPage page, UserRepresentation user, Login loginPage, String expectedString) {
page.navigateTo(); page.navigateTo();
waitForPageToLoad();
assertCurrentUrlStartsWith(loginPage); assertCurrentUrlStartsWith(loginPage);
loginPage.form().login(user); loginPage.form().login(user);
waitUntilElement(By.xpath("//body")).text().contains(expectedString); waitUntilElement(By.xpath("//body")).text().contains(expectedString);
@ -662,7 +664,7 @@ public class SAMLServletAdapterTest extends AbstractSAMLServletAdapterTest {
rep.setProviderId(ImportedRsaKeyProviderFactory.ID); rep.setProviderId(ImportedRsaKeyProviderFactory.ID);
rep.setProviderType(KeyProvider.class.getName()); rep.setProviderType(KeyProvider.class.getName());
org.keycloak.common.util.MultivaluedHashMap config = new org.keycloak.common.util.MultivaluedHashMap(); MultivaluedHashMap<String, String> config = new MultivaluedHashMap<>();
config.addFirst("priority", priority); config.addFirst("priority", priority);
config.addFirst(Attributes.PRIVATE_KEY_KEY, NEW_KEY_PRIVATE_KEY_PEM); config.addFirst(Attributes.PRIVATE_KEY_KEY, NEW_KEY_PRIVATE_KEY_PEM);
rep.setConfig(config); rep.setConfig(config);
@ -683,6 +685,10 @@ public class SAMLServletAdapterTest extends AbstractSAMLServletAdapterTest {
} }
private void testRotatedKeysPropagated(SAMLServlet servletPage, Login loginPage) throws Exception { private void testRotatedKeysPropagated(SAMLServlet servletPage, Login loginPage) throws Exception {
testRotatedKeysPropagated(servletPage, loginPage, true);
}
private void testRotatedKeysPropagated(SAMLServlet servletPage, Login loginPage, boolean shouldLogout) throws Exception {
boolean keyDropped = false; boolean keyDropped = false;
try { try {
log.info("Creating new key"); log.info("Creating new key");
@ -693,9 +699,12 @@ public class SAMLServletAdapterTest extends AbstractSAMLServletAdapterTest {
keyDropped = true; keyDropped = true;
testSuccessfulAndUnauthorizedLogin(servletPage, loginPage); testSuccessfulAndUnauthorizedLogin(servletPage, loginPage);
} finally { } finally {
if (! keyDropped) { if (!keyDropped) {
dropKeys("1000"); dropKeys("1000");
} }
if (shouldLogout) {
servletPage.logout();
}
} }
} }