ES创建连接时使用“是否验证服务端ssl证书”字段 (#2815)

hhyo · Sep 19, 2024 · b1efe08 · b1efe08
1 parent 0e649e9
commit b1efe08
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/sql/engines/__init__.py b/sql/engines/__init__.py
@@ -28,7 +28,6 @@ def __init__(self, instance: Instance = None):
             self.password = instance.password
             self.db_name = instance.db_name
             self.mode = instance.mode
-            self.is_ssl = instance.is_ssl
 
             # 判断如果配置了隧道则连接隧道，只测试了MySQL
             if self.instance.tunnel:

diff --git a/sql/engines/elasticsearch.py b/sql/engines/elasticsearch.py
@@ -1046,13 +1046,13 @@ def get_connection(self, db_name=None):
         if self.conn:
             return self.conn
         if self.instance:
-            scheme = "https" if self.is_ssl else "http"
+            scheme = "https" if self.instance.is_ssl else "http"
             hosts = [
                 {
                     "host": self.host,
                     "port": self.port,
                     "scheme": scheme,
-                    "use_ssl": self.is_ssl,
+                    "use_ssl": self.instance.is_ssl,
                 }
             ]
             http_auth = (
@@ -1064,7 +1064,7 @@ def get_connection(self, db_name=None):
                 self.conn = Elasticsearch(
                     hosts=hosts,
                     http_auth=http_auth,
-                    verify_certs=True,  # 需要证书验证
+                    verify_certs=self.instance.verify_ssl,  # 需要证书验证
                 )
             except Exception as e:
                 raise Exception(f"Elasticsearch 连接建立失败: {str(e)}")
@@ -1095,13 +1095,13 @@ def get_connection(self, db_name=None):
         if self.conn:
             return self.conn
         if self.instance:
-            scheme = "https" if self.is_ssl else "http"
+            scheme = "https" if self.instance.is_ssl else "http"
             hosts = [
                 {
                     "host": self.host,
                     "port": self.port,
                     "scheme": scheme,
-                    "use_ssl": self.is_ssl,
+                    "use_ssl": self.instance.is_ssl,
                 }
             ]
             http_auth = (
@@ -1114,7 +1114,7 @@ def get_connection(self, db_name=None):
                 self.conn = OpenSearch(
                     hosts=hosts,
                     http_auth=http_auth,
-                    verify_certs=True,  # 开启证书验证
+                    verify_certs=self.instance.verify_ssl,  # 开启证书验证
                 )
             except Exception as e:
                 raise Exception(f"OpenSearch 连接建立失败: {str(e)}")

diff --git a/sql/engines/redis.py b/sql/engines/redis.py
@@ -35,7 +35,7 @@ def get_connection(self, db_name=None):
                 encoding_errors="ignore",
                 decode_responses=True,
                 socket_connect_timeout=10,
-                ssl=self.is_ssl,
+                ssl=self.instance.is_ssl,
             )
         else:
             return redis.Redis(
@@ -47,7 +47,7 @@ def get_connection(self, db_name=None):
                 encoding_errors="ignore",
                 decode_responses=True,
                 socket_connect_timeout=10,
-                ssl=self.is_ssl,
+                ssl=self.instance.is_ssl,
             )
 
     name = "Redis"