easy_whitelist 1.0.27__tar.gz → 1.0.29__tar.gz

{easy_whitelist-1.0.27 → easy_whitelist-1.0.29}/.gitignore

@@ -2,3 +2,6 @@
 .vscode/
 *.code-workspace
 dist/
+build/
+*.egg-info
+tests/

{easy_whitelist-1.0.27 → easy_whitelist-1.0.29}/PKG-INFO

@@ -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.27 → easy_whitelist-1.0.29}/README.md

@@ -2,7 +2,7 @@
 
 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 地址
@@ -29,8 +29,14 @@ 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/SECURITY.md

@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+
+## Reporting a Vulnerability
+
+Please use https://github.com/qiqilelebaobao to report security vulnerabilities.
+
+The Security Team will process your report within a week, and respond within a month (although it will depend on the severity of your report).

{easy_whitelist-1.0.27 → easy_whitelist-1.0.29}/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-1.0.27/easy_whitelist/easy.py → easy_whitelist-1.0.29/easy_whitelist/__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-1.0.27 → easy_whitelist-1.0.29}/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-1.0.27 → easy_whitelist-1.0.29}/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-1.0.27 → easy_whitelist-1.0.29}/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 → easy_whitelist-1.0.29}/pyproject.toml

@@ -4,7 +4,11 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "easy_whitelist"
-authors = [{name = "qiqilelebaobao"}, {name = "qiqilelebaobao", email = "qiqilelebaobao@163.com"}]
+authors = [
+  {name = "qiqilelebaobao"},
+  {name = "qiqilelebaobao", email = "qiqilelebaobao@163.com"}
+]
+
 readme = "README.md"
 license = {text = "Apache License 2.0"}
 classifiers = [
@@ -29,7 +33,12 @@ maintainers = [
   {name = "qiqilelebaobao", email = "qiqilelebaobao@163.com"}
 ]
 
-keywords = ["automation", "whitelist", "acl", "security-groups", "alibaba-cloud", "tencent-cloud", "security-tools", "security-group-rule"]
+keywords = ["automation", "whitelist", "acl", 
+"security-groups", "alibaba-cloud", "tencent-cloud", 
+"security-tools", "security-group-rule"]
 
 [project.urls]
 Homepage = "https://github.com/qiqilelebaobao/easy_whitelist"
+
+[project.scripts]
+easy = "easy_whitelist.__main__:main"

easy_whitelist-1.0.29/sample/cvm_sample_detail.py

@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+import os
+import sys
+import logging
+
+from tencentcloud.common import credential
+from tencentcloud.common.exception.tencent_cloud_sdk_exception import TencentCloudSDKException
+# 导入对应产品模块的client models。
+from tencentcloud.cvm.v20170312 import cvm_client, models
+
+# 导入可选配置类
+from tencentcloud.common.profile.client_profile import ClientProfile
+from tencentcloud.common.profile.http_profile import HttpProfile
+try:
+    # 实例化一个认证对象，入参需要传入腾讯云账户secretId，secretKey。
+    # 为了保护密钥安全，建议将密钥设置在环境变量中或者配置文件中，请参考本文凭证管理章节。
+    # 硬编码密钥到代码中有可能随代码泄露而暴露，有安全隐患，并不推荐。
+    # cred = credential.Credential("secretId", "secretKey")
+    cred = credential.Credential(
+        os.environ.get("TENCENTCLOUD_SECRET_ID"),
+        os.environ.get("TENCENTCLOUD_SECRET_KEY"))
+    cred = credential.Credential("SecretId", "SecretKey")
+
+    # 实例化一个http选项，可选的，没有特殊需求可以跳过。
+    httpProfile = HttpProfile()
+    # 如果需要指定proxy访问接口，可以按照如下方式初始化hp
+    # httpProfile = HttpProfile(proxy="http://用户名:密码@代理IP:代理端口")
+    httpProfile.protocol = "https"  # 在外网互通的网络环境下支持http协议(默认是https协议),建议使用https协议
+    httpProfile.keepAlive = True  # 状态保持，默认是False
+    httpProfile.reqMethod = "GET"  # get请求(默认为post请求)
+    httpProfile.reqTimeout = 30    # 请求超时时间，单位为秒(默认60秒)
+    httpProfile.endpoint = "cvm.ap-shanghai.tencentcloudapi.com"  # 指定接入地域域名(默认就近接入)
+
+    # 实例化一个client选项，可选的，没有特殊需求可以跳过。
+    clientProfile = ClientProfile()
+    clientProfile.signMethod = "TC3-HMAC-SHA256"  # 指定签名算法
+    clientProfile.language = "en-US"  # 指定展示英文（默认为中文）
+    clientProfile.httpProfile = httpProfile
+
+    # 实例化要请求产品(以cvm为例)的client对象，clientProfile是可选的。
+    client = cvm_client.CvmClient(cred, "ap-shanghai", clientProfile)
+
+    # 打印日志按照如下方式，也可以设置log_format，默认为 '%(asctime)s %(process)d %(filename)s L%(lineno)s %(levelname)s %(message)s'
+    # client.set_stream_logger(stream=sys.stdout, level=logging.DEBUG)
+    # client.set_file_logger(file_path="/log", level=logging.DEBUG) 日志文件滚动输出，最多10个文件，单个文件最大512MB
+    # client.set_default_logger() 去除所有log handler，默认不输出
+
+    # 实例化一个cvm实例信息查询请求对象,每个接口都会对应一个request对象。
+    req = models.DescribeInstancesRequest()
+
+    # 填充请求参数,这里request对象的成员变量即对应接口的入参。
+    # 您可以通过官网接口文档或跳转到request对象的定义处查看请求参数的定义。
+    respFilter = models.Filter()  # 创建Filter对象, 以zone的维度来查询cvm实例。
+    respFilter.Name = "zone"
+    respFilter.Values = ["ap-shanghai-1", "ap-shanghai-2"]
+    req.Filters = [respFilter]  # Filters 是成员为Filter对象的列表
+
+    # python sdk支持自定义header如 X-TC-TraceId、X-TC-Canary，可以按照如下方式指定，header必须是字典类型的
+    headers = {
+        "X-TC-TraceId": "ffe0c072-8a5d-4e17-8887-a8a60252abca"
+    }
+    req.headers = headers
+
+    # 通过client对象调用DescribeInstances方法发起请求。注意请求方法名与请求对象是对应的，headers为可选参数。
+    # 返回的resp是一个DescribeInstancesResponse类的实例，与请求对象对应。
+    resp = client.DescribeInstances(req)
+
+    # 输出json格式的字符串回包
+    print(resp.to_json_string(indent=2))
+
+    # 也可以取出单个值。
+    # 您可以通过官网接口文档或跳转到response对象的定义处查看返回字段的定义。
+    print(resp.TotalCount)
+except TencentCloudSDKException as err:
+    print(err)

easy_whitelist-1.0.27/SECURITY.md

@@ -1,21 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Use this section to tell people about which versions of your project are
-currently being supported with security updates.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 5.1.x   | :white_check_mark: |
-| 5.0.x   | :x:                |
-| 4.0.x   | :white_check_mark: |
-| < 4.0   | :x:                |
-
-## Reporting a Vulnerability
-
-Use this section to tell people how to report a vulnerability.
-
-Tell them where to go, how often they can expect to get an update on a
-reported vulnerability, what to expect if the vulnerability is accepted or
-declined, etc.

easy_whitelist-1.0.27/sample/__init__.py

@@ -1,2 +0,0 @@
-
-__all__ = ["aa", ]

easy_whitelist-1.0.27/sample/aa.py

@@ -1,7 +0,0 @@
-
-
-print(f'name:{__name__}, file:{__file__}, package:{(__package__)}')
-
-aaa = 3
-aab = 4
-aac = 5

easy_whitelist-1.0.27/sample/memo.md

@@ -1,23 +0,0 @@
-Here is Hogan’s full memo:
-、、、
-At Microsoft, we deliver mission-critical infrastructure that the world depends on to achieve more. With that trust in us comes a great responsibility: to protect our customers, our company, and our world from cyber threats. As Microsoft employees, we all have a role in that responsibility.
-
-As Satya referenced in his May 3 email and again during his FY25 kick off on July 9, security is our number-one priority, and everyone at Microsoft will have security as a Core Priority. When faced with a tradeoff, the answer is clear and simple: security above all else. Our commitment to security is enduring. New and novel attacks will require us to continue to learn, innovate, and defend. Yet working together, we will make nonlinear improvements, stay alert, and meet the expectations of our customers. They are counting on us, and our future depends on their trust.
-
-Our new Security Core Priority reinforces our commitment to security and holds us accountable for building secure products and services. It is now available in the Connect tool for most employees, and we are partnering with geo HR teams to expand access to all employees globally. The Security Core Priority is not a check-the-box compliance exercise; it is a way for every employee and manager to commit to—and be accountable for—prioritizing security, and a way for us to codify your contributions and to recognize you for your impact. We all must act with a security-first mindset, speak up, and proactively look for opportunities to ensure security in everything we do.
-
-The core priority will have two parts:
-
-Core and common elements that apply to all employees
-
-An optional section for employees to further specify how they will activate the Security Core Priority based on their role, team, org, etc.
-
-All employees will set their Security Core Priority as part their first FY25 Connect, with the intent that during regular Connect conversations, you and your manager will discuss your Security Core Priority progress and impact. This process will follow the same approach as our other company-wide core priorities for Diversity & Inclusion and Managers. You can learn more about the Security Core Priority here, including FAQs and Security Core Priority activation examples for three main types of roles: technical, customer and partner-facing, and all other roles.
-
-As we kick off our 50th year as a company, I know we all feel honored and humbled that we are still here—as a relevant and consequential company—pursuing our mission together. When we empower every person and organization on the planet to achieve more, we take on society’s biggest challenges and empower the world. What a big, bold, and meaningful mission we have, and yet none of us can take this for granted. We are here because our customers trust us, and we must continue to earn their trust every day.
-
-Thank you for your commitment to our Security Core Priority that will help protect Microsoft, our customers, and our partners.
-
-Kathleen
-
-、、、

easy_whitelist-1.0.27/sample/test.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-import json
-import os
-
-from tencentcloud.common.common_client import CommonClient
-from tencentcloud.common import credential
-from tencentcloud.common.exception.tencent_cloud_sdk_exception import TencentCloudSDKException
-from tencentcloud.common.profile.client_profile import ClientProfile
-from tencentcloud.common.profile.http_profile import HttpProfile
-
-try:
-    cred = credential.Credential(
-        os.environ.get("TENCENTCLOUD_SECRET_ID"),
-        os.environ.get("TENCENTCLOUD_SECRET_KEY"))
-
-    pass
-
-    httpProfile = HttpProfile()
-    httpProfile.endpoint = "vpc.tencentcloudapi.com"
-    httpProfile.proxy = '127.0.0.1:8080'
-    clientProfile = ClientProfile()
-    clientProfile.httpProfile = httpProfile
-
-    headers = {}
-    common_client = CommonClient("vpc", "2017-03-12", cred, "ap-nanjing", profile=clientProfile)
-    templates = common_client.call_json("DescribeAddressTemplates", headers)
-    print(json.dumps(templates, ensure_ascii=False))
-
-except TencentCloudSDKException as err:
-    print(err)

easy_whitelist-1.0.27/sample/test2.py

@@ -1,14 +0,0 @@
-
-def outer():
-    x = "local"
-    def inner():
-        global y
-        print("inner:", y)
-        x = "nonlocal"
-
-    inner()
-    print("outer:", x)
-
-x = 'global'
-outer()
-print('glabal:', x)