diff --git a/adapters/oidc/servlet-filter/pom.xml b/adapters/oidc/servlet-filter/pom.xml index 008e8fd269..7cd29e60e8 100755 --- a/adapters/oidc/servlet-filter/pom.xml +++ b/adapters/oidc/servlet-filter/pom.xml @@ -63,6 +63,10 @@ org.keycloak keycloak-adapter-core + + org.keycloak + keycloak-policy-enforcer + org.apache.httpcomponents httpclient diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-saml-adapter-core/main/module.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-saml-adapter-core/main/module.xml index 4b7e225165..d1db424f60 100755 --- a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-saml-adapter-core/main/module.xml +++ b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-saml-adapter-core/main/module.xml @@ -38,6 +38,11 @@ + + + + + diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/common/cli/add-secured-deployments.cli b/testsuite/integration-arquillian/servers/app-server/jboss/common/cli/add-secured-deployments.cli index 437691a70b..60e5023687 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/common/cli/add-secured-deployments.cli +++ b/testsuite/integration-arquillian/servers/app-server/jboss/common/cli/add-secured-deployments.cli @@ -6,7 +6,6 @@ embed-server --server-config=standalone.xml auth-server-url=${auth.server.actual.protocol:https}://${auth.server.host:localhost}:${auth.server.https.port:8543}/auth, \ ssl-required=EXTERNAL, \ disable-trust-manager=true, \ - realm-public-key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQAB \ ) /subsystem=keycloak/secure-deployment=customer-portal-subsystem.war/credential=secret/:add(value=password) @@ -16,6 +15,5 @@ embed-server --server-config=standalone.xml auth-server-url=${auth.server.actual.protocol:https}://${auth.server.host:localhost}:${auth.server.https.port:8543}/auth, \ ssl-required=EXTERNAL, \ disable-trust-manager=true, \ - realm-public-key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQAB \ ) /subsystem=keycloak/secure-deployment=product-portal-subsystem.war/credential=secret/:add(value=password) diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/eap/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/eap/pom.xml index 909fdc5228..34afca8285 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/eap/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/eap/pom.xml @@ -69,6 +69,15 @@ jboss-eap-7.1 + + app-server-eap-java17 + + [17,) + + + false + + diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml index f70b56b2a4..7ee6178a08 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml @@ -38,6 +38,7 @@ ${project.version} true true + true bash jboss-cli.${script.suffix} @@ -525,6 +526,49 @@ + + + + enable-java-17 + process-resources + + exec + + + ${skip.java17.enablement} + ${cli.executable} + ${cli.working.dir} + + ${app.server.java.home} + + + ${cli.jboss-cli.arg} + --file=${app.server.jboss.home}/docs/examples/enable-elytron-se17.cli + + + + + + enable-java-17-ha + process-resources + + exec + + + ${skip.java17.enablement} + ${cli.executable} + ${cli.working.dir} + + ${app.server.java.home} + + + ${cli.jboss-cli.arg} + --file=${app.server.jboss.home}/docs/examples/enable-elytron-se17.cli + -Dconfig=standalone-ha.xml + + + + add-secured-deployments generate-test-sources diff --git a/testsuite/integration-arquillian/servers/pom.xml b/testsuite/integration-arquillian/servers/pom.xml index 14239d8dd7..f85c0c9008 100644 --- a/testsuite/integration-arquillian/servers/pom.xml +++ b/testsuite/integration-arquillian/servers/pom.xml @@ -33,7 +33,7 @@ sh - 7.4.0.GA-redhat-00005 + 7.4.9.GA-redhat-00003 7.1.5.GA-redhat-00002 7.1.1.Final diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java index e3114f4dbb..f6a9871468 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java @@ -25,7 +25,6 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jetbrains.annotations.Nullable; import org.junit.After; -import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; import org.keycloak.common.Profile; @@ -35,23 +34,19 @@ import org.keycloak.testsuite.adapter.page.AngularCorsProductTestApp; import org.keycloak.testsuite.adapter.page.CorsDatabaseServiceTestApp; import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; -import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.utils.arquillian.ContainerConstants; import org.keycloak.testsuite.auth.page.account.Account; import org.keycloak.testsuite.auth.page.login.OIDCLogin; import org.keycloak.testsuite.util.JavascriptBrowser; -import org.keycloak.testsuite.util.WaitUtils; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; import java.io.File; import java.io.IOException; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import static junit.framework.TestCase.assertNotNull; -import org.junit.Assume; import org.keycloak.testsuite.util.DroneUtils; import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; @@ -73,7 +68,6 @@ import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) -@DisableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true) // TODO remove this (KEYCLOAK-16228) public class CorsExampleAdapterTest extends AbstractExampleAdapterTest { public static final String CORS = "cors"; @@ -180,17 +174,13 @@ public class CorsExampleAdapterTest extends AbstractExampleAdapterTest { @Nullable private String getAuthServerVersion() { DroneUtils.getCurrentDriver().navigate().to(suiteContext.getAuthServerInfo().getContextRoot().toString() + - "/auth/admin/master/console/#/server-info"); + "/auth/admin/master/console/#/master/info"); jsDriverTestRealmLoginPage.form().login("admin", "admin"); - - Pattern pattern = Pattern.compile("]+>Server Version" + - "\\s+]+>([^<]+)"); - Matcher matcher = pattern.matcher(DroneUtils.getCurrentDriver().getPageSource()); - - if (matcher.find()) { - return matcher.group(1); + // just get the first list description which is the version + List elements = jsDriver.findElements(By.xpath(".//dd[@class='pf-c-description-list__description']")); + if (!elements.isEmpty()) { + return elements.get(0).getText(); } - return null; } }