easy_whitelist 1.0.43__py3-none-any.whl → 1.0.45__py3-none-any.whl

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.43'
+__version__ = '1.0.45'
 # __author__ = 'qiqileleabaobao <qiqilelebaobao@163.com>'
 
 __all__ = []

easy_whitelist/__main__.py

@@ -8,9 +8,9 @@ import string
 import sys
 import logging
 
-from config import arg
-from tcloud import client
-from tcloud.template import list_template, set_template, create_template
+from easy_whitelist.config import arg
+from easy_whitelist.tcloud import client
+from easy_whitelist.tcloud.template import list_template, set_template, create_template
 
 
 def loop_list(common_client, proxy=None):

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/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']
 ]

easy_whitelist/tcloud/template.py

@@ -3,7 +3,7 @@ import random
 import sys
 import logging
 
-from ip import ip
+from easy_whitelist.ip import ip
 from tencentcloud.common.exception.tencent_cloud_sdk_exception import TencentCloudSDKException
 
 

{easy_whitelist-1.0.43.dist-info → easy_whitelist-1.0.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easy_whitelist
-Version: 1.0.43
+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.43.dist-info → easy_whitelist-1.0.45.dist-info}/RECORD

@@ -1,20 +1,20 @@
-easy_whitelist/__init__.py,sha256=1on1I7SeFbPuz7yi7HM60DagScp0AXYrwkpp3Vo2bao,303
-easy_whitelist/__main__.py,sha256=koZeYIzTYuAASgx-T-qrV0rTbrFBdceaH0PCmua4x3c,2313
+easy_whitelist/__init__.py,sha256=EzzJJXwF7RvhwwS3xT8baXNXNSZV4-thxAoeZxt2JCI,303
+easy_whitelist/__main__.py,sha256=x5teqF_1OWhLujmBM37jYNJ9Ed1kF_xyzkYpJf4TCI0,2358
 easy_whitelist/config/__init__.py,sha256=fK-lJ3GD4u1_FGkZfPf-f7fxjMwb1t0AZcG7mfIHLks,19
 easy_whitelist/config/arg.py,sha256=efzlQSHK49MFhf0VAnVt6jkGxdwW3ae3yUJmDIKx9mY,1087
 easy_whitelist/ip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 easy_whitelist/ip/agent.py,sha256=dJDkw1mipazcOyldbBZW5Mhjr17UqDlaBn2jUo80C7I,487
-easy_whitelist/ip/ip.py,sha256=K34xjZsFWsSi70crQQ51k04x8H5StC-yE5ZMWDEm41I,2145
+easy_whitelist/ip/ip.py,sha256=H_daXbZ67Crp9sDHdNeuIyZD3H1Z6DrPXQOMiahgxtg,2236
 easy_whitelist/ip/pattern.py,sha256=184XTlT0087eBZbm9LC5AB38PMLazQueW8E7l4jSwkM,149
-easy_whitelist/ip/url.py,sha256=kFBZ2E_AYQ-AYo7eeKQJ22kjviQ61bZMdQS4EOR5j-k,439
+easy_whitelist/ip/url.py,sha256=xmma_JtcY7LS6fDvfH2RBXvn_3-KZktg-fQj-kxhE10,470
 easy_whitelist/sample/common_client_sample.py,sha256=kPde6JHuGLHapC7oSzoC_RdjS7Lxpqtp890NbGIVomc,1958
 easy_whitelist/sample/cvm_sample_detail.py,sha256=sxsDJY2YvU6uwgbGBzWrl4tFZOKjGq9YMVEKIEjUNEI,4144
 easy_whitelist/sample/cvm_sample_simple.py,sha256=g5rESUuRwcVqxemPct3QrWhZ4tnoRHh_hFkrqlHOTw0,871
 easy_whitelist/tcloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 easy_whitelist/tcloud/client.py,sha256=eHevgHB1Y8C2Rwa8ztiIm-GkNTOJDlWU7RMNhw6oTmw,906
-easy_whitelist/tcloud/template.py,sha256=rZ6Ud6iwIJmqgzj4Iyzp8cydZ68JXzqv-2iBmNzwe7Y,6051
-easy_whitelist-1.0.43.dist-info/entry_points.txt,sha256=-URzXdGXqVTDQm_AhH9k0u4Qm9G0s4ZDXcnA-XQt73Q,53
-easy_whitelist-1.0.43.dist-info/LICENSE,sha256=sWhlh6jzXRpuhxIbCZfjCEX_YQI4mMK6iO1bfpgkfzM,11343
-easy_whitelist-1.0.43.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-easy_whitelist-1.0.43.dist-info/METADATA,sha256=3lYA6NSe4-V8qVIRk1MZXcyIr9w7UMi3EEsExlfBbnw,3553
-easy_whitelist-1.0.43.dist-info/RECORD,,
+easy_whitelist/tcloud/template.py,sha256=dLqFSunO8_wjZfCU0z5x9_G30pIDTT91qhJFYtlMRb4,6066
+easy_whitelist-1.0.45.dist-info/entry_points.txt,sha256=-URzXdGXqVTDQm_AhH9k0u4Qm9G0s4ZDXcnA-XQt73Q,53
+easy_whitelist-1.0.45.dist-info/LICENSE,sha256=sWhlh6jzXRpuhxIbCZfjCEX_YQI4mMK6iO1bfpgkfzM,11343
+easy_whitelist-1.0.45.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+easy_whitelist-1.0.45.dist-info/METADATA,sha256=-IF-TYEk7Ijf3cKWclazm2sTKJ6mUQbTl6EEBfcCaZY,3553
+easy_whitelist-1.0.45.dist-info/RECORD,,