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

…figuration
apache · Jul 3, 2023 · 27c939a · 27c939a
1 parent c0f5a14
commit 27c939a
Show file tree

Hide file tree

Showing 2 changed files with 11 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
@@ -46,7 +46,7 @@ protected AbstractSAML2SP4UILogic(
     protected SAML2Configuration newSAML2Configuration() {
         SAML2Configuration cfg = new SAML2Configuration(
                 resourceResolver.getResource(props.getKeystore()),
-                null,
+                props.getKeystoreAlias(),
                 props.getKeystoreType(),
                 props.getKeystoreStorepass(),
                 props.getKeystoreKeypass(),

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;
     }