Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r671347 - in /tomcat/tc6.0.x/trunk: STATUS.txt
 java/org/apache/catalina/valves/WebdavFixValve.java
 webapps/docs/changelog.xml
Date: Tue, 24 Jun 2008 21:17:35 -0000
To: tomcat-dev@jakarta.apache.org
From: markt@apache.org
Message-Id: <20080624211735.B1CC02388A02@eris.apache.org>

Author: markt
Date: Tue Jun 24 14:17:34 2008
New Revision: 671347

URL: http://svn.apache.org/viewvc?rev=671347&view=rev
Log:
Provide a workaround for the buggy MS webdav client

Added:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/WebdavFixValve.java
Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=671347&r1=671346&r2=671347&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 24 14:17:34 2008
@@ -41,12 +41,6 @@
   +1: markt, remm
   -1: 
 
-* Enhancement https://issues.apache.org/bugzilla/show_bug.cgi?id=45155
-  Provide a workaround to a buggy MS WebDAV client.
-  http://svn.apache.org/viewvc?rev=664345&view=rev
-  +1: markt, fhanik, remm
-  -1: 
-
 * Provide belt and braces XSS protection. Really an app responsbility but worth
   protecting against in case the app forgets.
   http://svn.apache.org/viewvc?rev=664483&view=rev

Added: tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/WebdavFixValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/WebdavFixValve.java?rev=671347&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/WebdavFixValve.java (added)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/WebdavFixValve.java Tue Jun 24 14:17:34 2008
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.catalina.valves;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+
+import org.apache.catalina.valves.ValveBase;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+
+/**
+ * Valve that attempts to force MS WebDAV clients connecting on port 80 to use
+ * a WebDAV client that actually works. Other workarounds that might help
+ * include:
+ * <ul>
+ *   <li>Specifing the port, even if it is port 80, when trying to connect.</li>
+ *   <li>Canceling the first authentication dialog box and then trying to
+ *       reconnect.</li>
+ * </ul>
+ * To use this valve add the following <code>&lt;Valve
+ * className="org.apache.catalina.valves.MicrosoftWebdavFixValve" /&gt;</code>
+ * to your <code>Engine</code>, <code>Host</code> or <code>Context</code> as
+ * required. Normally, this valve would be used at the <code>Context</code>
+ * level.
+ *
+ * @version $Revision: 420067 $, $Date: 2006-07-08 09:16:58 +0200 (sub, 08 srp 2006) $
+ */
+
+public class WebdavFixValve
+    extends ValveBase {
+
+    /**
+     * Check for the broken MS WebDAV client and if detected issue a re-direct
+     * that hopefully will cause the non-broken client to be used.
+     */
+    public void invoke(Request request, Response response)
+        throws IOException, ServletException {
+
+        String ua = request.getHeader("User-Agent");
+        if (ua != null && ua.contains("MiniRedir")) {
+            response.sendRedirect(buildRedirect(request));
+        } else {
+            getNext().invoke(request, response);
+        }
+    }
+
+    private String buildRedirect(Request request) {
+        StringBuffer location =
+            new StringBuffer(request.getRequestURL().length());
+        location.append(request.getScheme());
+        location.append("://");
+        location.append(request.getHost().getName());
+        location.append(':');
+        // If we include the port, even if it is 80, then MS clients will use
+        // a WebDAV client that works rather than the MiniRedir that has
+        // problems with BASIC authentication
+        location.append(request.getServerPort());
+        location.append(request.getRequestURI());
+        return location.toString();
+    }
+}

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=671347&r1=671346&r2=671347&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun 24 14:17:34 2008
@@ -193,6 +193,11 @@
         <code>DirContextURLConnection</code> as per the HTTP spec. Patch
         provided by Chris Hubick. (markt)
       </fix>
+      <add>
+        A new valve, <code>org.apache.catalina.valves.WebdavFixValve<code>,
+        that forces MS clients connecting to the WebDAV Servlet on port 80 to
+        use a client that works rather than the default broken one. (markt)
+      </add>
     </changelog>
   </subsection>
   <subsection name="Coyote">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org