From 27c939a38ee7db3acc2ec6f8ac4af5f702568238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= Date: Mon, 3 Jul 2023 16:00:45 +0200 Subject: [PATCH] Adding missing option to specify keystore alias in SAML 2.0 SP4UI configuration --- .../syncope/core/logic/AbstractSAML2SP4UILogic.java | 2 +- .../syncope/core/logic/SAML2SP4UIProperties.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/AbstractSAML2SP4UILogic.java b/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/AbstractSAML2SP4UILogic.java index b9a7f263e6..1afdeb6fa4 100644 --- a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/AbstractSAML2SP4UILogic.java +++ b/ext/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 index a58989319f..7f941ec6ab 100644 --- 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; }