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 je...@apache.org on 2015/01/27 23:06:54 UTC
hadoop git commit: YARN-2897. CrossOriginFilter needs more log
statements (Mit Desai via jeagles)
Repository: hadoop
Updated Branches:
refs/heads/trunk 8bf6f0b70 -> a8ad1e808
YARN-2897. CrossOriginFilter needs more log statements (Mit Desai via jeagles)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a8ad1e80
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a8ad1e80
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a8ad1e80
Branch: refs/heads/trunk
Commit: a8ad1e8089e4bf5854085d2d38d1c0133b5a41bc
Parents: 8bf6f0b
Author: Jonathan Eagles <je...@gmail.com>
Authored: Tue Jan 27 16:06:39 2015 -0600
Committer: Jonathan Eagles <je...@gmail.com>
Committed: Tue Jan 27 16:06:39 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/a8ad1e80/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 054b394..56ffe97 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -209,6 +209,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/a8ad1e80/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());