zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix password encoder for compatibility

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2020-11-08 12:08:13 -08:00
parent 1a524434da
commit 430b30bffb
6 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
View File

@@ -1,7 +1,6 @@
log4j.rootLogger=WARN, stdout, R
log4j.logger.com.wisemapping=WARN,stdout,R
log4j.logger.org.springframework=WARN,stdout,R
log4j.logger.org.codehaus.jackson=WARN,stdout,R
log4j.logger.com.wisemapping=INFO,stdout,R
log4j.logger.org.springframework=INFO,stdout,R
log4j.logger.org.hibernate=WARN,stdout,R
log4j.logger.org.hibernate.engine.StatefulPersistenceContext=ERROR,stdout,R

2
wise-webapp/src/main/webapp/WEB-INF/wisemapping-model.xml
View File

@@ -7,7 +7,7 @@
<beans>
<bean id="userManager" class="com.wisemapping.dao.UserManagerImpl">
<property name="hibernateTemplate" ref="hibernateTemplate"/>
<property name="encoder" ref="encoder"/>
<property name="encoder" ref="passwordEncoder"/>
</bean>
<bean id="mindmapManager" class="com.wisemapping.dao.MindmapManagerImpl">

5
wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-db.xml
View File

@@ -8,6 +8,8 @@
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd">
<bean id="passwordEncoder" class="com.wisemapping.security.DefaultPasswordEncoderFactories" factory-method="createDelegatingPasswordEncoder"/>
<sec:authentication-manager alias="authenticationManager">
<sec:authentication-provider ref="dbAuthenticationProvider"/>
<sec:authentication-provider user-service-ref="userDetailsService"/>
@@ -15,7 +17,6 @@
<bean id="dbAuthenticationProvider" class="com.wisemapping.security.AuthenticationProvider">
<property name="userDetailsService" ref="userDetailsService"/>
<property name="encoder" ref="encoder"/>
<property name="encoder" ref="passwordEncoder"/>
</bean>
</beans>

2
wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
View File

@@ -87,8 +87,6 @@
<sec:logout logout-url="/c/logout" invalidate-session="true" logout-success-url="/c/login"/>
</sec:http>
<bean id="encoder" class="com.wisemapping.security.CustomPasswordEncoder"/>
<import resource="wisemapping-security-${security.type}.xml"/>
<bean id="userDetailsService" class="com.wisemapping.security.UserDetailsService">