From f376278d4d764475d2d806ef537ffcfa2f729997 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 25 Aug 2015 15:46:00 +0200 Subject: remove space characters from configuration values --- .../auth/PropertyBasedAuthConfigurationProvider.java | 2 +- .../moa/id/protocols/oauth20/OAuth20Configuration.java | 6 +++--- .../moa/id/protocols/pvp2x/config/PVPConfiguration.java | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java index 7418f2e35..cb9ac890d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/PropertyBasedAuthConfigurationProvider.java @@ -180,7 +180,7 @@ public class PropertyBasedAuthConfigurationProvider extends ConfigurationProvide @Override public String getConfigurationWithKey(String key) { try { - return configuration.getStringValue(key); + return configuration.getStringValue(key).trim(); } catch (at.gv.egiz.components.configuration.api.ConfigurationException e) { return null; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/OAuth20Configuration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/OAuth20Configuration.java index 8eddd7833..e2ac97535 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/OAuth20Configuration.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/OAuth20Configuration.java @@ -62,15 +62,15 @@ public class OAuth20Configuration { } public String getJWTKeyStorePassword() { - return props.getProperty(JWT_KEYSTORE_PASSWORD); + return props.getProperty(JWT_KEYSTORE_PASSWORD).trim(); } public String getJWTKeyName() { - return props.getProperty(JWT_KEY_NAME); + return props.getProperty(JWT_KEY_NAME).trim(); } public String getJWTKeyPassword() { - return props.getProperty(JWT_KEY_PASSWORD); + return props.getProperty(JWT_KEY_PASSWORD).trim(); } } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java index 87a63a8a0..dc3b787e4 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java @@ -165,31 +165,31 @@ public class PVPConfiguration { } public String getIDPKeyStorePassword() { - return props.getProperty(IDP_KS_PASS); + return props.getProperty(IDP_KS_PASS).trim(); } public String getIDPKeyAliasMetadata() { - return props.getProperty(IDP_KEYALIASMETADATA); + return props.getProperty(IDP_KEYALIASMETADATA).trim(); } public String getIDPKeyPasswordMetadata() { - return props.getProperty(IDP_KEY_PASSMETADATA); + return props.getProperty(IDP_KEY_PASSMETADATA).trim(); } public String getIDPKeyAliasAssertionSign() { - return props.getProperty(IDP_KEYALIASASSERTION); + return props.getProperty(IDP_KEYALIASASSERTION).trim(); } public String getIDPKeyPasswordAssertionSign() { - return props.getProperty(IDP_KEY_PASSASSERTION); + return props.getProperty(IDP_KEY_PASSASSERTION).trim(); } public String getIDPKeyAliasAssertionEncryption() { - return props.getProperty(IDP_KEYALIASASSERTION); + return props.getProperty(IDP_KEYALIASASSERTION).trim(); } public String getIDPKeyPasswordAssertionEncryption() { - return props.getProperty(IDP_KEY_PASSASSERTION); + return props.getProperty(IDP_KEY_PASSASSERTION).trim(); } public String getIDPIssuerName() throws ConfigurationException { -- cgit v1.2.3