Author: szetszwo
Date: Tue Nov 8 19:50:38 2011
New Revision: 1199413
URL: http://svn.apache.org/viewvc?rev=1199413&view=rev
Log:
svn merge -c 1196812 from 0.23 for HADOOP-7792 and HDFS-2416.
Modified:
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/
(props changed)
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java
Propchange:
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 19:50:38 2011
@@ -1 +1,2 @@
+/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common:1196812
/hadoop/common/trunk/hadoop-common-project/hadoop-common:1161777,1161781,1162008,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163456,1163465,1163490,1163768,1163852,1163858,1164255,1164301,1164339,1166009,1166402,1167383,1170379,1170459,1171297,1172916,1173402,1176550,1176986,1177035,1177487,1177531,1177859,1177864,1179869,1182641,1183132,1189357,1189932,1189982,1190109,1195575,1195760,1196113,1196129
Modified:
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1199413&r1=1199412&r2=1199413&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Nov 8 19:50:38 2011
@@ -441,6 +441,9 @@ Release 0.23.0 - 2011-11-01
HADOOP-7789. Improvements to site navigation. (acmurthy)
+ HADOOP-7792. Add verifyToken method to
AbstractDelegationTokenSecretManager.
+ (jitendra)
+
OPTIMIZATIONS
HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole
Propchange:
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 19:50:38 2011
@@ -1,3 +1,4 @@
+/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt:1196812
/hadoop/common/branches/yahoo-merge/CHANGES.txt:1079157,1079163-1079164,1079167
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161777,1161781,1162008,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163456,1163465,1163490,1163768,1163852,1163858,1164255,1164301,1166009,1166402,1167383,1169986,1170046,1170379,1170459,1171297,1171894,1171909,1172186,1172916,1173402,1176550,1176986,1177035,1177487,1177531,1177859,1177864,1179869,1182641,1183132,1189357,1189932,1189982,1190109,1195575,1195760,1196113,1196129
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
Propchange:
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 19:50:38 2011
@@ -1,3 +1,4 @@
+/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java:1196812
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1161777,1161781,1162008,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163456,1163465,1163490,1163768,1163852,1163858,1164255,1164301,1164339,1166402,1167383,1170379,1170459,1171297,1172916,1173402,1176550,1176986,1177035,1177487,1177531,1177859,1177864,1182641,1183132,1189932,1189982,1190109,1195575,1195760,1196113,1196129
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified:
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java?rev=1199413&r1=1199412&r2=1199413&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java
(original)
+++
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java
Tue Nov 8 19:50:38 2011
@@ -210,6 +210,21 @@ extends AbstractDelegationTokenIdentifie
}
/**
+ * Verifies that the given identifier and password are valid and match.
+ * @param identifier Token identifier.
+ * @param password Password in the token.
+ * @throws InvalidToken
+ */
+ public synchronized void verifyToken(TokenIdent identifier, byte[] password)
+ throws InvalidToken {
+ byte[] storedPassword = retrievePassword(identifier);
+ if (!Arrays.equals(password, storedPassword)) {
+ throw new InvalidToken("token (" + identifier
+ + ") is invalid, password doesn't match");
+ }
+ }
+
+ /**
* Renew a delegation token.
* @param token the token to renew
* @param renewer the full principal name of the user doing the renewal
Modified:
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java?rev=1199413&r1=1199412&r2=1199413&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java
(original)
+++
hadoop/common/branches/branch-0.23.0/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java
Tue Nov 8 19:50:38 2011
@@ -360,6 +360,8 @@ public class TestDelegationToken {
byte[] storedPassword = dtSecretManager.retrievePassword(id);
byte[] password = dtSecretManager.createPassword(id, key);
Assert.assertTrue(Arrays.equals(password, storedPassword));
+ //verify by secret manager api
+ dtSecretManager.verifyToken(id, password);
}
} finally {
dtSecretManager.stopThreads();
