svn commit: r980528 - in /hadoop/hdfs/trunk: CHANGES.txt src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/AuthorizationFilter.java

[sz...@apache.org]

Author: szetszwo
Date: Thu Jul 29 18:06:57 2010
New Revision: 980528

URL: http://svn.apache.org/viewvc?rev=980528&view=rev
Log:
HDFS-1317. Remove the FILEPATH_PATTERN from hdfsproxy.AuthorizationFilter.  Contributed by Rohini Palaniswamy

Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/AuthorizationFilter.java

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=980528&r1=980527&r2=980528&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Thu Jul 29 18:06:57 2010
@@ -171,6 +171,9 @@ Trunk (unreleased changes)
     HDFS-1319. Fix location of re-login for secondary namenode from HDFS-999. 
     (jghoman)
 
+    HDFS-1317. Remove the FILEPATH_PATTERN from hdfsproxy.AuthorizationFilter.
+    (Rohini Palaniswamy via szetszwo)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/AuthorizationFilter.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/AuthorizationFilter.java?rev=980528&r1=980527&r2=980528&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/AuthorizationFilter.java (original)
+++ hadoop/hdfs/trunk/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/AuthorizationFilter.java Thu Jul 29 18:06:57 2010
@@ -41,13 +41,6 @@ public class AuthorizationFilter impleme
   /** Pattern for a filter to find out if a request is HFTP/HSFTP request */
   protected static final Pattern HFTP_PATTERN = Pattern
       .compile("^(/listPaths|/data|/streamFile|/file)$");
-  /**
-   * Pattern for a filter to find out if an HFTP/HSFTP request stores its file
-   * path in the extra path information associated with the URL; if not, the
-   * file path is stored in request parameter "filename"
-   */
-  protected static final Pattern FILEPATH_PATTERN = Pattern
-      .compile("^(/listPaths|/data|/file)$");
 
   protected String namenode;
   
@@ -119,14 +112,8 @@ public class AuthorizationFilter impleme
     // check request path
     String servletPath = rqst.getServletPath();
     if (HFTP_PATTERN.matcher(servletPath).matches()) {
-      // request is an HSFTP request
-      if (FILEPATH_PATTERN.matcher(servletPath).matches()) {
         // file path as part of the URL
         filePath = rqst.getPathInfo() != null ? rqst.getPathInfo() : "/";
-      } else {
-        // file path is stored in "filename" parameter
-        filePath = rqst.getParameter("filename");
-      }
     }
     return filePath;
   }