Fix: cyberghostvpn未上传至知识库

2 files changed, 8 insertions, 8 deletions

diff --git a/detection/vpn_detector.py b/detection/vpn_detector.py
index 52e1d91..9830ae3 100644
--- a/detection/vpn_detector.py
+++ b/detection/vpn_detector.py
@@ -132,7 +132,7 @@ class VpnDetector:
         except Exception as e:
             # self.logger.error("Resolve failed. {}: {} ".format(server_name, e))
             pass
-        self.logger.info('{}  {}'.format(server_name, resolved_addr))
+        # self.logger.info('{}  {}'.format(server_name, resolved_addr))
 
         return server_name, resolved_addr
 
diff --git a/detection/vpnservices/cyberghostvpn.py b/detection/vpnservices/cyberghostvpn.py
index 2aae173..4550a99 100644
--- a/detection/vpnservices/cyberghostvpn.py
+++ b/detection/vpnservices/cyberghostvpn.py
@@ -167,13 +167,12 @@ class CyberghostvpnServerip(VpnDetector):
                         index += 1
                         resolve_result = self.get_resolved_addr(f"blade{str(index)}.{rack_name}.nodes.gen4.ninja")
                 self.logger.info('[{}] - Get {} server ip by resolving server name successfully.'.format(self.plugin_name, len(resolved_ip_list)))
-
         else:
             self.logger.info('[{}] - No internet connection, skip dns resolve.'.format(self.plugin_name))
 
 
         # 根据udp探测行为获取IP
-        self.logger.info('[{}] - Start to query server ip from session records.'.format(self.plugin_name))
+        self.logger.info('[{}] - Start to query server ip from session records according to udp payload feature.'.format(self.plugin_name))
 
         TIME_FILTER_PATTERN = self.config['common']['time_filter_pattern'].replace('recv_time_columnname',
                                                                                    self.config['common'][
@@ -194,13 +193,14 @@ class CyberghostvpnServerip(VpnDetector):
 
         if cyberghostvpn_serverip_df.empty:
             self.logger.info('[{}] - No server ip found from session records'.format(self.plugin_name))
-            return []
-        cyberghostvpn_serverip_list = cyberghostvpn_serverip_df[0].drop_duplicates().tolist()
-        self.logger.info('[{}] - Query server ip from clickhouse database successfully. {} items found'
-                         .format(self.plugin_name, len(cyberghostvpn_serverip_list)))
+        else:
+            cyberghostvpn_serverip_list = cyberghostvpn_serverip_df[0].drop_duplicates().tolist()
+            self.logger.info('[{}] - Query server ip from clickhouse database successfully. {} items found'
+                             .format(self.plugin_name, len(cyberghostvpn_serverip_list)))
+            resolved_ip_list.extend(cyberghostvpn_serverip_list)
 
 
-        result_ip_list = list(set(cyberghostvpn_serverip_list + resolved_ip_list))
+        result_ip_list = list(set(resolved_ip_list))
 
         return [ServerGroup(self.object_type, result_ip_list, self.output_file_name)]