You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/04/27 08:58:30 UTC
[3/3] kylin git commit: KYLIN-2564 use InMemoryUserDetailsManager
instead of InMemoryDaoImpl
KYLIN-2564 use InMemoryUserDetailsManager instead of InMemoryDaoImpl
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/29265aff
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/29265aff
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/29265aff
Branch: refs/heads/KYLIN-2535
Commit: 29265aff2956fd125062e1aa431c4821f70e922d
Parents: 6cd1b36
Author: Hongbin Ma <ma...@apache.org>
Authored: Wed Apr 26 22:04:37 2017 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Wed Apr 26 22:04:37 2017 +0800
----------------------------------------------------------------------
server/src/main/resources/kylinSecurity.xml | 63 +++++++++++-------------
1 file changed, 29 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/29265aff/server/src/main/resources/kylinSecurity.xml
----------------------------------------------------------------------
diff --git a/server/src/main/resources/kylinSecurity.xml b/server/src/main/resources/kylinSecurity.xml
index 13d4f50..374341c 100644
--- a/server/src/main/resources/kylinSecurity.xml
+++ b/server/src/main/resources/kylinSecurity.xml
@@ -172,47 +172,42 @@
<value>ROLE_ANALYST</value>
</util:list>
+ <bean class="org.springframework.security.core.userdetails.User" id="adminUser">
+ <constructor-arg value="ADMIN"/>
+ <constructor-arg
+ value="$2a$10$o3ktIWsGYxXNuUWQiYlZXOW5hWcqyNAFQsSSCSEWoC/BRVMAUjL32"/>
+ <constructor-arg ref="adminAuthorities"/>
+ </bean>
+ <bean class="org.springframework.security.core.userdetails.User" id="modelerUser">
+ <constructor-arg value="MODELER"/>
+ <constructor-arg
+ value="$2a$10$Le5ernTeGNIARwMJsY0WaOLioNQdb0QD11DwjeyNqqNRp5NaDo2FG"/>
+ <constructor-arg ref="modelerAuthorities"/>
+ </bean>
+ <bean class="org.springframework.security.core.userdetails.User" id="analystUser">
+ <constructor-arg value="ANALYST"/>
+ <constructor-arg
+ value="$2a$10$s4INO3XHjPP5Vm2xH027Ce9QeXWdrfq5pvzuGr9z/lQmHqi0rsbNi"/>
+ <constructor-arg ref="analystAuthorities"/>
+ </bean>
+
<bean id="kylinUserAuthProvider"
class="org.apache.kylin.rest.security.KylinAuthenticationProvider">
<constructor-arg>
<bean class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">
<property name="userDetailsService">
- <bean class="org.springframework.security.core.userdetails.memory.InMemoryDaoImpl">
- <property name="userMap">
- <bean class="org.springframework.security.core.userdetails.memory.UserMap">
- <property name="users">
- <util:map key-type="java.lang.String"
- value-type="org.springframework.security.core.userdetails.User">
- <entry key="admin">
- <bean class="org.springframework.security.core.userdetails.User">
- <constructor-arg value="ADMIN"/>
- <constructor-arg
- value="$2a$10$o3ktIWsGYxXNuUWQiYlZXOW5hWcqyNAFQsSSCSEWoC/BRVMAUjL32"/>
- <constructor-arg ref="adminAuthorities"/>
- </bean>
- </entry>
- <entry key="modeler">
- <bean class="org.springframework.security.core.userdetails.User">
- <constructor-arg value="MODELER"/>
- <constructor-arg
- value="$2a$10$Le5ernTeGNIARwMJsY0WaOLioNQdb0QD11DwjeyNqqNRp5NaDo2FG"/>
- <constructor-arg ref="modelerAuthorities"/>
- </bean>
- </entry>
- <entry key="analyst">
- <bean class="org.springframework.security.core.userdetails.User">
- <constructor-arg value="ANALYST"/>
- <constructor-arg
- value="$2a$10$s4INO3XHjPP5Vm2xH027Ce9QeXWdrfq5pvzuGr9z/lQmHqi0rsbNi"/>
- <constructor-arg ref="analystAuthorities"/>
- </bean>
- </entry>
- </util:map>
- </property>
- </bean>
- </property>
+ <bean class="org.springframework.security.provisioning.InMemoryUserDetailsManager">
+ <constructor-arg>
+ <util:list
+ value-type="org.springframework.security.core.userdetails.User">
+ <ref bean="adminUser"></ref>
+ <ref bean="modelerUser"></ref>
+ <ref bean="analystUser"></ref>
+ </util:list>
+ </constructor-arg>
</bean>
</property>
+
<property name="passwordEncoder" ref="passwordEncoder"></property>
</bean>
</constructor-arg>