diff options
| author | 尹姜谊 <[email protected]> | 2024-04-17 18:07:01 +0800 |
|---|---|---|
| committer | 尹姜谊 <[email protected]> | 2024-04-17 18:07:01 +0800 |
| commit | c0d48d9b8b55926fcaf38c7a126c67ea01e03dbf (patch) | |
| tree | 4fc604fde65225883c55db228bc5ecee131c5856 | |
| parent | 1cc37ec84e68c6b86f9c8c466b9c93ee2341727e (diff) | |
Modify: 适配知识库域名正则匹配24.04
| -rw-r--r-- | config24.01.yaml | 4 | ||||
| -rw-r--r-- | detection/vpn_detector.py | 2 | ||||
| -rw-r--r-- | detection/vpnservices/cyberghostvpn.py | 2 | ||||
| -rw-r--r-- | detection/vpnservices/ipvanishvpn.py | 2 | ||||
| -rw-r--r-- | detection/vpnservices/ivacyvpn.py | 2 | ||||
| -rw-r--r-- | detection/vpnservices/windscribevpn.py | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/config24.01.yaml b/config24.01.yaml index f58789e..25adcdb 100644 --- a/config24.01.yaml +++ b/config24.01.yaml @@ -12,8 +12,8 @@ common: protected_ip_list: ['8.8.8.8', '8.8.4.4', '1.1.1.1', '255.255.255.255', '0.0.0.0', '127.*'] monitor: - monitor_file_path: /Users/joy/Downloads/vpn_thwarting_monitor.prom -# monitor_file_path: /opt/vpn-finder-plugins/prom/vpn_plugin_knowledgebase_monitor.prom +# monitor_file_path: /Users/joy/Downloads/vpn_thwarting_monitor.prom + monitor_file_path: /opt/vpn-finder-plugins/prom/vpn_plugin_knowledgebase_monitor.prom outdated_days: 100 # outdated after Inactive for days. outdated results will not be monitored as effective results timezone_hour_gap: 8 diff --git a/detection/vpn_detector.py b/detection/vpn_detector.py index d119e2c..d5de299 100644 --- a/detection/vpn_detector.py +++ b/detection/vpn_detector.py @@ -97,7 +97,7 @@ class VpnDetector: result_df['ip_addr_format'] = 'Single' if object_type == 'domain': - result_df['domain'] = object_list + result_df['domain'] = ['$'+i for i in object_list] result_df['type'] = 'Domain' result_df['source_id'] = plugin_id diff --git a/detection/vpnservices/cyberghostvpn.py b/detection/vpnservices/cyberghostvpn.py index c5b45a9..5c90de8 100644 --- a/detection/vpnservices/cyberghostvpn.py +++ b/detection/vpnservices/cyberghostvpn.py @@ -140,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 3d3cd34..6f2db93 100644 --- a/detection/vpnservices/ipvanishvpn.py +++ b/detection/vpnservices/ipvanishvpn.py @@ -118,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 3c5f3bb..9929583 100644 --- a/detection/vpnservices/ivacyvpn.py +++ b/detection/vpnservices/ivacyvpn.py @@ -96,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 6b9ff4e..43cee14 100644 --- a/detection/vpnservices/windscribevpn.py +++ b/detection/vpnservices/windscribevpn.py @@ -130,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) |