From 77a494d3befe9a06d68b83c9ab6bc204ac6ed0e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Barto=C5=A1?= <mabartos@redhat.com>
Date: Tue, 10 Jan 2023 18:32:51 +0100
Subject: [PATCH] Undertow JakartaEE adapter in the testsuite

---
 .../adapters/undertow/UndertowHttpFacade.java |  13 +-
 .../undertow/UndertowHttpServletRequest.java  |   2 +-
 testsuite/integration-arquillian/pom.xml      |   2 +-
 .../servers/adapter-spi/README.md             |  16 ++
 .../servers/adapter-spi/pom.xml               |   3 +-
 .../undertow-adapter-jakarta/pom.xml          |  15 +-
 .../undertow-adapter-saml-jakarta/.gitignore  |   1 +
 .../undertow-adapter-saml-jakarta/pom.xml     | 138 ++++++++++++++++++
 .../.gitignore                                |   0
 .../pom.xml                                   |   8 +-
 .../undertow/UndertowHttpServletRequest.java  |   0
 .../servers/app-server/undertow/pom.xml       |   5 +-
 testsuite/utils/pom.xml                       |   5 +-
 13 files changed, 177 insertions(+), 31 deletions(-)
 create mode 100644 testsuite/integration-arquillian/servers/adapter-spi/README.md
 create mode 100644 testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-saml-jakarta/.gitignore
 create mode 100644 testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-saml-jakarta/pom.xml
 rename testsuite/integration-arquillian/servers/adapter-spi/{undertow-adapter-jakarta-spi => undertow-adapter-spi-jakarta}/.gitignore (100%)
 rename testsuite/integration-arquillian/servers/adapter-spi/{undertow-adapter-jakarta-spi => undertow-adapter-spi-jakarta}/pom.xml (91%)
 rename testsuite/integration-arquillian/servers/adapter-spi/{undertow-adapter-jakarta-spi => undertow-adapter-spi-jakarta}/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java (100%)

diff --git a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java
index 497f772c31..c86a54f0a4 100755
--- a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java
+++ b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java
@@ -196,18 +196,7 @@ public class UndertowHttpFacade implements HttpFacade {
 
                 inputStream = new BufferedInputStream(exchange.getInputStream());
                 
-                context.setServletRequest(new HttpServletRequestWrapper((HttpServletRequest) servletRequest) {
-                    @Override
-                    public ServletInputStream getInputStream() {
-                        inputStream.mark(0);
-                        return new ServletInputStream() {
-                            @Override
-                            public int read() throws IOException {
-                                return inputStream.read();
-                            }
-                        };
-                    }
-                });
+                context.setServletRequest(UndertowHttpServletRequest.setupServletInputStream(servletRequest, inputStream));
                 return inputStream;
             }
 
diff --git a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java
index 5f619bcfcd..338f66e22a 100644
--- a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java
+++ b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java
@@ -26,7 +26,7 @@ import java.io.InputStream;
 
 public class UndertowHttpServletRequest {
 
-    public static HttpServletRequestWrapper setupServletInputStream(ServletRequest servletRequest, InputStream inputStream) {
+    public static HttpServletRequestWrapper setupServletInputStream(ServletRequest servletRequest, final InputStream inputStream) {
         return new HttpServletRequestWrapper((HttpServletRequest) servletRequest) {
             @Override
             public ServletInputStream getInputStream() {
diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index 3b071ffd0d..b768af23b4 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -41,7 +41,7 @@
         <cache.server.java.home>${java.home}</cache.server.java.home>
 
         <!--component versions-->
-        <arquillian-core.version>1.6.0.Final</arquillian-core.version>
+        <arquillian-core.version>1.7.0.Alpha13</arquillian-core.version>
         <!--the version of shrinkwrap_resolver should align with the version in arquillian-bom-->
         <shrinkwrap-resolver.version>3.1.4</shrinkwrap-resolver.version>
         <selenium.version>3.14.0</selenium.version>
diff --git a/testsuite/integration-arquillian/servers/adapter-spi/README.md b/testsuite/integration-arquillian/servers/adapter-spi/README.md
new file mode 100644
index 0000000000..608f9cebcb
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/adapter-spi/README.md
@@ -0,0 +1,16 @@
+# Adapter SPI
+
+This module is primarily used for custom adapters in the testsuite.
+
+## Undertow
+Modules related to Undertow:
+* Keycloak Undertow Adapter SPI (`undertow-adapter-spi-jakarta`)
+* Keycloak Undertow OIDC adapter (`undertow-adapter-jakarta`)
+* Keycloak Undertow SAML adapter (`undertow-adapter-saml-jakarta`)
+
+These modules are automatically generated from the Keycloak adapters module (`/adapters`) and converted to adapters supporting JakartaEE.
+
+You can override files from the original module by putting the class with the same name into the `src` directory.
+Do not forget to edit `.gitignore` file for changes, which should be kept in the module.
+
+You can check the behavior in `undertow-adapter-spi-jakarta` module and class `UndertowHttpServletRequest`.
diff --git a/testsuite/integration-arquillian/servers/adapter-spi/pom.xml b/testsuite/integration-arquillian/servers/adapter-spi/pom.xml
index 80af3a7f6a..b5833d40e1 100644
--- a/testsuite/integration-arquillian/servers/adapter-spi/pom.xml
+++ b/testsuite/integration-arquillian/servers/adapter-spi/pom.xml
@@ -14,8 +14,9 @@
     <name>Testsuite Adapter SPI</name>
 
     <modules>
-        <module>undertow-adapter-jakarta-spi</module>
+        <module>undertow-adapter-spi-jakarta</module>
         <module>undertow-adapter-jakarta</module>
+        <module>undertow-adapter-saml-jakarta</module>
     </modules>
 
     <properties>
diff --git a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/pom.xml b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/pom.xml
index 55d3c22aa3..02953eb3fd 100644
--- a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/pom.xml
+++ b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/pom.xml
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>keycloak-undertow-adapter-jakarta</artifactId>
-    <name>App Server - Undertow (JakartaEE)</name>
+    <name>Undertow OIDC Adapter (JakartaEE)</name>
     <packaging>jar</packaging>
 
     <properties>
@@ -27,12 +27,16 @@
             *;resolution:=optional
         </keycloak.osgi.import>
 
-        <undertow-adapter-spi-base>${project.basedir}/../../../../../adapters/oidc/undertow</undertow-adapter-spi-base>
-        <jakarta-transformer-sources>${undertow-adapter-spi-base}/</jakarta-transformer-sources>
+        <jakarta-transformer-sources>${project.basedir}/../../../../../adapters/oidc/undertow</jakarta-transformer-sources>
         <jakarta-transformer-target>${project.basedir}</jakarta-transformer-target>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-undertow-adapter-spi-jakarta</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
@@ -46,11 +50,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-adapter-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>integration-arquillian-undertow-jakarta-spi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-adapter-core</artifactId>
diff --git a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-saml-jakarta/.gitignore b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-saml-jakarta/.gitignore
new file mode 100644
index 0000000000..aa8e45f12b
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-saml-jakarta/.gitignore
@@ -0,0 +1 @@
+src/
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-saml-jakarta/pom.xml b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-saml-jakarta/pom.xml
new file mode 100644
index 0000000000..6399ec7a1f
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-saml-jakarta/pom.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>integration-arquillian-servers</artifactId>
+        <groupId>org.keycloak.testsuite</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>keycloak-saml-undertow-adapter-jakarta</artifactId>
+    <name>Undertow SAML Adapter (JakartaEE)</name>
+    <packaging>jar</packaging>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+
+        <jakarta-transformer-sources>${project.basedir}/../../../../../adapters/saml/undertow</jakarta-transformer-sources>
+        <jakarta-transformer-target>${project.basedir}</jakarta-transformer-target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-saml-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-adapter-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-common</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-saml-adapter-api-public</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-saml-adapter-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak.testsuite</groupId>
+            <artifactId>keycloak-undertow-adapter-jakarta</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.servlet</groupId>
+            <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.undertow</groupId>
+            <artifactId>undertow-servlet</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.undertow</groupId>
+            <artifactId>undertow-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>transform</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <property name="plugin_classpath" refid="maven.plugin.classpath" />
+                                <java classname="org.eclipse.transformer.jakarta.JakartaTransformer">
+                                    <arg value="-o" />
+                                    <arg value="${jakarta-transformer-sources}" />
+                                    <arg value="${jakarta-transformer-target}/tmp" />
+                                    <classpath>
+                                        <pathelement path="${plugin_classpath}" />
+                                    </classpath>
+                                </java>
+                                <touch>
+                                    <fileset dir="${jakarta-transformer-target}"/>
+                                </touch>
+                                <copy todir="${jakarta-transformer-target}" overwrite="false">
+                                    <fileset dir="${jakarta-transformer-target}/tmp"/>
+                                </copy>
+                                <delete dir="${jakarta-transformer-target}/tmp"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.eclipse.transformer</groupId>
+                        <artifactId>org.eclipse.transformer.cli</artifactId>
+                        <version>0.2.0</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>ant-contrib</groupId>
+                        <artifactId>ant-contrib</artifactId>
+                        <version>1.0b3</version>
+                        <exclusions>
+                            <exclusion>
+                                <groupId>ant</groupId>
+                                <artifactId>ant</artifactId>
+                            </exclusion>
+                        </exclusions>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/.gitignore b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-spi-jakarta/.gitignore
similarity index 100%
rename from testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/.gitignore
rename to testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-spi-jakarta/.gitignore
diff --git a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/pom.xml b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-spi-jakarta/pom.xml
similarity index 91%
rename from testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/pom.xml
rename to testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-spi-jakarta/pom.xml
index 6a1eb6e30f..a33f4aad3a 100644
--- a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/pom.xml
+++ b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-spi-jakarta/pom.xml
@@ -10,15 +10,15 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>integration-arquillian-undertow-jakarta-spi</artifactId>
-    <name>App Server - Undertow SPI (JakartaEE)</name>
+    <artifactId>keycloak-undertow-adapter-spi-jakarta</artifactId>
+    <name>Adapter Undertow SPI (JakartaEE)</name>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
 
-        <undertow-adapter-spi-base>${project.basedir}/../../../../../adapters/spi/undertow-adapter-spi</undertow-adapter-spi-base>
-        <jakarta-transformer-sources>${undertow-adapter-spi-base}/src/main/java/org/keycloak/adapters/undertow/</jakarta-transformer-sources>
+        <undertow-adapter-base>${project.basedir}/../../../../../adapters/spi/undertow-adapter-spi</undertow-adapter-base>
+        <jakarta-transformer-sources>${undertow-adapter-base}/src/main/java/org/keycloak/adapters/undertow/</jakarta-transformer-sources>
         <jakarta-transformer-target>${project.basedir}/src/main/java/org/keycloak/adapters/undertow/</jakarta-transformer-target>
     </properties>
 
diff --git a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-spi-jakarta/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java
similarity index 100%
rename from testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java
rename to testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-spi-jakarta/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java
diff --git a/testsuite/integration-arquillian/servers/app-server/undertow/pom.xml b/testsuite/integration-arquillian/servers/app-server/undertow/pom.xml
index 537655a5f4..1f708815e3 100644
--- a/testsuite/integration-arquillian/servers/app-server/undertow/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/undertow/pom.xml
@@ -34,8 +34,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-saml-undertow-adapter</artifactId>
+            <groupId>org.keycloak.testsuite</groupId>
+            <artifactId>keycloak-saml-undertow-adapter-jakarta</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
diff --git a/testsuite/utils/pom.xml b/testsuite/utils/pom.xml
index 3afa8cff54..4fd78ee4b3 100755
--- a/testsuite/utils/pom.xml
+++ b/testsuite/utils/pom.xml
@@ -186,8 +186,9 @@
             <artifactId>keycloak-servlet-filter-adapter</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-saml-undertow-adapter</artifactId>
+            <groupId>org.keycloak.testsuite</groupId>
+            <artifactId>keycloak-saml-undertow-adapter-jakarta</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>