Repository: hadoop Updated Branches: refs/heads/branch-2 3c8d3816c -> c95e8951f
YARN-2897. CrossOriginFilter needs more log statements (Mit Desai via jeagles) (cherry picked from commit a8ad1e8089e4bf5854085d2d38d1c0133b5a41bc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c95e8951 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c95e8951 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c95e8951 Branch: refs/heads/branch-2 Commit: c95e8951f847368378ad62ae26cd847a452fe23d Parents: 3c8d381 Author: Jonathan Eagles <[email protected]> Authored: Tue Jan 27 16:06:39 2015 -0600 Committer: Jonathan Eagles <[email protected]> Committed: Tue Jan 27 16:07:27 2015 -0600 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../server/timeline/webapp/CrossOriginFilter.java | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c95e8951/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 29439cb..5422c0e 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -175,6 +175,9 @@ Release 2.7.0 - UNRELEASED YARN-3086. Make NodeManager memory configurable in MiniYARNCluster. (Robert Metzger via ozawa) + YARN-2897. CrossOriginFilter needs more log statements (Mit Desai via + jeagles) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/c95e8951/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/webapp/CrossOriginFilter.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/webapp/CrossOriginFilter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/webapp/CrossOriginFilter.java index d5fab7a..9edaefb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/webapp/CrossOriginFilter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/webapp/CrossOriginFilter.java @@ -106,25 +106,43 @@ public class CrossOriginFilter implements Filter { String originsList = encodeHeader(req.getHeader(ORIGIN)); if (!isCrossOrigin(originsList)) { + if(LOG.isDebugEnabled()) { + LOG.debug("Header origin is null. Returning"); + } return; } if (!areOriginsAllowed(originsList)) { + if(LOG.isDebugEnabled()) { + LOG.debug("Header origins '" + originsList + "' not allowed. Returning"); + } return; } String accessControlRequestMethod = req.getHeader(ACCESS_CONTROL_REQUEST_METHOD); if (!isMethodAllowed(accessControlRequestMethod)) { + if(LOG.isDebugEnabled()) { + LOG.debug("Access control method '" + accessControlRequestMethod + + "' not allowed. Returning"); + } return; } String accessControlRequestHeaders = req.getHeader(ACCESS_CONTROL_REQUEST_HEADERS); if (!areHeadersAllowed(accessControlRequestHeaders)) { + if(LOG.isDebugEnabled()) { + LOG.debug("Access control headers '" + accessControlRequestHeaders + + "' not allowed. Returning"); + } return; } + if(LOG.isDebugEnabled()) { + LOG.debug("Completed cross origin filter checks. Populating " + + "HttpServletResponse"); + } res.setHeader(ACCESS_CONTROL_ALLOW_ORIGIN, originsList); res.setHeader(ACCESS_CONTROL_ALLOW_CREDENTIALS, Boolean.TRUE.toString()); res.setHeader(ACCESS_CONTROL_ALLOW_METHODS, getAllowedMethodsHeader());
