iup-nft 0.5__py3-none-any.whl → 0.7__py3-none-any.whl

iup/main.py

@@ -42,6 +42,47 @@ def parse_port(port: str):
     return None
 
 
+def parse_host_name(hostname_str: str):
+    """Normalize input and return domain name only (no scheme, no port).
+
+    Accepts inputs like:
+    - a.com:443
+    - https://a.com
+    - http//:a.com:443
+
+    Returns domain (e.g. 'a.com') or None. IP addresses are rejected.
+    """
+    if not hostname_str:
+        return None
+    s = hostname_str.strip()
+    # detect and strip scheme (require '://', e.g. http:// or https://)
+    # this prevents malformed inputs like 'http:a.com:443' being treated as scheme
+    m = re.match(r'^([a-zA-Z][a-zA-Z0-9+\-]*)://', s)
+    has_scheme = bool(m)
+    if m:
+        s = s[m.end():]
+    # remove credentials if present (user:pass@host)
+    if '@' in s:
+        s = s.split('@')[-1]
+    # if there was a scheme, remove path part
+    if has_scheme and '/' in s:
+        s = s.split('/')[0]
+    # now s should be host[:port]
+    host_port = s.strip()
+    # strip port if present (last :digits)
+    if ':' in host_port:
+        parts = host_port.rsplit(':', 1)
+        if parts[1].isdigit():
+            host_port = parts[0]
+    host = host_port.strip().lower()
+    # reject pure IPs
+    if is_ip_address(host):
+        return None
+    if is_domain_name(host):
+        return host
+    return None
+
+
 def parse_yes_or_no(msg: str):
     msg = msg.upper()
     if msg in ['Y', 'YES', 'T', 'TRUE']:
@@ -56,8 +97,9 @@ def read_hostname_from_file(path: str):
     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)
+            parsed = parse_host_name(host_name_str)
+            if parsed:
+                hostnames.append(parsed)
     hostnames = list(dict.fromkeys(hostnames))
     return hostnames
 
@@ -99,16 +141,16 @@ def update_rule_by_ssh(hostnames: list, config: Config):
         print('msg', msg) if msg else print()
         print('err', err) if err else print()
     if config.refresh:
-        if need_restart_dns:
-            print('reboot dnsmasq')
-            _, stdout, stderr = ssh.exec_command(CMD_DNSMASQ)
+        if need_restart_cdns:
+            print('reboot chinadns')
+            _, stdout, stderr = ssh.exec_command(CMD_CHNDNS)
             msg = stdout.readlines()
             err = stderr.readlines()
             print('msg', msg) if msg else print()
             print('err', err) if err else print()
-        if need_restart_cdns:
-            print('reboot chinadns')
-            _, stdout, stderr = ssh.exec_command(CMD_CHNDNS)
+        if need_restart_dns:
+            print('reboot dnsmasq')
+            _, stdout, stderr = ssh.exec_command(CMD_DNSMASQ)
             msg = stdout.readlines()
             err = stderr.readlines()
             print('msg', msg) if msg else print()
@@ -119,8 +161,9 @@ def gen_hostnames_by_sources(sources):
     hostnames = []
     for source in sources:
         if not path.exists(source):
-            if is_domain_name(source):
-                hostnames.append(source)
+            parsed = parse_host_name(source)
+            if parsed:
+                hostnames.append(parsed)
         elif path.isfile(source):
             hostnames += read_hostname_from_file(source)
     return list(dict.fromkeys(hostnames))
@@ -130,6 +173,7 @@ def main():
     print('sources:', sources)
     hostnames = gen_hostnames_by_sources(sources)
     if hostnames:
+        print('hostnames to update:', hostnames)
         update_rule_by_ssh(hostnames, config)
     else:
         print('没有读取到有效域名，请检查！！！')

iup/main_iupd.py

@@ -51,14 +51,54 @@ def parse_yes_or_no(msg: str):
         return False
     return None
 
+def parse_host_name(hostname_str: str):
+    """Normalize input and return domain name only (no scheme, no port).
+
+    Accepts inputs like:
+    - a.com:443
+    - https://a.com
+    - http//:a.com:443
+
+    Returns domain (e.g. 'a.com') or None. IP addresses are rejected.
+    """
+    if not hostname_str:
+        return None
+    s = hostname_str.strip()
+    # detect and strip scheme (require '://', e.g. http:// or https://)
+    # this prevents malformed inputs like 'http:a.com:443' being treated as scheme
+    m = re.match(r'^([a-zA-Z][a-zA-Z0-9+\-]*)://', s)
+    has_scheme = bool(m)
+    if m:
+        s = s[m.end():]
+    # remove credentials if present (user:pass@host)
+    if '@' in s:
+        s = s.split('@')[-1]
+    # if there was a scheme, remove path part
+    if has_scheme and '/' in s:
+        s = s.split('/')[0]
+    # now s should be host[:port]
+    host_port = s.strip()
+    # strip port if present (last :digits)
+    if ':' in host_port:
+        parts = host_port.rsplit(':', 1)
+        if parts[1].isdigit():
+            host_port = parts[0]
+    host = host_port.strip().lower()
+    # reject pure IPs
+    if is_ip_address(host):
+        return None
+    if is_domain_name(host):
+        return host
+    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)
+            parsed = parse_host_name(host_name_str)
+            if parsed:
+                hostnames.append(parsed)
     hostnames = list(dict.fromkeys(hostnames))
     return hostnames
 
@@ -100,16 +140,16 @@ def update_rule_by_ssh(hostnames: list, config: Config):
         print('msg', msg) if msg else print()
         print('err', err) if err else print()
     if config.refresh:
-        if need_restart_dns:
-            print('reboot dnsmasq')
-            _, stdout, stderr = ssh.exec_command(CMD_DNSMASQ)
+        if need_restart_cdns:
+            print('reboot chinadns')
+            _, stdout, stderr = ssh.exec_command(CMD_CHNDNS)
             msg = stdout.readlines()
             err = stderr.readlines()
             print('msg', msg) if msg else print()
             print('err', err) if err else print()
-        if need_restart_cdns:
-            print('reboot chinadns')
-            _, stdout, stderr = ssh.exec_command(CMD_CHNDNS)
+        if need_restart_dns:
+            print('reboot dnsmasq')
+            _, stdout, stderr = ssh.exec_command(CMD_DNSMASQ)
             msg = stdout.readlines()
             err = stderr.readlines()
             print('msg', msg) if msg else print()
@@ -120,8 +160,9 @@ def gen_hostnames_by_sources(sources):
     hostnames = []
     for source in sources:
         if not path.exists(source):
-            if is_domain_name(source):
-                hostnames.append(source)
+            parsed = parse_host_name(source)
+            if parsed:
+                hostnames.append(parsed)
         elif path.isfile(source):
             hostnames += read_hostname_from_file(source)
     return list(dict.fromkeys(hostnames))
@@ -131,6 +172,7 @@ def main():
     print('sources:', sources)
     hostnames = gen_hostnames_by_sources(sources)
     if hostnames:
+        print('hostnames to delete:', hostnames)
         update_rule_by_ssh(hostnames, config)
     else:
         print('没有读取到有效域名，请检查！！！')

{iup_nft-0.5.dist-info → iup_nft-0.7.dist-info}/METADATA

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

iup_nft-0.7.dist-info/RECORD

@@ -0,0 +1,9 @@
+iup/__init__.py,sha256=CJiAR6OdV8OFR6zNHs9vvRnJV8UgZ_c7dcvaVHeSHkY,112
+iup/config.py,sha256=Ecg9m83D_Cp_inYrltt--oPcupVvCw9oo8m5ukKyWLA,2862
+iup/main.py,sha256=46zeTzjdpYlwpiaU1wJdfhyKRmYxhWE2tR57xniVE4M,6839
+iup/main_iupd.py,sha256=HeW4eHp0P0E5cjmEJyJrSuU7So0LTyCA-orsYatzaZQ,6729
+iup_nft-0.7.dist-info/METADATA,sha256=-ShoFLrteDbDgvR-q7PhtuuI58iI1BMEDb3rd4FQHAE,209
+iup_nft-0.7.dist-info/WHEEL,sha256=WnJ8fYhv8N4SYVK2lLYNI6N0kVATA7b0piVUNvqIIJE,91
+iup_nft-0.7.dist-info/entry_points.txt,sha256=__DnLePT02PMCliwlVR7zwdJVJXmIWIwa5jeAb-U9rM,94
+iup_nft-0.7.dist-info/top_level.txt,sha256=abec3YOzJRti4IxzOLIn-uDOPTtYUE-Uv65cAv1v8JY,4
+iup_nft-0.7.dist-info/RECORD,,

{iup_nft-0.5.dist-info → iup_nft-0.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: setuptools (75.3.3)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

iup_nft-0.5.dist-info/RECORD

@@ -1,9 +0,0 @@
-iup/__init__.py,sha256=CJiAR6OdV8OFR6zNHs9vvRnJV8UgZ_c7dcvaVHeSHkY,112
-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=Jq0JioHvsRhQhAM0Rroro3tgvyh-obaSniINzq8wqm8,5400
-iup_nft-0.5.dist-info/METADATA,sha256=9zDVl_0O8SqEDl64F2th2tH-0nU4iTaOL3N679Fy9QI,209
-iup_nft-0.5.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-iup_nft-0.5.dist-info/entry_points.txt,sha256=__DnLePT02PMCliwlVR7zwdJVJXmIWIwa5jeAb-U9rM,94
-iup_nft-0.5.dist-info/top_level.txt,sha256=abec3YOzJRti4IxzOLIn-uDOPTtYUE-Uv65cAv1v8JY,4
-iup_nft-0.5.dist-info/RECORD,,