From d0b1cd9b7ee3a469fc6330ab1cb03f951bf691fe Mon Sep 17 00:00:00 2001 From: Mahadev Konar Date: Mon, 23 Jan 2012 21:27:19 +0000 Subject: [PATCH] MAPREDUCE-3702 and MAPREDUCE-3691 - merging r1234991 and r1234989 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234994 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 6 + .../org/apache/hadoop/yarn/webapp/WebApp.java | 3 + .../server/webproxy/amfilter/AmIpFilter.java | 13 +- .../webproxy/amfilter/TestAmFilter.java | 121 ++++++++++++++++++ 4 files changed, 138 insertions(+), 5 deletions(-) create mode 100644 hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 6cfa1213f3b..72190463802 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -483,6 +483,12 @@ Release 0.23.1 - Unreleased MAPREDUCE-3705. ant build fails on 0.23 branch. (Thomas Graves via mahadev) + + MAPREDUCE-3691. webservices add support to compress response. + (Thomas Graves via mahadev) + + MAPREDUCE-3702. internal server error trying access application master + via proxy with filter enabled (Thomas Graves via mahadev) Release 0.23.0 - 2011-11-01 diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java index 198ab3ed214..72dd53fb6fd 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java @@ -36,6 +36,7 @@ import com.google.common.collect.Lists; import com.google.inject.Provides; import com.google.inject.servlet.GuiceFilter; import com.google.inject.servlet.ServletModule; +import com.sun.jersey.api.container.filter.GZIPContentEncodingFilter; import com.sun.jersey.api.core.ResourceConfig; import com.sun.jersey.core.util.FeaturesAndProperties; import com.sun.jersey.guice.spi.container.servlet.GuiceContainer; @@ -160,6 +161,8 @@ public abstract class WebApp extends ServletModule { params.put(ResourceConfig.FEATURE_IMPLICIT_VIEWABLES, "true"); params.put(ServletContainer.FEATURE_FILTER_FORWARD_ON_404, "true"); params.put(FeaturesAndProperties.FEATURE_XMLROOTELEMENT_PROCESSING, "true"); + params.put(ResourceConfig.PROPERTY_CONTAINER_REQUEST_FILTERS, GZIPContentEncodingFilter.class.getName()); + params.put(ResourceConfig.PROPERTY_CONTAINER_RESPONSE_FILTERS, GZIPContentEncodingFilter.class.getName()); filter("/*").through(GuiceContainer.class, params); } diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmIpFilter.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmIpFilter.java index d1cae5cc1eb..1fe45720f85 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmIpFilter.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmIpFilter.java @@ -57,7 +57,7 @@ public class AmIpFilter implements Filter { proxyUriBase = conf.getInitParameter(PROXY_URI_BASE); } - private Set getProxyAddresses() throws ServletException { + protected Set getProxyAddresses() throws ServletException { long now = System.currentTimeMillis(); synchronized(this) { if(proxyAddresses == null || (lastUpdate + updateInterval) >= now) { @@ -97,10 +97,13 @@ public class AmIpFilter implements Filter { } String user = null; - for(Cookie c: httpReq.getCookies()) { - if(WebAppProxyServlet.PROXY_USER_COOKIE_NAME.equals(c.getName())){ - user = c.getValue(); - break; + + if (httpReq.getCookies() != null) { + for(Cookie c: httpReq.getCookies()) { + if(WebAppProxyServlet.PROXY_USER_COOKIE_NAME.equals(c.getName())){ + user = c.getValue(); + break; + } } } if(user == null) { diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java new file mode 100644 index 00000000000..8753a357463 --- /dev/null +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java @@ -0,0 +1,121 @@ +/** + * 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.hadoop.yarn.server.webproxy.amfilter; + +import java.io.IOException; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicBoolean; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import junit.framework.Assert; + +import org.junit.Test; +import org.mockito.Mockito; + + +public class TestAmFilter { + + private String proxyHost = "bogushost.com"; + private String proxyUri = "http://bogus"; + + private class TestAmIpFilter extends AmIpFilter { + + private Set proxyAddresses = null; + + protected Set getProxyAddresses() { + if(proxyAddresses == null) { + proxyAddresses = new HashSet(); + } + proxyAddresses.add(proxyHost); + return proxyAddresses; + } + } + + + private static class DummyFilterConfig implements FilterConfig { + final Map map; + + + DummyFilterConfig(Map map) { + this.map = map; + } + + @Override + public String getFilterName() { + return "dummy"; + } + @Override + public String getInitParameter(String arg0) { + return map.get(arg0); + } + @Override + public Enumeration getInitParameterNames() { + return Collections.enumeration(map.keySet()); + } + @Override + public ServletContext getServletContext() { + return null; + } + } + + + @Test + public void filterNullCookies() throws Exception { + HttpServletRequest request = Mockito.mock(HttpServletRequest.class); + + Mockito.when(request.getCookies()).thenReturn(null); + Mockito.when(request.getRemoteAddr()).thenReturn(proxyHost); + + HttpServletResponse response = Mockito.mock(HttpServletResponse.class); + + final AtomicBoolean invoked = new AtomicBoolean(); + + FilterChain chain = new FilterChain() { + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) + throws IOException, ServletException { + invoked.set(true); + } + }; + + Map params = new HashMap(); + params.put(AmIpFilter.PROXY_HOST, proxyHost); + params.put(AmIpFilter.PROXY_URI_BASE, proxyUri); + FilterConfig conf = new DummyFilterConfig(params); + Filter filter = new TestAmIpFilter(); + filter.init(conf); + filter.doFilter(request, response, chain); + Assert.assertTrue(invoked.get()); + filter.destroy(); + } +}