easy_whitelist 1.0.44__tar.gz → 1.0.45__tar.gz

{easy_whitelist-1.0.44 → easy_whitelist-1.0.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easy_whitelist
-Version: 1.0.44
+Version: 1.0.45
 Summary: Easy_whitelist is a smart tool that detects the local Internet IP address and automatically updates the local Internet IP address to the cloud security group whitelist. The tool is written in Python.
 Keywords: automation,whitelist,acl,security-groups,alibaba-cloud,tencent-cloud,security-tools,security-group-rule
 Author: qiqilelebaobao

{easy_whitelist-1.0.44 → easy_whitelist-1.0.45}/easy_whitelist/__init__.py

@@ -1,6 +1,6 @@
 r"""Easy_whitelist is a smart tool that detects the local Internet IP address and automatically updates the local Internet IP address to the cloud security group whitelist. The tool is written in Python.
 """
-__version__ = '1.0.44'
+__version__ = '1.0.45'
 # __author__ = 'qiqileleabaobao <qiqilelebaobao@163.com>'
 
 __all__ = []

{easy_whitelist-1.0.44 → easy_whitelist-1.0.45}/easy_whitelist/ip/ip.py

@@ -7,11 +7,15 @@ import logging
 
 from . import url
 
-def get_local_ip_from_url_and_parse(u, patt, ag, proxy=None):
+def get_local_ip_from_url_and_parse(u, patt, ag, if_enable, proxy=None):
     # 发送GET请求
     headers = {'user-agent': ag}
+    
+    if not re.search('enable', if_enable, re.IGNORECASE):
+        return None
+
     try:
-        logging.info(f'Starting fetch local ip from {u} with proxy {proxy}')
+        logging.info(f'Starting fetch local ip from {u} with proxy "{proxy}"')
 
         if proxy:
             response = requests.get(u, headers=headers, timeout=(3,5),
@@ -20,7 +24,7 @@ def get_local_ip_from_url_and_parse(u, patt, ag, proxy=None):
                                             })
         else:
             response = requests.get(u, headers=headers, timeout=(3, 5))
-            
+
         # 获取响应内容
         respon = response.text
         l_ip = url.parse_ip_from_response(respon, patt)
@@ -48,7 +52,7 @@ def validate_ip(l_ip):
 def get_local_ips(proxy=None):
     ip_list = []
     for i, u in enumerate(url.detect_url, 1):
-        l_ip = get_local_ip_from_url_and_parse(u[0], u[1], u[2], proxy)
+        l_ip = get_local_ip_from_url_and_parse(u[0], u[1], u[2], u[3], proxy)
         if l_ip and validate_ip(l_ip):
             ip_list.append(l_ip)
     return ip_list

{easy_whitelist-1.0.44 → easy_whitelist-1.0.45}/easy_whitelist/ip/url.py

@@ -10,7 +10,7 @@ def parse_ip_from_response(response, patt):
         return result.group(1)
 
 detect_url = [
-    ['https://ifconfig.me', IFCONFIG_ME_PATTERN, random.choice(curl_user_agent)],
-    ['http://cip.cc', CIP_CC_PATTERN, random.choice(chrome_user_agent)],
-    ['https://tool.lu/ip/', TOOL_LU_PATTERN, random.choice(chrome_user_agent)]
+    ['https://ifconfig.me', IFCONFIG_ME_PATTERN, random.choice(curl_user_agent), 'enable'],
+    ['http://cip.cc', CIP_CC_PATTERN, random.choice(chrome_user_agent), 'DISABLE'],
+    ['https://tool.lu/ip/', TOOL_LU_PATTERN, random.choice(chrome_user_agent), 'enable']
 ]