Optimize remoting authentication

git-svn-id: https://svn.argeo.org/commons/trunk@5531 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 ee9c6aa0d501adcbea60cbc00fb1753babcb559f..57481b6383d00677b3d1ba1e767c4ae17102aa73 100644 (file)
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security-filters.xml
@@ -9,9 +9,12 @@
        <bean id="springSecurityFilterChain" class="org.springframework.security.util.FilterChainProxy">
                <sec:filter-chain-map path-type="ant">
                        <sec:filter-chain pattern="/webdav/**"
-                               filters="session,x509,basic,rememberMe,exception,interceptor" />
-                       <sec:filter-chain pattern="/remoting/**"
-                               filters="x509,basic,anonymous,exception,interceptor" />
+                               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/**"
@@ -27,7 +30,7 @@
                <property name="objectDefinitionSource">
                        <value>
                                PATTERN_TYPE_APACHE_ANT
-                               /*/*/*/**=ROLE_USER,ROLE_ADMIN
+                               /**=ROLE_USER,ROLE_ADMIN
                        </value>
                </property>
        </bean>
@@ -64,14 +67,14 @@
                <!-- 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>
 
-       <!-- Use the remember me cookie to authenticate -->
+       <!-- Use the remember me cookie to authenticate
        <bean id="rememberMe"
                class="org.springframework.security.ui.rememberme.RememberMeProcessingFilter">
                <property name="authenticationManager" ref="authenticationManager" />
@@ -85,7 +88,8 @@
                <property name="tokenValiditySeconds" value="${argeo.jcr.webapp.rememberMeValidity}" />
                <property name="alwaysRemember" value="true" />
        </bean>
-
+ -->
+ 
        <!-- Basic authentication -->
        <bean id="basic"
                class="org.springframework.security.ui.basicauth.BasicProcessingFilter">
@@ -95,14 +99,14 @@
                <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>
 

diff --git a/server/modules/org.argeo.jackrabbit.webapp/jackrabbit-webapp.properties b/server/modules/org.argeo.jackrabbit.webapp/jackrabbit-webapp.properties
index f0125853ea3c61f2e96418226c3b7498ae8155c1..47f47b93bd5099b05a69b92b236e3eba516a2a82 100644 (file)
--- a/server/modules/org.argeo.jackrabbit.webapp/jackrabbit-webapp.properties
+++ b/server/modules/org.argeo.jackrabbit.webapp/jackrabbit-webapp.properties
@@ -1,3 +1,3 @@
 argeo.security.systemKey=argeo
-
+argeo.server.realmName=Argeo
 argeo.jcr.webapp.rememberMeValidity=3600
\ No newline at end of file