X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fmodules%2Forg.argeo.jackrabbit.webapp%2FWEB-INF%2Fsecurity-filters.xml;h=47ed794f7a0c5936d6de1078f10a7105a5712cc6;hb=615bcb2bf7937888af7631cb3319d8c55b275fa9;hp=d7613a0ff0cd3f406df63495e12b8e054cb16708;hpb=7ffa880a608e9a1ed12b9d394bc3434da33c5914;p=lgpl%2Fargeo-commons.git

diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml
index d7613a0ff..47ed794f7 100644
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml
@@ -8,70 +8,89 @@
 
 	<bean id="springSecurityFilterChain" class="org.springframework.security.util.FilterChainProxy">
 		<sec:filter-chain-map path-type="ant">
-			<sec:filter-chain pattern="/**"
-				filters="httpSessionContextIntegrationFilter,logoutFilter,basicProcessingFilter,anonymousProcessingFilter,securityContextHolderAwareRequestFilter,exceptionTranslationFilter,filterInvocationInterceptor" />
+			<sec:filter-chain pattern="/webdav/**"
+				filters="session,x509,basic,exception,interceptor" />
+			<!-- For some reason the first level listing workspaces must be public -->
+			<sec:filter-chain pattern="/remoting/*/"
+				filters="anonymous,exception,interceptorPublic" />
+			<sec:filter-chain pattern="/remoting/*/**"
+				filters="session,x509,basic,exception,interceptor" />
+			<sec:filter-chain pattern="/public/**"
+				filters="anonymous,exception,interceptorPublic" />
+			<sec:filter-chain pattern="/pub/**"
+				filters="anonymous,exception,interceptorPublic" />
+			<sec:filter-chain pattern="/j_spring_security_logout"
+				filters="logout,exception" />
 		</sec:filter-chain-map>
+		<property name="matcher">
+			<bean class="org.springframework.security.util.AntUrlPathMatcher">
+				<!-- Do not convert to lower case -->
+				<constructor-arg value="false" />
+			</bean>
+		</property>
 	</bean>
 
 	<!-- The actual authorization checks (called last, but first here for ease 
 		of configuration) -->
-	<bean id="filterInvocationInterceptor" parent="filterInvocationInterceptorTemplate">
+	<bean id="interceptor" parent="filterInvocationInterceptorTemplate">
+		<property name="objectDefinitionSource">
+			<value>
+				PATTERN_TYPE_APACHE_ANT
+				/**=ROLE_USER,ROLE_ADMIN
+			</value>
+		</property>
+	</bean>
+	<bean id="interceptorPublic" parent="filterInvocationInterceptorTemplate">
 		<property name="objectDefinitionSource">
 			<value>
-				CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON
 				PATTERN_TYPE_APACHE_ANT
-				/public/**=IS_AUTHENTICATED_ANONYMOUSLY
-				/*/*/*/**=ROLE_USER
 				/**=IS_AUTHENTICATED_ANONYMOUSLY
 			</value>
-			<!-- <value> -->
-			<!-- CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON -->
-			<!-- PATTERN_TYPE_APACHE_ANT -->
-			<!-- /config/**=ROLE_ADMINISTRATOR -->
-			<!-- /**=IS_AUTHENTICATED_ANONYMOUSLY -->
-			<!-- </value> -->
+		</property>
+	</bean>
+
+	<bean id="x509"
+		class="org.springframework.security.ui.preauth.x509.X509PreAuthenticatedProcessingFilter">
+		<property name="authenticationManager" ref="authenticationManager" />
+		<property name="principalExtractor">
+			<bean
+				class="org.springframework.security.ui.preauth.x509.SubjectDnX509PrincipalExtractor">
+				<property name="subjectDnRegex" value="CN=(.*?)," />
+			</bean>
 		</property>
 	</bean>
 
 	<!-- Integrates the authentication information in the http sessions -->
-	<bean id="httpSessionContextIntegrationFilter"
+	<bean id="session"
 		class="org.springframework.security.context.HttpSessionContextIntegrationFilter">
 		<property name="allowSessionCreation" value="true" />
 	</bean>
 
 	<!-- Processes logouts, removing both session informations and the remember-me 
 		cookie from the browser -->
-	<bean id="logoutFilter" class="org.springframework.security.ui.logout.LogoutFilter">
-		<constructor-arg value="/web/" />
+	<bean id="logout" class="org.springframework.security.ui.logout.LogoutFilter">
+		<constructor-arg value="/webdav/node/main" />
 		<!-- URL redirected to after logout -->
 		<constructor-arg>
 			<list>
-				<ref bean="rememberMeServices" />
+				<!-- <ref bean="rememberMeServices" /> -->
 				<bean
 					class="org.springframework.security.ui.logout.SecurityContextLogoutHandler" />
 			</list>
 		</constructor-arg>
 	</bean>
 
-	<!-- Double check, this may not be necessary -->
-	<bean id="securityContextHolderAwareRequestFilter"
-		class="org.springframework.security.wrapper.SecurityContextHolderAwareRequestFilter" />
-
-	<!-- Use the remember me cookie to authenticate -->
-	<bean id="rememberMeProcessingFilter"
-		class="org.springframework.security.ui.rememberme.RememberMeProcessingFilter">
-		<property name="authenticationManager" ref="authenticationManager" />
-		<property name="rememberMeServices" ref="rememberMeServices" />
-	</bean>
-
-	<bean id="rememberMeServices"
-		class="org.springframework.security.ui.rememberme.TokenBasedRememberMeServices">
-		<property name="userDetailsService" ref="userDetailsService" />
-		<property name="key" value="${argeo.security.systemKey}" />
-	</bean>
+	<!-- Use the remember me cookie to authenticate <bean id="rememberMe" class="org.springframework.security.ui.rememberme.RememberMeProcessingFilter"> 
+		<property name="authenticationManager" ref="authenticationManager" /> <property 
+		name="rememberMeServices" ref="rememberMeServices" /> </bean> <bean id="rememberMeServices" 
+		class="org.springframework.security.ui.rememberme.TokenBasedRememberMeServices"> 
+		<property name="userDetailsService" ref="userDetailsService" /> <property 
+		name="key" value="${argeo.security.systemKey}" /> <property name="tokenValiditySeconds" 
+		value="${argeo.jcr.webapp.rememberMeValidity}" /> <property name="alwaysRemember" 
+		value="true" /> </bean> -->
 
 	<!-- Basic authentication -->
-	<bean id="basicProcessingFilter"
+	<bean id="basic"
 		class="org.springframework.security.ui.basicauth.BasicProcessingFilter">
 		<property name="authenticationManager">
 			<ref bean="authenticationManager" />
@@ -79,26 +98,26 @@
 		<property name="authenticationEntryPoint">
 			<ref local="basicProcessingFilterEntryPoint" />
 		</property>
-		<property name="rememberMeServices" ref="rememberMeServices" />
+		<!-- <property name="rememberMeServices" ref="rememberMeServices" /> -->
 	</bean>
 
 	<!-- Activate basic auth when needed -->
 	<bean id="basicProcessingFilterEntryPoint"
 		class="org.springframework.security.ui.basicauth.BasicProcessingFilterEntryPoint">
 		<property name="realmName">
-			<value>Argeo</value>
+			<value>${argeo.server.realmName}</value>
 		</property>
 	</bean>
 
 	<!-- If everything else failed, anonymous authentication -->
-	<bean id="anonymousProcessingFilter"
+	<bean id="anonymous"
 		class="org.springframework.security.providers.anonymous.AnonymousProcessingFilter">
 		<property name="key" value="${argeo.security.systemKey}" />
 		<property name="userAttribute" value="anonymous,ROLE_ANONYMOUS" />
 	</bean>
 
 	<!-- Reacts to security related exceptions -->
-	<bean id="exceptionTranslationFilter"
+	<bean id="exception"
 		class="org.springframework.security.ui.ExceptionTranslationFilter">
 		<property name="authenticationEntryPoint">
 			<ref bean="basicProcessingFilterEntryPoint" />