修改：适配24.08版本知识库库表结构变化24.08

4 files changed, 12 insertions, 20 deletions

diff --git a/detection/vpnservices/cyberghostvpn.py b/detection/vpnservices/cyberghostvpn.py
index b68adb1..5c90de8 100644
--- a/detection/vpnservices/cyberghostvpn.py
+++ b/detection/vpnservices/cyberghostvpn.py
@@ -71,14 +71,12 @@ class CyberghostvpnServerip(VpnDetector):
 
         self.kb_sql = self.plugin_config['ip']['kb_sql']
         self.kb_dbname = self.config['knowledgebase']['db_name']
-        self.kb_table_name = self.config['knowledgebase']['domain_library_name']
 
         self.mariadb = MariadbUtil(self.config['mariadb']['host'], self.config['mariadb']['port'],
                                    self.config['mariadb']['user'], str(self.config['mariadb']['pswd']),
                                    self.config['mariadb']['db_name'])
         self.mariadb_dbname = self.config['mariadb']['db_name']
-        self.mariadb_ip_tb_name = self.config['mariadb']['ip_table_name']
-        self.mariadb_domain_tb_name = self.config['mariadb']['domain_table_name']
+        self.mariadb_tb_name = self.config['mariadb']['table_name']
 
         self.sql = self.plugin_config['ip']['sql']
 
@@ -130,7 +128,7 @@ class CyberghostvpnServerip(VpnDetector):
         :return: cyberghostvpn server ip list
         """
         self.kb_sql = self.kb_sql.replace("{$mariadb_dbname}", self.mariadb_dbname).replace(
-            "{$mariadb_domain_tablename}", self.mariadb_domain_tb_name)
+            "{$mariadb_tablename}", self.mariadb_tb_name)
 
         # 根据server name获取ip
         self.logger.info('[{}] - Get servername from knowledge base.'.format(self.plugin_name))
@@ -142,7 +140,7 @@ class CyberghostvpnServerip(VpnDetector):
             self.mariadb.close()
 
         if query_result:
-            servername_list = [i[0] for i in query_result]
+            servername_list = [i[0].strip('$') for i in query_result]
         self.server_name_list.extend(servername_list)
 
         # 判断是否能够访问外网，如果能够访问外网，则从外网获取cyberghost_servername_list的域名解析地址
diff --git a/detection/vpnservices/ipvanishvpn.py b/detection/vpnservices/ipvanishvpn.py
index 1b1d5fb..6f2db93 100644
--- a/detection/vpnservices/ipvanishvpn.py
+++ b/detection/vpnservices/ipvanishvpn.py
@@ -71,14 +71,12 @@ class IpvanishvpnServerip(VpnDetector):
 
         self.kb_sql = self.plugin_config['ip']['kb_sql']
         self.kb_dbname = self.config['knowledgebase']['db_name']
-        self.kb_table_name = self.config['knowledgebase']['domain_library_name']
 
         self.mariadb = MariadbUtil(self.config['mariadb']['host'], self.config['mariadb']['port'],
                                    self.config['mariadb']['user'], str(self.config['mariadb']['pswd']),
                                    self.config['mariadb']['db_name'])
         self.mariadb_dbname = self.config['mariadb']['db_name']
-        self.mariadb_ip_tb_name = self.config['mariadb']['ip_table_name']
-        self.mariadb_domain_tb_name = self.config['mariadb']['domain_table_name']
+        self.mariadb_tb_name = self.config['mariadb']['table_name']
 
         self.server_name_list = []
 
@@ -110,7 +108,7 @@ class IpvanishvpnServerip(VpnDetector):
         Get ipvanishvpn server ip by resolving ipvanishvpn server name
         :return: ipvanishvpn server ip list
         """
-        self.kb_sql = self.kb_sql.replace("{$mariadb_dbname}", self.mariadb_dbname).replace("{$mariadb_domain_tablename}", self.mariadb_domain_tb_name)
+        self.kb_sql = self.kb_sql.replace("{$mariadb_dbname}", self.mariadb_dbname).replace("{$mariadb_tablename}", self.mariadb_tb_name)
 
         servername_list = []
         resolved_ip_list = []
@@ -120,7 +118,7 @@ class IpvanishvpnServerip(VpnDetector):
             self.mariadb.close()
 
         if query_result:
-            servername_list = [i[0] for i in query_result]
+            servername_list = [i[0].strip('$') for i in query_result]
 
         self.server_name_list.extend(servername_list)
 
diff --git a/detection/vpnservices/ivacyvpn.py b/detection/vpnservices/ivacyvpn.py
index e12fd9c..9929583 100644
--- a/detection/vpnservices/ivacyvpn.py
+++ b/detection/vpnservices/ivacyvpn.py
@@ -68,14 +68,12 @@ class IvacyvpnServerip(VpnDetector):
 
         self.kb_sql = self.plugin_config['ip']['kb_sql']
         self.kb_dbname = self.config['knowledgebase']['db_name']
-        self.kb_table_name = self.config['knowledgebase']['domain_library_name']
 
         self.mariadb = MariadbUtil(self.config['mariadb']['host'], self.config['mariadb']['port'],
                                    self.config['mariadb']['user'], str(self.config['mariadb']['pswd']),
                                    self.config['mariadb']['db_name'])
         self.mariadb_dbname = self.config['mariadb']['db_name']
-        self.mariadb_ip_tb_name = self.config['mariadb']['ip_table_name']
-        self.mariadb_domain_tb_name = self.config['mariadb']['domain_table_name']
+        self.mariadb_tb_name = self.config['mariadb']['table_name']
 
         self.server_name_list = []
 
@@ -87,7 +85,7 @@ class IvacyvpnServerip(VpnDetector):
         Find ivacyvpn server ip by resolving ivacyvpn server name
         :return: server ip list
         """
-        self.kb_sql = self.kb_sql.replace("{$mariadb_dbname}", self.mariadb_dbname).replace("{$mariadb_domain_tablename}", self.mariadb_domain_tb_name)
+        self.kb_sql = self.kb_sql.replace("{$mariadb_dbname}", self.mariadb_dbname).replace("{$mariadb_tablename}", self.mariadb_tb_name)
 
         server_ip_list = []
 
@@ -98,7 +96,7 @@ class IvacyvpnServerip(VpnDetector):
 
         if query_result:
             for row in query_result:
-                self.server_name_list.append(row[0])
+                self.server_name_list.append(row[0].strip('$'))
 
         # add dc-xxx.pointtoserver.com to self.server_name_list
         self.server_name_list.extend([f"dc-{str(index)}.pointtoserver.com" for index in range(1000)])
diff --git a/detection/vpnservices/windscribevpn.py b/detection/vpnservices/windscribevpn.py
index 5978907..43cee14 100644
--- a/detection/vpnservices/windscribevpn.py
+++ b/detection/vpnservices/windscribevpn.py
@@ -79,14 +79,12 @@ class WindscribevpnActiveServerip(VpnDetector):
         self.kb_sql = self.plugin_config['ip']['kb_sql']
         self.sql = self.plugin_config['ip']['sql']
         self.kb_dbname = self.config['knowledgebase']['db_name']
-        self.kb_table_name = self.config['knowledgebase']['domain_library_name']
 
         self.mariadb = MariadbUtil(self.config['mariadb']['host'], self.config['mariadb']['port'],
                                    self.config['mariadb']['user'], str(self.config['mariadb']['pswd']),
                                    self.config['mariadb']['db_name'])
         self.mariadb_dbname = self.config['mariadb']['db_name']
-        self.mariadb_ip_tb_name = self.config['mariadb']['ip_table_name']
-        self.mariadb_domain_tb_name = self.config['mariadb']['domain_table_name']
+        self.mariadb_tb_name = self.config['mariadb']['table_name']
 
         self.server_name_list = []
 
@@ -122,7 +120,7 @@ class WindscribevpnActiveServerip(VpnDetector):
         :return: windscribevpn server ip list
         """
         self.kb_sql = self.kb_sql.replace("{$mariadb_dbname}", self.mariadb_dbname).replace(
-            "{$mariadb_domain_tablename}", self.mariadb_domain_tb_name)
+            "{$mariadb_tablename}", self.mariadb_tb_name)
 
         servername_list = []
         resolved_ip_list = []
@@ -132,7 +130,7 @@ class WindscribevpnActiveServerip(VpnDetector):
             self.mariadb.close()
 
         if query_result:
-            servername_list = [i[0] for i in query_result]
+            servername_list = [i[0].strip('$') for i in query_result]
 
         self.server_name_list.extend(servername_list)