diff --git a/pom.xml b/pom.xml index c4c599ee598..5dde5df3397 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ ${dist.archive.dir.prefix}-${dist.archive.dir.version} - 19.0.1.Final + 21.1.1.Final 29.0.0.Final @@ -190,7 +190,7 @@ 1.9.0 1.0.4 5.1.8 - 2.0.1.Final + 5.0.0.Final 1.6.13 1.15.0 0.40.3 diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/galleon/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/galleon/pom.xml index 50ab5e2be1b..bf2689dd999 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/galleon/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/galleon/pom.xml @@ -22,17 +22,11 @@ wildfly-ee-dist ${eap.version} - ${containers.home}/jboss-distribution - + ${containers.home}/jboss-distribution jboss-eap-8.0 keycloak-saml-adapter-galleon-pack - true - true - true - true - UTF-8 @@ -41,26 +35,10 @@ org.keycloak.testsuite integration-arquillian-servers-app-server-spi ${project.version} - - - org.jboss.arquillian.protocol - arquillian-protocol-servlet - - - - - org.jboss.arquillian.protocol - arquillian-protocol-servlet-jakarta org.wildfly.arquillian wildfly-arquillian-container-managed - - - org.jboss.arquillian.protocol - arquillian-protocol-servlet - - org.keycloak.testsuite @@ -165,4 +143,4 @@ - \ No newline at end of file + diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml index 94122ce5433..3c55d4907b1 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml @@ -35,37 +35,10 @@ ${project.parent.basedir}/assembly.xml ${containers.home}/${app.server.jboss.unpacked.folder.name} ${containers.home} - - ${project.version} - ${project.version} - true - true - false - true - - bash - jboss-cli.${script.suffix} - ${app.server.jboss.home}/bin - - - windows-properties-cli - - - Windows - - - - run-jboss-cli.bat - - - ${common.resources}/win - ${app.server.jboss.home}/bin - - app-server-jboss-submodules @@ -73,24 +46,8 @@ src - - - - org.keycloak - ${app.server.saml.adapter.artifactId} - ${saml-adapter.version} - zip - - - * - * - - - - - maven-enforcer-plugin @@ -113,67 +70,6 @@ - - maven-dependency-plugin - - - unpack-jboss-distribution - generate-resources - - unpack - - - - - ${app.server.jboss.groupId} - ${app.server.jboss.artifactId} - ${app.server.jboss.version} - zip - ${app.server.jboss.unpacked.folder.path} - - - - - - - - - org.codehaus.mojo - xml-maven-plugin - - - io-worker-threads - process-resources - - transform - - - - - ${app.server.jboss.home}/standalone/configuration - - standalone.xml - standalone-ha.xml - - ${common.resources}/io.xsl - ${app.server.jboss.home}/standalone/configuration - - - worker.io-threads - ${app.server.worker.io-threads} - - - worker.task-max-threads - ${app.server.worker.task-max-threads} - - - - - - - - - maven-resources-plugin @@ -267,269 +163,6 @@ - - org.codehaus.mojo - exec-maven-plugin - - - add-adapter-log-level-standalone - process-resources - - exec - - - ${skip.apply.offline.cli} - ${cli.executable} - ${cli.working.dir} - - ${app.server.java.home} - - - ${cli.jboss-cli.arg} - --file=${common.resources}/cli/add-adapter-log-level.cli - - ${cli.win.working.dir} - - - - - add-adapter-log-level-standalone-ha - process-resources - - exec - - - ${skip.apply.offline.cli} - ${cli.executable} - ${cli.working.dir} - - ${app.server.java.home} - - - ${cli.jboss-cli.arg} - --file=${common.resources}/cli/add-adapter-log-level.cli - - ${cli.win.working.dir} - -Dserver.config=standalone-ha.xml - - - - - - - adapter-elytron-install-saml-offline-standalone - process-resources - - exec - - - ${skip.elytron.adapter.installation} - ${cli.executable} - ${cli.working.dir} - - ${app.server.java.home} - - - ${cli.jboss-cli.arg} - --file=${app.server.jboss.home}/bin/adapter-elytron-install-saml-offline.cli - - ${cli.win.working.dir} - - - - - - adapter-elytron-install-saml-offline-standalone-ha - process-resources - - exec - - - ${skip.elytron.adapter.installation} - ${cli.executable} - ${cli.working.dir} - - ${app.server.java.home} - - - ${cli.jboss-cli.arg} - --file=${app.server.jboss.home}/bin/adapter-elytron-install-saml-offline.cli - - ${cli.win.working.dir} - -Dserver.config=standalone-ha.xml - - - - - - - adapter-install-saml-offline-standalone - process-resources - - exec - - - ${skip.adapter.offline.installation} - ${cli.executable} - ${cli.working.dir} - - ${app.server.java.home} - - - ${cli.jboss-cli.arg} - --file=${app.server.jboss.home}/bin/adapter-install-saml-offline.cli - - ${cli.win.working.dir} - - - - - - adapter-install-saml-offline-standalone-ha - process-resources - - exec - - - ${skip.adapter.offline.installation} - ${cli.executable} - ${cli.working.dir} - - ${app.server.java.home} - - - ${cli.jboss-cli.arg} - --file=${app.server.jboss.home}/bin/adapter-install-saml-offline.cli - - ${cli.win.working.dir} - -Dserver.config=standalone-ha.xml - - - - - - - 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 - ${cli.win.working.dir} - - - - - - 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 - ${cli.win.working.dir} - -Dconfig=standalone-ha.xml - - - - - - configure-cluster-config - generate-test-sources - - exec - - - ${skip.configure.clustered.scenario} - ${cli.executable} - ${cli.working.dir} - - ${app.server.java.home} - - - ${cli.jboss-cli.arg} - --file=${common.resources}/cli/configure-cluster-config.cli - - ${cli.win.working.dir} - -Djboss.server.config.dir=${app.server.jboss.home}/standalone-cluster/configuration - - - - - configure-crossdc-config - generate-test-sources - - exec - - - ${skip.configure.clustered.scenario} - ${cli.executable} - ${cli.working.dir} - - ${app.server.java.home} - - - ${cli.jboss-cli.arg} - --file=${common.resources}/cli/configure-crossdc-config.cli - - ${cli.win.working.dir} - -Djboss.server.config.dir=${app.server.jboss.home}/standalone-crossdc/configuration - - - - - - maven-assembly-plugin @@ -553,98 +186,6 @@ - - app-server-saml-supported - - - src/saml-adapter-supported - - - - true - - - - - maven-enforcer-plugin - - - - enforce - - - - - app.server.saml.adapter.artifactId - - - - - - - - maven-dependency-plugin - - - unpack-saml-adapter - generate-resources - - unpack - - - - - org.keycloak - ${app.server.saml.adapter.artifactId} - ${saml-adapter.version} - zip - ${app.server.jboss.home} - - - - - - - - - - - app-server-apply-patches - - - app.server.patch.zips - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - install-patches - process-resources - - exec - - - ${common.resources}/install-patch.${script.suffix} - ${app.server.jboss.home}/bin - - ${app.server.java.home} - ${app.server.jboss.home} - ${app.server.patch.zips} - - - - - - - - - - app-server-eap8 diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/pom.xml index 916584df2d7..6781a322c59 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/pom.xml @@ -30,17 +30,13 @@ App Server - Wildfly - 23.0.2.Final + 29.0.1.Final wildfly org.wildfly wildfly-dist ${wildfly.server.version} wildfly-${wildfly.server.version} - - keycloak-saml-wildfly-adapter-dist - - false @@ -59,4 +55,49 @@ ${project.version} + + + + + org.wildfly.plugins + wildfly-maven-plugin + ${wildfly.plugin.version} + + + + provision + + generate-sources + + + + ${app.server.jboss.home} + true + true + + + wildfly@maven(org.jboss.universe:community-universe)#${wildfly.server.version} + + + org.keycloak + keycloak-saml-adapter-galleon-pack + ${project.version} + + + + core-server + web-server + jaxrs-server + datasources-web-server + webservices + web-console + keycloak-saml + keycloak-client-saml + keycloak-client-saml-ejb + + false + + + + diff --git a/testsuite/integration-arquillian/test-apps/pom.xml b/testsuite/integration-arquillian/test-apps/pom.xml index f9a001475e8..1b874991172 100644 --- a/testsuite/integration-arquillian/test-apps/pom.xml +++ b/testsuite/integration-arquillian/test-apps/pom.xml @@ -20,7 +20,6 @@ servlet-authz servlet-policy-enforcer servlets - servlets-jakarta cors diff --git a/testsuite/integration-arquillian/test-apps/servlets-jakarta/.gitignore b/testsuite/integration-arquillian/test-apps/servlets-jakarta/.gitignore deleted file mode 100644 index aa8e45f12bc..00000000000 --- a/testsuite/integration-arquillian/test-apps/servlets-jakarta/.gitignore +++ /dev/null @@ -1 +0,0 @@ -src/ \ No newline at end of file diff --git a/testsuite/integration-arquillian/test-apps/servlets-jakarta/pom.xml b/testsuite/integration-arquillian/test-apps/servlets-jakarta/pom.xml deleted file mode 100644 index 37e157d6a58..00000000000 --- a/testsuite/integration-arquillian/test-apps/servlets-jakarta/pom.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - 4.0.0 - - org.keycloak.testsuite - integration-arquillian-test-apps - 999.0.0-SNAPSHOT - - - integration-arquillian-test-apps-servlets-jakarta - - - 17 - 17 - UTF-8 - - ${project.basedir}/../servlets/src - ${project.basedir}/src - - - - - jakarta.servlet - jakarta.servlet-api - - - junit - junit - compile - - - org.keycloak.testsuite - integration-arquillian-util - ${project.version} - - - org.keycloak - keycloak-policy-enforcer - - - org.keycloak - keycloak-core - - - jakarta.ws.rs - jakarta.ws.rs-api - - - org.keycloak - keycloak-adapter-spi - - - org.keycloak - keycloak-saml-adapter-api-public - - - org.jboss.resteasy - resteasy-core - - - io.quarkus.resteasy.reactive - resteasy-reactive-common - - - org.apache.httpcomponents - httpclient - - - org.keycloak - keycloak-saml-core - - - org.keycloak - keycloak-saml-adapter-core - - - org.keycloak - keycloak-saml-core-public - - - - - - - maven-antrun-plugin - 3.1.0 - - - transform - initialize - - run - - - - - - - - - - - - - - - - - - - org.eclipse.transformer - org.eclipse.transformer.cli - 0.5.0 - - - org.apache.ant - ant - 1.10.14 - - - - - - diff --git a/testsuite/integration-arquillian/test-apps/servlets/pom.xml b/testsuite/integration-arquillian/test-apps/servlets/pom.xml index a809558d73a..2dd7ac75bac 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/pom.xml +++ b/testsuite/integration-arquillian/test-apps/servlets/pom.xml @@ -14,11 +14,8 @@ - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - - provided + jakarta.servlet + jakarta.servlet-api junit @@ -39,8 +36,8 @@ keycloak-core - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api org.keycloak diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/filter/AdapterActionsFilter.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/filter/AdapterActionsFilter.java index 9e97fc9b8fb..c6de2b7916a 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/filter/AdapterActionsFilter.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/filter/AdapterActionsFilter.java @@ -21,9 +21,9 @@ package org.keycloak.testsuite.adapter.filter; import org.jboss.logging.Logger; import org.keycloak.common.util.Time; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/BasicAuthServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/BasicAuthServlet.java index 3c51343758c..dc6c6e84f27 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/BasicAuthServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/BasicAuthServlet.java @@ -1,9 +1,9 @@ package org.keycloak.testsuite.adapter.servlet; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CallAuthenticatedServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CallAuthenticatedServlet.java index ad7dbe52415..185dac3294e 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CallAuthenticatedServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CallAuthenticatedServlet.java @@ -19,10 +19,10 @@ package org.keycloak.testsuite.adapter.servlet; import org.keycloak.KeycloakSecurityContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkServlet.java index 9bc68df0bd5..82db06e3d89 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkServlet.java @@ -21,11 +21,11 @@ import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.representations.AccessToken; -import javax.servlet.annotation.WebServlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.nio.charset.StandardCharsets; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerDatabaseServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerDatabaseServlet.java index 9214d467992..36dd415b4fa 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerDatabaseServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerDatabaseServlet.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.adapter.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServlet.java index d7ccf462e3a..daeb0ce4183 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServlet.java @@ -19,12 +19,12 @@ package org.keycloak.testsuite.adapter.servlet; import org.keycloak.KeycloakSecurityContext; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.HttpHeaders; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.HttpHeaders; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServletNoConf.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServletNoConf.java index 0710814d01c..d72842377d7 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServletNoConf.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServletNoConf.java @@ -19,12 +19,12 @@ package org.keycloak.testsuite.adapter.servlet; import org.keycloak.KeycloakSecurityContext; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.HttpHeaders; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.HttpHeaders; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java index f718b5f4f38..c7d7a309bff 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.adapter.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import org.keycloak.adapters.spi.AuthenticationError; @@ -35,7 +35,7 @@ public class ErrorServlet extends HttpServlet { protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { authError = (AuthenticationError)req.getAttribute(AuthenticationError.class.getName()); - Integer statusCode = (Integer) req.getAttribute("javax.servlet.error.status_code"); + Integer statusCode = (Integer) req.getAttribute("jakarta.servlet.error.status_code"); resp.setContentType("text/html"); PrintWriter pw = resp.getWriter(); diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/InputServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/InputServlet.java index f945729bcc4..4cc5f08a19c 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/InputServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/InputServlet.java @@ -19,11 +19,11 @@ package org.keycloak.testsuite.adapter.servlet; import org.junit.Assert; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/KerberosCredDelegServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/KerberosCredDelegServlet.java index 5c93c6e464c..874d429a15d 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/KerberosCredDelegServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/KerberosCredDelegServlet.java @@ -28,10 +28,10 @@ import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; import javax.security.sasl.Sasl; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.Hashtable; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/MultiTenantServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/MultiTenantServlet.java index d658db75745..6a0b1b8dbf2 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/MultiTenantServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/MultiTenantServlet.java @@ -18,10 +18,10 @@ package org.keycloak.testsuite.adapter.servlet; import org.keycloak.KeycloakSecurityContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ProductServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ProductServlet.java index ce07a5dc6fc..3231315257d 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ProductServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ProductServlet.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.adapter.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlSPFacade.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlSPFacade.java index c2ae10e6e97..734785190d3 100755 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlSPFacade.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlSPFacade.java @@ -24,11 +24,11 @@ import org.keycloak.saml.common.exceptions.ConfigurationException; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.UriBuilder; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.io.PrintWriter; import java.net.URI; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java index c3f2f3b715c..283ce765cf4 100755 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java @@ -25,18 +25,18 @@ import org.keycloak.adapters.saml.SamlSession; import org.keycloak.adapters.spi.AuthenticationError; import org.keycloak.saml.processing.core.saml.v2.constants.X500SAMLProfileConstants; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import javax.xml.datatype.XMLGregorianCalendar; import java.io.IOException; import java.io.StringWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SessionServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SessionServlet.java index e8320a55aac..dbf7e3deae0 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SessionServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SessionServlet.java @@ -17,12 +17,12 @@ package org.keycloak.testsuite.adapter.servlet; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.io.PrintWriter; import java.io.Serializable; diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index fdf03ebc7c4..b907686d48f 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -32,7 +32,7 @@ - Servlet 3.0 + Servlet 5.0 false false - @@ -129,6 +129,11 @@ integration-arquillian-util ${project.version} + + org.keycloak.testsuite + integration-arquillian-test-apps-servlets + ${project.version} + org.mvel mvel2 @@ -504,7 +509,6 @@ eap8 false integration-arquillian-servers-app-server-jboss-galleon - Servlet 5.0 ${tests.wildfly.core.version} diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/hal/ConsoleProtectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/hal/ConsoleProtectionTest.java deleted file mode 100644 index f3e3a060e13..00000000000 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/hal/ConsoleProtectionTest.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright 2017 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.keycloak.testsuite.adapter.example.hal; - -import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; -import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; - -import java.io.IOException; -import java.util.List; -import java.util.concurrent.TimeoutException; - -import org.jboss.arquillian.drone.api.annotation.Drone; - -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Test; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.adapter.AbstractAdapterTest; -import org.keycloak.testsuite.arquillian.AppServerTestEnricher; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; -import org.keycloak.testsuite.pages.AppPage; -import org.keycloak.testsuite.pages.LoginPage; -import org.keycloak.testsuite.util.JavascriptBrowser; -import org.keycloak.testsuite.util.DroneUtils; -import org.keycloak.testsuite.util.TestAppHelper; -import org.keycloak.testsuite.utils.arquillian.ContainerConstants; -import org.keycloak.testsuite.pages.AppServerWelcomePage; -import org.openqa.selenium.WebDriver; -import org.wildfly.extras.creaper.core.online.CliException; -import org.wildfly.extras.creaper.core.online.OnlineManagementClient; -import org.wildfly.extras.creaper.core.online.operations.Address; -import org.wildfly.extras.creaper.core.online.operations.OperationException; -import org.wildfly.extras.creaper.core.online.operations.Operations; -import org.wildfly.extras.creaper.core.online.operations.admin.Administration; - -/** - * - * @author Pedro Igor - */ -@AppServerContainer(ContainerConstants.APP_SERVER_EAP8) -public class ConsoleProtectionTest extends AbstractAdapterTest { - - @Page - protected LoginPage loginPage; - - @Page - protected AppPage appPage; - - // Javascript browser needed KEYCLOAK-4703 - @Drone - @JavascriptBrowser - protected WebDriver jsDriver; - - @Page - @JavascriptBrowser - protected AppServerWelcomePage appServerWelcomePage; - - @Override - public void addAdapterTestRealms(List testRealms) { - testRealms.add(loadRealm("/wildfly-integration/wildfly-management-realm.json")); - } - - @Before - public void beforeConsoleProtectionTest() throws IOException, OperationException { - try (OnlineManagementClient clientWorkerNodeClient = AppServerTestEnricher.getManagementClient()) { - - Operations operations = new Operations(clientWorkerNodeClient); - - Assume.assumeTrue(operations.exists(Address.subsystem("elytron").and("security-domain", "KeycloakDomain"))); - - // Create a realm for both wildfly console and mgmt interface - clientWorkerNodeClient.execute("/subsystem=keycloak/realm=jboss-infra:add(auth-server-url=" + getAuthServerContextRoot() + "/auth,realm-public-key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQAB)"); - - // Create a secure-deployment in order to protect mgmt interface - clientWorkerNodeClient.execute("/subsystem=keycloak/secure-deployment=wildfly-management:add(realm=jboss-infra,resource=wildfly-management,principal-attribute=preferred_username,bearer-only=true,ssl-required=EXTERNAL)"); - - // Protect HTTP mgmt interface with Keycloak adapter - clientWorkerNodeClient.execute("/core-service=management/management-interface=http-interface:undefine-attribute(name=security-realm)"); - clientWorkerNodeClient.execute("/subsystem=elytron/http-authentication-factory=keycloak-mgmt-http-authentication:add(security-domain=KeycloakDomain,http-server-mechanism-factory=wildfly-management,mechanism-configurations=[{mechanism-name=KEYCLOAK,mechanism-realm-configurations=[{realm-name=KeycloakOIDCRealm,realm-mapper=keycloak-oidc-realm-mapper}]}])"); - clientWorkerNodeClient.execute("/core-service=management/management-interface=http-interface:write-attribute(name=http-authentication-factory,value=keycloak-mgmt-http-authentication)"); - clientWorkerNodeClient.execute("/core-service=management/management-interface=http-interface:write-attribute(name=http-upgrade, value={enabled=true, sasl-authentication-factory=management-sasl-authentication})"); - - // Enable RBAC where roles are obtained from the identity - clientWorkerNodeClient.execute("/core-service=management/access=authorization:write-attribute(name=provider,value=rbac)"); - clientWorkerNodeClient.execute("/core-service=management/access=authorization:write-attribute(name=use-identity-roles,value=true)"); - - // Create a secure-server in order to publish the wildfly console configuration via mgmt interface - clientWorkerNodeClient.execute("/subsystem=keycloak/secure-server=wildfly-console:add(realm=jboss-infra,resource=wildfly-console,public-client=true)"); - - log.debug("Reloading the server"); - new Administration(clientWorkerNodeClient).reload(); - log.debug("Reloaded"); - } catch (CliException | IOException | InterruptedException | TimeoutException cause) { - throw new RuntimeException("Failed to configure app server", cause); - } - - DroneUtils.addWebDriver(jsDriver); - log.debug("Added jsDriver"); - } - - @Test - public void testUserCanAccessAccountService() { - TestAppHelper testAppHelper = new TestAppHelper(oauth, loginPage, appPage); - testAppHelper.login("admin", "admin"); - appPage.assertCurrent(); - - appServerWelcomePage.navigateToAccessControl(); - appServerWelcomePage.navigateManageProfile(); - } -} diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/different-cookie-name/WEB-INF/web.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/different-cookie-name/WEB-INF/web.xml index 83985c05720..e2b19ba52f3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/different-cookie-name/WEB-INF/web.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/different-cookie-name/WEB-INF/web.xml @@ -24,12 +24,12 @@ %CONTEXT_PATH% - javax.ws.rs.core.Application + jakarta.ws.rs.core.Application 1 - javax.ws.rs.core.Application + jakarta.ws.rs.core.Application /* diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/employee-role-mapping/WEB-INF/web.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/employee-role-mapping/WEB-INF/web.xml index 132f151db02..dc5c16b99cc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/employee-role-mapping/WEB-INF/web.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/employee-role-mapping/WEB-INF/web.xml @@ -24,11 +24,11 @@ %CONTEXT_PATH% - javax.ws.rs.core.Application + jakarta.ws.rs.core.Application 1 - javax.ws.rs.core.Application + jakarta.ws.rs.core.Application /* diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/multi-tenant-saml/WEB-INF/web.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/multi-tenant-saml/WEB-INF/web.xml index a4f67a87562..c11719d2a47 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/multi-tenant-saml/WEB-INF/web.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/multi-tenant-saml/WEB-INF/web.xml @@ -24,11 +24,11 @@ %CONTEXT_PATH% - javax.ws.rs.core.Application + jakarta.ws.rs.core.Application 1 - javax.ws.rs.core.Application + jakarta.ws.rs.core.Application /* diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/sales-post-clock-skew/WEB-INF/web.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/sales-post-clock-skew/WEB-INF/web.xml index 5e26dd9de8e..1c88c766fe4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/sales-post-clock-skew/WEB-INF/web.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/sales-post-clock-skew/WEB-INF/web.xml @@ -24,11 +24,11 @@ %CONTEXT_PATH% - javax.ws.rs.core.Application + jakarta.ws.rs.core.Application 1 - javax.ws.rs.core.Application + jakarta.ws.rs.core.Application /* diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/web-with-action-filter.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/web-with-action-filter.xml index de1b5adb3c1..681bc9f143a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/web-with-action-filter.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/web-with-action-filter.xml @@ -24,11 +24,11 @@ %CONTEXT_PATH% - javax.ws.rs.core.Application + jakarta.ws.rs.core.Application 1 - javax.ws.rs.core.Application + jakarta.ws.rs.core.Application /* diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/web.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/web.xml index 825985f1ea7..083bf66d90b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/web.xml +++ b/testsuite/integration-arquillian/tests/base/src/test/resources/adapter-test/keycloak-saml/web.xml @@ -24,11 +24,11 @@ %CONTEXT_PATH% - javax.ws.rs.core.Application + jakarta.ws.rs.core.Application 1 - javax.ws.rs.core.Application + jakarta.ws.rs.core.Application /* diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/wildfly-integration/wildfly-management-realm.json b/testsuite/integration-arquillian/tests/base/src/test/resources/wildfly-integration/wildfly-management-realm.json deleted file mode 100644 index d87eaa294ea..00000000000 --- a/testsuite/integration-arquillian/tests/base/src/test/resources/wildfly-integration/wildfly-management-realm.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "realm": "jboss-infra", - "enabled": true, - "sslRequired": "external", - "requiredCredentials": [ - "password" - ], - "users": [ - { - "username": "admin", - "enabled": true, - "email": "admin@admin.com", - "firstName": "Admin", - "lastName": "Istrator", - "credentials": [ - { - "type": "password", - "value": "admin" - } - ], - "realmRoles": [ - "Administrator" - ], - "clientRoles": { - "realm-management": [ - "realm-admin" - ], - "account": [ - "manage-account" - ] - } - } - ], - "roles": { - "realm": [ - { - "name": "Administrator", - "description": "Administrator privileges" - } - ] - }, - "clients": [ - { - "clientId": "wildfly-console", - "enabled": true, - "adminUrl": "http://localhost:10190", - "baseUrl": "http://localhost:10190", - "publicClient": true, - "redirectUris": [ - "http://localhost:10190/*" - ], - "webOrigins": ["http://localhost:10190"] - }, - { - "clientId": "wildfly-management", - "secret": "secret", - "enabled": true, - "baseUrl": "/photoz-restful-api", - "publicClient": false, - "redirectUris": [ - "/photoz-restful-api/*" - ], - "webOrigins" : ["*"] - } - ] -} diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index 68b01e2a28d..00de5983f1e 100644 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -1627,7 +1627,7 @@ org.jboss.arquillian.protocol - arquillian-protocol-servlet + arquillian-protocol-servlet-jakarta org.jboss.arquillian.graphene @@ -1925,40 +1925,6 @@ - - app-server-eap8 - - - app.server - eap8 - - - - - org.keycloak.testsuite - integration-arquillian-test-apps-servlets-jakarta - ${project.version} - - - - - - not-app-server-eap8 - - - app.server - !eap8 - - - - - org.keycloak.testsuite - integration-arquillian-test-apps-servlets - ${project.version} - - - - generate-certs-for-custom-auth-server-host