NXP-8636: support generic WebDAV clients transparently

nuxeo-archives · Jan 16, 2012 · 1f8b25e · 1f8b25e
1 parent cb4e526
commit 1f8b25e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/nuxeo-platform-wi-backend/src/main/resources/OSGI-INF/authentication-contrib.xml b/nuxeo-platform-wi-backend/src/main/resources/OSGI-INF/authentication-contrib.xml
@@ -20,7 +20,7 @@
       </replacementChain>
     </specificAuthenticationChain>
 
-    <specificAuthenticationChain name="WebDAV">
+    <specificAuthenticationChain name="WebDAV_Root">
       <headers>
         <header name="User-Agent">(Microsoft-WebDAV-MiniRedir|DavClnt|litmus|gvfs|gnome-vfs|davfs|WebDAV|cadaver|BitKinex|GoodReader|DataAccess|iWorkHTTPKit).*</header>
       </headers>

diff --git a/nuxeo-platform-wi-backend/src/main/resources/OSGI-INF/request-controler-contrib.xml b/nuxeo-platform-wi-backend/src/main/resources/OSGI-INF/request-controler-contrib.xml
@@ -10,9 +10,6 @@
     <filterConfig name="WSSFilterRessources" transactional="fasle" synchonize="false" grant="false">
       <pattern>/nuxeo/_vti_bin/resources/.*</pattern>
     </filterConfig>
-    <filterConfig name="WebDAV" transactional="false" synchonize="false">
-      <pattern>${org.nuxeo.ecm.contextPath}/sites/dav.*</pattern>
-    </filterConfig>
 
   </extension>
 

diff --git a/nuxeo-webdav/src/main/resources/META-INF/MANIFEST.MF b/nuxeo-webdav/src/main/resources/META-INF/MANIFEST.MF
@@ -8,4 +8,5 @@ Provide-Package: org.nuxeo.ecm.webdav
 Require-Bundle: org.nuxeo.ecm.core.api,
  org.nuxeo.ecm.webengine.core
 Nuxeo-WebModule: org.nuxeo.ecm.webdav.Application;host=nuxeo-webdav
-Nuxeo-Component: OSGI-INF/auth-contrib.xml
+Nuxeo-Component: OSGI-INF/auth-contrib.xml,
+ OSGI-INF/request-controller-contrib.xml
diff --git a/nuxeo-webdav/src/main/resources/OSGI-INF/auth-contrib.xml b/nuxeo-webdav/src/main/resources/OSGI-INF/auth-contrib.xml
@@ -21,18 +21,16 @@ Setup a Basic Auth plugin for /dav paths that will always send 401 on authentica
   <extension
       target="org.nuxeo.ecm.platform.ui.web.auth.service.PluggableAuthenticationService"
       point="specificChains">
-
     <specificAuthenticationChain name="WebDAV">
         <urlPatterns>
-            <url>(.*)/dav.*</url>
+            <url>(.*)/site/dav.*</url>
         </urlPatterns>
-
         <replacementChain>
+            <plugin>DIGEST_AUTH</plugin>
             <plugin>WEBDAV_BASIC_AUTH</plugin>
             <plugin>ANONYMOUS_AUTH</plugin>
         </replacementChain>
     </specificAuthenticationChain>
-
   </extension>
 
 </component>
diff --git a/nuxeo-webdav/src/main/resources/OSGI-INF/request-controller-contrib.xml b/nuxeo-webdav/src/main/resources/OSGI-INF/request-controller-contrib.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<component name="org.nuxeo.ecm.platform.ui.web.RequestControllerService.contrib">
+<component name="org.nuxeo.ecm.webdav.RequestControllerService.contrib">
 
   <extension target="org.nuxeo.ecm.platform.web.common.requestcontroller.service.RequestControllerService"
     point="filterConfig">