KYLIN-2941 Configuration setting for SSO Signed-off-by: shaofengshi <shaofeng...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/6b393978 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/6b393978 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/6b393978 Branch: refs/heads/master Commit: 6b39397859494492a9e9cfe1cc5b2ea83369fbde Parents: d0c015b Author: liapan <lia...@ebay.com> Authored: Fri Dec 8 16:17:34 2017 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Fri Dec 8 18:57:29 2017 +0800 ---------------------------------------------------------------------- .../src/main/resources/kylin-backward-compatibility.properties | 1 + core-common/src/main/resources/kylin-defaults.properties | 1 + examples/test_case_data/localmeta/kylin.properties | 1 + server/src/main/resources/kylinSecurity.xml | 4 ++-- 4 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/6b393978/core-common/src/main/resources/kylin-backward-compatibility.properties ---------------------------------------------------------------------- diff --git a/core-common/src/main/resources/kylin-backward-compatibility.properties b/core-common/src/main/resources/kylin-backward-compatibility.properties index 66e6e87..687c6a0 100644 --- a/core-common/src/main/resources/kylin-backward-compatibility.properties +++ b/core-common/src/main/resources/kylin-backward-compatibility.properties @@ -208,6 +208,7 @@ ldap.service.searchPattern=kylin.security.ldap.service-search-pattern ldap.service.groupSearchBase=kylin.security.ldap.service-group-search-base saml.metadata.file=kylin.security.saml.metadata-file saml.metadata.entityBaseURL=kylin.security.saml.metadata-entity-base-url +saml.keystore.file=kylin.security.saml.keystore-file saml.context.scheme=kylin.security.saml.context-scheme saml.context.serverName=kylin.security.saml.context-server-name saml.context.serverPort=kylin.security.saml.context-server-port http://git-wip-us.apache.org/repos/asf/kylin/blob/6b393978/core-common/src/main/resources/kylin-defaults.properties ---------------------------------------------------------------------- diff --git a/core-common/src/main/resources/kylin-defaults.properties b/core-common/src/main/resources/kylin-defaults.properties index 475deb3..0b2a7a3 100644 --- a/core-common/src/main/resources/kylin-defaults.properties +++ b/core-common/src/main/resources/kylin-defaults.properties @@ -234,6 +234,7 @@ kylin.security.ldap.service-group-search-base= # SAML IDP metadata file location kylin.security.saml.metadata-file=classpath:sso_metadata.xml kylin.security.saml.metadata-entity-base-url=https://hostname/kylin +kylin.security.saml.keystore-file=classpath:samlKeystore.jks kylin.security.saml.context-scheme=https kylin.security.saml.context-server-name=hostname kylin.security.saml.context-server-port=443 http://git-wip-us.apache.org/repos/asf/kylin/blob/6b393978/examples/test_case_data/localmeta/kylin.properties ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/kylin.properties b/examples/test_case_data/localmeta/kylin.properties index c7dda3f..81c49d4 100644 --- a/examples/test_case_data/localmeta/kylin.properties +++ b/examples/test_case_data/localmeta/kylin.properties @@ -115,6 +115,7 @@ kylin.security.ldap.service-group-search-base= # SAML IDP metadata file location kylin.security.saml.metadata-file=classpath:sso_metadata.xml kylin.security.saml.metadata-entity-base-url=https://hostname/kylin +kylin.security.saml.keystore-file=classpath:samlKeystore.jks kylin.security.saml.context-scheme=https kylin.security.saml.context-server-name=hostname kylin.security.saml.context-server-port=443 http://git-wip-us.apache.org/repos/asf/kylin/blob/6b393978/server/src/main/resources/kylinSecurity.xml ---------------------------------------------------------------------- diff --git a/server/src/main/resources/kylinSecurity.xml b/server/src/main/resources/kylinSecurity.xml index ca49255..364c487 100644 --- a/server/src/main/resources/kylinSecurity.xml +++ b/server/src/main/resources/kylinSecurity.xml @@ -318,7 +318,7 @@ <!-- Central storage of cryptographic keys --> <bean id="keyManager" class="org.springframework.security.saml.key.JKSKeyManager"> - <constructor-arg value="classpath:samlKeystore.jks"/> + <constructor-arg value="${kylin.security.saml.keystore-file}"/> <constructor-arg type="java.lang.String" value="changeit"/> <constructor-arg> <map> @@ -403,7 +403,7 @@ <constructor-arg> <bean class="org.opensaml.saml2.metadata.provider.FilesystemMetadataProvider"> <constructor-arg> - <value type="java.io.File">classpath:sso_metadata.xml</value> + <value type="java.io.File">${kylin.security.saml.metadata-file}</value> </constructor-arg> <property name="parserPool" ref="parserPool"/> </bean>
