(syncope) branch master updated: Upgrading CAS (#783)

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new d5e2316804 Upgrading CAS (#783)
d5e2316804 is described below

commit d5e231680440518f88f2add209dbd915ac1dca13
Author: Francesco Chicchiriccò <ilgro...@users.noreply.github.com>
AuthorDate: Fri Jul 12 16:32:09 2024 +0200

    Upgrading CAS (#783)
---
 .../src/main/resources/wa-embedded.properties          |  8 ++++----
 pom.xml                                                |  4 ++--
 wa/starter/pom.xml                                     | 18 ++++++++++++++++++
 .../wa/starter/pac4j/saml/WASAML2ClientCustomizer.java |  3 +--
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/fit/wa-reference/src/main/resources/wa-embedded.properties 
b/fit/wa-reference/src/main/resources/wa-embedded.properties
index baf6dccb7c..a957c5fd0e 100644
--- a/fit/wa-reference/src/main/resources/wa-embedded.properties
+++ b/fit/wa-reference/src/main/resources/wa-embedded.properties
@@ -34,8 +34,8 @@ service.discovery.address=https://localhost:9443/syncope-wa/
 # registered Spring MVC handler mappings
 spring.mvc.pathmatch.matching-strategy=ant-path-matcher
 
-cas.tgc.crypto.encryption.key=a4tIE5DL52q7jdqWVxb4r03iV598lR0Yr84hU0Of_hI
-cas.tgc.crypto.signing.key=qM7RBG27BOSnUCo7PQhBIAr5ZhYrtI-kzhMVjRvn6RJE7R2meleqFLVD6dxloW8qlYRIBOd9u9TwuSoWFvMNPw
+cas.tgc.crypto.signing.key=GBFdLSLDY0V-a9bc0anJZqygsxYUNPUU80XM6pSKTUjRc_qm7LQQ73m5f0QWidfM_xyymg1L2suMhoFsst4XwQ
+cas.tgc.crypto.encryption.key=mW6lMvsSo48eZ1Ntt74a-O9jjQQQ_OLUE24RVN2_A_sPX43mpBM5FPuf205Wxae6mWZqmPBRA46RKZWNcM5xaQ
 
-cas.webflow.crypto.signing.key=w0oLP9sGkSgZ_7sdmxIGvX51i-WFHD7ysGIBoU_EgA3ANl3IrsyadNMm7y5mskNHBU48gIIhxDP2QDVqtwNZng
-cas.webflow.crypto.encryption.key=LYU6kw5VFv1hzmTgGbwTbw
+cas.webflow.crypto.signing.key=Md6kkPlXx5L18TD0mFELpQXWnDbMffj-uPutPckMnAPPuJQEbfcLLYBnOynYIEDgnEpd7sxUwGYd8_sVYFMcjw
+cas.webflow.crypto.encryption.key=FhLgLpaPL8GVNuqqo7gtiw
diff --git a/pom.xml b/pom.xml
index 7e64971e78..92933906cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -435,9 +435,9 @@ under the License.
     <commons-jexl.version>3.4.0</commons-jexl.version>
     <commons-text.version>1.12.0</commons-text.version>
 
-    <pac4j.version>6.0.4.1</pac4j.version>
+    <pac4j.version>6.0.5-SNAPSHOT</pac4j.version>
 
-    <cas.version>7.1.0-RC4</cas.version>
+    <cas.version>7.1.0-RC5</cas.version>
     <cas-client.version>4.0.4</cas-client.version>
 
     <h2.version>2.2.224</h2.version>
diff --git a/wa/starter/pom.xml b/wa/starter/pom.xml
index 0ccb677695..6cf95ac0d9 100644
--- a/wa/starter/pom.xml
+++ b/wa/starter/pom.xml
@@ -358,6 +358,24 @@ under the License.
       <artifactId>cas-server-support-x509-webflow</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.apereo.cas</groupId>
+      <artifactId>cas-server-support-pac4j-saml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.pac4j</groupId>
+      <artifactId>pac4j-saml</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apereo.cas</groupId>
+      <artifactId>cas-server-support-pac4j-oidc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.pac4j</groupId>
+      <artifactId>pac4j-oidc</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
diff --git 
a/wa/starter/src/main/java/org/apache/syncope/wa/starter/pac4j/saml/WASAML2ClientCustomizer.java
 
b/wa/starter/src/main/java/org/apache/syncope/wa/starter/pac4j/saml/WASAML2ClientCustomizer.java
index 20afed79cf..c947fa3d94 100644
--- 
a/wa/starter/src/main/java/org/apache/syncope/wa/starter/pac4j/saml/WASAML2ClientCustomizer.java
+++ 
b/wa/starter/src/main/java/org/apache/syncope/wa/starter/pac4j/saml/WASAML2ClientCustomizer.java
@@ -38,9 +38,8 @@ public class WASAML2ClientCustomizer implements 
DelegatedClientFactoryCustomizer
 
     @Override
     public void customize(final Client client) {
-        if (client instanceof SAML2Client) {
+        if (client instanceof SAML2Client saml2Client) {
             LOG.debug("Customizing SAML2 client {}", client.getName());
-            SAML2Client saml2Client = (SAML2Client) client;
             SAML2Configuration configuration = saml2Client.getConfiguration();
             configuration.setKeystoreGenerator(new 
WASAML2ClientKeystoreGenerator(restClient, saml2Client));
             configuration.setMetadataGenerator(new 
WASAML2ClientMetadataGenerator(restClient, saml2Client));