summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author尹姜谊 <[email protected]>2024-02-18 10:45:26 +0800
committer尹姜谊 <[email protected]>2024-02-18 10:45:26 +0800
commit61883adbc1b2722bea4ce67356e3d3683c5ecbe0 (patch)
tree8460ce274baa96eb013eb17c149ffec9574bea6a
parent9faa956f2583ef51c15ef3ac37061c6dcf1dda9f (diff)
Fix: 修复主动探测开关不生效问题
-rw-r--r--data/cyberghostvpn/cyberghostvpn-domain_2024-02-07_16.txt0
-rw-r--r--data/cyberghostvpn/cyberghostvpn-ip_2024-02-07_18.txt0
-rw-r--r--detection/vpnservices/ipvanishvpn.py2
-rw-r--r--detection/vpnservices/ivacyvpn.py2
-rw-r--r--detection/vpnservices/windscribevpn.py2
5 files changed, 3 insertions, 3 deletions
diff --git a/data/cyberghostvpn/cyberghostvpn-domain_2024-02-07_16.txt b/data/cyberghostvpn/cyberghostvpn-domain_2024-02-07_16.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/data/cyberghostvpn/cyberghostvpn-domain_2024-02-07_16.txt
diff --git a/data/cyberghostvpn/cyberghostvpn-ip_2024-02-07_18.txt b/data/cyberghostvpn/cyberghostvpn-ip_2024-02-07_18.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/data/cyberghostvpn/cyberghostvpn-ip_2024-02-07_18.txt
diff --git a/detection/vpnservices/ipvanishvpn.py b/detection/vpnservices/ipvanishvpn.py
index 5b7905e..1ff908c 100644
--- a/detection/vpnservices/ipvanishvpn.py
+++ b/detection/vpnservices/ipvanishvpn.py
@@ -117,7 +117,7 @@ class IpvanishvpnServerip(VpnDetector):
servername_list = [i[0] for i in query_result]
# 判断是否能够访问外网,如果能够访问外网,则从外网获取ipvanish_servername_list的域名解析地址
- if self.config['common']['active_scan']['switch']=='on' and check_internet():
+ if self.config['common']['active_scan']['switch'] and check_internet():
servername_list = self.find_more_servernames(servername_list)
if len(servername_list) > 0:
resolved_ip_list = self.resolve_dns_for_domain_list(servername_list)
diff --git a/detection/vpnservices/ivacyvpn.py b/detection/vpnservices/ivacyvpn.py
index 70ae4a1..918e14e 100644
--- a/detection/vpnservices/ivacyvpn.py
+++ b/detection/vpnservices/ivacyvpn.py
@@ -100,7 +100,7 @@ class IvacyvpnServerip(VpnDetector):
server_name_list.extend([f"dc-{str(index)}.pointtoserver.com" for index in range(1000)])
server_name_list = list(set(server_name_list))
- if self.config['common']['active_scan']['switch']=='on' and check_internet():
+ if self.config['common']['active_scan']['switch'] and check_internet():
server_ip_list = self.resolve_dns_for_domain_list(server_name_list)
if server_ip_list:
server_ip_list = list(set(server_ip_list))
diff --git a/detection/vpnservices/windscribevpn.py b/detection/vpnservices/windscribevpn.py
index 834a2d0..3676232 100644
--- a/detection/vpnservices/windscribevpn.py
+++ b/detection/vpnservices/windscribevpn.py
@@ -120,7 +120,7 @@ class WindscribevpnServerip(VpnDetector):
servername_list = [i[0] for i in query_result]
# 判断是否能够访问外网,如果能够访问外网,则从外网获取windscribevpn_servername_list的域名解析地址
- if self.config['common']['active_scan']['switch']=='on' and check_internet():
+ if self.config['common']['active_scan']['switch'] and check_internet():
servername_list = self.find_more_servernames(servername_list)
if len(servername_list) > 0:
resolved_ip_list = self.resolve_dns_for_domain_list(servername_list)