Revert "[Issue apache#554] Removing hardcoded username and password i…

…n the project code (apache#555)" (apache#559) This reverts commit e2adda8.
xwm1992 · Dec 27, 2021 · e130143 · e130143
1 parent 37fbff2
commit e130143
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 54 deletions.
diff --git a/...sh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ProtocolKey.java b/...sh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ProtocolKey.java
@@ -30,8 +30,8 @@ public static class ClientInstanceKey {
         public static final String SYS = "Sys";
         public static final String PID = "Pid";
         public static final String IP = "Ip";
-        public static final String USERNAME = "";
-        public static final String PASSWD = "";
+        public static final String USERNAME = "Username";
+        public static final String PASSWD = "Passwd";
     }
 
 

diff --git a/...c/main/java/org/apache/eventmesh/common/protocol/http/header/client/RegRequestHeader.java b/...c/main/java/org/apache/eventmesh/common/protocol/http/header/client/RegRequestHeader.java
@@ -17,16 +17,16 @@
 
 package org.apache.eventmesh.common.protocol.http.header.client;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolKey;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion;
 import org.apache.eventmesh.common.protocol.http.header.Header;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class RegRequestHeader extends Header {
 
     private String code;
@@ -45,9 +45,9 @@ public class RegRequestHeader extends Header {
 
     private String ip;
 
-    private String username;
+    private String username = "username";
 
-    private String passwd;
+    private String passwd = "user@123";
 
     public static RegRequestHeader buildHeader(Map<String, Object> headerParam) {
         RegRequestHeader header = new RegRequestHeader();

diff --git a/.../java/org/apache/eventmesh/common/protocol/http/header/client/SubscribeRequestHeader.java b/.../java/org/apache/eventmesh/common/protocol/http/header/client/SubscribeRequestHeader.java
@@ -17,16 +17,16 @@
 
 package org.apache.eventmesh.common.protocol.http.header.client;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolKey;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion;
 import org.apache.eventmesh.common.protocol.http.header.Header;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class SubscribeRequestHeader extends Header {
 
     private String code;
@@ -45,9 +45,9 @@ public class SubscribeRequestHeader extends Header {
 
     private String ip;
 
-    private String username;
+    private String username = "username";
 
-    private String passwd;
+    private String passwd = "user@123";
 
     public static SubscribeRequestHeader buildHeader(Map<String, Object> headerParam) {
         SubscribeRequestHeader header = new SubscribeRequestHeader();

diff --git a/...ava/org/apache/eventmesh/common/protocol/http/header/client/UnSubscribeRequestHeader.java b/...ava/org/apache/eventmesh/common/protocol/http/header/client/UnSubscribeRequestHeader.java
@@ -17,16 +17,16 @@
 
 package org.apache.eventmesh.common.protocol.http.header.client;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolKey;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion;
 import org.apache.eventmesh.common.protocol.http.header.Header;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class UnSubscribeRequestHeader extends Header {
 
     private String code;
@@ -45,9 +45,9 @@ public class UnSubscribeRequestHeader extends Header {
 
     private String ip;
 
-    private String username;
+    private String username = "username";
 
-    private String passwd;
+    private String passwd = "user@123";
 
     public static UnSubscribeRequestHeader buildHeader(Map<String, Object> headerParam) {
         UnSubscribeRequestHeader header = new UnSubscribeRequestHeader();

diff --git a/...a/org/apache/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java b/...a/org/apache/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java
@@ -18,14 +18,14 @@
 package org.apache.eventmesh.common.protocol.http.header.message;
 
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolKey;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion;
 import org.apache.eventmesh.common.protocol.http.header.Header;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class PushMessageResponseHeader extends Header {
 
     //response code
@@ -53,10 +53,10 @@ public class PushMessageResponseHeader extends Header {
     private String ip;
 
     //USERNAME of the requester
-    private String username;
+    private String username = "username";
 
     //PASSWD of the requester
-    private String passwd;
+    private String passwd = "user@123";
 
     public String getUsername() {
         return username;

diff --git a/...a/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java b/...a/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java
@@ -17,16 +17,16 @@
 
 package org.apache.eventmesh.common.protocol.http.header.message;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolKey;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion;
 import org.apache.eventmesh.common.protocol.http.header.Header;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class ReplyMessageRequestHeader extends Header {
 
     //request code
@@ -54,10 +54,10 @@ public class ReplyMessageRequestHeader extends Header {
     private String ip;
 
     //USERNAME of the requester
-    private String username;
+    private String username = "username";
 
     //PASSWD of the requester
-    private String passwd;
+    private String passwd = "user@123";
 
     public String getUsername() {
         return username;

diff --git a/...g/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java b/...g/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java
@@ -18,16 +18,16 @@
 package org.apache.eventmesh.common.protocol.http.header.message;
 
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolKey;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion;
 import org.apache.eventmesh.common.protocol.http.header.Header;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class SendMessageBatchRequestHeader extends Header {
 
     //request code
@@ -55,10 +55,10 @@ public class SendMessageBatchRequestHeader extends Header {
     private String ip;
 
     //USERNAME of the requester
-    private String username;
+    private String username = "username";
 
     //PASSWD of the requester
-    private String passwd;
+    private String passwd = "user@123";
 
     public String getUsername() {
         return username;

diff --git a/...apache/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java b/...apache/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java
@@ -17,16 +17,16 @@
 
 package org.apache.eventmesh.common.protocol.http.header.message;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolKey;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion;
 import org.apache.eventmesh.common.protocol.http.header.Header;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class SendMessageBatchV2RequestHeader extends Header {
 
     //request code
@@ -54,10 +54,10 @@ public class SendMessageBatchV2RequestHeader extends Header {
     private String ip;
 
     //USERNAME of the requester
-    private String username;
+    private String username = "username";
 
     //PASSWD of the requester
-    private String passwd;
+    private String passwd = "user@123";
 
     public String getUsername() {
         return username;

diff --git a/...va/org/apache/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java b/...va/org/apache/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java
@@ -17,16 +17,16 @@
 
 package org.apache.eventmesh.common.protocol.http.header.message;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolKey;
 import org.apache.eventmesh.common.protocol.http.common.ProtocolVersion;
 import org.apache.eventmesh.common.protocol.http.header.Header;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class SendMessageRequestHeader extends Header {
 
     //request code
@@ -54,10 +54,10 @@ public class SendMessageRequestHeader extends Header {
     private String ip;
 
     //USERNAME of the requester
-    private String username;
+    private String username = "username";
 
     //PASSWD of the requester
-    private String passwd;
+    private String passwd = "user@123";
 
     public String getUsername() {
         return username;

diff --git a/...g/apache/eventmesh/common/protocol/http/header/message/PushMessageResponseHeaderTest.java b/...g/apache/eventmesh/common/protocol/http/header/message/PushMessageResponseHeaderTest.java
@@ -23,6 +23,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.hamcrest.CoreMatchers.is;
 
 public class PushMessageResponseHeaderTest {
@@ -39,5 +42,7 @@ public void testToMap() {
         Assert.assertThat(header.toMap().get(ProtocolKey.ClientInstanceKey.SYS), is("SYSID"));
         Assert.assertThat(header.toMap().get(ProtocolKey.ClientInstanceKey.PID), is("PID"));
         Assert.assertThat(header.toMap().get(ProtocolKey.ClientInstanceKey.IP), is("127.0.0.1"));
+        Assert.assertThat(header.toMap().get(ProtocolKey.ClientInstanceKey.USERNAME), is("username"));
+        Assert.assertThat(header.toMap().get(ProtocolKey.ClientInstanceKey.PASSWD), is("user@123"));
     }
 }
diff --git a/...g/apache/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeaderTest.java b/...g/apache/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeaderTest.java
@@ -44,6 +44,8 @@ public void before() {
         headerParam.put(ProtocolKey.ClientInstanceKey.SYS, "SYS");
         headerParam.put(ProtocolKey.ClientInstanceKey.PID, "PID");
         headerParam.put(ProtocolKey.ClientInstanceKey.IP, "127.0.0.1");
+        headerParam.put(ProtocolKey.ClientInstanceKey.USERNAME, "username");
+        headerParam.put(ProtocolKey.ClientInstanceKey.PASSWD, "user@123");
         header = ReplyMessageRequestHeader.buildHeader(headerParam);
     }
 
@@ -57,5 +59,7 @@ public void testToMap() {
         Assert.assertThat(header.toMap().get(ProtocolKey.ClientInstanceKey.SYS), is("SYS"));
         Assert.assertThat(header.toMap().get(ProtocolKey.ClientInstanceKey.PID), is("PID"));
         Assert.assertThat(header.toMap().get(ProtocolKey.ClientInstanceKey.IP), is("127.0.0.1"));
+        Assert.assertThat(header.toMap().get(ProtocolKey.ClientInstanceKey.USERNAME), is("username"));
+        Assert.assertThat(header.toMap().get(ProtocolKey.ClientInstanceKey.PASSWD), is("user@123"));
     }
 }
diff --git a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/conf/LiteClientConfig.java b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/conf/LiteClientConfig.java
@@ -52,9 +52,9 @@ public class LiteClientConfig {
 
     private String sys;
 
-    private String userName;
+    private String userName = "userName";
 
-    private String password;
+    private String password = "password";
 
     private boolean useTls = false;
 

diff --git a/...tmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/ssl/MyX509TrustManager.java b/...tmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/ssl/MyX509TrustManager.java
@@ -17,27 +17,27 @@
 
 package org.apache.eventmesh.client.http.ssl;
 
-import org.apache.commons.lang3.StringUtils;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.security.KeyStore;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.commons.lang3.StringUtils;
 
 public class MyX509TrustManager implements X509TrustManager {
     X509TrustManager myTrustManager;
 
     public MyX509TrustManager() throws Exception {
         KeyStore keyStore = KeyStore.getInstance("JKS");
-        String fileName = System.getProperty("ssl.client.cer", "");
-        String pass = System.getProperty("ssl.client.pass", "");
+        String fileName = System.getProperty("ssl.client.cer", "sChat2.jks");
+        String pass = System.getProperty("ssl.client.pass", "sNetty");
         char[] filePass = null;
         if (StringUtils.isNotBlank(pass)) {
             filePass = pass.toCharArray();

diff --git a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/EventMeshCommon.java b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/EventMeshCommon.java
@@ -52,12 +52,12 @@ public class EventMeshCommon {
     /**
      * Username used for EventMesh verification
      */
-    public static String EventMesh_USER = "";
+    public static String EventMesh_USER = "EventMesh";
 
     /**
      * Password used for EventMesh verification
      */
-    public static String EventMesh_PASS = "";
+    public static String EventMesh_PASS = "EventMesh@123";
 
     /**
      * Timeout time shared by the server