keycloak-uncached
Changes
testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/application.properties 12(+12 -0)
testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/static/admin/index.html 12(+12 -0)
testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/static/index.html 12(+12 -0)
testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/templates/linking.html 9(+9 -0)
testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/templates/session.html 9(+9 -0)
testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/templates/tokens.html 11(+11 -0)
testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/test/java/org/keycloak/SpringBootAdapterApplicationTests.java 16(+16 -0)
testsuite/integration-arquillian/test-apps/spring-boot-2-adapter/src/main/java/org/keycloak/AdminController.java 142(+0 -142)
testsuite/integration-arquillian/test-apps/spring-boot-2-adapter/src/main/java/org/keycloak/SpringBootAdapterApplication.java 12(+0 -12)
Details
diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/mvnw b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/mvnw
new file mode 100755
index 0000000..5bf251c
--- /dev/null
+++ b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/mvnw
@@ -0,0 +1,225 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Migwn, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+echo $MAVEN_PROJECTBASEDIR
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/mvnw.cmd b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/mvnw.cmd
new file mode 100644
index 0000000..019bd74
--- /dev/null
+++ b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/mvnw.cmd
@@ -0,0 +1,143 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/pom.xml b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/pom.xml
new file mode 100644
index 0000000..0c68e9a
--- /dev/null
+++ b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/pom.xml
@@ -0,0 +1,204 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.keycloak</groupId>
+ <artifactId>spring-boot-21-adapter</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>spring-boot-adapter</name>
+ <description>Spring boot adapter test application</description>
+
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.1.0.RELEASE</version>
+ <relativePath/> <!-- lookup parent from repository -->
+ </parent>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <java.version>1.8</java.version>
+
+ <keycloak.version>4.0.0.Beta2-SNAPSHOT</keycloak.version>
+
+ <repo.url />
+
+
+ <jetty.adapter.version />
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-spring-boot-2-adapter</artifactId>
+ <version>${keycloak.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>spring-boot-adapter-tomcat</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-tomcat8-adapter</artifactId>
+ <version>${keycloak.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>spring-boot-adapter-jetty</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>spring-boot-adapter-undertow</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-undertow</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-undertow-adapter</artifactId>
+ <version>${keycloak.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>repo-url</id>
+ <activation>
+ <property>
+ <name>repo.url</name>
+ </property>
+ </activation>
+ <repositories>
+ <repository>
+ <id>custom-repo</id>
+ <name>custom repo</name>
+ <url>${repo.url}</url>
+ </repository>
+ </repositories>
+ </profile>
+
+ <profile>
+ <id>jetty-version-94</id>
+ <activation>
+ <property>
+ <name>jetty.adapter.version</name>
+ <value>94</value>
+ </property>
+ </activation>
+ <properties>
+ <jetty.version>9.4.14.v20181114</jetty.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-jetty94-adapter</artifactId>
+ <version>${keycloak.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jetty</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>copy-source-file</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <tasks>
+ <copy file="../spring-boot-adapter/src/main/java/org/keycloak/AdminController.java"
+ tofile="src/main/java/org/keycloak/AdminController.java"/>
+ <copy file="../spring-boot-adapter/src/main/java/org/keycloak/SpringBootAdapterApplication.java"
+ tofile="src/main/java/org/keycloak/SpringBootAdapterApplication.java"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>remove-source-file</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <delete file="src/main/java/org/keycloak/AdminController.java"/>
+ <delete file="src/main/java/org/keycloak/SpringBootAdapterApplication.java"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/application.properties b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/application.properties
new file mode 100644
index 0000000..84de1bb
--- /dev/null
+++ b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/application.properties
@@ -0,0 +1,12 @@
+server.port=8280
+
+keycloak.realm=test
+keycloak.auth-server-url=http://localhost:8180/auth
+keycloak.ssl-required=external
+keycloak.resource=spring-boot-app
+keycloak.credentials.secret=e3789ac5-bde6-4957-a7b0-612823dac101
+keycloak.realm-key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQAB
+
+keycloak.security-constraints[0].authRoles[0]=admin
+keycloak.security-constraints[0].securityCollections[0].name=Admin zone
+keycloak.security-constraints[0].securityCollections[0].patterns[0]=/admin/*
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/static/admin/index.html b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/static/admin/index.html
new file mode 100644
index 0000000..acb47af
--- /dev/null
+++ b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/static/admin/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>springboot admin page</title>
+</head>
+<body>
+
+ <div class="test">You are now admin</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/static/index.html b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/static/index.html
new file mode 100644
index 0000000..5ca7303
--- /dev/null
+++ b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/static/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>springboot test page</title>
+</head>
+<body>
+
+ <div class="test">Click <a href="admin/index.html" class="adminlink">here</a> to go admin</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/templates/linking.html b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/templates/linking.html
new file mode 100644
index 0000000..6c7d5bd
--- /dev/null
+++ b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/templates/linking.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org/">
+<head>
+ <title>Linking page result</title>
+</head>
+<body>
+ <span id="error" th:text="${error}"/>
+</body>
+</html>
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/templates/session.html b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/templates/session.html
new file mode 100644
index 0000000..9a7e52f
--- /dev/null
+++ b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/templates/session.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org/">
+<head>
+ <title>session counter page</title>
+</head>
+ <body>
+ <span id="counter" th:text="${counter}"></span>
+ </body>
+</html>
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/templates/tokens.html b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/templates/tokens.html
new file mode 100644
index 0000000..09dee72
--- /dev/null
+++ b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/main/resources/templates/tokens.html
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org/">
+ <head>
+ <title>Tokens from spring boot</title>
+ </head>
+ <body>
+ <span id="accessToken" th:text="${accessToken}"></span>
+ <span id="refreshToken" th:text="${refreshToken}"></span>
+ <span id="accessTokenString" th:text="${accessTokenString}"></span>
+ </body>
+</html>
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/test/java/org/keycloak/SpringBootAdapterApplicationTests.java b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/test/java/org/keycloak/SpringBootAdapterApplicationTests.java
new file mode 100644
index 0000000..8df20da
--- /dev/null
+++ b/testsuite/integration-arquillian/test-apps/spring-boot-21-adapter/src/test/java/org/keycloak/SpringBootAdapterApplicationTests.java
@@ -0,0 +1,16 @@
+package org.keycloak;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringBootAdapterApplicationTests {
+
+ @Test
+ public void contextLoads() {
+ }
+
+}
diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-2-adapter/pom.xml b/testsuite/integration-arquillian/test-apps/spring-boot-2-adapter/pom.xml
index 8adacdc..e22c3ac 100644
--- a/testsuite/integration-arquillian/test-apps/spring-boot-2-adapter/pom.xml
+++ b/testsuite/integration-arquillian/test-apps/spring-boot-2-adapter/pom.xml
@@ -132,83 +132,28 @@
</profile>
<profile>
- <id>jetty-version-81</id>
+ <id>jetty-version-94</id>
<activation>
<property>
<name>jetty.adapter.version</name>
- <value>81</value>
+ <value>94</value>
</property>
</activation>
<properties>
- <jetty.version>8.1.22.v20160922</jetty.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-jetty81-adapter</artifactId>
- <version>${keycloak.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jetty</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>jetty-version-92</id>
- <activation>
- <property>
- <name>jetty.adapter.version</name>
- <value>92</value>
- </property>
- </activation>
- <properties>
- <jetty.version>9.2.23.v20171218</jetty.version>
+ <jetty.version>9.4.14.v20181114</jetty.version>
</properties>
<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
- <artifactId>keycloak-jetty92-adapter</artifactId>
+ <artifactId>keycloak-jetty94-adapter</artifactId>
<version>${keycloak.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jetty</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>jetty-version-93</id>
- <activation>
- <property>
- <name>jetty.adapter.version</name>
- <value>93</value>
- </property>
- </activation>
- <properties>
- <jetty.version>9.3.22.v20171030</jetty.version>
- </properties>
- <dependencies>
<dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-jetty93-adapter</artifactId>
- <version>${keycloak.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jetty</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jetty</artifactId>
- </dependency>
</dependencies>
</profile>
-
</profiles>
@@ -218,6 +163,41 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>copy-source-file</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <tasks>
+ <copy file="../spring-boot-adapter/src/main/java/org/keycloak/AdminController.java"
+ tofile="src/main/java/org/keycloak/AdminController.java"/>
+ <copy file="../spring-boot-adapter/src/main/java/org/keycloak/SpringBootAdapterApplication.java"
+ tofile="src/main/java/org/keycloak/SpringBootAdapterApplication.java"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>remove-source-file</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <delete file="src/main/java/org/keycloak/AdminController.java"/>
+ <delete file="src/main/java/org/keycloak/SpringBootAdapterApplication.java"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-adapter/src/main/java/org/keycloak/AdminController.java b/testsuite/integration-arquillian/test-apps/spring-boot-adapter/src/main/java/org/keycloak/AdminController.java
index 2857172..e4333d3 100644
--- a/testsuite/integration-arquillian/test-apps/spring-boot-adapter/src/main/java/org/keycloak/AdminController.java
+++ b/testsuite/integration-arquillian/test-apps/spring-boot-adapter/src/main/java/org/keycloak/AdminController.java
@@ -107,7 +107,7 @@ public class AdminController {
KeycloakSecurityContext.class.getName(),
RequestAttributes.SCOPE_REQUEST);
AccessToken token = keycloakSession.getToken();
- String clientId = token.getAudience()[0];
+ String clientId = token.getIssuedFor();
String nonce = UUID.randomUUID().toString();
MessageDigest md;
try {
diff --git a/testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml b/testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml
index 5a6639a..f26a723 100644
--- a/testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml
@@ -68,7 +68,7 @@
<name>springboot</name>
<workingDir>../../../../test-apps/spring-boot-adapter</workingDir>
<healthcheckUrl>http://localhost:8280/index.html</healthcheckUrl>
- <waitAfterLaunch>360</waitAfterLaunch>
+ <waitAfterLaunch>900</waitAfterLaunch>
<arguments>
<argument>mvn</argument>
<argument>spring-boot:run</argument>
@@ -118,7 +118,107 @@
<name>springboot</name>
<workingDir>../../../../test-apps/spring-boot-adapter</workingDir>
<healthcheckUrl>http://localhost:8280/index.html</healthcheckUrl>
- <waitAfterLaunch>360</waitAfterLaunch>
+ <waitAfterLaunch>900</waitAfterLaunch>
+ <arguments>
+ <argument>mvn</argument>
+ <argument>spring-boot:run</argument>
+ <argument>-B</argument>
+ <argument>-s</argument>
+ <argument>${maven.settings.file}</argument>
+ <argument>-Dkeycloak.version=${project.version}</argument>
+ <argument>-Pspring-boot-adapter-${adapter.container}</argument>
+ <argument>-Dmaven.repo.local=${settings.localRepository}</argument>
+ <argument>-Djetty.adapter.version=${jetty.adapter.version}</argument>
+ </arguments>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>kill-processes</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop-all</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>test-springboot-2-prod</id>
+ <properties>
+ <exclude.springboot>-</exclude.springboot>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.bazaarvoice.maven.plugins</groupId>
+ <artifactId>process-exec-maven-plugin</artifactId>
+ <version>0.7</version>
+ <executions>
+ <execution>
+ <id>spring-boot-application-process</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ <configuration>
+ <name>springboot</name>
+ <workingDir>../../../../test-apps/spring-boot-2-adapter</workingDir>
+ <healthcheckUrl>http://localhost:8280/index.html</healthcheckUrl>
+ <waitAfterLaunch>900</waitAfterLaunch>
+ <arguments>
+ <argument>mvn</argument>
+ <argument>spring-boot:run</argument>
+ <argument>-B</argument>
+ <argument>-s</argument>
+ <argument>${maven.settings.file}</argument>
+ <argument>-Dkeycloak.version=${project.version}</argument>
+ <argument>-Pspring-boot-adapter-${adapter.container}</argument>
+ <argument>-Dmaven.repo.local=${settings.localRepository}</argument>
+ <argument>-Djetty.adapter.version=${jetty.adapter.version}</argument>
+ </arguments>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>kill-processes</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop-all</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>test-springboot-21-prod</id>
+ <properties>
+ <exclude.springboot>-</exclude.springboot>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.bazaarvoice.maven.plugins</groupId>
+ <artifactId>process-exec-maven-plugin</artifactId>
+ <version>0.7</version>
+ <executions>
+ <execution>
+ <id>spring-boot-application-process</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ <configuration>
+ <name>springboot</name>
+ <workingDir>../../../../test-apps/spring-boot-21-adapter</workingDir>
+ <healthcheckUrl>http://localhost:8280/index.html</healthcheckUrl>
+ <waitAfterLaunch>900</waitAfterLaunch>
<arguments>
<argument>mvn</argument>
<argument>spring-boot:run</argument>
@@ -168,7 +268,7 @@
<name>springboot</name>
<workingDir>../../../../test-apps/spring-boot-2-adapter</workingDir>
<healthcheckUrl>http://localhost:8280/index.html</healthcheckUrl>
- <waitAfterLaunch>360</waitAfterLaunch>
+ <waitAfterLaunch>900</waitAfterLaunch>
<arguments>
<argument>mvn</argument>
<argument>spring-boot:run</argument>