easy_whitelist 1.0.44__tar.gz → 1.0.48__tar.gz

{easy_whitelist-1.0.44 → easy_whitelist-1.0.48}/.gitignore

@@ -4,4 +4,5 @@
 dist/
 build/
 *.egg-info
-tests/
+**/__pycache__
+note.md

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

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

@@ -5,11 +5,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
@@ -32,11 +34,13 @@ 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 → easy_whitelist-1.0.48}/SECURITY.md

@@ -5,9 +5,8 @@
 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.
+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).
+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.48/easy_whitelist/__init__.py

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

{easy_whitelist-1.0.44 → easy_whitelist-1.0.48}/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-1.0.44 → easy_whitelist-1.0.48}/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.48}/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-1.0.44 → easy_whitelist-1.0.48}/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-1.0.44 → easy_whitelist-1.0.48}/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.48/note.md

@@ -0,0 +1,5 @@
+# 小记录
+
+## Cache
+
+/Users/yuyuan/Library/Caches/com.apple.python/Users/yuyuan/Gitlab

{easy_whitelist-1.0.44 → easy_whitelist-1.0.48}/pyproject.toml

@@ -13,7 +13,7 @@ requires-python = ">= 3.6"
 readme = "README.md"
 license = {text = "Apache License 2.0"}
 classifiers = [
-  "License :: OSI Approved :: Apache Software License", 
+  "License :: OSI Approved :: Apache Software License",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3 :: Only",
   "Programming Language :: Python :: 3.6",
@@ -34,15 +34,15 @@ maintainers = [
   {name = "qiqilelebaobao", email = "qiqilelebaobao@163.com"}
 ]
 
-keywords = ["automation", "whitelist", "acl", 
-"security-groups", "alibaba-cloud", "tencent-cloud", 
+keywords = ["automation", "whitelist", "acl",
+"security-groups", "alibaba-cloud", "tencent-cloud",
 "security-tools", "security-group-rule"]
 
-# description = '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.'
+description = '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.33'
+version = '1.0.48'
 
-dynamic = ["version", "description"]
+# dynamic = ["version", "description"]
 
 [project.urls]
 Homepage = "https://github.com/qiqilelebaobao/easy_whitelist"
@@ -57,3 +57,9 @@ cli = [
   "rich",
   "click",
 ]
+
+[tool.flit.sdist]
+include = [
+    "SECURITY.md",
+    "CODE_OF_CONDUCT.md",
+]

easy_whitelist-1.0.44/easy_whitelist/__init__.py

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

easy_whitelist-1.0.44/setup.py

@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-# import os
-
-from setuptools import setup, find_packages
-
-# import easy_whitelist
-
-# ROOT = os.path.dirname(__file__)
-
-setup(
-    name='easy_whitelist',
-    install_requires=[
-        'tencentcloud-sdk-python',
-    ],
-    description='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.',
-    # long_description=open('README.md').read(),
-    long_description = 'nihao',
-    author='qiqilelebaobao',
-    author_email='qiqilelebaobao@163.com',
-    maintainer_email="qiqilelebaobao@163.com",
-    version='1.0.34',
-    # version=easy_whitelist.__version__,
-    url='https://github.com/qiqilelebaobao/easy_whitelist',
-    scripts=[],
-    license="Apache License 2.0",
-    platforms='any',
-    packages=find_packages(exclude=[]),
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: Apache Software License',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-    ],
-    
-)