big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-17575. SaslDataTransferClient should use SaslParticipant to create messages. (#6954)

Browse Source
This commit is contained in:
Tsz-Wo Nicholas Sze 2024-08-05 10:42:12 -07:00 committed by GitHub
parent 59d5e0bb2e
commit b189ef8197
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferClient.java
View File

@ -519,25 +519,25 @@ private IOStreamPair doSaslHandshake(InetAddress addr,
// In which case there will be no encrypted secret sent from NN.
BlockTokenIdentifier blockTokenIdentifier =
accessToken.decodeIdentifier();
final byte[] first = sasl.createFirstMessage();
if (blockTokenIdentifier != null) {
byte[] handshakeSecret =
accessToken.decodeIdentifier().getHandshakeMsg();
if (handshakeSecret == null || handshakeSecret.length == 0) {
LOG.debug("Handshake secret is null, "
+ "sending without handshake secret.");
sendSaslMessage(out, new byte[0]);
sendSaslMessage(out, first);
} else {
LOG.debug("Sending handshake secret.");
BlockTokenIdentifier identifier = new BlockTokenIdentifier();
identifier.readFields(new DataInputStream(
new ByteArrayInputStream(accessToken.getIdentifier())));
String bpid = identifier.getBlockPoolId();
sendSaslMessageHandshakeSecret(out, new byte[0],
handshakeSecret, bpid);
sendSaslMessageHandshakeSecret(out, first, handshakeSecret, bpid);
}
} else {
LOG.debug("Block token id is null, sending without handshake secret.");
sendSaslMessage(out, new byte[0]);
sendSaslMessage(out, first);
}
// step 1
@ -565,6 +565,7 @@ private IOStreamPair doSaslHandshake(InetAddress addr,
cipherOptions.add(option);
}
}
LOG.debug("{}: cipherOptions={}", sasl, cipherOptions);
sendSaslMessageAndNegotiationCipherOptions(out, localResponse,
cipherOptions);

16
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslParticipant.java
View File

@ -20,6 +20,7 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.util.Map;
import java.util.Objects;
import javax.security.auth.callback.CallbackHandler;
import javax.security.sasl.Sasl;
import javax.security.sasl.SaslClient;
@ -52,6 +53,7 @@ class SaslParticipant {
private static final String SERVER_NAME = "0";
private static final String PROTOCOL = "hdfs";
private static final String[] MECHANISM_ARRAY = {SaslConstants.SASL_MECHANISM};
private static final byte[] EMPTY_BYTE_ARRAY = {};
// One of these will always be null.
private final SaslServer saslServer;
@ -110,7 +112,7 @@ public static SaslParticipant createClientSaslParticipant(String userName,
* @param saslServer to wrap
*/
private SaslParticipant(SaslServer saslServer) {
this.saslServer = saslServer;
this.saslServer = Objects.requireNonNull(saslServer, "saslServer == null");
this.saslClient = null;
}
@ -121,7 +123,12 @@ private SaslParticipant(SaslServer saslServer) {
*/
private SaslParticipant(SaslClient saslClient) {
this.saslServer = null;
this.saslClient = saslClient;
this.saslClient = Objects.requireNonNull(saslClient, "saslClient == null");
}
byte[] createFirstMessage() throws SaslException {
return MECHANISM_ARRAY[0].equals(SaslConstants.SASL_MECHANISM_DEFAULT) ? EMPTY_BYTE_ARRAY
: evaluateChallengeOrResponse(EMPTY_BYTE_ARRAY);
}
/**
@ -228,4 +235,9 @@ public IOStreamPair createStreamPair(DataOutputStream out,
new SaslOutputStream(out, saslServer));
}
}
@Override
public String toString() {
return "Sasl" + (saslServer != null? "Server" : "Client");
}
}

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/TestSaslDataTransfer.java
View File

@ -77,7 +77,7 @@ public class TestSaslDataTransfer extends SaslDataTransferTestCase {
public ExpectedException exception = ExpectedException.none();
@Rule
public Timeout timeout = new Timeout(60000);
public Timeout timeout = new Timeout(300_000);
@After
public void shutdown() {