agent-bypass 2.11.6 → 2.12.0

package/scripts/jsrip.py

@@ -15,7 +15,8 @@ JS 静态文件提取器（§01 Step 8 侧枝折射）
   python3 jsrip.py https://target.com --scan       # 自动找页面引用的 JS
   python3 jsrip.py https://target.com/app.js --json
 """
-import argparse, json, re, ssl, sys, urllib.parse
+import argsmini as argparse
+import json, re, ssl, sys, urllib.parse
 import urllib.request, urllib.error
 
 CTX = ssl.create_default_context()

package/scripts/mutate.py

@@ -22,7 +22,8 @@
   # 输出全部（含失败）
   python3 mutate.py https://target.com/admin --all
 """
-import argparse, ssl, sys, urllib.parse
+import argsmini as argparse
+import ssl, sys, urllib.parse
 import urllib.request, urllib.error
 
 CTX = ssl.create_default_context()

package/scripts/portscan.py

@@ -12,7 +12,8 @@
 
 输出: jsonl（每行一个开放端口）
 """
-import asyncio, json, sys, argparse
+import argsmini as argparse
+import asyncio, json, sys
 
 TOP100 = [21,22,23,25,53,80,110,111,135,139,143,443,445,993,995,1433,1521,1723,
           2049,3306,3389,5432,5900,5984,6379,7001,8000,8008,8080,8081,8443,8888,

package/scripts/webprobe.py

@@ -5,7 +5,7 @@ Web 批量指纹 + 路径探测器
 用法: python3 webprobe.py <domain> [<domain> ...]      # 或完整 URL
 输出: jsonl（指纹 + 命中路径）
 """
-import sys, json, ssl, re, urllib.request, urllib.error, concurrent.futures
+import sys, json, ssl, re, urllib.request, urllib.error
 
 UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0 Safari/537.36"
 CTX = ssl.create_default_context()
@@ -41,10 +41,49 @@ def req(url, method="GET", data=None, timeout=12, headers=None):
     except Exception as e:
         return 0, {}, str(e).encode()
 
+def _pool_map(items, fn, workers):
+    """保序线程池（替代 concurrent.futures，省 iSH import 成本）"""
+    items = list(items)
+    if len(items) <= 1:
+        return [fn(x) for x in items]
+    import threading
+    out = [None] * len(items)
+    nxt = [0]
+    lock = threading.Lock()
+
+    def worker():
+        while True:
+            with lock:
+                if nxt[0] >= len(items):
+                    return
+                i = nxt[0]
+                nxt[0] += 1
+            try:
+                out[i] = fn(items[i])
+            except Exception:
+                out[i] = None
+
+    ts = [threading.Thread(target=worker, daemon=True)
+          for _ in range(max(1, min(workers, len(items))))]
+    for t in ts:
+        t.start()
+    for t in ts:
+        t.join()
+    return out
+
+
 def scan(domain):
     out = {"domain": domain, "hits": [], "errors": []}
-    # 指纹
-    st, hd, bd = req(f"https://{domain}/")
+    # 指纹（https 失败自动回落 http；都不可达则快速返回）
+    base = f"https://{domain}"
+    st, hd, bd = req(base + "/")
+    if st == 0:
+        base = f"http://{domain}"
+        st, hd, bd = req(base + "/")
+    if st == 0:
+        out["root_status"] = 0
+        out["errors"].append("主机不可达（https/http 均失败）")
+        return out
     txt = bd.decode("utf-8", "replace")
     out["root_status"] = st
     out["server"] = hd.get("Server") or hd.get("server")
@@ -54,9 +93,16 @@ def scan(domain):
         r"(dujiaoka|独角数卡|ruoyi|若依|spring|actuator|vue|react|nuxt|next|vite|"
         r"laravel|thinkphp|django|flask|express|gin|subvault|new-api|one-api)",
         txt + str(hd), re.I)))
-    # 路径探测
-    for p in PROBE_PATHS:
-        s, h, b = req(f"https://{domain}{p}")
+
+    # 路径探测（6 并发，保序；根不可达时不再打 40 条）
+    def probe(p):
+        s, h, b = req(base + p)
+        return p, s, h, b
+
+    for rp in _pool_map(PROBE_PATHS, probe, 6):
+        if rp is None:
+            continue
+        p, s, h, b = rp
         if s in (200, 201, 301, 302, 401, 403, 405, 500):
             bt = b[:300].decode("utf-8", "replace")
             # 过滤 SPA 兜底（同 root 长度 + text/html）
@@ -68,12 +114,12 @@ def scan(domain):
     return out
 
 def main():
-    domains = sys.argv[1:]
-    if not domains:
+    args = sys.argv[1:]
+    if not args or any(a in ('-h', '--help') for a in args):
         print(__doc__.strip())
         sys.exit(0)
-    with concurrent.futures.ThreadPoolExecutor(max_workers=6) as ex:
-        for r in ex.map(scan, domains):
+    for r in _pool_map(args, scan, 6):
+        if r is not None:
             print(json.dumps(r, ensure_ascii=False))
 
 if __name__ == "__main__":