(inlong) branch master updated: [INLONG-9848][Agent] Add the getAuthHeader function in the HttpManager class (#9849)

[dockerzhang]

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 4f9f405984 [INLONG-9848][Agent] Add the getAuthHeader function in the 
HttpManager class (#9849)
4f9f405984 is described below

commit 4f9f40598414b43ab9cd20f929b2a03cf39ec10f
Author: justinwwhuang <hww_jus...@163.com>
AuthorDate: Wed Mar 20 10:16:57 2024 +0800

    [INLONG-9848][Agent] Add the getAuthHeader function in the HttpManager 
class (#9849)
---
 .../org/apache/inlong/agent/utils/HttpManager.java  | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/HttpManager.java
 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/HttpManager.java
index e8477c6fb5..2144702c5d 100644
--- 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/HttpManager.java
+++ 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/utils/HttpManager.java
@@ -42,6 +42,8 @@ import javax.net.ssl.SSLContext;
 import java.nio.charset.Charset;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import static 
org.apache.inlong.agent.constant.FetcherConstants.AGENT_HTTP_APPLICATION_JSON;
@@ -158,7 +160,10 @@ public class HttpManager {
     public String doSentPost(String url, Object dto) {
         try {
             HttpPost post = getHttpPost(url);
-            post.addHeader(BasicAuth.BASIC_AUTH_HEADER, 
BasicAuth.genBasicAuthCredential(secretId, secretKey));
+            Map<String, String> authHeader = getAuthHeader();
+            authHeader.forEach((k, v) -> {
+                post.addHeader(k, v);
+            });
             StringEntity stringEntity = new StringEntity(toJsonStr(dto), 
Charset.forName("UTF-8"));
             stringEntity.setContentType(AGENT_HTTP_APPLICATION_JSON);
             post.setEntity(stringEntity);
@@ -190,7 +195,10 @@ public class HttpManager {
     public String doSendPost(String url) {
         try {
             HttpPost post = getHttpPost(url);
-            post.addHeader(BasicAuth.BASIC_AUTH_HEADER, 
BasicAuth.genBasicAuthCredential(secretId, secretKey));
+            Map<String, String> authHeader = getAuthHeader();
+            authHeader.forEach((k, v) -> {
+                post.addHeader(k, v);
+            });
             CloseableHttpResponse response = httpClient.execute(post);
             String returnStr = EntityUtils.toString(response.getEntity());
             if (returnStr != null && !returnStr.isEmpty()
@@ -218,4 +226,13 @@ public class HttpManager {
         return new HttpGet(url);
     }
 
+    public Map<String, String> getAuthHeader() {
+        Map<String, String> header = new HashMap<>();
+        try {
+            header.put(BasicAuth.BASIC_AUTH_HEADER, 
BasicAuth.genBasicAuthCredential(secretId, secretKey));
+        } catch (Exception e) {
+            LOGGER.error("Get auth header error", e);
+        }
+        return header;
+    }
 }