From bce2126fd185b01393c93d29742e72baa74676b8 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Thu, 17 Mar 2022 14:44:26 -0300 Subject: [PATCH] Update samples to use Spring Security 6 Issue gh-46 --- .idea/misc.xml | 2 +- gradle.properties | 4 +- reactive/rsocket/hello-security/build.gradle | 4 +- .../rsocket/hello-security/gradle.properties | 4 +- .../webflux-fn/hello-security/build.gradle | 4 +- .../hello-security/gradle.properties | 4 +- reactive/webflux-fn/hello/build.gradle | 4 +- reactive/webflux-fn/hello/gradle.properties | 4 +- .../username-password/form/build.gradle | 4 +- .../username-password/form/gradle.properties | 4 +- .../java/example/pages/LoginPage.java | 2 + .../java/authentication/x509/build.gradle | 4 +- .../authentication/x509/gradle.properties | 4 +- .../java/hello-security-explicit/build.gradle | 4 +- .../hello-security-explicit/gradle.properties | 4 +- .../java/example/pages/LoginPage.java | 2 + .../webflux/java/hello-security/build.gradle | 4 +- .../java/hello-security/gradle.properties | 4 +- reactive/webflux/java/hello/build.gradle | 4 +- reactive/webflux/java/hello/gradle.properties | 4 +- reactive/webflux/java/method/build.gradle | 4 +- .../webflux/java/method/gradle.properties | 4 +- .../webflux/java/oauth2/login/build.gradle | 6 +- .../java/oauth2/login/gradle.properties | 4 +- .../java/oauth2/resource-server/build.gradle | 4 +- .../oauth2/resource-server/gradle.properties | 4 +- .../java/oauth2/webclient/build.gradle | 6 +- .../java/oauth2/webclient/gradle.properties | 4 +- .../kotlin/hello-security/build.gradle.kts | 11 +- .../kotlin/hello-security/gradle.properties | 2 +- .../username-password/form/build.gradle | 8 +- .../form/gradle/gretty.gradle | 4 +- .../example/MvcWebApplicationInitializer.java | 2 +- .../java/example/WebMvcConfiguration.java | 8 +- .../authentication/x509/build.gradle | 2 +- .../hello-mvc-security/build.gradle | 8 +- .../hello-mvc-security/gradle/gretty.gradle | 4 +- .../java/example/pages/LoginPage.java | 2 + .../example/MvcWebApplicationInitializer.java | 2 +- .../java/example/WebMvcConfiguration.java | 8 +- .../java/example/pages/LoginPage.java | 2 + .../saml2/login/build.gradle | 15 +- .../example/Saml2JavaConfigurationITests.java | 60 +++++--- .../example/MvcWebApplicationInitializer.java | 2 +- .../java/example/WebMvcConfiguration.java | 10 +- .../username-password/mfa/build.gradle | 4 +- .../username-password/mfa/gradle.properties | 4 +- .../example/MfaAuthenticationHandler.java | 6 +- .../src/main/java/example/MfaController.java | 4 +- .../java/example/MfaApplicationTests.java | 3 +- .../custom-user/build.gradle | 4 +- .../custom-user/gradle.properties | 4 +- .../java/hello-security-explicit/build.gradle | 4 +- .../hello-security-explicit/gradle.properties | 4 +- .../java/example/pages/LoginPage.java | 2 + .../java/hello-security/build.gradle | 4 +- .../java/hello-security/gradle.properties | 4 +- .../java/hello-security/settings.gradle | 1 - servlet/spring-boot/java/hello/build.gradle | 4 +- .../spring-boot/java/hello/gradle.properties | 4 +- .../spring-boot/java/jwt/login/build.gradle | 4 +- .../java/jwt/login/gradle.properties | 4 +- servlet/spring-boot/java/ldap/build.gradle | 4 +- .../spring-boot/java/ldap/gradle.properties | 4 +- .../oauth2/authorization-server/build.gradle | 4 +- .../authorization-server/gradle.properties | 4 +- .../java/oauth2/login/build.gradle | 6 +- .../java/oauth2/login/gradle.properties | 4 +- .../example/OAuth2LoginApplicationTests.java | 13 +- .../filter/LoopbackIpRedirectFilter.java | 8 +- .../hello-security/build.gradle | 4 +- .../hello-security/gradle.properties | 4 +- .../oauth2/resource-server/jwe/build.gradle | 4 +- .../resource-server/jwe/gradle.properties | 4 +- .../multi-tenancy/build.gradle | 6 +- .../multi-tenancy/gradle.properties | 4 +- .../src/main/resources/application.yml | 5 +- .../resource-server/opaque/build.gradle | 6 +- .../resource-server/opaque/gradle.properties | 4 +- .../resource-server/static/build.gradle | 4 +- .../resource-server/static/gradle.properties | 4 +- .../java/oauth2/webclient/build.gradle | 6 +- .../java/oauth2/webclient/gradle.properties | 4 +- .../saml2/login-single-tenant/build.gradle | 6 +- .../login-single-tenant/gradle.properties | 4 +- .../spring-boot/java/saml2/login/build.gradle | 7 +- .../java/saml2/login/gradle.properties | 4 +- .../example/Saml2LoginApplicationITests.java | 144 ++++++++++-------- .../saml2/refreshable-metadata/build.gradle | 6 +- .../refreshable-metadata/gradle.properties | 4 +- .../kotlin/hello-security/build.gradle.kts | 11 +- .../kotlin/hello-security/gradle.properties | 2 +- .../security/samples/config/SecurityConfig.kt | 15 +- servlet/xml/java/contacts/gradle.properties | 2 +- servlet/xml/java/dms/gradle.properties | 2 +- servlet/xml/java/helloworld/gradle.properties | 2 +- servlet/xml/java/preauth/gradle.properties | 2 +- .../xml/java/saml2/login-logout/build.gradle | 5 +- .../java/saml2/login-logout/gradle.properties | 2 +- .../saml2/login-logout/gradle/gretty.gradle | 4 +- settings.gradle | 1 + 101 files changed, 347 insertions(+), 306 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 5821b2f..7edc3a5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 5ab3f03..53c91c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true diff --git a/reactive/rsocket/hello-security/build.gradle b/reactive/rsocket/hello-security/build.gradle index 30585ac..d188451 100644 --- a/reactive/rsocket/hello-security/build.gradle +++ b/reactive/rsocket/hello-security/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/rsocket/hello-security/gradle.properties b/reactive/rsocket/hello-security/gradle.properties index c924e36..ce1417e 100644 --- a/reactive/rsocket/hello-security/gradle.properties +++ b/reactive/rsocket/hello-security/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/reactive/webflux-fn/hello-security/build.gradle b/reactive/webflux-fn/hello-security/build.gradle index d500ed8..b5aae82 100644 --- a/reactive/webflux-fn/hello-security/build.gradle +++ b/reactive/webflux-fn/hello-security/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux-fn/hello-security/gradle.properties b/reactive/webflux-fn/hello-security/gradle.properties index c924e36..ce1417e 100644 --- a/reactive/webflux-fn/hello-security/gradle.properties +++ b/reactive/webflux-fn/hello-security/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/reactive/webflux-fn/hello/build.gradle b/reactive/webflux-fn/hello/build.gradle index 444de4e..1e520af 100644 --- a/reactive/webflux-fn/hello/build.gradle +++ b/reactive/webflux-fn/hello/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux-fn/hello/gradle.properties b/reactive/webflux-fn/hello/gradle.properties index c924e36..ce1417e 100644 --- a/reactive/webflux-fn/hello/gradle.properties +++ b/reactive/webflux-fn/hello/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/reactive/webflux/java/authentication/username-password/form/build.gradle b/reactive/webflux/java/authentication/username-password/form/build.gradle index 4ed2d27..40196ac 100644 --- a/reactive/webflux/java/authentication/username-password/form/build.gradle +++ b/reactive/webflux/java/authentication/username-password/form/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '2.6.4' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/authentication/username-password/form/gradle.properties b/reactive/webflux/java/authentication/username-password/form/gradle.properties index c924e36..e19a862 100644 --- a/reactive/webflux/java/authentication/username-password/form/gradle.properties +++ b/reactive/webflux/java/authentication/username-password/form/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=5.7.0-SNAPSHOT +spring-security.version=5.7.0-SNAPSHOT diff --git a/reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/pages/LoginPage.java b/reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/pages/LoginPage.java index 5773a37..298092d 100644 --- a/reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/pages/LoginPage.java +++ b/reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/pages/LoginPage.java @@ -70,8 +70,10 @@ public class LoginPage { private WebDriver driver; + @FindBy(id = "username") private WebElement username; + @FindBy(id = "password") private WebElement password; @FindBy(css = "button[type=submit]") diff --git a/reactive/webflux/java/authentication/x509/build.gradle b/reactive/webflux/java/authentication/x509/build.gradle index 90195b4..dd773f6 100644 --- a/reactive/webflux/java/authentication/x509/build.gradle +++ b/reactive/webflux/java/authentication/x509/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/authentication/x509/gradle.properties b/reactive/webflux/java/authentication/x509/gradle.properties index c924e36..ce1417e 100644 --- a/reactive/webflux/java/authentication/x509/gradle.properties +++ b/reactive/webflux/java/authentication/x509/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/reactive/webflux/java/hello-security-explicit/build.gradle b/reactive/webflux/java/hello-security-explicit/build.gradle index 7ef4928..4d34ec2 100644 --- a/reactive/webflux/java/hello-security-explicit/build.gradle +++ b/reactive/webflux/java/hello-security-explicit/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/hello-security-explicit/gradle.properties b/reactive/webflux/java/hello-security-explicit/gradle.properties index c924e36..ce1417e 100644 --- a/reactive/webflux/java/hello-security-explicit/gradle.properties +++ b/reactive/webflux/java/hello-security-explicit/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/reactive/webflux/java/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java b/reactive/webflux/java/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java index 60e0b3d..319e70c 100644 --- a/reactive/webflux/java/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java +++ b/reactive/webflux/java/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java @@ -51,8 +51,10 @@ public class LoginPage { private WebDriver webDriver; + @FindBy(id = "username") private WebElement username; + @FindBy(id = "password") private WebElement password; @FindBy(css = "button[type=submit]") diff --git a/reactive/webflux/java/hello-security/build.gradle b/reactive/webflux/java/hello-security/build.gradle index 0150ff3..3ac381e 100644 --- a/reactive/webflux/java/hello-security/build.gradle +++ b/reactive/webflux/java/hello-security/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/hello-security/gradle.properties b/reactive/webflux/java/hello-security/gradle.properties index c924e36..ce1417e 100644 --- a/reactive/webflux/java/hello-security/gradle.properties +++ b/reactive/webflux/java/hello-security/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/reactive/webflux/java/hello/build.gradle b/reactive/webflux/java/hello/build.gradle index 444de4e..1e520af 100644 --- a/reactive/webflux/java/hello/build.gradle +++ b/reactive/webflux/java/hello/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/hello/gradle.properties b/reactive/webflux/java/hello/gradle.properties index c924e36..ce1417e 100644 --- a/reactive/webflux/java/hello/gradle.properties +++ b/reactive/webflux/java/hello/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/reactive/webflux/java/method/build.gradle b/reactive/webflux/java/method/build.gradle index 680af93..80187bb 100644 --- a/reactive/webflux/java/method/build.gradle +++ b/reactive/webflux/java/method/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/method/gradle.properties b/reactive/webflux/java/method/gradle.properties index c924e36..ce1417e 100644 --- a/reactive/webflux/java/method/gradle.properties +++ b/reactive/webflux/java/method/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/reactive/webflux/java/oauth2/login/build.gradle b/reactive/webflux/java/oauth2/login/build.gradle index 3920308..225f9da 100644 --- a/reactive/webflux/java/oauth2/login/build.gradle +++ b/reactive/webflux/java/oauth2/login/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } @@ -15,7 +15,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' diff --git a/reactive/webflux/java/oauth2/login/gradle.properties b/reactive/webflux/java/oauth2/login/gradle.properties index c924e36..ce1417e 100644 --- a/reactive/webflux/java/oauth2/login/gradle.properties +++ b/reactive/webflux/java/oauth2/login/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/reactive/webflux/java/oauth2/resource-server/build.gradle b/reactive/webflux/java/oauth2/resource-server/build.gradle index 0274f0d..7f6573e 100644 --- a/reactive/webflux/java/oauth2/resource-server/build.gradle +++ b/reactive/webflux/java/oauth2/resource-server/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/reactive/webflux/java/oauth2/resource-server/gradle.properties b/reactive/webflux/java/oauth2/resource-server/gradle.properties index c924e36..ce1417e 100644 --- a/reactive/webflux/java/oauth2/resource-server/gradle.properties +++ b/reactive/webflux/java/oauth2/resource-server/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/reactive/webflux/java/oauth2/webclient/build.gradle b/reactive/webflux/java/oauth2/webclient/build.gradle index c80b454..7adb7cc 100644 --- a/reactive/webflux/java/oauth2/webclient/build.gradle +++ b/reactive/webflux/java/oauth2/webclient/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } @@ -15,7 +15,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework:spring-webflux' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' - implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' implementation 'io.projectreactor.netty:reactor-netty' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/reactive/webflux/java/oauth2/webclient/gradle.properties b/reactive/webflux/java/oauth2/webclient/gradle.properties index c924e36..ce1417e 100644 --- a/reactive/webflux/java/oauth2/webclient/gradle.properties +++ b/reactive/webflux/java/oauth2/webclient/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/reactive/webflux/kotlin/hello-security/build.gradle.kts b/reactive/webflux/kotlin/hello-security/build.gradle.kts index 58b7dbb..d9261b4 100644 --- a/reactive/webflux/kotlin/hello-security/build.gradle.kts +++ b/reactive/webflux/kotlin/hello-security/build.gradle.kts @@ -1,8 +1,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("org.springframework.boot") version "2.5.0" - id("io.spring.dependency-management") version "1.0.9.RELEASE" + id("org.springframework.boot") version "3.0.0-M1" + id("io.spring.dependency-management") version "1.0.11.RELEASE" kotlin("jvm") version "1.6.0" kotlin("plugin.spring") version "1.6.0" } @@ -12,13 +12,16 @@ repositories { maven { url = uri("https://repo.spring.io/snapshot") } + maven { + url = uri("https://repo.spring.io/milestone") + } } dependencies { implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.springframework.boot:spring-boot-starter-thymeleaf") implementation("org.springframework.boot:spring-boot-starter-webflux") - implementation("org.thymeleaf.extras:thymeleaf-extras-springsecurity5") + implementation("org.thymeleaf.extras:thymeleaf-extras-springsecurity6") implementation("io.projectreactor.kotlin:reactor-kotlin-extensions") implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") @@ -40,4 +43,4 @@ tasks.withType { tasks.withType { useJUnitPlatform() -} \ No newline at end of file +} diff --git a/reactive/webflux/kotlin/hello-security/gradle.properties b/reactive/webflux/kotlin/hello-security/gradle.properties index 778a95c..a37772a 100644 --- a/reactive/webflux/kotlin/hello-security/gradle.properties +++ b/reactive/webflux/kotlin/hello-security/gradle.properties @@ -1 +1 @@ -spring-security.version=5.6.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/java-configuration/authentication/username-password/form/build.gradle b/servlet/java-configuration/authentication/username-password/form/build.gradle index 57a935c..27928f9 100644 --- a/servlet/java-configuration/authentication/username-password/form/build.gradle +++ b/servlet/java-configuration/authentication/username-password/form/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "nebula.integtest" version "8.2.0" - id "org.gretty" version "3.0.6" + id "org.gretty" version "4.0.0" id "war" } @@ -14,14 +14,14 @@ repositories { } dependencies { - implementation platform("org.springframework:spring-framework-bom:5.3.0") - implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT") + implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") + implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.springframework.security:spring-security-config" implementation "org.springframework.security:spring-security-web" implementation "org.springframework:spring-webmvc" - implementation "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" + implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.M1" testImplementation "org.assertj:assertj-core:3.18.0" testImplementation "org.springframework:spring-test" diff --git a/servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle b/servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle index 6949bdf..3428615 100644 --- a/servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle +++ b/servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle @@ -1,5 +1,5 @@ gretty { - servletContainer = "tomcat9" + servletContainer = "tomcat10" contextPath = "/" fileLogEnabled = false integrationTestTask = 'integrationTest' @@ -38,4 +38,4 @@ project.tasks.matching { it.name == "integrationTest" }.all { integrationTest.systemProperty 'app.httpBaseURI', httpBaseUrl integrationTest.systemProperty 'app.httpsBaseURI', httpsBaseUrl } -} \ No newline at end of file +} diff --git a/servlet/java-configuration/authentication/username-password/form/src/main/java/example/MvcWebApplicationInitializer.java b/servlet/java-configuration/authentication/username-password/form/src/main/java/example/MvcWebApplicationInitializer.java index a45eec0..5679405 100644 --- a/servlet/java-configuration/authentication/username-password/form/src/main/java/example/MvcWebApplicationInitializer.java +++ b/servlet/java-configuration/authentication/username-password/form/src/main/java/example/MvcWebApplicationInitializer.java @@ -16,7 +16,7 @@ package example; -import javax.servlet.Filter; +import jakarta.servlet.Filter; import org.springframework.web.filter.HiddenHttpMethodFilter; import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; diff --git a/servlet/java-configuration/authentication/username-password/form/src/main/java/example/WebMvcConfiguration.java b/servlet/java-configuration/authentication/username-password/form/src/main/java/example/WebMvcConfiguration.java index 9c01f78..3e18741 100644 --- a/servlet/java-configuration/authentication/username-password/form/src/main/java/example/WebMvcConfiguration.java +++ b/servlet/java-configuration/authentication/username-password/form/src/main/java/example/WebMvcConfiguration.java @@ -16,10 +16,10 @@ package example; -import org.thymeleaf.spring5.ISpringTemplateEngine; -import org.thymeleaf.spring5.SpringTemplateEngine; -import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; -import org.thymeleaf.spring5.view.ThymeleafViewResolver; +import org.thymeleaf.spring6.ISpringTemplateEngine; +import org.thymeleaf.spring6.SpringTemplateEngine; +import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver; +import org.thymeleaf.spring6.view.ThymeleafViewResolver; import org.thymeleaf.templatemode.TemplateMode; import org.thymeleaf.templateresolver.ITemplateResolver; diff --git a/servlet/java-configuration/authentication/x509/build.gradle b/servlet/java-configuration/authentication/x509/build.gradle index 1eda48b..2268004 100644 --- a/servlet/java-configuration/authentication/x509/build.gradle +++ b/servlet/java-configuration/authentication/x509/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "nebula.integtest" version "8.2.0" +// id "nebula.integtest" version "8.2.0" id "org.gretty" version "3.0.6" id "war" } diff --git a/servlet/java-configuration/hello-mvc-security/build.gradle b/servlet/java-configuration/hello-mvc-security/build.gradle index 57a935c..27928f9 100644 --- a/servlet/java-configuration/hello-mvc-security/build.gradle +++ b/servlet/java-configuration/hello-mvc-security/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "nebula.integtest" version "8.2.0" - id "org.gretty" version "3.0.6" + id "org.gretty" version "4.0.0" id "war" } @@ -14,14 +14,14 @@ repositories { } dependencies { - implementation platform("org.springframework:spring-framework-bom:5.3.0") - implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT") + implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") + implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.springframework.security:spring-security-config" implementation "org.springframework.security:spring-security-web" implementation "org.springframework:spring-webmvc" - implementation "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" + implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.M1" testImplementation "org.assertj:assertj-core:3.18.0" testImplementation "org.springframework:spring-test" diff --git a/servlet/java-configuration/hello-mvc-security/gradle/gretty.gradle b/servlet/java-configuration/hello-mvc-security/gradle/gretty.gradle index 6949bdf..3428615 100644 --- a/servlet/java-configuration/hello-mvc-security/gradle/gretty.gradle +++ b/servlet/java-configuration/hello-mvc-security/gradle/gretty.gradle @@ -1,5 +1,5 @@ gretty { - servletContainer = "tomcat9" + servletContainer = "tomcat10" contextPath = "/" fileLogEnabled = false integrationTestTask = 'integrationTest' @@ -38,4 +38,4 @@ project.tasks.matching { it.name == "integrationTest" }.all { integrationTest.systemProperty 'app.httpBaseURI', httpBaseUrl integrationTest.systemProperty 'app.httpsBaseURI', httpsBaseUrl } -} \ No newline at end of file +} diff --git a/servlet/java-configuration/hello-mvc-security/src/integTest/java/example/pages/LoginPage.java b/servlet/java-configuration/hello-mvc-security/src/integTest/java/example/pages/LoginPage.java index 25bcec3..3ef69d0 100644 --- a/servlet/java-configuration/hello-mvc-security/src/integTest/java/example/pages/LoginPage.java +++ b/servlet/java-configuration/hello-mvc-security/src/integTest/java/example/pages/LoginPage.java @@ -51,8 +51,10 @@ public class LoginPage { private WebDriver webDriver; + @FindBy(id = "username") private WebElement username; + @FindBy(id = "password") private WebElement password; @FindBy(css = "button[type=submit]") diff --git a/servlet/java-configuration/hello-mvc-security/src/main/java/example/MvcWebApplicationInitializer.java b/servlet/java-configuration/hello-mvc-security/src/main/java/example/MvcWebApplicationInitializer.java index a45eec0..5679405 100644 --- a/servlet/java-configuration/hello-mvc-security/src/main/java/example/MvcWebApplicationInitializer.java +++ b/servlet/java-configuration/hello-mvc-security/src/main/java/example/MvcWebApplicationInitializer.java @@ -16,7 +16,7 @@ package example; -import javax.servlet.Filter; +import jakarta.servlet.Filter; import org.springframework.web.filter.HiddenHttpMethodFilter; import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; diff --git a/servlet/java-configuration/hello-mvc-security/src/main/java/example/WebMvcConfiguration.java b/servlet/java-configuration/hello-mvc-security/src/main/java/example/WebMvcConfiguration.java index 9c01f78..3e18741 100644 --- a/servlet/java-configuration/hello-mvc-security/src/main/java/example/WebMvcConfiguration.java +++ b/servlet/java-configuration/hello-mvc-security/src/main/java/example/WebMvcConfiguration.java @@ -16,10 +16,10 @@ package example; -import org.thymeleaf.spring5.ISpringTemplateEngine; -import org.thymeleaf.spring5.SpringTemplateEngine; -import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; -import org.thymeleaf.spring5.view.ThymeleafViewResolver; +import org.thymeleaf.spring6.ISpringTemplateEngine; +import org.thymeleaf.spring6.SpringTemplateEngine; +import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver; +import org.thymeleaf.spring6.view.ThymeleafViewResolver; import org.thymeleaf.templatemode.TemplateMode; import org.thymeleaf.templateresolver.ITemplateResolver; diff --git a/servlet/java-configuration/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java b/servlet/java-configuration/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java index 25bcec3..3ef69d0 100644 --- a/servlet/java-configuration/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java +++ b/servlet/java-configuration/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java @@ -51,8 +51,10 @@ public class LoginPage { private WebDriver webDriver; + @FindBy(id = "username") private WebElement username; + @FindBy(id = "password") private WebElement password; @FindBy(css = "button[type=submit]") diff --git a/servlet/java-configuration/saml2/login/build.gradle b/servlet/java-configuration/saml2/login/build.gradle index 65cb823..8be8ca2 100644 --- a/servlet/java-configuration/saml2/login/build.gradle +++ b/servlet/java-configuration/saml2/login/build.gradle @@ -36,21 +36,19 @@ dependencies { implementation "org.opensaml:opensaml-saml-api:4.1.1" implementation "org.opensaml:opensaml-saml-impl:4.1.1" } - implementation platform("org.springframework:spring-framework-bom:5.3.11") - implementation platform("org.springframework.security:spring-security-bom:5.6.0-SNAPSHOT") + implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") + implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.springframework.security:spring-security-config" implementation "org.springframework.security:spring-security-web" implementation "org.springframework:spring-webmvc" implementation "org.springframework.security:spring-security-saml2-service-provider" - implementation "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2" - implementation "org.apache.taglibs:taglibs-standard-jstlel:1.2.5" - implementation "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" - implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.0.4.RELEASE" + implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.M1" + implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.0.M1" - providedCompile "javax.servlet:javax.servlet-api:4.0.1" - providedCompile "javax.servlet.jsp:javax.servlet.jsp-api:2.3.3" + providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0" + providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0" testImplementation "org.assertj:assertj-core:3.18.0" testImplementation "org.springframework:spring-test" @@ -58,6 +56,7 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0" testImplementation 'org.hamcrest:hamcrest:2.2' + testImplementation 'org.awaitility:awaitility:4.2.0' testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } diff --git a/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java b/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java index 3cd5ac1..8e31aaa 100644 --- a/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java +++ b/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java @@ -16,15 +16,16 @@ package example; -import java.io.IOException; +import java.util.concurrent.TimeUnit; +import com.gargoylesoftware.htmlunit.ElementNotFoundException; import com.gargoylesoftware.htmlunit.WebClient; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlInput; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput; import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -40,6 +41,9 @@ import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; + @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = ApplicationConfiguration.class) @WebAppConfiguration @@ -66,35 +70,47 @@ public class Saml2JavaConfigurationITests { @Test void authenticationAttemptWhenValidThenShowsUserEmailAddress() throws Exception { - HtmlPage relyingParty = performLogin(); - Assertions.assertThat(relyingParty.asText()).contains("You're email address is testuser@spring.security.saml"); + performLogin(); + HtmlPage home = (HtmlPage) this.webClient.getCurrentWindow().getEnclosedPage(); + assertThat(home.asText()).contains("You're email address is testuser@spring.security.saml"); } @Test void logoutWhenRelyingPartyInitiatedLogoutThenLoginPageWithLogoutParam() throws Exception { - HtmlPage relyingParty = performLogin(); - HtmlElement rpLogoutButton = relyingParty.getHtmlElementById("rp_logout_button"); + performLogin(); + HtmlPage home = (HtmlPage) this.webClient.getCurrentWindow().getEnclosedPage(); + HtmlElement rpLogoutButton = home.getHtmlElementById("rp_logout_button"); HtmlPage loginPage = rpLogoutButton.click(); - Assertions.assertThat(loginPage.getUrl().getFile()).isEqualTo("/login?logout"); + assertThat(loginPage.getUrl().getFile()).isEqualTo("/login?logout"); } - @Test - void logoutWhenAssertingPartyInitiatedLogoutThenLoginPageWithLogoutParam() throws Exception { - HtmlPage relyingParty = performLogin(); - HtmlElement apLogoutButton = relyingParty.getHtmlElementById("ap_logout_button"); - HtmlPage loginPage = apLogoutButton.click(); - Assertions.assertThat(loginPage.getUrl().getFile()).isEqualTo("/login?logout"); - } - - private HtmlPage performLogin() throws IOException { + private void performLogin() throws Exception { HtmlPage login = this.webClient.getPage("/"); - HtmlForm form = login.getFormByName("f"); + this.webClient.waitForBackgroundJavaScript(10000); + HtmlForm form = findForm(login); HtmlInput username = form.getInputByName("username"); - HtmlInput password = form.getInputByName("password"); - HtmlSubmitInput submit = login.getHtmlElementById("submit_button"); - username.setValueAttribute("user"); - password.setValueAttribute("password"); - return submit.click(); + HtmlPasswordInput password = form.getInputByName("password"); + HtmlSubmitInput submit = login.getHtmlElementById("okta-signin-submit"); + username.type("testuser@spring.security.saml"); + password.type("12345678"); + submit.click(); + this.webClient.waitForBackgroundJavaScript(10000); + } + + private HtmlForm findForm(HtmlPage login) { + await().atMost(10, TimeUnit.SECONDS) + .until(() -> login.getForms().stream().map(HtmlForm::getId).anyMatch("form19"::equals)); + for (HtmlForm form : login.getForms()) { + try { + if (form.getId().equals("form19")) { + return form; + } + } + catch (ElementNotFoundException ex) { + // Continue + } + } + throw new IllegalStateException("Could not resolve login form"); } } diff --git a/servlet/java-configuration/saml2/login/src/main/java/example/MvcWebApplicationInitializer.java b/servlet/java-configuration/saml2/login/src/main/java/example/MvcWebApplicationInitializer.java index a45eec0..5679405 100644 --- a/servlet/java-configuration/saml2/login/src/main/java/example/MvcWebApplicationInitializer.java +++ b/servlet/java-configuration/saml2/login/src/main/java/example/MvcWebApplicationInitializer.java @@ -16,7 +16,7 @@ package example; -import javax.servlet.Filter; +import jakarta.servlet.Filter; import org.springframework.web.filter.HiddenHttpMethodFilter; import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; diff --git a/servlet/java-configuration/saml2/login/src/main/java/example/WebMvcConfiguration.java b/servlet/java-configuration/saml2/login/src/main/java/example/WebMvcConfiguration.java index 9bf0279..4e2bac4 100644 --- a/servlet/java-configuration/saml2/login/src/main/java/example/WebMvcConfiguration.java +++ b/servlet/java-configuration/saml2/login/src/main/java/example/WebMvcConfiguration.java @@ -16,11 +16,11 @@ package example; -import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect; -import org.thymeleaf.spring5.ISpringTemplateEngine; -import org.thymeleaf.spring5.SpringTemplateEngine; -import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; -import org.thymeleaf.spring5.view.ThymeleafViewResolver; +import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect; +import org.thymeleaf.spring6.ISpringTemplateEngine; +import org.thymeleaf.spring6.SpringTemplateEngine; +import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver; +import org.thymeleaf.spring6.view.ThymeleafViewResolver; import org.thymeleaf.templatemode.TemplateMode; import org.thymeleaf.templateresolver.ITemplateResolver; diff --git a/servlet/spring-boot/java/authentication/username-password/mfa/build.gradle b/servlet/spring-boot/java/authentication/username-password/mfa/build.gradle index ac0000e..f626778 100644 --- a/servlet/spring-boot/java/authentication/username-password/mfa/build.gradle +++ b/servlet/spring-boot/java/authentication/username-password/mfa/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'io.spring.dependency-management' version '1.0.10.RELEASE' - id 'org.springframework.boot' version '2.5.2' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/authentication/username-password/mfa/gradle.properties b/servlet/spring-boot/java/authentication/username-password/mfa/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/authentication/username-password/mfa/gradle.properties +++ b/servlet/spring-boot/java/authentication/username-password/mfa/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/authentication/username-password/mfa/src/main/java/example/MfaAuthenticationHandler.java b/servlet/spring-boot/java/authentication/username-password/mfa/src/main/java/example/MfaAuthenticationHandler.java index 5e4f57d..8187a89 100644 --- a/servlet/spring-boot/java/authentication/username-password/mfa/src/main/java/example/MfaAuthenticationHandler.java +++ b/servlet/spring-boot/java/authentication/username-password/mfa/src/main/java/example/MfaAuthenticationHandler.java @@ -18,9 +18,9 @@ package example; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.core.Authentication; diff --git a/servlet/spring-boot/java/authentication/username-password/mfa/src/main/java/example/MfaController.java b/servlet/spring-boot/java/authentication/username-password/mfa/src/main/java/example/MfaController.java index d956bd3..42846e6 100644 --- a/servlet/spring-boot/java/authentication/username-password/mfa/src/main/java/example/MfaController.java +++ b/servlet/spring-boot/java/authentication/username-password/mfa/src/main/java/example/MfaController.java @@ -18,8 +18,8 @@ package example; import java.security.SecureRandom; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/servlet/spring-boot/java/authentication/username-password/mfa/src/test/java/example/MfaApplicationTests.java b/servlet/spring-boot/java/authentication/username-password/mfa/src/test/java/example/MfaApplicationTests.java index 55d4b3b..b8e6d7e 100644 --- a/servlet/spring-boot/java/authentication/username-password/mfa/src/test/java/example/MfaApplicationTests.java +++ b/servlet/spring-boot/java/authentication/username-password/mfa/src/test/java/example/MfaApplicationTests.java @@ -15,9 +15,8 @@ */ package example; -import javax.servlet.http.HttpSession; - import com.j256.twofactorauth.TimeBasedOneTimePasswordUtil; +import jakarta.servlet.http.HttpSession; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle b/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle index b340e08..5340f91 100644 --- a/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle +++ b/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'io.spring.dependency-management' version '1.0.10.RELEASE' - id 'org.springframework.boot' version '2.5.2' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/gradle.properties b/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/gradle.properties +++ b/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/hello-security-explicit/build.gradle b/servlet/spring-boot/java/hello-security-explicit/build.gradle index a35be68..880c19a 100644 --- a/servlet/spring-boot/java/hello-security-explicit/build.gradle +++ b/servlet/spring-boot/java/hello-security-explicit/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'io.spring.dependency-management' version '1.0.10.RELEASE' - id 'org.springframework.boot' version '2.5.2' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/hello-security-explicit/gradle.properties b/servlet/spring-boot/java/hello-security-explicit/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/hello-security-explicit/gradle.properties +++ b/servlet/spring-boot/java/hello-security-explicit/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java b/servlet/spring-boot/java/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java index 60e0b3d..319e70c 100644 --- a/servlet/spring-boot/java/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java +++ b/servlet/spring-boot/java/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java @@ -51,8 +51,10 @@ public class LoginPage { private WebDriver webDriver; + @FindBy(id = "username") private WebElement username; + @FindBy(id = "password") private WebElement password; @FindBy(css = "button[type=submit]") diff --git a/servlet/spring-boot/java/hello-security/build.gradle b/servlet/spring-boot/java/hello-security/build.gradle index 0040ffb..1d4cea9 100644 --- a/servlet/spring-boot/java/hello-security/build.gradle +++ b/servlet/spring-boot/java/hello-security/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'io.spring.dependency-management' version '1.0.10.RELEASE' - id 'org.springframework.boot' version '2.5.2' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/hello-security/gradle.properties b/servlet/spring-boot/java/hello-security/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/hello-security/gradle.properties +++ b/servlet/spring-boot/java/hello-security/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/hello-security/settings.gradle b/servlet/spring-boot/java/hello-security/settings.gradle index 8b13789..e69de29 100644 --- a/servlet/spring-boot/java/hello-security/settings.gradle +++ b/servlet/spring-boot/java/hello-security/settings.gradle @@ -1 +0,0 @@ - diff --git a/servlet/spring-boot/java/hello/build.gradle b/servlet/spring-boot/java/hello/build.gradle index a1baa10..5e4f518 100644 --- a/servlet/spring-boot/java/hello/build.gradle +++ b/servlet/spring-boot/java/hello/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/hello/gradle.properties b/servlet/spring-boot/java/hello/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/hello/gradle.properties +++ b/servlet/spring-boot/java/hello/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/jwt/login/build.gradle b/servlet/spring-boot/java/jwt/login/build.gradle index 3f92f0e..ff109f9 100644 --- a/servlet/spring-boot/java/jwt/login/build.gradle +++ b/servlet/spring-boot/java/jwt/login/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' } diff --git a/servlet/spring-boot/java/jwt/login/gradle.properties b/servlet/spring-boot/java/jwt/login/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/jwt/login/gradle.properties +++ b/servlet/spring-boot/java/jwt/login/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/ldap/build.gradle b/servlet/spring-boot/java/ldap/build.gradle index 90aeaae..9ffc99c 100644 --- a/servlet/spring-boot/java/ldap/build.gradle +++ b/servlet/spring-boot/java/ldap/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' } diff --git a/servlet/spring-boot/java/ldap/gradle.properties b/servlet/spring-boot/java/ldap/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/ldap/gradle.properties +++ b/servlet/spring-boot/java/ldap/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/oauth2/authorization-server/build.gradle b/servlet/spring-boot/java/oauth2/authorization-server/build.gradle index f7a47d8..e05bf17 100644 --- a/servlet/spring-boot/java/oauth2/authorization-server/build.gradle +++ b/servlet/spring-boot/java/oauth2/authorization-server/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '2.6.4' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/oauth2/authorization-server/gradle.properties b/servlet/spring-boot/java/oauth2/authorization-server/gradle.properties index c924e36..e19a862 100644 --- a/servlet/spring-boot/java/oauth2/authorization-server/gradle.properties +++ b/servlet/spring-boot/java/oauth2/authorization-server/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=5.7.0-SNAPSHOT +spring-security.version=5.7.0-SNAPSHOT diff --git a/servlet/spring-boot/java/oauth2/login/build.gradle b/servlet/spring-boot/java/oauth2/login/build.gradle index 7afaf82..10ffa1e 100644 --- a/servlet/spring-boot/java/oauth2/login/build.gradle +++ b/servlet/spring-boot/java/oauth2/login/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } @@ -15,7 +15,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' diff --git a/servlet/spring-boot/java/oauth2/login/gradle.properties b/servlet/spring-boot/java/oauth2/login/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/oauth2/login/gradle.properties +++ b/servlet/spring-boot/java/oauth2/login/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java b/servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java index 5f44272..3eda5f2 100644 --- a/servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java +++ b/servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java @@ -225,7 +225,7 @@ public class OAuth2LoginApplicationTests { HtmlElement errorElement = page.getBody().getFirstByXPath("div"); assertThat(errorElement).isNotNull(); - assertThat(errorElement.asText()).contains("authorization_request_not_found"); + assertThat(errorElement.asNormalizedText()).contains("authorization_request_not_found"); } @Test @@ -253,7 +253,7 @@ public class OAuth2LoginApplicationTests { HtmlElement errorElement = page.getBody().getFirstByXPath("div"); assertThat(errorElement).isNotNull(); - assertThat(errorElement.asText()).contains("authorization_request_not_found"); + assertThat(errorElement.asNormalizedText()).contains("authorization_request_not_found"); } @Test @@ -291,7 +291,7 @@ public class OAuth2LoginApplicationTests { assertThat(clientAnchorElements.get(i).getAttribute("href")).isIn(googleClientAuthorizeUri, githubClientAuthorizeUri, facebookClientAuthorizeUri, oktaClientAuthorizeUri, springClientAuthorizeUri); - assertThat(clientAnchorElements.get(i).asText()).isIn(googleClientRegistration.getClientName(), + assertThat(clientAnchorElements.get(i).asNormalizedText()).isIn(googleClientRegistration.getClientName(), githubClientRegistration.getClientName(), facebookClientRegistration.getClientName(), oktaClientRegistration.getClientName(), springClientRegistration.getClientName()); } @@ -301,13 +301,14 @@ public class OAuth2LoginApplicationTests { assertThat(page.getTitleText()).isEqualTo("Spring Security - OAuth 2.0 Login"); DomNodeList divElements = page.getBody().getElementsByTagName("div"); - assertThat(divElements.get(1).asText()).contains("User: joeg@springsecurity.io"); - assertThat(divElements.get(4).asText()).contains("You are successfully logged in joeg@springsecurity.io"); + assertThat(divElements.get(1).asNormalizedText()).contains("User: joeg@springsecurity.io"); + assertThat(divElements.get(4).asNormalizedText()) + .contains("You are successfully logged in joeg@springsecurity.io"); } private HtmlAnchor getClientAnchorElement(HtmlPage page, ClientRegistration clientRegistration) { Optional clientAnchorElement = page.getAnchors().stream() - .filter((e) -> e.asText().equals(clientRegistration.getClientName())).findFirst(); + .filter((e) -> e.asNormalizedText().equals(clientRegistration.getClientName())).findFirst(); return (clientAnchorElement.orElse(null)); } diff --git a/servlet/spring-boot/java/oauth2/login/src/main/java/example/filter/LoopbackIpRedirectFilter.java b/servlet/spring-boot/java/oauth2/login/src/main/java/example/filter/LoopbackIpRedirectFilter.java index d9f00e5..4b22949 100644 --- a/servlet/spring-boot/java/oauth2/login/src/main/java/example/filter/LoopbackIpRedirectFilter.java +++ b/servlet/spring-boot/java/oauth2/login/src/main/java/example/filter/LoopbackIpRedirectFilter.java @@ -18,10 +18,10 @@ package example.filter; import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; diff --git a/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle index d64e474..cb4dae4 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/oauth2/resource-server/hello-security/gradle.properties b/servlet/spring-boot/java/oauth2/resource-server/hello-security/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/hello-security/gradle.properties +++ b/servlet/spring-boot/java/oauth2/resource-server/hello-security/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle index 40f80e1..4276e9f 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle @@ -15,8 +15,8 @@ */ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/oauth2/resource-server/jwe/gradle.properties b/servlet/spring-boot/java/oauth2/resource-server/jwe/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/jwe/gradle.properties +++ b/servlet/spring-boot/java/oauth2/resource-server/jwe/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle index f34a102..a65f5fc 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle @@ -15,8 +15,8 @@ */ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '2.6.4' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } @@ -31,7 +31,7 @@ dependencies { implementation 'com.squareup.okhttp3:mockwebserver' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'com.nimbusds:oauth2-oidc-sdk' + implementation 'com.nimbusds:oauth2-oidc-sdk:9.29' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' diff --git a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/gradle.properties b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/gradle.properties index c924e36..e19a862 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/gradle.properties +++ b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=5.7.0-SNAPSHOT +spring-security.version=5.7.0-SNAPSHOT diff --git a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/resources/application.yml b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/resources/application.yml index fe03b67..3c4745b 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/resources/application.yml +++ b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/resources/application.yml @@ -7,4 +7,7 @@ spring: opaquetoken: introspection-uri: ${mockwebserver.url}/introspect client-id: client - client-secret: secret \ No newline at end of file + client-secret: secret + mvc: + pathmatch: + matching-strategy: ant_path_matcher diff --git a/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle index f34a102..c58f5df 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle @@ -15,8 +15,8 @@ */ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } @@ -31,7 +31,7 @@ dependencies { implementation 'com.squareup.okhttp3:mockwebserver' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'com.nimbusds:oauth2-oidc-sdk' + implementation 'com.nimbusds:oauth2-oidc-sdk:9.29' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' diff --git a/servlet/spring-boot/java/oauth2/resource-server/opaque/gradle.properties b/servlet/spring-boot/java/oauth2/resource-server/opaque/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/opaque/gradle.properties +++ b/servlet/spring-boot/java/oauth2/resource-server/opaque/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle index 40f80e1..4276e9f 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle +++ b/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle @@ -15,8 +15,8 @@ */ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } diff --git a/servlet/spring-boot/java/oauth2/resource-server/static/gradle.properties b/servlet/spring-boot/java/oauth2/resource-server/static/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/oauth2/resource-server/static/gradle.properties +++ b/servlet/spring-boot/java/oauth2/resource-server/static/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/oauth2/webclient/build.gradle b/servlet/spring-boot/java/oauth2/webclient/build.gradle index 6e282ac..259b84e 100644 --- a/servlet/spring-boot/java/oauth2/webclient/build.gradle +++ b/servlet/spring-boot/java/oauth2/webclient/build.gradle @@ -15,8 +15,8 @@ */ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } @@ -32,7 +32,7 @@ dependencies { implementation 'org.springframework:spring-webflux' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' implementation 'io.projectreactor.netty:reactor-netty' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/servlet/spring-boot/java/oauth2/webclient/gradle.properties b/servlet/spring-boot/java/oauth2/webclient/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/oauth2/webclient/gradle.properties +++ b/servlet/spring-boot/java/oauth2/webclient/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle b/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle index 4120308..e5879af 100644 --- a/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle +++ b/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } @@ -22,7 +22,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.security:spring-security-saml2-service-provider' - implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' testImplementation 'net.sourceforge.htmlunit:htmlunit' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/servlet/spring-boot/java/saml2/login-single-tenant/gradle.properties b/servlet/spring-boot/java/saml2/login-single-tenant/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/saml2/login-single-tenant/gradle.properties +++ b/servlet/spring-boot/java/saml2/login-single-tenant/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/saml2/login/build.gradle b/servlet/spring-boot/java/saml2/login/build.gradle index 4120308..ca79630 100644 --- a/servlet/spring-boot/java/saml2/login/build.gradle +++ b/servlet/spring-boot/java/saml2/login/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } @@ -22,11 +22,12 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.security:spring-security-saml2-service-provider' - implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' testImplementation 'net.sourceforge.htmlunit:htmlunit' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' + testImplementation 'org.awaitility:awaitility:4.2.0' } tasks.withType(Test).configureEach { diff --git a/servlet/spring-boot/java/saml2/login/gradle.properties b/servlet/spring-boot/java/saml2/login/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/saml2/login/gradle.properties +++ b/servlet/spring-boot/java/saml2/login/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java b/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java index 2ddcfaf..5c40b9d 100644 --- a/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java +++ b/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java @@ -16,50 +16,33 @@ package example; -import java.io.IOException; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpSession; +import java.util.concurrent.TimeUnit; +import com.gargoylesoftware.htmlunit.ElementNotFoundException; import com.gargoylesoftware.htmlunit.WebClient; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlForm; import com.gargoylesoftware.htmlunit.html.HtmlInput; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput; import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.mock.web.MockHttpSession; import org.springframework.test.web.servlet.MockMvc; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.awaitility.Awaitility.await; @SpringBootTest @AutoConfigureMockMvc public class Saml2LoginApplicationITests { - static final String SIGNED_RESPONSE = "<samlp:Response xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" ID="_ce2b5855cf59ba24789528dd8d3d728db0ebf3e73b" Version="2.0" IssueInstant="2021-01-20T01:03:24Z" Destination="http://localhost:8080/login/saml2/sso/one" InResponseTo="ARQc98f200-dcf7-4df4-a522-07206208b07d"><saml:Issuer>https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php</saml:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
  <ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
    <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
  <ds:Reference URI="#_ce2b5855cf59ba24789528dd8d3d728db0ebf3e73b"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>MrT5/0u4Rq9wBc/z1Pwak5DWfmq8iNVNv6WGeageEsQ=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>Yh5PQ9pUAnI/9nm781gN4m8SKE8OUQL5N2R7fIOfkGVc3F8s6ReGxQ5agyAWbt3P4pCtVxkjnN+2NJyL8BhQ0sttJ/obELrFRWKzf2aBZKcB7BGLSmEwhPQ77pG/Jl20ah42hdrXW7LONoEY8s2cOwvmz6D6moXAjk0uvPES68TVwqSefOrp5utBdRAKzqBQCcPXRBvpy5bwBJC/dJ4NP/2ijQ77b7yhoT44GmaIGnHj4aQZxodcRn5OhChXFN2uI6amfOFX98cQvy+8CZoXaFQ2rfOgOlgsncFXc0ixX+NLJ9oJRVOhqEZccbhgxO3hiCe0zdndyhUlihc0tU69YA==</ds:SignatureValue>
<ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIEEzCCAvugAwIBAgIJAIc1qzLrv+5nMA0GCSqGSIb3DQEBCwUAMIGfMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ08xFDASBgNVBAcMC0Nhc3RsZSBSb2NrMRwwGgYDVQQKDBNTYW1sIFRlc3RpbmcgU2VydmVyMQswCQYDVQQLDAJJVDEgMB4GA1UEAwwXc2ltcGxlc2FtbHBocC5jZmFwcHMuaW8xIDAeBgkqhkiG9w0BCQEWEWZoYW5pa0BwaXZvdGFsLmlvMB4XDTE1MDIyMzIyNDUwM1oXDTI1MDIyMjIyNDUwM1owgZ8xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDTzEUMBIGA1UEBwwLQ2FzdGxlIFJvY2sxHDAaBgNVBAoME1NhbWwgVGVzdGluZyBTZXJ2ZXIxCzAJBgNVBAsMAklUMSAwHgYDVQQDDBdzaW1wbGVzYW1scGhwLmNmYXBwcy5pbzEgMB4GCSqGSIb3DQEJARYRZmhhbmlrQHBpdm90YWwuaW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4cn62E1xLqpN34PmbrKBbkOXFjzWgJ9b+pXuaRft6A339uuIQeoeH5qeSKRVTl32L0gdz2ZivLwZXW+cqvftVW1tvEHvzJFyxeTW3fCUeCQsebLnA2qRa07RkxTo6Nf244mWWRDodcoHEfDUSbxfTZ6IExSojSIU2RnD6WllYWFdD1GFpBJOmQB8rAc8wJIBdHFdQnX8Ttl7hZ6rtgqEYMzYVMuJ2F2r1HSU1zSAvwpdYP6rRGFRJEfdA9mm3WKfNLSc5cljz0X/TXy0vVlAV95l9qcfFzPmrkNIst9FZSwpvB49LyAVke04FQPPwLgVH4gphiJH3jvZ7I+J5lS8VAgMBAAGjUDBOMB0GA1UdDgQWBBTTyP6Cc5HlBJ5+ucVCwGc5ogKNGzAfBgNVHSMEGDAWgBTTyP6Cc5HlBJ5+ucVCwGc5ogKNGzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAvMS4EQeP/ipV4jOG5lO6/tYCb/iJeAduOnRhkJk0DbX329lDLZhTTL/x/w/9muCVcvLrzEp6PN+VWfw5E5FWtZN0yhGtP9R+vZnrV+oc2zGD+no1/ySFOe3EiJCO5dehxKjYEmBRv5sU/LZFKZpozKN/BMEa6CqLuxbzb7ykxVr7EVFXwltPxzE9TmL9OACNNyF5eJHWMRMllarUvkcXlh4pux4ks9e6zV9DQBy2zds9f1I3qxg0eX6JnGrXi/ZiCT+lJgVe3ZFXiejiLAiKB04sXW3ti0LW3lx13Y1YlQ4/tlpgTgfIJxKV6nyPiLoK0nywbMd+vpAirDt2Oc+hk</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><samlp:Status><samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/></samlp:Status><saml:Assertion xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" ID="_cb63bc36c2c03b4e1bcd5b1b0cc2e165d044546e88" Version="2.0" IssueInstant="2021-01-20T01:03:24Z"><saml:Issuer>https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php</saml:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
  <ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
    <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
  <ds:Reference URI="#_cb63bc36c2c03b4e1bcd5b1b0cc2e165d044546e88"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>Uam7cGTiBwlnD0ItgyiNJV3vgCO7+YfDqIbkXDdGxkA=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>FHiYJDL9JMs5ceyYxTUX+RwDBn9DV3TO5t1ajn+hamoW61JAcBZ610PzX33wjP72MdbgCZtyfckJKYQJOOK3FLKNBKBJa93lI/kefcMtSPlAShDJorve4SKVkoVo6KVptx/NNz0FHI5DEe6bQEceab4DU41UtJP0u2Zmzz5c4/7W8Kvkz2LLmxVfQ7Ckhvh/70aXydYPUFiwlN/WYSWrXUOh9sEL1bdeeC1dbzZyWM6WgJGQ1JInPgHgta9q1Ozxib8YKEzPIC3TFevE5cJa0T/wSs9R17BRGONrXSMd/D+xbF4gyHanDdYNaSvO7HKjxo4pbMZcNix8LNEXdkbdLw==</ds:SignatureValue>
<ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIEEzCCAvugAwIBAgIJAIc1qzLrv+5nMA0GCSqGSIb3DQEBCwUAMIGfMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ08xFDASBgNVBAcMC0Nhc3RsZSBSb2NrMRwwGgYDVQQKDBNTYW1sIFRlc3RpbmcgU2VydmVyMQswCQYDVQQLDAJJVDEgMB4GA1UEAwwXc2ltcGxlc2FtbHBocC5jZmFwcHMuaW8xIDAeBgkqhkiG9w0BCQEWEWZoYW5pa0BwaXZvdGFsLmlvMB4XDTE1MDIyMzIyNDUwM1oXDTI1MDIyMjIyNDUwM1owgZ8xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDTzEUMBIGA1UEBwwLQ2FzdGxlIFJvY2sxHDAaBgNVBAoME1NhbWwgVGVzdGluZyBTZXJ2ZXIxCzAJBgNVBAsMAklUMSAwHgYDVQQDDBdzaW1wbGVzYW1scGhwLmNmYXBwcy5pbzEgMB4GCSqGSIb3DQEJARYRZmhhbmlrQHBpdm90YWwuaW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4cn62E1xLqpN34PmbrKBbkOXFjzWgJ9b+pXuaRft6A339uuIQeoeH5qeSKRVTl32L0gdz2ZivLwZXW+cqvftVW1tvEHvzJFyxeTW3fCUeCQsebLnA2qRa07RkxTo6Nf244mWWRDodcoHEfDUSbxfTZ6IExSojSIU2RnD6WllYWFdD1GFpBJOmQB8rAc8wJIBdHFdQnX8Ttl7hZ6rtgqEYMzYVMuJ2F2r1HSU1zSAvwpdYP6rRGFRJEfdA9mm3WKfNLSc5cljz0X/TXy0vVlAV95l9qcfFzPmrkNIst9FZSwpvB49LyAVke04FQPPwLgVH4gphiJH3jvZ7I+J5lS8VAgMBAAGjUDBOMB0GA1UdDgQWBBTTyP6Cc5HlBJ5+ucVCwGc5ogKNGzAfBgNVHSMEGDAWgBTTyP6Cc5HlBJ5+ucVCwGc5ogKNGzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAvMS4EQeP/ipV4jOG5lO6/tYCb/iJeAduOnRhkJk0DbX329lDLZhTTL/x/w/9muCVcvLrzEp6PN+VWfw5E5FWtZN0yhGtP9R+vZnrV+oc2zGD+no1/ySFOe3EiJCO5dehxKjYEmBRv5sU/LZFKZpozKN/BMEa6CqLuxbzb7ykxVr7EVFXwltPxzE9TmL9OACNNyF5eJHWMRMllarUvkcXlh4pux4ks9e6zV9DQBy2zds9f1I3qxg0eX6JnGrXi/ZiCT+lJgVe3ZFXiejiLAiKB04sXW3ti0LW3lx13Y1YlQ4/tlpgTgfIJxKV6nyPiLoK0nywbMd+vpAirDt2Oc+hk</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><saml:Subject><saml:NameID SPNameQualifier="http://localhost:8080/saml2/service-provider-metadata/one" Format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress">testuser@spring.security.saml</saml:NameID><saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml:SubjectConfirmationData NotOnOrAfter="2052-09-28T02:50:04Z" Recipient="http://localhost:8080/login/saml2/sso/one" InResponseTo="ARQc98f200-dcf7-4df4-a522-07206208b07d"/></saml:SubjectConfirmation></saml:Subject><saml:Conditions NotBefore="2021-01-20T01:02:54Z" NotOnOrAfter="2052-09-28T02:50:04Z"><saml:AudienceRestriction><saml:Audience>http://localhost:8080/saml2/service-provider-metadata/one</saml:Audience></saml:AudienceRestriction></saml:Conditions><saml:AuthnStatement AuthnInstant="2021-01-20T00:48:29Z" SessionNotOnOrAfter="2021-01-20T08:48:29Z" SessionIndex="_e7a1a9e495bfe226649e8dcc37e14154495215d6eb"><saml:AuthnContext><saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</saml:AuthnContextClassRef></saml:AuthnContext></saml:AuthnStatement><saml:AttributeStatement><saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"><saml:AttributeValue xsi:type="xs:string">testuser@spring.security.saml</saml:AttributeValue></saml:Attribute><saml:Attribute Name="eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"><saml:AttributeValue xsi:type="xs:string">member</saml:AttributeValue><saml:AttributeValue xsi:type="xs:string">user</saml:AttributeValue></saml:Attribute><saml:Attribute Name="emailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"><saml:AttributeValue xsi:type="xs:string">testuser@spring.security.saml</saml:AttributeValue></saml:Attribute></saml:AttributeStatement></saml:Assertion></samlp:Response>"; - - static final Map> USER_ATTRIBUTES = new LinkedHashMap<>(); - - static { - USER_ATTRIBUTES.put("uid", Arrays.asList("testuser@spring.security.saml")); - USER_ATTRIBUTES.put("eduPersonAffiliation", Arrays.asList("member", "user")); - USER_ATTRIBUTES.put("emailAddress", Arrays.asList("testuser@spring.security.saml")); - } - @Autowired MockMvc mvc; @@ -71,51 +54,80 @@ public class Saml2LoginApplicationITests { this.webClient.getCookieManager().clearCookies(); } - @Test - void indexWhenSamlResponseThenShowsUserInformation() throws Exception { - HttpSession session = this.mvc.perform(get("http://localhost:8080/")).andExpect(status().is3xxRedirection()) - .andExpect(redirectedUrl("http://localhost:8080/login")).andReturn().getRequest().getSession(); - - this.mvc.perform(post("http://localhost:8080/login/saml2/sso/one").param("SAMLResponse", SIGNED_RESPONSE) - .session((MockHttpSession) session)).andExpect(redirectedUrl("http://localhost:8080/")); - - this.mvc.perform(get("http://localhost:8080/").session((MockHttpSession) session)) - .andExpect(model().attribute("emailAddress", "testuser@spring.security.saml")) - .andExpect(model().attribute("userAttributes", USER_ATTRIBUTES)); - } - - @Test - void authenticationAttemptWhenValidThenShowsUserEmailAddress() throws Exception { - HtmlPage relyingParty = performLogin(); - assertThat(relyingParty.asNormalizedText()).contains("You're email address is testuser@spring.security.saml"); - } - - @Test - void logoutWhenRelyingPartyInitiatedLogoutThenLoginPageWithLogoutParam() throws Exception { - HtmlPage relyingParty = performLogin(); - HtmlElement rpLogoutButton = relyingParty.getHtmlElementById("rp_logout_button"); - HtmlPage loginPage = rpLogoutButton.click(); - assertThat(loginPage.getUrl().getFile()).isEqualTo("/login?logout"); - } - - @Test - void logoutWhenAssertingPartyInitiatedLogoutThenLoginPageWithLogoutParam() throws Exception { - HtmlPage relyingParty = performLogin(); - HtmlElement apLogoutButton = relyingParty.getHtmlElementById("ap_logout_button"); - HtmlPage loginPage = apLogoutButton.click(); - assertThat(loginPage.getUrl().getFile()).isEqualTo("/login?logout"); - } - - private HtmlPage performLogin() throws IOException { + private void performLogin(String registrationId) throws Exception { HtmlPage login = this.webClient.getPage("/"); - HtmlPage assertingParty = login.getAnchorByHref("/saml2/authenticate/one").click(); - HtmlForm form = assertingParty.getFormByName("f"); + login.getAnchorByHref("/saml2/authenticate/" + registrationId).click(); + this.webClient.waitForBackgroundJavaScript(10000); + HtmlPage okta = (HtmlPage) this.webClient.getCurrentWindow().getEnclosedPage(); + this.webClient.waitForBackgroundJavaScript(10000); + HtmlForm form = findForm(okta); HtmlInput username = form.getInputByName("username"); - HtmlInput password = form.getInputByName("password"); - HtmlSubmitInput submit = assertingParty.getHtmlElementById("submit_button"); - username.setValueAttribute("user"); - password.setValueAttribute("password"); - return submit.click(); + HtmlPasswordInput password = form.getInputByName("password"); + HtmlSubmitInput submit = okta.getHtmlElementById("okta-signin-submit"); + username.type("testuser@spring.security.saml"); + password.type("12345678"); + submit.click(); + this.webClient.waitForBackgroundJavaScript(10000); + } + + private HtmlForm findForm(HtmlPage login) { + await().atMost(10, TimeUnit.SECONDS) + .until(() -> login.getForms().stream().map(HtmlForm::getId).anyMatch("form19"::equals)); + for (HtmlForm form : login.getForms()) { + try { + if (form.getId().equals("form19")) { + return form; + } + } + catch (ElementNotFoundException ex) { + // Continue + } + } + throw new IllegalStateException("Could not resolve login form"); + } + + @DisplayName("Tenant one tests") + @Nested + class TenantOneTests { + + @Test + void authenticationAttemptWhenValidThenShowsUserEmailAddress() throws Exception { + performLogin("one"); + HtmlPage home = (HtmlPage) Saml2LoginApplicationITests.this.webClient.getCurrentWindow().getEnclosedPage(); + assertThat(home.asText()).contains("You're email address is testuser@spring.security.saml"); + } + + @Test + void logoutWhenRelyingPartyInitiatedLogoutThenLoginPageWithLogoutParam() throws Exception { + performLogin("one"); + HtmlPage home = (HtmlPage) Saml2LoginApplicationITests.this.webClient.getCurrentWindow().getEnclosedPage(); + HtmlElement rpLogoutButton = home.getHtmlElementById("rp_logout_button"); + HtmlPage loginPage = rpLogoutButton.click(); + assertThat(loginPage.getUrl().getFile()).isEqualTo("/login?logout"); + } + + } + + @DisplayName("Tenant two tests") + @Nested + class TenantTwoTests { + + @Test + void authenticationAttemptWhenValidThenShowsUserEmailAddress() throws Exception { + performLogin("two"); + HtmlPage home = (HtmlPage) Saml2LoginApplicationITests.this.webClient.getCurrentWindow().getEnclosedPage(); + assertThat(home.asText()).contains("You're email address is testuser@spring.security.saml"); + } + + @Test + void logoutWhenRelyingPartyInitiatedLogoutThenLoginPageWithLogoutParam() throws Exception { + performLogin("two"); + HtmlPage home = (HtmlPage) Saml2LoginApplicationITests.this.webClient.getCurrentWindow().getEnclosedPage(); + HtmlElement rpLogoutButton = home.getHtmlElementById("rp_logout_button"); + HtmlPage loginPage = rpLogoutButton.click(); + assertThat(loginPage.getUrl().getFile()).isEqualTo("/login?logout"); + } + } } diff --git a/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle b/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle index 3fc5803..e5879af 100644 --- a/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle +++ b/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.6' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'org.springframework.boot' version '3.0.0-M1' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "nebula.integtest" version "8.2.0" id 'java' } @@ -22,7 +22,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.security:spring-security-saml2-service-provider' - implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' testImplementation 'net.sourceforge.htmlunit:htmlunit' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/servlet/spring-boot/java/saml2/refreshable-metadata/gradle.properties b/servlet/spring-boot/java/saml2/refreshable-metadata/gradle.properties index c924e36..ce1417e 100644 --- a/servlet/spring-boot/java/saml2/refreshable-metadata/gradle.properties +++ b/servlet/spring-boot/java/saml2/refreshable-metadata/gradle.properties @@ -1,2 +1,2 @@ -version=5.6.0-SNAPSHOT -spring-security.version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/kotlin/hello-security/build.gradle.kts b/servlet/spring-boot/kotlin/hello-security/build.gradle.kts index 968fc25..69420e0 100644 --- a/servlet/spring-boot/kotlin/hello-security/build.gradle.kts +++ b/servlet/spring-boot/kotlin/hello-security/build.gradle.kts @@ -1,8 +1,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("org.springframework.boot") version "2.5.0" - id("io.spring.dependency-management") version "1.0.9.RELEASE" + id("org.springframework.boot") version "3.0.0-M1" + id("io.spring.dependency-management") version "1.0.11.RELEASE" kotlin("jvm") version "1.6.0" kotlin("plugin.spring") version "1.6.0" } @@ -12,15 +12,16 @@ repositories { maven { url = uri("https://repo.spring.io/snapshot") } + maven { + url = uri("https://repo.spring.io/milestone") + } } dependencies { - implementation("org.jetbrains.kotlin:kotlin-reflect") - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.springframework.boot:spring-boot-starter-thymeleaf") implementation("org.springframework.boot:spring-boot-starter-web") - implementation("org.thymeleaf.extras:thymeleaf-extras-springsecurity5") + implementation("org.thymeleaf.extras:thymeleaf-extras-springsecurity6") testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.springframework.security:spring-security-test") } diff --git a/servlet/spring-boot/kotlin/hello-security/gradle.properties b/servlet/spring-boot/kotlin/hello-security/gradle.properties index 778a95c..a37772a 100644 --- a/servlet/spring-boot/kotlin/hello-security/gradle.properties +++ b/servlet/spring-boot/kotlin/hello-security/gradle.properties @@ -1 +1 @@ -spring-security.version=5.6.0-SNAPSHOT +spring-security.version=6.0.0-SNAPSHOT diff --git a/servlet/spring-boot/kotlin/hello-security/src/main/kotlin/org/springframework/security/samples/config/SecurityConfig.kt b/servlet/spring-boot/kotlin/hello-security/src/main/kotlin/org/springframework/security/samples/config/SecurityConfig.kt index 296d19b..063555d 100644 --- a/servlet/spring-boot/kotlin/hello-security/src/main/kotlin/org/springframework/security/samples/config/SecurityConfig.kt +++ b/servlet/spring-boot/kotlin/hello-security/src/main/kotlin/org/springframework/security/samples/config/SecurityConfig.kt @@ -19,7 +19,6 @@ package org.springframework.security.samples.config import org.springframework.context.annotation.Bean import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity -import org.springframework.security.config.web.servlet.invoke import org.springframework.security.core.userdetails.User import org.springframework.security.core.userdetails.UserDetailsService import org.springframework.security.provisioning.InMemoryUserDetailsManager @@ -33,15 +32,11 @@ class SecurityConfig { @Bean fun filterChain(http: HttpSecurity): SecurityFilterChain { - http { - authorizeRequests { - authorize("/css/**", permitAll) - authorize("/user/**", hasAuthority("ROLE_USER")) - } - formLogin { - loginPage = "/log-in" - } - } + http.authorizeRequests() + .antMatchers("/css/**").permitAll() + .antMatchers("/user/**").hasAuthority("ROLE_USER") + .and() + .formLogin().loginPage("/log-in") return http.build() } diff --git a/servlet/xml/java/contacts/gradle.properties b/servlet/xml/java/contacts/gradle.properties index 99e4019..a2f0b27 100644 --- a/servlet/xml/java/contacts/gradle.properties +++ b/servlet/xml/java/contacts/gradle.properties @@ -1 +1 @@ -version=5.6.0-SNAPSHOT \ No newline at end of file +version=6.0.0-SNAPSHOT diff --git a/servlet/xml/java/dms/gradle.properties b/servlet/xml/java/dms/gradle.properties index f309933..a2f0b27 100644 --- a/servlet/xml/java/dms/gradle.properties +++ b/servlet/xml/java/dms/gradle.properties @@ -1 +1 @@ -version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT diff --git a/servlet/xml/java/helloworld/gradle.properties b/servlet/xml/java/helloworld/gradle.properties index f309933..a2f0b27 100644 --- a/servlet/xml/java/helloworld/gradle.properties +++ b/servlet/xml/java/helloworld/gradle.properties @@ -1 +1 @@ -version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT diff --git a/servlet/xml/java/preauth/gradle.properties b/servlet/xml/java/preauth/gradle.properties index f309933..a2f0b27 100644 --- a/servlet/xml/java/preauth/gradle.properties +++ b/servlet/xml/java/preauth/gradle.properties @@ -1 +1 @@ -version=5.6.0-SNAPSHOT +version=6.0.0-SNAPSHOT diff --git a/servlet/xml/java/saml2/login-logout/build.gradle b/servlet/xml/java/saml2/login-logout/build.gradle index 24eade3..96efcf7 100644 --- a/servlet/xml/java/saml2/login-logout/build.gradle +++ b/servlet/xml/java/saml2/login-logout/build.gradle @@ -1,6 +1,7 @@ plugins { id "java" - id "org.gretty" version "3.0.6" + id "nebula.integtest" version "8.2.0" + id "org.gretty" version "4.0.0" id "war" } @@ -34,7 +35,7 @@ dependencies { testImplementation "org.springframework:spring-test" testImplementation "org.springframework.security:spring-security-test" testImplementation "org.junit.jupiter:junit-jupiter-api" - testImplementation 'net.sourceforge.htmlunit:htmlunit:2.49.1' + testImplementation 'net.sourceforge.htmlunit:htmlunit:2.44.0' testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/servlet/xml/java/saml2/login-logout/gradle.properties b/servlet/xml/java/saml2/login-logout/gradle.properties index e170fd3..a2f0b27 100644 --- a/servlet/xml/java/saml2/login-logout/gradle.properties +++ b/servlet/xml/java/saml2/login-logout/gradle.properties @@ -1 +1 @@ -version=5.7.0-SNAPSHOT +version=6.0.0-SNAPSHOT diff --git a/servlet/xml/java/saml2/login-logout/gradle/gretty.gradle b/servlet/xml/java/saml2/login-logout/gradle/gretty.gradle index 6949bdf..3428615 100644 --- a/servlet/xml/java/saml2/login-logout/gradle/gretty.gradle +++ b/servlet/xml/java/saml2/login-logout/gradle/gretty.gradle @@ -1,5 +1,5 @@ gretty { - servletContainer = "tomcat9" + servletContainer = "tomcat10" contextPath = "/" fileLogEnabled = false integrationTestTask = 'integrationTest' @@ -38,4 +38,4 @@ project.tasks.matching { it.name == "integrationTest" }.all { integrationTest.systemProperty 'app.httpBaseURI', httpBaseUrl integrationTest.systemProperty 'app.httpsBaseURI', httpsBaseUrl } -} \ No newline at end of file +} diff --git a/settings.gradle b/settings.gradle index fcbbf0f..8a57a6c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,6 +2,7 @@ pluginManagement { repositories { mavenCentral() gradlePluginPortal() + maven { url 'https://repo.spring.io/milestone' } maven { url "https://repo.spring.io/libs-snapshot" } } resolutionStrategy {