diff --git a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java index a1b58e6cc2..3f8661614a 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java +++ b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java @@ -21,6 +21,7 @@ import java.io.IOException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apereo.cas.client.util.CommonUtils; +import org.apereo.cas.client.util.WebUtils; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.cas.ServiceProperties; @@ -85,7 +86,7 @@ public class CasAuthenticationEntryPoint implements AuthenticationEntryPoint, In * @return the constructed service url. CANNOT be NULL. */ protected String createServiceUrl(HttpServletRequest request, HttpServletResponse response) { - return CommonUtils.constructServiceUrl(null, response, this.serviceProperties.getService(), null, + return WebUtils.constructServiceUrl(null, response, this.serviceProperties.getService(), null, this.serviceProperties.getArtifactParameter(), this.encodeServiceUrlWithSessionId); } diff --git a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java index e34d9b44fe..854332f7f3 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java +++ b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java @@ -23,7 +23,7 @@ import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apereo.cas.client.proxy.ProxyGrantingTicketStorage; -import org.apereo.cas.client.util.CommonUtils; +import org.apereo.cas.client.util.WebUtils; import org.apereo.cas.client.validation.TicketValidator; import org.springframework.core.log.LogMessage; @@ -228,7 +228,7 @@ public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFil // request has been processed if (proxyReceptorRequest(request)) { this.logger.debug("Responding to proxy receptor request"); - CommonUtils.readAndRespondToProxyReceptorRequest(request, response, this.proxyGrantingTicketStorage); + WebUtils.readAndRespondToProxyReceptorRequest(request, response, this.proxyGrantingTicketStorage); return null; } String serviceTicket = obtainArtifact(request); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d89bfd9014..4477b1775b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -57,7 +57,7 @@ org-apache-maven-maven-resolver-provider = "org.apache.maven:maven-resolver-prov org-apache-maven-resolver-maven-resolver-connector-basic = { module = "org.apache.maven.resolver:maven-resolver-connector-basic", version.ref = "org-apache-maven-resolver" } org-apache-maven-resolver-maven-resolver-impl = { module = "org.apache.maven.resolver:maven-resolver-impl", version.ref = "org-apache-maven-resolver" } org-apache-maven-resolver-maven-resolver-transport-http = { module = "org.apache.maven.resolver:maven-resolver-transport-http", version.ref = "org-apache-maven-resolver" } -org-apereo-cas-client-cas-client-core = "org.apereo.cas.client:cas-client-core:4.0.2" +org-apereo-cas-client-cas-client-core = "org.apereo.cas.client:cas-client-core:4.0.3" org-aspectj-aspectjrt = { module = "org.aspectj:aspectjrt", version.ref = "org-aspectj" } org-aspectj-aspectjweaver = { module = "org.aspectj:aspectjweaver", version.ref = "org-aspectj" } org-assertj-assertj-core = "org.assertj:assertj-core:3.24.2"