easy_whitelist 1.0.27__py2.py3-none-any.whl → 1.0.29__py2.py3-none-any.whl

easy_whitelist/__init__.py

@@ -1,6 +1,6 @@
-r"""Easy_whitelist is a small 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.
+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.27'
+__version__ = '1.0.29'
 # __author__ = 'qiqileleabaobao <qiqilelebaobao@163.com>'
 
 __all__ = []

easy_whitelist/{easy.py → __main__.py}

@@ -11,6 +11,7 @@ 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):
     template_ids = list_template(common_client)
     last_input = None
@@ -24,13 +25,15 @@ def loop_list(common_client):
                 if (a := int(input_from_user)) > 0 and a <= len(template_ids):
                     set_template(common_client, template_ids[a - 1])
                 else:
-                    print('Wrong #, please input # from list.')
+                    print('Wrong index, please input right index from the list.')
         elif input_from_user == 'l' or input_from_user == 'L':
             list_template(common_client)
         elif input_from_user == 'q' or input_from_user == 'Q':
             break
+        elif input_from_user == '':
+            continue
         else:
-            print('Input error...')
+            print('Input error.')
 
 def main():
     tencent, alibaba, action, target, target_id, proxy = arg.init_arg()
@@ -48,6 +51,6 @@ def main():
         else:
             print('Wrong postion, shall not be here.')
 
-if __name__ == '__main__':
 
+if __name__ == '__main__':
     main()

easy_whitelist/config/arg.py

@@ -3,15 +3,15 @@ import argparse
 def init_arg():
     '''parse parameter from command line.'''
     
-    parser = argparse.ArgumentParser(prog='python3 easy.py', description='This is a cloud acl auto whitelist program.', epilog='Enjoy the tool. :) ')
+    parser = argparse.ArgumentParser(prog='easy', description='This is a cloud acl auto whitelist tool.', epilog='Enjoy the tool. :) ')
 
-    my_group = parser.add_mutually_exclusive_group(required=True)
-    my_group.add_argument('-t', '-T', '--tencent', action='store_true', help='tencent cloud')
+    my_group = parser.add_mutually_exclusive_group(required=False)
+    my_group.add_argument('-t', '-T', '--tencent', action='store_true', default=True, help='tencent cloud')
     my_group.add_argument('-a', '-A', '--alibaba', action='store_true', help='alibaba cloud')
     
     parser.add_argument('-p', '-P', '--proxy',  action='store', default=-1, type=int, help ='local HTTP proxy port')
     
-    parser.add_argument('target', help='template or rule', choices=['template', 'rule'])
+    parser.add_argument('target', help='template or rule_id', choices=['template', 'rule_id'])
     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

@@ -10,7 +10,7 @@ def get_local_ip_from_url_and_parse(u, patt, ag):
     headers = {'user-agent': ag}
     # print(f'user_agent:{ag}')
     try:
-        response = requests.get(u, headers=headers, timeout=60)
+        response = requests.get(u, headers=headers, timeout=5)
         # 获取响应内容
         respon = response.text
         l_ip = url.parse_ip_from_response(respon, patt)

easy_whitelist/tcloud/template.py

@@ -39,7 +39,7 @@ def list_template(common_client):
         # print(template_ids)
         addreset = ' ~ '.join(template['AddressSet'][:3])
         if len(template['AddressSet']) > 3:
-            addreset += f' ~~~{len(template["AddressSet"])-3} more...'
+            addreset += f' ~~~ {len(template["AddressSet"])-3} more...'
         print(f"{str(i):10}"
               f"{template['AddressTemplateId']:20}"
               f"{template['CreatedTime']:30}"

{easy_whitelist-1.0.27.dist-info → easy_whitelist-1.0.29.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: easy_whitelist
-Version: 1.0.27
-Summary: Easy_whitelist is a small 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.29
+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
 Author-email: qiqilelebaobao <qiqilelebaobao@163.com>
@@ -26,7 +26,7 @@ Project-URL: Homepage, https://github.com/qiqilelebaobao/easy_whitelist
 
 Easy_whitelist 是一个探测本机互联网 IP 地址，将并本机互联网IP地址，自动更新到云安全组白名单的小工具。工具使用 Python 编写。
 
-Easy_whitelist is a small 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.
+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 地址
@@ -53,9 +53,15 @@ Main functions include:
 需要 Python3 环境
 Python3 is required
 
-## 使用说明 Instructions
+## 使用说明 Basic Usage
 
+* 通过列表选择模版，设置白名单
 ```shell
-$ python3 easy.py -t template list
+$ easy template list
+```
+
+* 通过新创建模版，设置白名单。需要指定关联的安全组ID
+```shell
+$ easy template create rule_id
 ```
 

easy_whitelist-1.0.29.dist-info/RECORD

@@ -0,0 +1,17 @@
+easy_whitelist/__init__.py,sha256=B9ePwbNJaL7BecbFcwmoPT7MM91G4AukZwlJzW7QlMQ,303
+easy_whitelist/__main__.py,sha256=8N3DqF3_9JNiq1qgZcOubPyUA0v7jmnz2deBBtMLdEQ,1801
+easy_whitelist/config/__init__.py,sha256=fK-lJ3GD4u1_FGkZfPf-f7fxjMwb1t0AZcG7mfIHLks,19
+easy_whitelist/config/arg.py,sha256=hB1CSpDfbIPykf8e-OqeKHStDujXGNaFk2guxdupAnE,1024
+easy_whitelist/ip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+easy_whitelist/ip/agent.py,sha256=dJDkw1mipazcOyldbBZW5Mhjr17UqDlaBn2jUo80C7I,487
+easy_whitelist/ip/ip.py,sha256=ri4KcamYJY3WRhOIPrtctlrhs2WO5Q_qDy661-dizb0,1595
+easy_whitelist/ip/pattern.py,sha256=184XTlT0087eBZbm9LC5AB38PMLazQueW8E7l4jSwkM,149
+easy_whitelist/ip/url.py,sha256=pZeexIQfJFWv-KdlOIAOVVk5aap4dyLsu2CiV8i9ofw,438
+easy_whitelist/tcloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+easy_whitelist/tcloud/client.py,sha256=Cbx66K8S7fAMto9GJMynOplbgk1m-QWg863BxeO0D24,785
+easy_whitelist/tcloud/template.py,sha256=Q2RX6uZVMMS0EhwVPXn1Ume5hBDQDslgaxXIic-cEvQ,5854
+easy_whitelist-1.0.29.dist-info/entry_points.txt,sha256=-URzXdGXqVTDQm_AhH9k0u4Qm9G0s4ZDXcnA-XQt73Q,53
+easy_whitelist-1.0.29.dist-info/LICENSE,sha256=sWhlh6jzXRpuhxIbCZfjCEX_YQI4mMK6iO1bfpgkfzM,11343
+easy_whitelist-1.0.29.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+easy_whitelist-1.0.29.dist-info/METADATA,sha256=4wlj2ZJlJLaFYfQR7NI3JFRMiB5W_DhPTtp2Mu1cFYA,3301
+easy_whitelist-1.0.29.dist-info/RECORD,,

easy_whitelist-1.0.29.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+easy=easy_whitelist.__main__:main
+

easy_whitelist-1.0.27.dist-info/RECORD

@@ -1,16 +0,0 @@
-easy_whitelist/__init__.py,sha256=3SuS3TMcAfJh0kBoPFQh_kPQl5DUiFWbNPQ80yxUa14,303
-easy_whitelist/easy.py,sha256=_dUY-U_y0k2IFgQwq5KTauOcKXBF5T1ARC_Vl82eyPw,1727
-easy_whitelist/config/__init__.py,sha256=fK-lJ3GD4u1_FGkZfPf-f7fxjMwb1t0AZcG7mfIHLks,19
-easy_whitelist/config/arg.py,sha256=Ytk9fKXd2-k0C01SHGtbYJGYVz2VqR8eDanJExZrPi4,1017
-easy_whitelist/ip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-easy_whitelist/ip/agent.py,sha256=dJDkw1mipazcOyldbBZW5Mhjr17UqDlaBn2jUo80C7I,487
-easy_whitelist/ip/ip.py,sha256=osThmW339MiJZ2R7h0YGkyKDIDINu9yItA5X4ghUw88,1596
-easy_whitelist/ip/pattern.py,sha256=184XTlT0087eBZbm9LC5AB38PMLazQueW8E7l4jSwkM,149
-easy_whitelist/ip/url.py,sha256=pZeexIQfJFWv-KdlOIAOVVk5aap4dyLsu2CiV8i9ofw,438
-easy_whitelist/tcloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-easy_whitelist/tcloud/client.py,sha256=Cbx66K8S7fAMto9GJMynOplbgk1m-QWg863BxeO0D24,785
-easy_whitelist/tcloud/template.py,sha256=8SuN2oLiYzgfySb3-Bc5EEuZon8sE5ea3n0QFdnM8Ys,5853
-easy_whitelist-1.0.27.dist-info/LICENSE,sha256=sWhlh6jzXRpuhxIbCZfjCEX_YQI4mMK6iO1bfpgkfzM,11343
-easy_whitelist-1.0.27.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-easy_whitelist-1.0.27.dist-info/METADATA,sha256=jw6fyVS-MrAqI9D2pVIpHNfXbMiS7vv5uFYwwy3VGkI,3149
-easy_whitelist-1.0.27.dist-info/RECORD,,