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 aa...@apache.org on 2021/07/10 06:07:48 UTC
[hadoop] branch branch-2.10 updated: HADOOP-17793. Better token
validation (#3189)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 9241470 HADOOP-17793. Better token validation (#3189)
9241470 is described below
commit 9241470dfd22f2a4b2cff4ea1987cb2d5090c590
Author: Artem Smotrakov <ar...@gmail.com>
AuthorDate: Sat Jul 10 06:42:31 2021 +0200
HADOOP-17793. Better token validation (#3189)
Signed-off-by: Akira Ajisaka <aa...@apache.org>
(cherry picked from commit ba325a8ada573291266c4d6447862072fdf88af5)
Conflicts:
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java
---
.../src/main/java/org/apache/hadoop/security/token/Token.java | 6 +++---
.../hadoop/hdfs/security/token/block/BlockTokenSecretManager.java | 6 +++---
.../server/nodemanager/containermanager/ContainerManagerImpl.java | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
index b79a018..06d9d71 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.*;
-import java.util.Arrays;
+import java.security.MessageDigest;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.UUID;
@@ -368,8 +368,8 @@ public class Token<T extends TokenIdentifier> implements Writable {
return false;
} else {
Token<T> r = (Token<T>) right;
- return Arrays.equals(identifier, r.identifier) &&
- Arrays.equals(password, r.password) &&
+ return MessageDigest.isEqual(identifier, r.identifier) &&
+ MessageDigest.isEqual(password, r.password) &&
kind.equals(r.kind) &&
service.equals(r.service);
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java
index 0a3537d..0680387 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java
@@ -22,8 +22,8 @@ import com.google.common.base.Charsets;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
+import java.security.MessageDigest;
import java.security.SecureRandom;
-import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Iterator;
@@ -326,8 +326,8 @@ public class BlockTokenSecretManager extends
+ ", block=" + block + ", access mode=" + mode);
}
checkAccess(id, userId, block, mode);
- if (!Arrays.equals(retrievePassword(id), token.getPassword())) {
- throw new InvalidToken("Block token with " + id.toString()
+ if (!MessageDigest.isEqual(retrievePassword(id), token.getPassword())) {
+ throw new InvalidToken("Block token with " + id
+ " doesn't have the correct token password");
}
}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
index 956ec26..3cb636d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
@@ -170,8 +170,8 @@ import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.URISyntaxException;
import java.nio.ByteBuffer;
+import java.security.MessageDigest;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.EnumSet;
import java.util.HashMap;
@@ -1196,7 +1196,7 @@ public class ContainerManagerImpl extends CompositeService implements
containerTokenIdentifier);
byte[] tokenPass = token.getPassword().array();
if (password == null || tokenPass == null
- || !Arrays.equals(password, tokenPass)) {
+ || !MessageDigest.isEqual(password, tokenPass)) {
throw new InvalidToken(
"Invalid container token used for starting container on : "
+ context.getNodeId().toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org