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 sz...@apache.org on 2024/12/06 01:21:07 UTC
(hadoop) branch trunk updated: HDFS-17679 Use saslClient#hasInitialResponse() instead of heuristics in SaslParticipant#createFirstMessage() (#7201)
This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 86d8fa6d518 HDFS-17679 Use saslClient#hasInitialResponse() instead of heuristics in SaslParticipant#createFirstMessage() (#7201)
86d8fa6d518 is described below
commit 86d8fa6d51887c88e91e5f170c294e931d71c32f
Author: Istvan Toth <st...@stoty.hu>
AuthorDate: Fri Dec 6 02:20:59 2024 +0100
HDFS-17679 Use saslClient#hasInitialResponse() instead of heuristics in SaslParticipant#createFirstMessage() (#7201)
---
.../hadoop/hdfs/protocol/datatransfer/sasl/SaslParticipant.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslParticipant.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslParticipant.java
index 7fb2f9f5fe9..85edcc6a0c5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslParticipant.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslParticipant.java
@@ -127,8 +127,13 @@ class SaslParticipant {
}
byte[] createFirstMessage() throws SaslException {
- return SaslMechanismFactory.isDefaultMechanism(MECHANISM_ARRAY[0]) ? EMPTY_BYTE_ARRAY
- : evaluateChallengeOrResponse(EMPTY_BYTE_ARRAY);
+ if (saslClient != null) {
+ return saslClient.hasInitialResponse()
+ ? saslClient.evaluateChallenge(EMPTY_BYTE_ARRAY)
+ : EMPTY_BYTE_ARRAY;
+ }
+ throw new IllegalStateException(
+ "createFirstMessage must only be called for clients");
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org