Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 98E4F200D34 for ; Fri, 20 Oct 2017 06:45:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9747A160BEE; Fri, 20 Oct 2017 04:45:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E7053160BED for ; Fri, 20 Oct 2017 06:45:50 +0200 (CEST) Received: (qmail 24745 invoked by uid 500); 20 Oct 2017 04:45:43 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 20204 invoked by uid 99); 20 Oct 2017 04:45:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Oct 2017 04:45:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5B982E001D; Fri, 20 Oct 2017 04:45:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: haibochen@apache.org To: common-commits@hadoop.apache.org Date: Fri, 20 Oct 2017 04:46:19 -0000 Message-Id: <05f34ae88beb4e9498057d95bdbc7861@git.apache.org> In-Reply-To: <7e747a8bb4df4b1bbc5b54290420f3f2@git.apache.org> References: <7e747a8bb4df4b1bbc5b54290420f3f2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [41/50] [abbrv] hadoop git commit: YARN-7338. Support same origin policy for cross site scripting prevention. (Sunil G via wangda) archived-at: Fri, 20 Oct 2017 04:45:51 -0000 YARN-7338. Support same origin policy for cross site scripting prevention. (Sunil G via wangda) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/298b174f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/298b174f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/298b174f Branch: refs/heads/YARN-1011 Commit: 298b174f663a06e67098f7b5cd645769c1a98a80 Parents: 3dd3d1d Author: Wangda Tan Authored: Thu Oct 19 14:44:42 2017 -0700 Committer: Wangda Tan Committed: Thu Oct 19 14:44:42 2017 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/yarn/webapp/WebApps.java | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/298b174f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java index 9c5e8c3..4f1cacf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java @@ -401,6 +401,7 @@ public class WebApps { WebApp webApp = build(webapp); HttpServer2 httpServer = webApp.httpServer(); if (ui2Context != null) { + addFiltersForNewContext(ui2Context); httpServer.addHandlerAtFront(ui2Context); } try { @@ -413,6 +414,27 @@ public class WebApps { return webApp; } + private void addFiltersForNewContext(WebAppContext ui2Context) { + Map params = getConfigParameters(csrfConfigPrefix); + + if (hasCSRFEnabled(params)) { + LOG.info("CSRF Protection has been enabled for the {} application. " + + "Please ensure that there is an authentication mechanism " + + "enabled (kerberos, custom, etc).", name); + String restCsrfClassName = RestCsrfPreventionFilter.class.getName(); + HttpServer2.defineFilter(ui2Context, restCsrfClassName, + restCsrfClassName, params, new String[]{"/*"}); + } + + params = getConfigParameters(xfsConfigPrefix); + + if (hasXFSEnabled()) { + String xfsClassName = XFrameOptionsFilter.class.getName(); + HttpServer2.defineFilter(ui2Context, xfsClassName, xfsClassName, params, + new String[]{"/*"}); + } + } + private String inferHostClass() { String thisClass = this.getClass().getName(); Throwable t = new Throwable(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org