Repository: hadoop Updated Branches: refs/heads/branch-2.6 19ec4212d -> de1044f48
HADOOP-11068. Match hadoop.auth cookie format to jetty output. Contributed by Gregory Chanan. (cherry picked from commit 5c900b522e70b512498ab7689f56eb1c5e4b963f) (cherry picked from commit b4446cb3704439c5b9e6e420bb54dfe2d95f5b19) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/de1044f4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/de1044f4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/de1044f4 Branch: refs/heads/branch-2.6 Commit: de1044f48d3094ac03a4fa5ac58b8e6a124f1541 Parents: 19ec421 Author: cnauroth <[email protected]> Authored: Wed Oct 29 11:18:44 2014 -0700 Committer: cnauroth <[email protected]> Committed: Wed Oct 29 11:24:34 2014 -0700 ---------------------------------------------------------------------- .../security/authentication/server/AuthenticationFilter.java | 3 +-- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/de1044f4/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationFilter.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationFilter.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationFilter.java index 47cf54c..a070345 100644 --- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationFilter.java +++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationFilter.java @@ -589,9 +589,8 @@ public class AuthenticationFilter implements Filter { StringBuilder sb = new StringBuilder(AuthenticatedURL.AUTH_COOKIE) .append("="); if (token != null && token.length() > 0) { - sb.append(token); + sb.append("\"").append(token).append("\""); } - sb.append("; Version=1"); if (path != null) { sb.append("; Path=").append(path); http://git-wip-us.apache.org/repos/asf/hadoop/blob/de1044f4/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index bc9c1d0..f1941e4 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -647,6 +647,9 @@ Release 2.6.0 - UNRELEASED HADOOP-11243. SSLFactory shouldn't allow SSLv3. (Wei Yan via kasha) + HADOOP-11068. Match hadoop.auth cookie format to jetty output. + (Gregory Chanan via cnauroth) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES
