From 9abb1058359134a5ca2f7e68eb2966465762f548 Mon Sep 17 00:00:00 2001 From: Ludy Date: Sat, 23 Nov 2024 11:51:17 +0100 Subject: [PATCH] Fix: Fixes dependency bug and replaces obsolete method (#2309) --- build.gradle | 6 +++--- .../SPDF/config/security/SecurityConfiguration.java | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index bb358ca9..d64bd28b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "org.springframework.boot" version "3.3.5" + id "org.springframework.boot" version "3.4.0" id "io.spring.dependency-management" version "1.1.6" id "org.springdoc.openapi-gradle-plugin" version "1.8.0" id "io.swagger.swaggerhub" version "1.3.2" @@ -15,7 +15,7 @@ plugins { import com.github.jk1.license.render.* ext { - springBootVersion = "3.3.5" + springBootVersion = "3.4.0" pdfboxVersion = "3.0.3" logbackVersion = "1.5.7" imageioVersion = "3.12.0" @@ -147,7 +147,7 @@ dependencies { implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5' //2.2.x requires rebuild of DB file.. need migration path runtimeOnly "com.h2database:h2:2.1.214" - // implementation "com.h2database:h2:2.2.224" + // runtimeOnly "com.h2database:h2:2.3.232" constraints { implementation "org.opensaml:opensaml-core" implementation "org.opensaml:opensaml-saml-api" diff --git a/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java b/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java index 1b7d37d6..e65c9f61 100644 --- a/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java +++ b/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java @@ -245,8 +245,7 @@ public class SecurityConfiguration { } // Handle SAML - if (applicationProperties.getSecurity().isSaml2Activ() - && applicationProperties.getSystem().getEnableAlphaFunctionality()) { + if (applicationProperties.getSecurity().isSaml2Activ()) { http.authenticationProvider(samlAuthenticationProvider()); http.saml2Login( saml2 -> @@ -452,7 +451,7 @@ public class SecurityConfiguration { RelyingPartyRegistration rp = RelyingPartyRegistration.withRegistrationId(samlConf.getRegistrationId()) .signingX509Credentials((c) -> c.add(signingCredential)) - .assertingPartyDetails( + .assertingPartyMetadata( (details) -> details.entityId(samlConf.getIdpIssuer()) .singleSignOnServiceLocation(