iup-nft 0.1__py3-none-any.whl → 0.2__py3-none-any.whl

iup/main_iupd.py

@@ -0,0 +1,141 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+import argparse
+from os import path
+import re
+import paramiko
+import iup
+from iup.config import Config
+import ipaddress
+
+
+HOSTNAME_PATTERN = r'^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$'
+CMD_TEMPLATE = 'iupd {}'
+CFG_FILE = 'config_iupd.ini'
+
+def is_domain_name(string: str):
+    if re.match(HOSTNAME_PATTERN, string):
+        return True
+    else:
+        return False
+
+def is_ip_address(ip_str: str):
+    try:
+        ip = ipaddress.ip_address(ip_str)
+        return ip is not None
+    except ValueError:
+        return False
+
+def parse_host_name(hostname_str: str):
+    if is_domain_name(hostname_str) or is_ip_address(hostname_str):
+        return hostname_str
+    return None
+
+def parse_port(port: str):
+    if port.isdigit():
+        port_num = int(port)
+        if port_num > 1 and port_num < 65535:
+            return port
+    return None
+
+
+def parse_yes_or_no(msg: str):
+    msg = msg.upper()
+    if msg in ['Y', 'YES', 'T', 'TRUE']:
+        return True
+    if msg in ['N', 'NO', 'F', 'FALSE']:
+        return False
+    return None
+
+
+def read_hostname_from_file(path: str):
+    hostnames = []
+    with open(path, 'r') as f:
+        for line in f:
+            host_name_str = line.strip()
+            if is_domain_name(host_name_str):
+                hostnames.append(host_name_str)
+    hostnames = list(dict.fromkeys(hostnames))
+    return hostnames
+
+def load_and_overlay_config() -> Config:
+    parser = argparse.ArgumentParser(description='iupd参数说明')
+    parser.add_argument("sources", nargs='+', help='域名或者域名文件路径')
+    parser.add_argument(
+        "--version",
+        action="version",
+        version=f"%(prog)s version {iup.__version__} installed in {path.dirname(__file__)}",
+    )
+    args = parser.parse_args()
+    config_path = path.join(path.dirname(__file__), CFG_FILE)
+    if not path.exists(config_path):
+        gen_config()
+    print('当前配置文件路径为:', config_path)
+    config = Config(config_path)
+    return args.sources, config
+
+def update_rule_by_ssh(hostnames: list, config: Config):
+    ssh = paramiko.SSHClient()
+    ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+    ssh.connect(config.host, port=config.port, username=config.username, password=config.password)
+    for hostname in hostnames:
+        cmd = CMD_TEMPLATE.format(hostname)
+        _, stdout, stderr = ssh.exec_command(cmd)
+        msg = stdout.readlines()
+        err = stderr.readlines()
+        print('msg', msg) if msg else print()
+        print('err', err) if err else print()
+    ssh.close()
+
+def gen_hostnames_by_sources(sources):
+    hostnames = []
+    for source in sources:
+        if not path.exists(source):
+            if is_domain_name(source):
+                hostnames.append(source)
+        elif path.isfile(source):
+            hostnames += read_hostname_from_file(source)
+    return list(dict.fromkeys(hostnames))
+
+def main():
+    sources, config = load_and_overlay_config()
+    print('sources:', sources)
+    hostnames = gen_hostnames_by_sources(sources)
+    if hostnames:
+        update_rule_by_ssh(hostnames, config)
+    else:
+        print('没有读取到有效域名，请检查！！！')
+
+def read_info_from_input(prompt, parser=None):
+    while True:
+        info = input(prompt)
+        if parser:
+            info = parser(info)
+            if not info is None:
+                break
+            else:
+                print('输入有误，请重新输入！')
+                continue
+        break
+    return info
+
+def gen_config():
+    print('配置向导，请按提示输入信息...')
+    host = read_info_from_input('请输入有效主机名:\n', parse_host_name)
+    port = int(read_info_from_input('请输入有效端口:\n', parse_port))
+    username = read_info_from_input('请输入openwrt用户名:\n')
+    password = read_info_from_input('请输入openwrt密码:\n')
+    config = Config()
+    config.update(host, port, username, password)
+    config_path = path.join(path.dirname(__file__), CFG_FILE)
+    config.save_to(config_path)
+    print('已生成配置文件写入到{}'.format(config_path))
+
+
+if __name__ == '__main__':
+    gen_config()
+
+
+
+
+

{iup_nft-0.1.dist-info → iup_nft-0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iup-nft
-Version: 0.1
+Version: 0.2
 Summary: ipset updater for openwrt
 Author: nobitaqaq
 Author-email: xiaoleigs@gmail.com

iup_nft-0.2.dist-info/RECORD

@@ -0,0 +1,9 @@
+iup/__init__.py,sha256=WXPOI9BwESIVzJ-XhG7bIFhsRg98u_v5gp16nY0bcbI,108
+iup/config.py,sha256=Ecg9m83D_Cp_inYrltt--oPcupVvCw9oo8m5ukKyWLA,2862
+iup/main.py,sha256=j7-6cFrI6_RFkWR-Y4_LChs3fBVb1JGKQ8aW_w_9kMk,5508
+iup/main_iupd.py,sha256=M1FFWLte7ZwiKL5OmsI3wAHG6GzyiNeBG3ku36X1QbY,4209
+iup_nft-0.2.dist-info/METADATA,sha256=L2R4XmsVsMyJiaG7WG8U0EkAlajVVJL8BGtoFkLQvPM,208
+iup_nft-0.2.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+iup_nft-0.2.dist-info/entry_points.txt,sha256=__DnLePT02PMCliwlVR7zwdJVJXmIWIwa5jeAb-U9rM,94
+iup_nft-0.2.dist-info/top_level.txt,sha256=abec3YOzJRti4IxzOLIn-uDOPTtYUE-Uv65cAv1v8JY,4
+iup_nft-0.2.dist-info/RECORD,,

{iup_nft-0.1.dist-info → iup_nft-0.2.dist-info}/entry_points.txt

@@ -1,3 +1,4 @@
 [console_scripts]
 iup = iup.main:main
 iup-cfg = iup.main:gen_config
+iupd = iup.main_iupd:main

iup_nft-0.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-iup/__init__.py,sha256=WXPOI9BwESIVzJ-XhG7bIFhsRg98u_v5gp16nY0bcbI,108
-iup/config.py,sha256=Ecg9m83D_Cp_inYrltt--oPcupVvCw9oo8m5ukKyWLA,2862
-iup/main.py,sha256=j7-6cFrI6_RFkWR-Y4_LChs3fBVb1JGKQ8aW_w_9kMk,5508
-iup_nft-0.1.dist-info/METADATA,sha256=SiGliRq46XFLR0k3q-mV62-0tnU8QI-p9vke0ftFqVw,208
-iup_nft-0.1.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-iup_nft-0.1.dist-info/entry_points.txt,sha256=ER1eUBmB6bXwudHBT51NoOtDSlnUgBi4T6J9_kA4pwc,68
-iup_nft-0.1.dist-info/top_level.txt,sha256=abec3YOzJRti4IxzOLIn-uDOPTtYUE-Uv65cAv1v8JY,4
-iup_nft-0.1.dist-info/RECORD,,