Merge pull request #45 from qzhello/main

fix: Split out user restclient, remove default header #44
TongchengOpenSource · Jun 4, 2024 · 7e2e434 · 7e2e434
2 parents ae33b63 + d7fb40b
commit 7e2e434
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/src/main/java/com/ly/ckibana/configure/config/ProxyConfigLoader.java b/src/main/java/com/ly/ckibana/configure/config/ProxyConfigLoader.java
@@ -204,7 +204,7 @@ public void updateProxyConfigMap(KibanaProperty newKibanaProperty) {
             try {
                 proxyConfig.getRestClient().close();
                 // create a new es client
-                proxyConfig.setRestClient(RestUtils.initEsResClient(this.kibanaProperty.getProxy().getEs()));
+                proxyConfig.setRestClient(RestUtils.initEsResClient(this.kibanaProperty.getProxy().getEs(), true));
             } catch (IOException e) {
                 log.error("close rest client error.", e);
             }

diff --git a/src/main/java/com/ly/ckibana/constants/Constants.java b/src/main/java/com/ly/ckibana/constants/Constants.java
@@ -226,4 +226,8 @@ public static class IndexBuilder {
 
         public static final String BULK_INDEX_NO_TYPE_HEADER = "{ \"index\": { \"_index\" : \"%s\", \"_id\": \"%s\"}}";
     }
+
+    public static class Headers {
+        public static final String AUTHORIZATION = "authorization";
+    }
 }
diff --git a/src/main/java/com/ly/ckibana/handlers/BaseHandler.java b/src/main/java/com/ly/ckibana/handlers/BaseHandler.java
@@ -133,6 +133,10 @@ private RequestContext build(HttpServletRequest request, HttpServletResponse res
         Map<String, Header> reqHeaders = HttpServletUtils.parseHttpRequestHeaders(request);
         Map<String, String> defaultHeaders = proxyConfig.getKibanaItemProperty().getEs().getHeaders();
         defaultHeaders.forEach((dhn, dhv) -> {
+            if (dhn.equalsIgnoreCase(Constants.Headers.AUTHORIZATION)) {
+                return;
+            }
+
             for (String headerName : reqHeaders.keySet()) {
                 if (headerName.equalsIgnoreCase(dhn)) {
                     reqHeaders.put(headerName, new BasicHeader(headerName, dhv));

diff --git a/src/main/java/com/ly/ckibana/model/request/ProxyConfig.java b/src/main/java/com/ly/ckibana/model/request/ProxyConfig.java
@@ -48,13 +48,16 @@ public class ProxyConfig {
 
     private RestClient restClient;
 
+    private RestClient userRestClient;
+
     private EsProxyClientConsumer esClientBuffer;
 
     private BalancedClickhouseDataSource ckDatasource;
 
     public ProxyConfig(KibanaItemProperty kibanaItemProperty) {
         this.kibanaItemProperty = kibanaItemProperty;
-        this.restClient = RestUtils.initEsResClient(kibanaItemProperty.getEs());
+        this.restClient = RestUtils.initEsResClient(kibanaItemProperty.getEs(), true);
+        this.userRestClient = RestUtils.initEsResClient(kibanaItemProperty.getEs(), false);
         this.esClientBuffer = new EsProxyClientConsumer();
         if (kibanaItemProperty.getCk() != null) {
             this.ckDatasource = CkService.initDatasource(kibanaItemProperty.getCk());

diff --git a/src/main/java/com/ly/ckibana/service/BlackSqlService.java b/src/main/java/com/ly/ckibana/service/BlackSqlService.java
@@ -61,11 +61,11 @@ public String addBlackSql(long range, String sql) {
     }
 
     public String removeBlackSql(String id) {
-        return EsClientUtil.deleteSource(proxyConfigLoader.getMetadataRestClient(), Constants.ConfigFile.BLACK_LIST_INDEX_NAME, id);
+        return EsClientUtil.deleteSource(requestContext.getProxyConfig().getRestClient(), Constants.ConfigFile.BLACK_LIST_INDEX_NAME, id);
     }
 
     public String getList(int size) {
-        return EsClientUtil.search(proxyConfigLoader.getMetadataRestClient(), Constants.ConfigFile.BLACK_LIST_INDEX_NAME, String.format("{\"size\":%s}", size));
+        return EsClientUtil.search(requestContext.getProxyConfig().getRestClient(), Constants.ConfigFile.BLACK_LIST_INDEX_NAME, String.format("{\"size\":%s}", size));
     }
 
     public boolean isBlackSql(long range, String sql) {

diff --git a/src/main/java/com/ly/ckibana/service/EsClientUtil.java b/src/main/java/com/ly/ckibana/service/EsClientUtil.java
@@ -54,8 +54,11 @@ public class EsClientUtil {
 
     protected static final Header[] BASE_HEADER = new Header[]{new BasicHeader("Content-Type", "application/json")};
 
+    /**
+     * 不指定则采用用户restclient
+     */
     public static String doRequest(RequestContext context) throws Exception {
-        return doRequest(context.getProxyConfig().getRestClient(), context.getRequestInfo(), context.getHttpResponse());
+        return doRequest(context.getProxyConfig().getUserRestClient(), context.getRequestInfo(), context.getHttpResponse());
     }
 
     public static String doRequest(RestClient restClient, RequestContext.RequestInfo requestInfo, HttpServletResponse response) throws Exception {

diff --git a/src/main/java/com/ly/ckibana/util/RestUtils.java b/src/main/java/com/ly/ckibana/util/RestUtils.java
@@ -75,9 +75,9 @@ public static String getClientIpAddr(HttpServletRequest request) {
     /**
      * 初始化es客户端.
      */
-    public static RestClient initEsResClient(EsProperty item) {
+    public static RestClient initEsResClient(EsProperty item, boolean mergeDefaultHeader) {
         Map<String, String> headersMap = new HashMap<>();
-        if (!CollectionUtils.isEmpty(item.getHeaders())) {
+        if (!CollectionUtils.isEmpty(item.getHeaders()) && mergeDefaultHeader) {
             headersMap.putAll(item.getHeaders());
         }
         return initEsRestClient(item.getHost(), headersMap);