easy_whitelist 1.0.44__py3-none-any.whl → 1.0.48__py3-none-any.whl

easy_whitelist/__init__.py

@@ -1,6 +1,7 @@
-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'
+# 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.48'
 # __author__ = 'qiqileleabaobao <qiqilelebaobao@163.com>'
 
 __all__ = []

easy_whitelist/config/arg.py

@@ -12,7 +12,7 @@ def init_arg():
     parser.add_argument('-p', '-P', '--proxy',  action='store', default=None, type=int, help ='local HTTP proxy port')
     parser.add_argument('-v', '--verbose', action='count', default=0)
     
-    parser.add_argument('target', help='template or rule_id', choices=['template', 'rule_id'])
+    parser.add_argument('target', help='template or rule', choices=['template', 'rule'])
     parser.add_argument('action', help='list', choices=['list', 'set', 'create'])
     parser.add_argument('target_id', help='template id or rule id', nargs='?')
 

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/pattern.py

@@ -2,3 +2,4 @@
 IFCONFIG_ME_PATTERN = r'(.+)'
 CIP_CC_PATTERN = r'URL\s+?:\s+?http://www.cip.cc/(.+)'
 TOOL_LU_PATTERN = r'<p>你的外网IP地址是：\s*?(.+)</p>'
+IP_SB_PATTERN = r'(.+)'

easy_whitelist/ip/url.py

@@ -10,7 +10,8 @@ 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'],
+    ['http://ip.sb/', IP_SB_PATTERN, random.choice(curl_user_agent), 'enable']
 ]

easy_whitelist/tcloud/template.py

@@ -111,7 +111,9 @@ def set_template(common_client, target_id, proxy=None):
         if target_id.startswith('ipm-'):
             addresses_extra = get_local_ip_and_format_addressesextra(proxy)
             if modify_template_address(common_client, addresses_extra, target_id):
-                logging.info(f'Successfully set {{{target_id}}} to {{{addresses_extra}}}')
+                # logging.info(f'Successfully set {{{target_id}}} to {{{addresses_extra}}}')
+                # print(f'Successfully set ({target_id}) to ({addresses_extra})')
+                print(f'成功将IP模版：{target_id} 设置为：({addresses_extra})')
         else:
             logging.warning('Wrong template id.')
     else:

{easy_whitelist-1.0.44.dist-info → easy_whitelist-1.0.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easy_whitelist
-Version: 1.0.44
+Version: 1.0.48
 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
@@ -36,11 +36,13 @@ Easy_whitelist 是一个探测本机互联网 IP 地址，将并本机互联网I
 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.
 
 主要功能包括：
+
 * 自动探测本机互联网 IP 地址
 * 支持阿里云、腾讯云的安全组白名单更新
 * 腾讯云支持地址模板更新
 
 Main functions include:
+
 * Automatically detect the local Internet IP address
 * Support security group whitelist updates for Alibaba Cloud and Tencent Cloud
 * Tencent Cloud supports address template updates
@@ -63,12 +65,14 @@ Python3 is required
 ## 使用说明 Basic Usage
 
 * 通过列表选择模版，设置白名单
+
 ```shell
-$ easy template list
+easy template list
 ```
 
 * 通过新创建模版，设置白名单。需要指定关联的安全组ID
+
 ```shell
-$ easy template create rule_id
+easy template create rule_id
 ```
 

{easy_whitelist-1.0.44.dist-info → easy_whitelist-1.0.48.dist-info}/RECORD

@@ -1,20 +1,20 @@
-easy_whitelist/__init__.py,sha256=S1wYuxOzsXW5UBY5GOQSpCmcoJhtXu_KIgHUmh6c8Eg,303
+easy_whitelist/__init__.py,sha256=gNo9C-Mtju0Mb3CGDdl-MH6ebTWsEb_vHUDzPfyCfYk,309
 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/config/arg.py,sha256=lEet81UOfL4IhSEPC5AajrcWh9Q_tUecWkFp8Cxwr2Q,1081
 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/pattern.py,sha256=184XTlT0087eBZbm9LC5AB38PMLazQueW8E7l4jSwkM,149
-easy_whitelist/ip/url.py,sha256=kFBZ2E_AYQ-AYo7eeKQJ22kjviQ61bZMdQS4EOR5j-k,439
+easy_whitelist/ip/ip.py,sha256=H_daXbZ67Crp9sDHdNeuIyZD3H1Z6DrPXQOMiahgxtg,2236
+easy_whitelist/ip/pattern.py,sha256=mIoYall_mLpNNmUX8jYjZ8tFsD064M9h1bbbok6CLGQ,172
+easy_whitelist/ip/url.py,sha256=2PYkz1ofL_VzbdIvC7IlD4TQju81dzDSYCQdIqoocBs,550
 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=dLqFSunO8_wjZfCU0z5x9_G30pIDTT91qhJFYtlMRb4,6066
-easy_whitelist-1.0.44.dist-info/entry_points.txt,sha256=-URzXdGXqVTDQm_AhH9k0u4Qm9G0s4ZDXcnA-XQt73Q,53
-easy_whitelist-1.0.44.dist-info/LICENSE,sha256=sWhlh6jzXRpuhxIbCZfjCEX_YQI4mMK6iO1bfpgkfzM,11343
-easy_whitelist-1.0.44.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-easy_whitelist-1.0.44.dist-info/METADATA,sha256=g3AMRmzX5gHBRh2gEqcKLusuSiHtEnK-CHGRLs6ttqo,3553
-easy_whitelist-1.0.44.dist-info/RECORD,,
+easy_whitelist/tcloud/template.py,sha256=V36vppKsozsTns0uZ1Qv3f7ITrNqOzhdpNULBG7EU80,6240
+easy_whitelist-1.0.48.dist-info/entry_points.txt,sha256=-URzXdGXqVTDQm_AhH9k0u4Qm9G0s4ZDXcnA-XQt73Q,53
+easy_whitelist-1.0.48.dist-info/LICENSE,sha256=sWhlh6jzXRpuhxIbCZfjCEX_YQI4mMK6iO1bfpgkfzM,11343
+easy_whitelist-1.0.48.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+easy_whitelist-1.0.48.dist-info/METADATA,sha256=T344pAnA8vxvRnq62R4MTJPPCxZcycZ0UoKA9HE2smo,3553
+easy_whitelist-1.0.48.dist-info/RECORD,,