Skip to content

HDFS-17668 Treat null SASL negotiated QOP as auth in DataTransferSasl… #7171

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
szetszwo merged 2 commits into from
Dec 3, 2024
Merged

HDFS-17668 Treat null SASL negotiated QOP as auth in DataTransferSasl… #7171

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b460ff1
HDFS-17668 Treat null SASL negotiated QOP as auth in DataTransferSasl…
stoty Nov 14, 2024
c66b937
clarify Exception message
stoty Nov 21, 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
9 changes: 7 additions & 2 deletions ...src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/DataTransferSaslUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,15 @@ public static void checkSaslComplete(SaslParticipant sasl,
String negotiatedQop = sasl.getNegotiatedQop();
LOG.debug("{}: Verifying QOP: requested = {}, negotiated = {}",
sasl, requestedQop, negotiatedQop);
if (negotiatedQop != null && !requestedQop.contains(negotiatedQop)) {
// Treat null negotiated QOP as "auth" for the purpose of verification
// Code elsewhere does the same implicitly
if(negotiatedQop == null) {
negotiatedQop = "auth";
}
if (!requestedQop.contains(negotiatedQop)) {
throw new IOException(String.format("SASL handshake completed, but " +
"channel does not have acceptable quality of protection, " +
"requested = %s, negotiated = %s", requestedQop, negotiatedQop));
"requested = %s, negotiated(effective) = %s", requestedQop, negotiatedQop));
}
}

Expand Down