HADOOP-17793. Better token validation (#3189)
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit ba325a8ada
)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/block/BlockTokenSecretManager.java
This commit is contained in:
parent
aae60521a3
commit
6c7f192f0f
|
@ -34,7 +34,7 @@ import org.slf4j.Logger;
|
|||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.*;
|
||||
import java.util.Arrays;
|
||||
import java.security.MessageDigest;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
import java.util.ServiceConfigurationError;
|
||||
|
@ -419,8 +419,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);
|
||||
}
|
||||
|
|
|
@ -22,6 +22,7 @@ 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;
|
||||
|
@ -407,7 +408,7 @@ public class BlockTokenSecretManager extends
|
|||
+ ", block=" + block + ", access mode=" + mode);
|
||||
}
|
||||
checkAccess(id, userId, block, mode, storageTypes, storageIds);
|
||||
if (!Arrays.equals(retrievePassword(id), token.getPassword())) {
|
||||
if (!MessageDigest.isEqual(retrievePassword(id), token.getPassword())) {
|
||||
throw new InvalidToken("Block token with " + id
|
||||
+ " doesn't have the correct token password");
|
||||
}
|
||||
|
|
|
@ -171,8 +171,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.HashMap;
|
||||
import java.util.List;
|
||||
|
@ -1233,7 +1233,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());
|
||||
|
|
Loading…
Reference in New Issue