Skip to content

HDFS-17575. SaslDataTransferClient should use SaslParticipant to create messages. #6933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 20, 2024
Merged

HDFS-17575. SaslDataTransferClient should use SaslParticipant to create messages. #6933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4688542
HDFS-17575. SaslDataTransferClient should use SaslParticipant to crea…
szetszwo Jul 10, 2024
1829f4c
Add a debug message.
szetszwo Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions ...c/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import org.apache.hadoop.security.token.SecretManager;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.Lists;
import org.apache.hadoop.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -84,6 +85,8 @@ public class SaslDataTransferClient {
private static final Logger LOG = LoggerFactory.getLogger(
SaslDataTransferClient.class);

private static final byte[] EMPTY_BYTE_ARRAY = {};

private final Configuration conf;
private final AtomicBoolean fallbackToSimpleAuth;
private final SaslPropertiesResolver saslPropsResolver;
Expand Down Expand Up @@ -519,25 +522,29 @@ 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.evaluateChallengeOrResponse(EMPTY_BYTE_ARRAY);
if (LOG.isDebugEnabled()) {
LOG.info("first: {}", first == null ? null : first.length == 0 ? "<empty>"
: StringUtils.byteToHexString(first));
}
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
Expand Down Expand Up @@ -565,6 +572,7 @@ private IOStreamPair doSaslHandshake(InetAddress addr,
cipherOptions.add(option);
}
}
LOG.debug("{}: cipherOptions={}", sasl, cipherOptions);
sendSaslMessageAndNegotiationCipherOptions(out, localResponse,
cipherOptions);

Expand Down
10 changes: 8 additions & 2 deletions ...ient/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslParticipant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -110,7 +111,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;
}

Expand All @@ -121,7 +122,7 @@ private SaslParticipant(SaslServer saslServer) {
*/
private SaslParticipant(SaslClient saslClient) {
this.saslServer = null;
this.saslClient = saslClient;
this.saslClient = Objects.requireNonNull(saslClient, "saslClient == null");
}

/**
Expand Down Expand Up @@ -228,4 +229,9 @@ public IOStreamPair createStreamPair(DataOutputStream out,
new SaslOutputStream(out, saslServer));
}
}

@Override
public String toString() {
return "Sasl" + (saslServer != null? "Server" : "Client");
}
}