Repository: incubator-slider Updated Branches: refs/heads/develop b126e7cbe -> 93e2b52f9
SLIDER-36 remove custom IP filter from AM; mark as deprecated Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/265c4785 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/265c4785 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/265c4785 Branch: refs/heads/develop Commit: 265c4785c9ddf7f7fc0394069ad957784d6d6abc Parents: b126e7c Author: Steve Loughran <ste...@apache.org> Authored: Thu Aug 28 15:48:26 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Aug 28 15:48:26 2014 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/slider/common/SliderKeys.java | 7 +++++++ .../org/apache/slider/server/appmaster/SliderAppMaster.java | 8 ++------ .../server/appmaster/web/SliderAmFilterInitializer.java | 1 + .../apache/slider/server/appmaster/web/SliderAmIpFilter.java | 6 ++++++ .../slider/server/appmaster/web/TestSliderAmFilter.java | 1 + 5 files changed, 17 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/265c4785/slider-core/src/main/java/org/apache/slider/common/SliderKeys.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/SliderKeys.java b/slider-core/src/main/java/org/apache/slider/common/SliderKeys.java index 38f55c2..1d0a6f5 100644 --- a/slider-core/src/main/java/org/apache/slider/common/SliderKeys.java +++ b/slider-core/src/main/java/org/apache/slider/common/SliderKeys.java @@ -172,4 +172,11 @@ public interface SliderKeys extends SliderXmlConfKeys { * Python specific */ String PYTHONPATH = "PYTHONPATH"; + + + /** + * Name of the AM filter to use: {@value} + */ + String AM_FILTER_NAME = + "org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer"; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/265c4785/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index 5a84c39..53ce4f8 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@ -126,8 +126,6 @@ import org.apache.slider.server.appmaster.state.SimpleReleaseSelector; import org.apache.slider.server.appmaster.web.AgentService; import org.apache.slider.server.appmaster.web.rest.agent.AgentWebApp; import org.apache.slider.server.appmaster.web.SliderAMWebApp; -import org.apache.slider.server.appmaster.web.SliderAmFilterInitializer; -import org.apache.slider.server.appmaster.web.SliderAmIpFilter; import org.apache.slider.server.appmaster.web.WebAppApi; import org.apache.slider.server.appmaster.web.WebAppApiImpl; import org.apache.slider.server.appmaster.web.rest.RestPaths; @@ -536,10 +534,8 @@ public class SliderAppMaster extends AbstractSliderLaunchedService } Configuration serviceConf = getConfig(); - // Try to get the proper filtering of static resources through the yarn proxy working - serviceConf.set(HADOOP_HTTP_FILTER_INITIALIZERS, - SliderAmFilterInitializer.NAME); - serviceConf.set(SliderAmIpFilter.WS_CONTEXT_ROOT, WS_CONTEXT_ROOT + "|" + WS_AGENT_CONTEXT_ROOT); + // IP filtering + serviceConf.set(HADOOP_HTTP_FILTER_INITIALIZERS, AM_FILTER_NAME); //get our provider MapOperations globalInternalOptions = getGlobalInternalOptions(); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/265c4785/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java index 5fffa4a..df6cea4 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java @@ -30,6 +30,7 @@ import org.apache.hadoop.yarn.webapp.util.WebAppUtils; import java.util.HashMap; import java.util.Map; +@Deprecated public class SliderAmFilterInitializer extends FilterInitializer { private static final String FILTER_NAME = "AM_PROXY_FILTER"; private static final String FILTER_CLASS = SliderAmIpFilter.class.getCanonicalName(); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/265c4785/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java index 4c66876..4ced0b1 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java @@ -41,6 +41,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +/** + * IP-based filter derived from + * {@link org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer}; + * with the ability to open up a section for unauthed access from everywhere. + */ +@Deprecated public class SliderAmIpFilter implements Filter { protected static final Logger log = LoggerFactory.getLogger(SliderAmIpFilter.class); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/265c4785/slider-core/src/test/java/org/apache/slider/server/appmaster/web/TestSliderAmFilter.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/TestSliderAmFilter.java b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/TestSliderAmFilter.java index 00e193d..4ce41a4 100644 --- a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/TestSliderAmFilter.java +++ b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/TestSliderAmFilter.java @@ -53,6 +53,7 @@ import static junit.framework.Assert.fail; * proxy. Another requests can be filtered with (without) user name. * */ +@Deprecated public class TestSliderAmFilter { private String proxyHost = "localhost";
