tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets WebdavServlet.java
Date Fri, 13 Feb 2004 20:06:50 GMT
markt       2004/02/13 12:06:50

  Modified:    catalina/src/share/org/apache/catalina/servlets
                        WebdavServlet.java
  Log:
  Fix bug 26906.
  - The destination path needs to be normalised after the protocol and host has been removed
(if present).
  - Reported by rsudharsan
  
  Revision  Changes    Path
  1.9       +9 -6      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
  
  Index: WebdavServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WebdavServlet.java	22 Dec 2003 12:38:02 -0000	1.8
  +++ WebdavServlet.java	13 Feb 2004 20:06:50 -0000	1.9
  @@ -1504,8 +1504,8 @@
               return false;
           }
   
  -        destinationPath = 
  -            normalize(RequestUtil.URLDecode(destinationPath, "UTF8"));
  +        // Remove url encoding from destination
  +        destinationPath = RequestUtil.URLDecode(destinationPath, "UTF8");
   
           int protocolIndex = destinationPath.indexOf("://");
           if (protocolIndex >= 0) {
  @@ -1539,6 +1539,9 @@
                   }
               }
           }
  +
  +        // Normalise destination path (remove '.' and '..')
  +        destinationPath = normalize(destinationPath);
   
           String contextPath = req.getContextPath();
           if ((contextPath != null) &&
  
  
  

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


Mime
View raw message