Repository: hadoop Updated Branches: refs/heads/branch-2 6caf36f9e -> b4446cb37
HADOOP-11068. Match hadoop.auth cookie format to jetty output. Contributed by Gregory Chanan. (cherry picked from commit 5c900b522e70b512498ab7689f56eb1c5e4b963f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b4446cb3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b4446cb3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b4446cb3 Branch: refs/heads/branch-2 Commit: b4446cb3704439c5b9e6e420bb54dfe2d95f5b19 Parents: 6caf36f Author: cnauroth <[email protected]> Authored: Wed Oct 29 11:18:44 2014 -0700 Committer: cnauroth <[email protected]> Committed: Wed Oct 29 11:21:37 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/b4446cb3/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/b4446cb3/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 cfeb576..3ba1b31 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -677,6 +677,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
