You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:38:13 UTC
svn commit: r1077629 - in
/hadoop/common/branches/branch-0.20-security-patches/src:
contrib/hdfsproxy/ contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/
hdfs/org/apache/hadoop/hdfs/server/namenode/
Author: omalley
Date: Fri Mar 4 04:38:12 2011
New Revision: 1077629
URL: http://svn.apache.org/viewvc?rev=1077629&view=rev
Log:
commit 6101633ef684689010aad9c3c9b389d97522ef5a
Author: Rohini Sangeetha Palaniswamy <ro...@yahoo-inc.com>
Date: Mon Aug 2 20:52:19 2010 -0700
HDFS:1313 from https://issues.apache.org/jira/secure/attachment/12450277/HDFS-1313.y0.20.1xx_noprefix.patch
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/build.xml
hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/LdapIpDirFilter.java
hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyStreamFile.java
hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/build.xml?rev=1077629&r1=1077628&r2=1077629&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/build.xml Fri Mar 4 04:38:12 2011
@@ -127,6 +127,8 @@
<include name="slf4j-api-${slf4j-api.version}.jar"/>
<include name="slf4j-log4j12-${slf4j-log4j12.version}.jar"/>
<include name="xmlenc-${xmlenc.version}.jar"/>
+ <include name="jetty-${jetty.version}.jar"/>
+ <include name="jetty-util-${jetty-util.version}.jar"/>
</lib>
<lib dir="${hadoop.root}/lib">
<include name="hadoop-core-*.jar"/>
@@ -181,6 +183,8 @@
<include name="slf4j-log4j12-${slf4j-log4j12.version}.jar"/>
<include name="xmlenc-${xmlenc.version}.jar"/>
<include name="core-${core.vesion}.jar"/>
+ <include name="jetty-${jetty.version}.jar"/>
+ <include name="jetty-util-${jetty-util.version}.jar"/>
</lib>
<lib dir="${hadoop.root}/lib">
<include name="hadoop-core-*.jar"/>
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/LdapIpDirFilter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/LdapIpDirFilter.java?rev=1077629&r1=1077628&r2=1077629&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/LdapIpDirFilter.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/LdapIpDirFilter.java Fri Mar 4 04:38:12 2011
@@ -21,6 +21,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.server.namenode.JspHelper;
import org.apache.hadoop.net.NetUtils;
import javax.naming.NamingEnumeration;
@@ -95,6 +96,7 @@ public class LdapIpDirFilter implements
InetSocketAddress nAddr = NetUtils.createSocketAddr(nn);
context.setAttribute("name.node.address", nAddr);
context.setAttribute("name.conf", conf);
+ context.setAttribute(JspHelper.CURRENT_CONF, conf);
// for storing hostname <--> cluster mapping to decide which source cluster
// to forward
Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyStreamFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyStreamFile.java?rev=1077629&r1=1077628&r2=1077629&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyStreamFile.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyStreamFile.java Fri Mar 4 04:38:12 2011
@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletReq
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.DFSClient;
+import org.apache.hadoop.hdfs.server.namenode.JspHelper;
import org.apache.hadoop.hdfs.server.namenode.StreamFile;
import org.apache.hadoop.security.UserGroupInformation;
@@ -42,4 +43,14 @@ public class ProxyStreamFile extends Str
.getAttribute("org.apache.hadoop.hdfsproxy.authorized.userID");
return ProxyUtil.getProxyUGIFor(userID);
}
+
+ @Override
+ protected DFSClient getDFSClient(HttpServletRequest request) throws IOException, InterruptedException {
+ ServletContext context = getServletContext();
+ Configuration conf = (Configuration) context.getAttribute(JspHelper.CURRENT_CONF);
+ UserGroupInformation ugi = getUGI(request, conf);
+ final InetSocketAddress nameNodeAddr = (InetSocketAddress) context.getAttribute("name.node.address");
+
+ return JspHelper.getDFSClient(ugi, nameNodeAddr, conf);
+ }
}
Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java?rev=1077629&r1=1077628&r2=1077629&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/StreamFile.java Fri Mar 4 04:38:12 2011
@@ -45,10 +45,19 @@ public class StreamFile extends DfsServl
}
}
+ /** getting a client for connecting to dfs */
+ protected DFSClient getDFSClient(HttpServletRequest request)
+ throws IOException, InterruptedException {
+
+ Configuration conf =
+ (Configuration) getServletContext().getAttribute(JspHelper.CURRENT_CONF);
+ UserGroupInformation ugi = getUGI(request, conf);
+
+ return JspHelper.getDFSClient(ugi, nameNodeAddr, conf);
+ }
+
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- Configuration conf =
- (Configuration) getServletContext().getAttribute(JspHelper.CURRENT_CONF);
final String filename = request.getPathInfo() != null ?
request.getPathInfo() : "/";
if (filename == null || filename.length() == 0) {
@@ -59,9 +68,8 @@ public class StreamFile extends DfsServl
}
DFSClient dfs;
- UserGroupInformation ugi = getUGI(request, conf);
try {
- dfs = JspHelper.getDFSClient(ugi, nameNodeAddr, conf);
+ dfs = getDFSClient(request);
} catch (InterruptedException e) {
response.sendError(400, e.getMessage());
return;