You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by cm...@apache.org on 2023/05/04 18:17:04 UTC
[kafka] 01/01: foo
This is an automated email from the ASF dual-hosted git repository.
cmccabe pushed a commit to branch cmccabe_2023-04-11_improve_controller_logging
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit 0aca8efbc31b8da4f4a0107ef50443b0b12eff73
Author: Colin P. McCabe <cm...@apache.org>
AuthorDate: Thu May 4 11:16:13 2023 -0700
foo
---
.../org/apache/kafka/metadata/util/RecordRedactor.java | 7 +++++--
.../apache/kafka/metadata/util/RecordRedactorTest.java | 17 +++++++++++++++--
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/metadata/src/main/java/org/apache/kafka/metadata/util/RecordRedactor.java b/metadata/src/main/java/org/apache/kafka/metadata/util/RecordRedactor.java
index d131b643c6b..5641a0cc0ff 100644
--- a/metadata/src/main/java/org/apache/kafka/metadata/util/RecordRedactor.java
+++ b/metadata/src/main/java/org/apache/kafka/metadata/util/RecordRedactor.java
@@ -23,6 +23,8 @@ import org.apache.kafka.common.metadata.UserScramCredentialRecord;
import org.apache.kafka.common.protocol.ApiMessage;
import org.apache.kafka.metadata.KafkaConfigSchema;
+import java.util.Arrays;
+
/**
* Converts a metadata record to a string suitable for logging to slf4j.
@@ -49,10 +51,11 @@ public final class RecordRedactor {
case USER_SCRAM_CREDENTIAL_RECORD: {
UserScramCredentialRecord record = (UserScramCredentialRecord) message;
return "UserScramCredentialRecord("
- + "name=" + record.name()
+ + "name=" + ((record.name() == null) ? "null" : "'" + record.name().toString() + "'")
+ ", mechanism=" + record.mechanism()
+ ", salt=(redacted)"
- + ", saltedPassword=(redacted)"
+ + ", storedKey=(redacted)"
+ + ", serverKey=(redacted)"
+ ", iterations=" + record.iterations()
+ ")";
}
diff --git a/metadata/src/test/java/org/apache/kafka/metadata/util/RecordRedactorTest.java b/metadata/src/test/java/org/apache/kafka/metadata/util/RecordRedactorTest.java
index a4e3bf8f541..631d440ddf3 100644
--- a/metadata/src/test/java/org/apache/kafka/metadata/util/RecordRedactorTest.java
+++ b/metadata/src/test/java/org/apache/kafka/metadata/util/RecordRedactorTest.java
@@ -57,8 +57,8 @@ final public class RecordRedactorTest {
@Test
public void testUserScramCredentialRecordToString() {
- assertEquals("UserScramCredentialRecord(name=bob, mechanism=0, " +
- "salt=(redacted), serverKey=(redacted), storedKey=(redacted), iterations=128)",
+ assertEquals("UserScramCredentialRecord(name='bob', mechanism=0, " +
+ "salt=(redacted), storedKey=(redacted), serverKey=(redacted), iterations=128)",
REDACTOR.toLoggableString(new UserScramCredentialRecord().
setName("bob").
setMechanism((byte) 0).
@@ -68,6 +68,19 @@ final public class RecordRedactorTest {
setIterations(128)));
}
+ @Test
+ public void testUserScramCredentialRecordToStringWithNullName() {
+ assertEquals("UserScramCredentialRecord(name=null, mechanism=1, " +
+ "salt=(redacted), storedKey=(redacted), serverKey=(redacted), iterations=256)",
+ REDACTOR.toLoggableString(new UserScramCredentialRecord().
+ setName(null).
+ setMechanism((byte) 1).
+ setSalt(new byte[512]).
+ setServerKey(new byte[128]).
+ setStoredKey(new byte[128]).
+ setIterations(256)));
+ }
+
@Test
public void testSensitiveConfigRecordToString() {
assertEquals("ConfigRecord(resourceType=4, resourceName='0', name='quux', " +