This is an automated email from the ASF dual-hosted git repository. penghui pushed a commit to branch branch-2.9 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 4a471d06ce173a99850866c095c54c88810e2ee4 Author: ZhangJian He <[email protected]> AuthorDate: Sun Jun 5 09:44:47 2022 +0800 [Revert] [#15483] Remove sensitive msg from consumer/producer stats log (#15817) ### Motivation See #15483 The `@Secret` annotation works well, and introduced in #8910 ### Modifications - Revert the unneeded `@JsonIgnore` - remove `Assert.assertFalse(s.contains("Password"));` `Password` is printed in a key. The sensitive field's value is `****`. (cherry picked from commit 67361e8db632b0cd4c23198c5c569f3f2193fc70) --- .../apache/pulsar/client/impl/conf/ClientConfigurationData.java | 7 ------- .../pulsar/client/impl/conf/ClientConfigurationDataTest.java | 1 - 2 files changed, 8 deletions(-) diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ClientConfigurationData.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ClientConfigurationData.java index 093e3e19883..3044b2a4c3b 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ClientConfigurationData.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ClientConfigurationData.java @@ -30,7 +30,6 @@ import java.util.Optional; import java.util.Set; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.Getter; import lombok.NoArgsConstructor; import org.apache.pulsar.client.api.Authentication; import org.apache.pulsar.client.api.ProxyProtocol; @@ -61,7 +60,6 @@ public class ClientConfigurationData implements Serializable, Cloneable { value = "The implementation class of ServiceUrlProvider used to generate ServiceUrl." ) @JsonIgnore - @Getter(onMethod_ = @JsonIgnore) private transient ServiceUrlProvider serviceUrlProvider; @ApiModelProperty( @@ -257,8 +255,6 @@ public class ClientConfigurationData implements Serializable, Cloneable { value = "Password of TLS TrustStore." ) @Secret - @JsonIgnore - @Getter(onMethod_ = @JsonIgnore) private String tlsTrustStorePassword = null; @ApiModelProperty( @@ -318,10 +314,8 @@ public class ClientConfigurationData implements Serializable, Cloneable { value = "Password of SOCKS5 proxy." ) @Secret - @JsonIgnore private String socks5ProxyPassword; - @JsonIgnore public Authentication getAuthentication() { if (authentication == null) { this.authentication = AuthenticationDisabled.INSTANCE; @@ -377,7 +371,6 @@ public class ClientConfigurationData implements Serializable, Cloneable { return Objects.nonNull(socks5ProxyUsername) ? socks5ProxyUsername : System.getProperty("socks5Proxy.username"); } - @JsonIgnore public String getSocks5ProxyPassword() { return Objects.nonNull(socks5ProxyPassword) ? socks5ProxyPassword : System.getProperty("socks5Proxy.password"); } diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ClientConfigurationDataTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ClientConfigurationDataTest.java index b5c30c9a7c6..c817ec996d4 100644 --- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ClientConfigurationDataTest.java +++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/ClientConfigurationDataTest.java @@ -48,7 +48,6 @@ public class ClientConfigurationDataTest { clientConfigurationData.setSocks5ProxyPassword("yyyy"); clientConfigurationData.setAuthentication(new AuthenticationToken("zzzz")); String s = w.writeValueAsString(clientConfigurationData); - Assert.assertFalse(s.contains("Password")); Assert.assertFalse(s.contains("xxxx")); Assert.assertFalse(s.contains("yyyy")); Assert.assertFalse(s.contains("zzzz"));
