cvs commit: jahia/src/java/org/apache/slide/webdav JahiaWebdavServlet.java jahia/src/java/org/jahia/services/webdav HttpRequestWrapper.java

[Serge Huber]

shuber      2005/06/17 17:35:59 CEST

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    src/java/org/apache/slide/webdav JahiaWebdavServlet.java 
    src/java/org/jahia/services/webdav HttpRequestWrapper.java 
  Log:
  Patch by UNIL :
  - authorize HEAD command as non authenticated
  - improved solidity of getUserPrincipal in request wrapper implementation
  
  Revision     Changes    Path
  1.6.4.1.2.3  +8 -5      
jahia/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java.diff?r1=1.6.4.1.2.2&r2=1.6.4.1.2.3&f=h
  1.1.2.4      +3 -0      
jahia/src/java/org/jahia/services/webdav/HttpRequestWrapper.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/HttpRequestWrapper.java.diff?r1=1.1.2.3&r2=1.1.2.4&f=h
  
  
  
  Index: JahiaWebdavServlet.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/apache/slide/webdav/Attic/JahiaWebdavServlet.java,v
  retrieving revision 1.6.4.1.2.2
  retrieving revision 1.6.4.1.2.3
  diff -u -r1.6.4.1.2.2 -r1.6.4.1.2.3
  --- JahiaWebdavServlet.java   25 Mar 2005 15:10:35 -0000      1.6.4.1.2.2
  +++ JahiaWebdavServlet.java   17 Jun 2005 15:35:58 -0000      1.6.4.1.2.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/repository/jahia/src/java/org/apache/slide/webdav/Attic/JahiaWebdavServlet.java,v
 1.6.4.1.2.2 2005/03/25 15:10:35 tdraier Exp $
  - * $Revision: 1.6.4.1.2.2 $
  - * $Date: 2005/03/25 15:10:35 $
  + * $Header: 
/home/cvs/repository/jahia/src/java/org/apache/slide/webdav/Attic/JahiaWebdavServlet.java,v
 1.6.4.1.2.3 2005/06/17 15:35:58 shuber Exp $
  + * $Revision: 1.6.4.1.2.3 $
  + * $Date: 2005/06/17 15:35:58 $
    *
    * ====================================================================
    *
  @@ -67,7 +67,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
    * @author Dirk Verbeeck
    * @author <a href="mailto:[EMAIL PROTECTED]">Christopher Lenz</a>
  - * @version $Revision: 1.6.4.1.2.2 $
  + * @version $Revision: 1.6.4.1.2.3 $
    */
   public class JahiaWebdavServlet
       extends HttpServlet {
  @@ -126,7 +126,10 @@
           if( token.getLogger().isEnabled(LOG_CHANNEL, Logger.DEBUG) )
               token.getLogger().log("==> "+req.getMethod()+" start: 
"+sdf.format(new Date(System.currentTimeMillis()))+" 
["+Thread.currentThread().getName()+"]", LOG_CHANNEL, Logger.DEBUG);
   
  -        if (authenticate && !req.getMethod().equals("GET") && 
req.getUserPrincipal() == null) {
  +        if (authenticate &&
  +            !req.getMethod().equals("GET") &&
  +            !req.getMethod().equals("HEAD") &&
  +            req.getUserPrincipal() == null) {
               resp.addHeader("WWW-Authenticate", "BASIC realm=\"" + 
token.getName() + "\"");
               resp.sendError(HttpServletResponse.SC_UNAUTHORIZED);
           }
  
  
  
  Index: HttpRequestWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/Attic/HttpRequestWrapper.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- HttpRequestWrapper.java   7 Jun 2005 12:50:50 -0000       1.1.2.3
  +++ HttpRequestWrapper.java   17 Jun 2005 15:35:58 -0000      1.1.2.4
  @@ -27,6 +27,7 @@
   import java.io.UnsupportedEncodingException;
   import java.io.IOException;
   import java.io.BufferedReader;
  +import java.lang.StringIndexOutOfBoundsException;
   
   import sun.misc.BASE64Decoder;
   
  @@ -169,6 +170,8 @@
                   }
               } catch (IOException e) {
                   e.printStackTrace();  //To change body of catch statement 
use Options | File Templates.
  +            } catch (StringIndexOutOfBoundsException sib) {
  +                sib.printStackTrace();
               }
           }