Adding missing option to specify keystore alias in SAML 2.0 SP4UI con…

…figuration
apache · Jul 3, 2023 · d557acb · d557acb
1 parent 1218877
commit d557acb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/...saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/AbstractSAML2SP4UILogic.java b/...saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/AbstractSAML2SP4UILogic.java
@@ -22,6 +22,7 @@
 import java.security.KeyStore;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
+import java.util.Optional;
 import org.apache.syncope.common.lib.to.EntityTO;
 import org.apache.syncope.core.logic.saml2.NoOpLogoutHandler;
 import org.pac4j.saml.config.SAML2Configuration;
@@ -50,7 +51,10 @@ protected SAML2Configuration newSAML2Configuration() {
                 props.getKeystoreKeypass(),
                 null);
 
-        cfg.setKeystoreType(props.getKeystoreType());
+        Optional.ofNullable(props.getKeystoreAlias()).ifPresent(cfg::setKeystoreAlias);
+
+        cfg.setKeystoreType(Optional.ofNullable(props.getKeystoreType()).orElseGet(() -> KeyStore.getDefaultType()));
+
         if (cfg.getKeystoreResource() instanceof FileUrlResource) {
             cfg.setKeystoreGenerator(new BaseSAML2KeystoreGenerator(cfg) {
 

diff --git a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/SAML2SP4UIProperties.java b/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/SAML2SP4UIProperties.java
@@ -31,6 +31,8 @@ public class SAML2SP4UIProperties {
 
     private String keystoreKeypass;
 
+    private String keystoreAlias;
+
     private long skew;
 
     public String getKeystore() {
@@ -65,6 +67,14 @@ public void setKeystoreKeypass(final String keystoreKeypass) {
         this.keystoreKeypass = keystoreKeypass;
     }
 
+    public String getKeystoreAlias() {
+        return keystoreAlias;
+    }
+
+    public void setKeystoreAlias(final String keystoreAlias) {
+        this.keystoreAlias = keystoreAlias;
+    }
+
     public long getSkew() {
         return skew;
     }