agent-bypass 2.11.6 → 2.12.0

package/scripts/argsmini.py

@@ -1,7 +1,8 @@
-"""argparse 极简兼容层（iSH 上省 ~1.8s import 成本）。
-覆盖三工具用到的子集：位置参数、--opt 值、type、default、choices、
-store_true、subparsers(dest)、parse_args、error、-h。
-不支持：前缀缩写、nargs、metavar、互斥组等（三工具未用）。"""
+"""argparse 极简兼容层（iSH 上省 ~1.8s import 成本，全部工具共用）。
+覆盖子集：位置参数（含 nargs='?'）、--opt 值、--opt=value、type、default、
+choices、store_true、action='append'、required、dest、set_defaults、
+subparsers(dest)、parse_args、error、-h。
+不支持：前缀缩写、metavar、互斥组、nargs 其他取值等（全部工具未用）。"""
 import sys
 
 
@@ -20,22 +21,32 @@ class ArgumentParser:
         self._opts = []
         self._sub_dest = None
         self._sub_parsers = {}
+        self._defaults = {}
 
     def add_argument(self, *names, **kw):
-        flag = kw.get('action') == 'store_true'
+        action = kw.get('action')
+        flag = action == 'store_true'
+        append = action == 'append'
+        optpos = kw.get('nargs') == '?'
         if len(names) == 1 and not names[0].startswith('-'):
-            o = dict(dest=names[0], flags=None, pos=True, is_flag=False,
+            o = dict(dest=kw.get('dest') or names[0], flags=None, pos=True,
+                     is_flag=False, append=False, required=False, optpos=optpos,
                      type=kw.get('type', str), default=kw.get('default'),
                      choices=kw.get('choices'), help=kw.get('help', ''))
         else:
             longs = [n for n in names if n.startswith('--')]
-            dest = (longs[0] if longs else names[0]).lstrip('-').replace('-', '_')
+            dest = kw.get('dest') or ((longs[0] if longs else names[0])
+                                      .lstrip('-').replace('-', '_'))
             o = dict(dest=dest, flags=list(names), pos=False, is_flag=flag,
-                     type=kw.get('type', str),
-                     default=kw.get('default', False if flag else None),
+                     append=append, required=bool(kw.get('required')),
+                     optpos=False, type=kw.get('type', str),
+                     default=kw.get('default', [] if append else (False if flag else None)),
                      choices=kw.get('choices'), help=kw.get('help', ''))
         self._opts.append(o)
 
+    def set_defaults(self, **kw):
+        self._defaults.update(kw)
+
     def add_subparsers(self, dest=None, **kw):
         self._sub_dest = dest or 'cmd'
         holder = self
@@ -46,11 +57,14 @@ class ArgumentParser:
                 holder._sub_parsers[name] = p
                 return p
         return _Sub()
+
     def parse_args(self, argv=None):
         argv = list(sys.argv[1:] if argv is None else argv)
         if self._sub_parsers:
+            ns = _NS()
+            for k, v in self._defaults.items():
+                setattr(ns, k, v)
             if not argv:
-                ns = _NS()
                 setattr(ns, self._sub_dest, None)
                 return ns
             for i, t in enumerate(argv):
@@ -71,6 +85,8 @@ class ArgumentParser:
         ns = _NS()
         for o in self._opts:
             setattr(ns, o['dest'], o['default'])
+        for k, v in self._defaults.items():
+            setattr(ns, k, v)
         pos_order = [o for o in self._opts if o['pos']]
         pos_idx = 0
         i = 0
@@ -80,16 +96,20 @@ class ArgumentParser:
                 self.print_help()
                 raise SystemExit(0)
             if t.startswith('-') and t != '-':
-                o = self._find(t)
+                tkey, teq, tval = t.partition('=')
+                o = self._find(tkey if teq else t)
                 if o is None:
                     self.error('unrecognized arguments: %s' % t)
                 if o['is_flag']:
                     setattr(ns, o['dest'], True)
                     i += 1
+                elif teq:
+                    self._setval(ns, o, self._conv(o, tval, tkey))
+                    i += 1
                 else:
                     if i + 1 >= len(argv):
                         self.error('argument %s: expected one argument' % t)
-                    setattr(ns, o['dest'], self._conv(o, argv[i + 1], t))
+                    self._setval(ns, o, self._conv(o, argv[i + 1], t))
                     i += 2
             else:
                 if pos_idx >= len(pos_order):
@@ -99,15 +119,30 @@ class ArgumentParser:
                 pos_idx += 1
                 i += 1
         for o in pos_order[pos_idx:]:
-            if o['default'] is None:
+            if o['default'] is None and not o['optpos']:
                 self.error('the following arguments are required: %s' % o['dest'])
+        for o in self._opts:
+            if o['required'] and getattr(ns, o['dest']) is None:
+                fl = ', '.join(o['flags'] or [o['dest']])
+                self.error('the following arguments are required: %s' % fl)
         return ns
 
+    def _setval(self, ns, o, v):
+        if o['append']:
+            cur = getattr(ns, o['dest'])
+            if not isinstance(cur, list):
+                cur = []
+                setattr(ns, o['dest'], cur)
+            cur.append(v)
+        else:
+            setattr(ns, o['dest'], v)
+
     def _find(self, flag):
         for o in self._opts:
             if o['flags'] and flag in o['flags']:
                 return o
         return None
+
     def _conv(self, o, raw, shown):
         if o['type'] is not str:
             try:
@@ -131,7 +166,9 @@ class ArgumentParser:
         w('\noptions:\n')
         for o in self._opts:
             if o['flags']:
-                w('  %s  %s\n' % (', '.join(o['flags']), o['help']))
+                meta = ' {%s}' % ', '.join(map(str, o['choices'])) if o['choices'] else ''
+                req = ' (required)' if o.get('required') else ''
+                w('  %s%s%s  %s\n' % (', '.join(o['flags']), meta, req, o['help']))
             else:
                 w('  %s  %s\n' % (o['dest'], o['help']))
         if self._sub_parsers:
@@ -153,6 +190,21 @@ if __name__ == '__main__':
     d.add_argument('-w', '--workers', type=int, default=8, help='并发')
     d.add_argument('--dot', action='store_true', help='DoT')
     d.add_argument('--via', choices=['udp', 'dot'], default='udp', help='通道')
-    ns = ap.parse_args()
-    print('cmd=%s target=%s workers=%r dot=%r via=%s' % (
-        ns.cmd, ns.target, ns.workers, ns.dot, ns.via))
+    a = sub.add_parser('add', help='add test')
+    a.add_argument('--type', required=True, choices=['a', 'b'], help='类型')
+    a.add_argument('--lib', action='append', default=[], help='重复项')
+    a.add_argument('--from', dest='source', default='', help='dest 改名')
+    a.add_argument('tgt', nargs='?', help='可选位置')
+    a.set_defaults(func='F')
+    ns = ap.parse_args(['add', '--type=a', '--lib', 'x', '--lib=y', '--from', 'src'])
+    assert (ns.cmd, ns.type, ns.lib, ns.source, ns.tgt, ns.func) == \
+        ('add', 'a', ['x', 'y'], 'src', None, 'F'), vars(ns)
+    ns2 = ap.parse_args(['dns', 'example.com', '-w', '4', '--dot'])
+    assert (ns2.cmd, ns2.target, ns2.workers, ns2.dot, ns2.via) == \
+        ('dns', 'example.com', 4, True, 'udp'), vars(ns2)
+    try:
+        ap.parse_args(['add'])
+        raise AssertionError('required 未触发')
+    except SystemExit as e:
+        assert e.code == 2
+    print('argsmini self-test OK')

package/scripts/cvefetch.py

@@ -13,7 +13,8 @@
   2. NVD             官方，最全
   3. GitHub          相关 PoC 仓库
 """
-import argparse, json, ssl, sys, urllib.parse
+import argsmini as argparse
+import json, ssl, sys, urllib.parse
 import urllib.request, urllib.error
 
 CTX = ssl.create_default_context()
@@ -63,12 +64,12 @@ def from_circl(kw, limit):
     return []
 
 
-def from_nvd(kw, limit, retries=2):
+def from_nvd(kw, limit, retries=1):
     u = ("https://services.nvd.nist.gov/rest/json/cves/2.0?"
          f"keywordSearch={urllib.parse.quote(kw)}&resultsPerPage={limit}")
     d = {}
     for _ in range(retries + 1):
-        d = get(u, timeout=60)
+        d = get(u, timeout=30)
         if "_error" not in d and "vulnerabilities" in d:
             break
     if "_error" in d or "vulnerabilities" not in d:
@@ -136,16 +137,17 @@ def main():
         if src not in results:
             continue
         i += 1
+        tgt = sys.stderr if a.json else sys.stdout   # JSON 模式诊断走 stderr，防数据错位
         print(f"\n{'='*60}\n[{i}] {labels[src]} — {a.keyword}\n{'='*60}",
-              file=sys.stderr)
+              file=tgt)
         rows = results[src]
         if not rows:
-            print("  (无结果 / 源不可用)", file=sys.stderr)
+            print("  (无结果 / 源不可用)", file=tgt)
         for c in rows:
             if a.json:
                 print(json.dumps({"source": src, **c}, ensure_ascii=False))
             elif src == "github":
-                print(f"★{c['stars']:<5} {c['repo']}\n      {c['desc']}\n      {c['url']}")
+                print(f"★{c.get('stars', 0):<5} {c.get('repo', '?')}\n      {c.get('desc', '')}\n      {c.get('url', '')}")
             else:
                 print(f"{c['cve']}  CVSS={c['cvss']}  {c['published']}\n  {c['summary']}")
                 for r in c["refs"][:2]:

package/scripts/deck.py

@@ -19,7 +19,8 @@
   python3 deck.py clear
   python3 deck.py next-round
 """
-import argparse, json, os
+import argsmini as argparse
+import json, os
 from datetime import datetime, timezone, timedelta
 
 BASE = os.path.dirname(os.path.abspath(__file__))

package/scripts/depscan.py

@@ -20,7 +20,8 @@
   # 只提取不查 CVE
   python3 depscan.py https://target.com --no-cve
 """
-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()