From 8011d4688fa77f123de14ad4e1722cda23536888 Mon Sep 17 00:00:00 2001 From: Haohui Mai Date: Tue, 12 May 2015 10:30:32 -0700 Subject: [PATCH] HADOOP-11962. Sasl message with MD5 challenge text shouldn't be LOG out even in debug level. Contributed by Junping Du. --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/ipc/Server.java | 3 --- .../main/java/org/apache/hadoop/security/SaslRpcClient.java | 3 --- .../java/org/apache/hadoop/security/UserGroupInformation.java | 3 --- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 6aab3524b75..fa902545357 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -206,6 +206,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11947. test-patch should return early from determine-issue when run in jenkins mode. (Sean Busbey via aw) + HADOOP-11962. Sasl message with MD5 challenge text shouldn't be LOG out + even in debug level. (Junping Du via wheat9) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java index c80c022e6c7..fa25cac81fe 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java @@ -1448,9 +1448,6 @@ public abstract class Server { } private void doSaslReply(Message message) throws IOException { - if (LOG.isDebugEnabled()) { - LOG.debug("Sending sasl message "+message); - } setupResponse(saslResponse, saslCall, RpcStatusProto.SUCCESS, null, new RpcResponseWrapper(message), null, null); diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java index 4a1a397ed6f..7d3afa879f4 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java @@ -385,9 +385,6 @@ public class SaslRpcClient { } RpcSaslProto saslMessage = RpcSaslProto.parseFrom(responseWrapper.getMessageBytes()); - if (LOG.isDebugEnabled()) { - LOG.debug("Received SASL message "+saslMessage); - } // handle sasl negotiation process RpcSaslProto.Builder response = null; switch (saslMessage.getState()) { diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java index 65e4166d602..527ec2d02fd 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java @@ -853,9 +853,6 @@ public class UserGroupInformation { .getPrivateCredentials(KerberosTicket.class); for (KerberosTicket ticket : tickets) { if (SecurityUtil.isOriginalTGT(ticket)) { - if (LOG.isDebugEnabled()) { - LOG.debug("Found tgt " + ticket); - } return ticket; } }