hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 23:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor updates to Spring configs for Spring Security v5

Browse Source
This commit is contained in:
Tim Donohue
2020-01-08 16:10:12 -06:00
parent 676fbb1450
commit 6a1c170fe6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dspace-rest/src/main/webapp/WEB-INF/applicationContext.xml
View File

@@ -11,7 +11,7 @@
<beans xmlns="http://www.springframework.org/schema/beans" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> http://www.springframework.org/schema/beans/spring-beans.xsd">
<!-- Acquires the DSpace Utility Class with initialized Service Manager --> <!-- Acquires the DSpace Utility Class with initialized Service Manager -->
<bean id="dspace" class="org.dspace.utils.DSpace"/> <bean id="dspace" class="org.dspace.utils.DSpace"/>
@@ -27,8 +27,8 @@
</bean> </bean>
<!-- Inject the SolrLoggerUsageEventListener into the EventService --> <!-- Inject the SolrLoggerUsageEventListener into the EventService -->
<!-- <!--
Temporarily commented out SolrLoggerUsageEventListener to get REST API working on master. Temporarily commented out SolrLoggerUsageEventListener to get REST API working on master.
This should be uncommented again once DS-3815 is resolved. This should be uncommented again once DS-3815 is resolved.
<bean class="org.dspace.statistics.SolrLoggerUsageEventListener"> <bean class="org.dspace.statistics.SolrLoggerUsageEventListener">

6
dspace-rest/src/main/webapp/WEB-INF/security-applicationContext.xml
View File

@@ -13,7 +13,7 @@
xmlns:security="http://www.springframework.org/schema/security" xmlns:security="http://www.springframework.org/schema/security"
xmlns:context="http://www.springframework.org/schema/context" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<context:annotation-config/> <context:annotation-config/>
@@ -21,7 +21,7 @@
Every url in the rest will pass through these filters, login & shibboleth-login will trigger an authentication attempt. Every url in the rest will pass through these filters, login & shibboleth-login will trigger an authentication attempt.
--> -->
<bean id="springSecurityFilterChain" class="org.springframework.security.web.FilterChainProxy"> <bean id="springSecurityFilterChain" class="org.springframework.security.web.FilterChainProxy">
<security:filter-chain-map path-type="ant"> <security:filter-chain-map request-matcher="ant">
<security:filter-chain pattern="/login" filters="sif,passwordLoginAuthenticationFilter"/> <security:filter-chain pattern="/login" filters="sif,passwordLoginAuthenticationFilter"/>
<security:filter-chain pattern="/shibboleth-login" filters="sif,passwordLoginAuthenticationFilter"/> <security:filter-chain pattern="/shibboleth-login" filters="sif,passwordLoginAuthenticationFilter"/>
<security:filter-chain pattern="/logout" filters="sif,logoutFilter"/> <security:filter-chain pattern="/logout" filters="sif,logoutFilter"/>
@@ -77,4 +77,4 @@
class="org.dspace.rest.authentication.NoRedirectAuthenticationLoginSuccessHandler"/> class="org.dspace.rest.authentication.NoRedirectAuthenticationLoginSuccessHandler"/>
<bean id="org.dspace.rest.authentication.NoRedirectAuthenticationLogoutSuccessHandler" <bean id="org.dspace.rest.authentication.NoRedirectAuthenticationLogoutSuccessHandler"
class="org.dspace.rest.authentication.NoRedirectAuthenticationLogoutSuccessHandler"/> class="org.dspace.rest.authentication.NoRedirectAuthenticationLogoutSuccessHandler"/>
</beans> </beans>