Add files via upload

tools/falco.yaml

@@ -1,9 +1,7 @@
 name: "falco"
 command: "falco"
 enabled: true
-
 short_description: "运行时安全监控工具"
-
 description: |
   Falco是一个运行时安全监控工具，用于检测容器和主机中的异常行为。
 
@@ -18,7 +16,6 @@ description: |
   - 异常检测
   - 安全事件响应
   - 合规性监控
-
 parameters:
   - name: "config_file"
     type: "string"
@@ -27,28 +24,26 @@ parameters:
     flag: "--config"
     format: "flag"
     default: "/etc/falco/falco.yaml"
-  
   - name: "rules_file"
     type: "string"
     description: "自定义规则文件"
     required: false
     flag: "--rules"
     format: "flag"
-  
+  - name: "json_output"
-  - name: "output_format"
+    type: "bool"
-    type: "string"
+    description: "以JSON格式输出（等同于 -o json_output=true）"
-    description: "输出格式（json, text）"
     required: false
-    flag: "--output"
+    flag: "-o json_output=true"
     format: "flag"
-    default: "json"
+    default: true
-  
   - name: "duration"
     type: "int"
     description: "监控持续时间（秒）"
     required: false
+    flag: "--duration"
+    format: "flag"
     default: 60
-  
   - name: "additional_args"
     type: "string"
     description: |

tools/fcrackzip.yaml

@@ -1,9 +1,7 @@
 name: "fcrackzip"
 command: "fcrackzip"
 enabled: true
-
 short_description: "ZIP 文件密码破解工具，支持暴力破解和字典攻击"
-
 description: |
   fcrackzip 是一个用于破解受密码保护的 ZIP 文件密码的工具。
 
@@ -24,7 +22,6 @@ description: |
   - 破解时间取决于密码复杂度
   - 建议使用字典文件提高效率
   - 仅用于授权的安全测试
-
 parameters:
   - name: "file"
     type: "string"
@@ -32,42 +29,37 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
+  - name: "dictionary_mode"
-  - name: "dictionary"
+    type: "bool"
-    type: "string"
+    description: "启用字典攻击模式（等同于 -D）"
-    description: "字典文件路径"
     required: false
     flag: "-D"
     format: "flag"
-  
+    default: false
+  - name: "dictionary"
+    type: "string"
+    description: "字典文件路径（与 -D 配合使用）"
+    required: false
+    flag: "-p"
+    format: "flag"
   - name: "bruteforce"
     type: "bool"
     description: "使用暴力破解模式"
     required: false
     flag: "-b"
     format: "flag"
-  
   - name: "charset"
     type: "string"
     description: "字符集，例如 'aA1' 表示小写字母、大写字母和数字"
     required: false
     flag: "-c"
     format: "flag"
-  
+  - name: "length_range"
-  - name: "min_length"
+    type: "string"
-    type: "int"
+    description: "密码长度范围，格式为min-max（例如 4-8）"
-    description: "最小密码长度"
     required: false
     flag: "-l"
     format: "flag"
-  
-  - name: "max_length"
-    type: "int"
-    description: "最大密码长度"
-    required: false
-    flag: "-u"
-    format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/feroxbuster.yaml

@@ -1,9 +1,7 @@
 name: "feroxbuster"
 command: "feroxbuster"
 enabled: true
-
 short_description: "递归内容发现工具"
-
 description: |
   Feroxbuster是一个快速、简单的递归内容发现工具。
 
@@ -18,7 +16,6 @@ description: |
   - 目录枚举
   - 文件发现
   - 安全测试
-
 parameters:
   - name: "url"
     type: "string"
@@ -26,14 +23,12 @@ parameters:
     required: true
     flag: "-u"
     format: "flag"
-  
   - name: "wordlist"
     type: "string"
     description: "字典文件路径"
     required: false
     flag: "-w"
     format: "flag"
-  
   - name: "threads"
     type: "int"
     description: "线程数"
@@ -41,7 +36,6 @@ parameters:
     flag: "-t"
     format: "flag"
     default: 10
-
   - name: "additional_args"
     type: "string"
     description: |

tools/ffuf.yaml

@@ -1,9 +1,7 @@
 name: "ffuf"
 command: "ffuf"
 enabled: true
-
 short_description: "快速Web模糊测试工具，用于目录、参数和内容发现"
-
 description: |
   FFuf是一个快速的Web模糊测试工具，用于目录发现、参数模糊测试和内容发现。
 
@@ -19,7 +17,6 @@ description: |
   - 目录枚举
   - 参数发现
   - 内容发现
-
 parameters:
   - name: "url"
     type: "string"
@@ -27,7 +24,6 @@ parameters:
     required: true
     flag: "-u"
     format: "flag"
-  
   - name: "wordlist"
     type: "string"
     description: "字典文件路径"
@@ -35,7 +31,6 @@ parameters:
     default: "/usr/share/wordlists/dirb/common.txt"
     flag: "-w"
     format: "flag"
-  
   - name: "match_codes"
     type: "string"
     description: "匹配的HTTP状态码（逗号分隔）"
@@ -43,9 +38,8 @@ parameters:
     default: "200,204,301,302,307,401,403"
     flag: "-mc"
     format: "flag"
-  
   - name: "additional_args"
     type: "string"
     description: "额外的FFuf参数"
     required: false
-
+    format: "positional"

tools/fierce.yaml

@@ -1,9 +1,7 @@
 name: "fierce"
 command: "fierce"
 enabled: true
-
 short_description: "DNS侦察工具"
-
 description: |
   Fierce是一个DNS侦察工具，用于发现目标域名的子域名。
 
@@ -18,7 +16,6 @@ description: |
   - 子域名枚举
   - 网络映射
   - 渗透测试
-
 parameters:
   - name: "domain"
     type: "string"
@@ -26,14 +23,12 @@ parameters:
     required: true
     flag: "-dns"
     format: "flag"
-  
   - name: "dns_server"
     type: "string"
     description: "要使用的DNS服务器"
     required: false
     flag: "-dnsserver"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/foremost.yaml

@@ -1,9 +1,7 @@
 name: "foremost"
 command: "foremost"
 enabled: true
-
 short_description: "文件恢复工具"
-
 description: |
   Foremost是一个基于文件头和尾的文件恢复工具。
 
@@ -18,7 +16,6 @@ description: |
   - 取证分析
   - 文件提取
   - 磁盘分析
-
 parameters:
   - name: "input_file"
     type: "string"
@@ -26,7 +23,6 @@ parameters:
     required: true
     flag: "-i"
     format: "flag"
-  
   - name: "output_dir"
     type: "string"
     description: "输出目录"
@@ -34,14 +30,12 @@ parameters:
     flag: "-o"
     format: "flag"
     default: "/tmp/foremost_output"
-  
   - name: "file_types"
     type: "string"
     description: "要恢复的文件类型（jpg,gif,png等）"
     required: false
     flag: "-t"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/gau.yaml

@@ -1,9 +1,7 @@
 name: "gau"
 command: "gau"
 enabled: true
-
 short_description: "从多个数据源获取所有URL"
-
 description: |
   Gau (Get All URLs) 从多个数据源获取目标域名的所有URL。
 
@@ -18,7 +16,6 @@ description: |
   - 历史URL收集
   - Bug bounty侦察
   - 安全测试
-
 parameters:
   - name: "domain"
     type: "string"
@@ -26,14 +23,12 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "providers"
     type: "string"
     description: "数据源（wayback,commoncrawl,otx,urlscan）"
     required: false
     flag: "-providers"
     format: "flag"
-  
   - name: "include_subs"
     type: "bool"
     description: "包含子域名"
@@ -41,7 +36,6 @@ parameters:
     flag: "-subs"
     format: "flag"
     default: true
-  
   - name: "additional_args"
     type: "string"
     description: |
@@ -58,4 +52,3 @@ parameters:
       - 此参数会直接追加到命令末尾
     required: false
     format: "positional"
-

tools/gdb-peda.yaml

@@ -1,9 +1,7 @@
 name: "gdb-peda"
 command: "gdb"
 enabled: true
-
 short_description: "带PEDA增强的GDB调试器"
-
 description: |
   GDB-PEDA是带有PEDA（Python Exploit Development Assistance）增强的GDB调试器。
 
@@ -18,7 +16,6 @@ description: |
   - 漏洞利用开发
   - 逆向工程
   - 安全研究
-
 parameters:
   - name: "binary"
     type: "string"
@@ -26,28 +23,24 @@ parameters:
     required: false
     position: 0
     format: "positional"
-  
   - name: "commands"
     type: "string"
     description: "GDB命令（分号分隔）"
     required: false
     flag: "-ex"
     format: "flag"
-  
   - name: "attach_pid"
     type: "int"
     description: "要附加的进程ID"
     required: false
     flag: "-p"
     format: "flag"
-  
   - name: "core_file"
     type: "string"
     description: "核心转储文件路径"
     required: false
     flag: "-c"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/gdb.yaml

@@ -1,9 +1,7 @@
 name: "gdb"
 command: "gdb"
 enabled: true
-
 short_description: "GNU调试器，用于二进制分析和调试"
-
 description: |
   GDB是GNU调试器，用于调试和分析二进制程序。
 
@@ -18,7 +16,6 @@ description: |
   - 漏洞研究
   - 逆向工程
   - 程序调试
-
 parameters:
   - name: "binary"
     type: "string"
@@ -26,21 +23,18 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "commands"
     type: "string"
     description: "要执行的GDB命令（分号分隔）"
     required: false
     flag: "-ex"
     format: "flag"
-  
   - name: "script_file"
     type: "string"
     description: "GDB脚本文件路径"
     required: false
     flag: "-x"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/ghidra.yaml

@@ -1,9 +1,7 @@
 name: "ghidra"
-command: "ghidra"
+command: "analyzeHeadless"
 enabled: true
-
 short_description: "高级二进制分析和逆向工程工具"
-
 description: |
   Ghidra是NSA开发的免费二进制分析和逆向工程工具。
 
@@ -18,36 +16,33 @@ description: |
   - 逆向工程
   - 恶意软件分析
   - 漏洞研究
-
 parameters:
-  - name: "binary"
+  - name: "project_dir"
     type: "string"
-    description: "要分析的二进制文件路径"
+    description: "Ghidra项目存放目录"
-    required: true
+    required: false
-  
+    default: "/tmp/ghidra_projects"
+    position: 0
+    format: "positional"
   - name: "project_name"
     type: "string"
     description: "Ghidra项目名称"
     required: false
     default: "hexstrike_analysis"
-  
+    position: 1
+    format: "positional"
+  - name: "binary"
+    type: "string"
+    description: "要分析的二进制文件路径"
+    required: true
+    flag: "-import"
+    format: "flag"
   - name: "script_file"
     type: "string"
-    description: "自定义Ghidra脚本文件"
+    description: "可选的Ghidra脚本文件（通过 -postScript 执行）"
     required: false
-  
+    flag: "-postScript"
-  - name: "analysis_timeout"
+    format: "flag"
-    type: "int"
-    description: "分析超时时间（秒）"
-    required: false
-    default: 300
-  
-  - name: "output_format"
-    type: "string"
-    description: "输出格式（xml, json）"
-    required: false
-    default: "xml"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/gobuster.yaml

@@ -1,9 +1,7 @@
 name: "gobuster"
 command: "gobuster"
 enabled: true
-
 short_description: "Web内容扫描工具，用于发现目录、文件和子域名"
-
 description: |
   Gobuster是一个快速的内容发现工具，用于Web应用程序的目录、文件和子域名枚举。
 
@@ -18,7 +16,6 @@ description: |
   - 目录枚举和文件发现
   - 子域名发现
   - 渗透测试信息收集
-
 parameters:
   - name: "mode"
     type: "string"
@@ -36,14 +33,12 @@ parameters:
     position: 0
     format: "positional"
     options: ["dir", "dns", "fuzz", "vhost"]
-  
   - name: "url"
     type: "string"
     description: "目标URL"
     required: true
     flag: "-u"
     format: "flag"
-  
   - name: "wordlist"
     type: "string"
     description: "字典文件路径"
@@ -51,9 +46,8 @@ parameters:
     default: "/usr/share/wordlists/dirb/common.txt"
     flag: "-w"
     format: "flag"
-  
   - name: "additional_args"
     type: "string"
     description: "额外的Gobuster参数"
     required: false
-
+    format: "positional"

tools/graphql-scanner.yaml

@@ -1,9 +1,7 @@
 name: "graphql-scanner"
 command: "graphqlmap"
 enabled: true
-
 short_description: "GraphQL安全扫描和自省工具"
-
 description: |
   高级GraphQL安全扫描和自省工具，用于检测GraphQL API中的安全问题。
 
@@ -18,7 +16,6 @@ description: |
   - API安全评估
   - 漏洞发现
   - 安全测试
-
 parameters:
   - name: "endpoint"
     type: "string"
@@ -26,7 +23,6 @@ parameters:
     required: true
     flag: "-u"
     format: "flag"
-  
   - name: "introspection"
     type: "bool"
     description: "测试自省查询"
@@ -34,7 +30,6 @@ parameters:
     default: true
     flag: "--introspection"
     format: "flag"
-  
   - name: "query_depth"
     type: "int"
     description: "要测试的最大查询深度"
@@ -42,7 +37,6 @@ parameters:
     default: 10
     flag: "--depth"
     format: "flag"
-  
   - name: "test_mutations"
     type: "bool"
     description: "测试突变操作"
@@ -50,7 +44,6 @@ parameters:
     default: true
     flag: "--mutations"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/hakrawler.yaml

@@ -1,9 +1,7 @@
 name: "hakrawler"
 command: "hakrawler"
 enabled: true
-
 short_description: "Web端点发现工具"
-
 description: |
   Hakrawler是一个快速、简单的Web端点发现工具。
 
@@ -18,13 +16,13 @@ description: |
   - 内容爬取
   - 安全测试
   - Bug bounty侦察
-
 parameters:
   - name: "url"
     type: "string"
     description: "目标URL"
     required: true
-  
+    flag: "-url"
+    format: "flag"
   - name: "depth"
     type: "int"
     description: "爬取深度"
@@ -32,7 +30,6 @@ parameters:
     flag: "-d"
     format: "flag"
     default: 2
-  
   - name: "forms"
     type: "bool"
     description: "包含表单"
@@ -40,7 +37,6 @@ parameters:
     flag: "-forms"
     format: "flag"
     default: true
-
   - name: "additional_args"
     type: "string"
     description: |

tools/hash-identifier.yaml

@@ -1,9 +1,37 @@
 name: "hash-identifier"
-command: "hash-identifier"
+command: "python3"
+args:
+  - "-c"
+  - |
+    import shlex
+    import subprocess
+    import sys
+
+    if len(sys.argv) < 2:
+        sys.stderr.write("缺少哈希值\n")
+        sys.exit(1)
+
+    hash_value = sys.argv[1]
+    extra = sys.argv[2] if len(sys.argv) > 2 else ""
+
+    cmd = ["hash-identifier"]
+    if extra:
+        cmd.extend(shlex.split(extra))
+
+    proc = subprocess.run(
+        cmd,
+        input=f"{hash_value}\n",
+        capture_output=True,
+        text=True,
+    )
+
+    if proc.returncode != 0:
+        sys.stderr.write(proc.stderr or proc.stdout)
+        sys.exit(proc.returncode)
+
+    sys.stdout.write(proc.stdout)
 enabled: true
-
 short_description: "哈希类型识别工具，用于识别未知哈希值的类型"
-
 description: |
   hash-identifier 是一个用于识别哈希值类型的工具，可以帮助确定未知哈希值使用的算法。
 
@@ -31,7 +59,6 @@ description: |
   **注意事项：**
   - 需要 Python 环境
   - 交互式工具，可能需要特殊处理
-
 parameters:
   - name: "hash"
     type: "string"
@@ -39,7 +66,6 @@ parameters:
     required: true
     position: 0
     format: "positional"
-
   - name: "additional_args"
     type: "string"
     description: |
@@ -53,4 +79,6 @@ parameters:
       - 确保参数格式正确，避免命令注入
       - 此参数会直接追加到命令末尾
     required: false
+    default: ""
+    position: 1
     format: "positional"

tools/hashcat.yaml

@@ -1,9 +1,7 @@
 name: "hashcat"
 command: "hashcat"
 enabled: true
-
 short_description: "高级密码破解工具，支持GPU加速"
-
 description: |
   Hashcat是一个高级密码恢复工具，支持多种哈希算法和攻击模式。
 
@@ -18,7 +16,6 @@ description: |
   - 哈希破解
   - 安全测试
   - 取证分析
-
 parameters:
   - name: "hash_file"
     type: "string"
@@ -26,14 +23,12 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "hash_type"
     type: "string"
     description: "哈希类型编号"
     required: true
     flag: "-m"
     format: "flag"
-  
   - name: "attack_mode"
     type: "string"
     description: "攻击模式（0=字典, 1=组合, 3=掩码等）"
@@ -41,7 +36,6 @@ parameters:
     default: "0"
     flag: "-a"
     format: "flag"
-  
   - name: "wordlist"
     type: "string"
     description: "字典文件"
@@ -49,16 +43,14 @@ parameters:
     default: "/usr/share/wordlists/rockyou.txt"
     position: 1
     format: "positional"
-  
   - name: "mask"
     type: "string"
     description: "掩码（用于掩码攻击）"
     required: false
-    flag: "-a"
+    position: 2
-    format: "flag"
+    format: "positional"
-  
   - name: "additional_args"
     type: "string"
     description: "额外的Hashcat参数"
     required: false
-
+    format: "positional"

tools/hashpump.yaml

@@ -1,9 +1,7 @@
 name: "hashpump"
 command: "hashpump"
 enabled: true
-
 short_description: "哈希长度扩展攻击工具"
-
 description: |
   HashPump是一个用于执行哈希长度扩展攻击的工具。
 
@@ -18,28 +16,31 @@ description: |
   - 哈希函数测试
   - CTF挑战
   - 安全研究
-
 parameters:
   - name: "signature"
     type: "string"
     description: "原始哈希签名"
     required: true
-  
+    flag: "-s"
+    format: "flag"
   - name: "data"
     type: "string"
     description: "原始数据"
     required: true
-  
+    flag: "-d"
+    format: "flag"
   - name: "key_length"
-    type: "string"
+    type: "int"
     description: "密钥长度"
     required: true
-  
+    flag: "-k"
+    format: "flag"
   - name: "append_data"
     type: "string"
     description: "要追加的数据"
     required: true
-
+    flag: "-a"
+    format: "flag"
   - name: "additional_args"
     type: "string"
     description: |

tools/http-framework-test.yaml

@@ -3,238 +3,321 @@ command: "python3"
 args:
   - "-c"
   - |
-      import argparse
+    import argparse
-      import json
+    import json
-      import shlex
+    import re
-      import subprocess
+    import shlex
-      import sys
+    import subprocess
-      import time
+    import sys
-      import urllib.parse
+    import time
+    import urllib.parse
 
-      METRIC_MARKER = "__CYBERSTRIKE_HTTP_METRICS__"
+    try:
-      METRIC_KEYS = [
+        from charset_normalizer import from_bytes as charset_from_bytes
-          "dns_lookup",
+    except ImportError:
-          "tcp_connect",
+        charset_from_bytes = None
-          "tls_handshake",
-          "pretransfer",
-          "ttfb",
-          "total",
-          "speed_download",
-          "size_download",
-          "http_code",
-          "redirects",
-      ]
 
-      def parse_headers(raw: str):
+    try:
-          if not raw:
+        import chardet
-              return []
+    except ImportError:
-          raw = raw.strip()
+        chardet = None
-          if not raw:
-              return []
-          try:
-              parsed = json.loads(raw)
-              headers = []
-              if isinstance(parsed, dict):
-                  for k, v in parsed.items():
-                      headers.append(f"{k}: {v}")
-                  return headers
-              if isinstance(parsed, list):
-                  for item in parsed:
-                      if isinstance(item, str) and item.strip():
-                          headers.append(item.strip())
-                  if headers:
-                      return headers
-          except json.JSONDecodeError:
-              pass
-          headers = []
-          for line in raw.replace(";", "\n").splitlines():
-              stripped = line.strip()
-              if stripped:
-                  headers.append(stripped)
-          return headers
 
-      def parse_additional(raw: str):
+    METRIC_MARKER = "__CYBERSTRIKE_HTTP_METRICS__"
-          if not raw:
+    METRIC_KEYS = [
-              return []
+        "dns_lookup",
-          try:
+        "tcp_connect",
-              return shlex.split(raw)
+        "tls_handshake",
-          except ValueError:
+        "pretransfer",
-              return [arg for arg in raw.split() if arg]
+        "ttfb",
+        "total",
+        "speed_download",
+        "size_download",
+        "http_code",
+        "redirects",
+    ]
 
-      def smart_encode_url(url: str, safe_path="/:@&=%+,$-~", safe_query="/:@&=%+,$-~"):
+    def parse_headers(raw: str):
-          try:
+        if not raw:
-              parts = urllib.parse.urlsplit(url)
+            return []
-          except ValueError:
+        raw = raw.strip()
-              return url
+        if not raw:
-          path = urllib.parse.quote(parts.path or "/", safe=safe_path)
+            return []
-          query = urllib.parse.quote(parts.query, safe=safe_query)
+        try:
-          fragment = urllib.parse.quote(parts.fragment, safe=safe_query)
+            parsed = json.loads(raw)
-          return urllib.parse.urlunsplit((parts.scheme, parts.netloc, path, query, fragment))
+            headers = []
+            if isinstance(parsed, dict):
+                for k, v in parsed.items():
+                    headers.append(f"{k}: {v}")
+                return headers
+            if isinstance(parsed, list):
+                for item in parsed:
+                    if isinstance(item, str) and item.strip():
+                        headers.append(item.strip())
+                if headers:
+                    return headers
+        except json.JSONDecodeError:
+            pass
+        headers = []
+        for line in raw.replace(";", "\n").splitlines():
+            stripped = line.strip()
+            if stripped:
+                headers.append(stripped)
+        return headers
 
-      def sanitize_cmd(cmd):
+    def parse_additional(raw: str):
-          return " ".join(shlex.quote(part) for part in cmd)
+        if not raw:
+            return []
+        try:
+            return shlex.split(raw)
+        except ValueError:
+            return [arg for arg in raw.split() if arg]
 
-      def extract_metrics(output: str):
+    def smart_encode_url(url: str, safe_path="/:@&=%+,$-~", safe_query="/:@&=%+,$-~"):
-          if METRIC_MARKER not in output:
+        try:
-              return output, {}
+            parts = urllib.parse.urlsplit(url)
-          head, tail = output.rsplit(METRIC_MARKER + ":", 1)
+        except ValueError:
-          values = tail.strip().split("|")
+            return url
-          stats = {}
+        path = urllib.parse.quote(parts.path or "/", safe=safe_path)
-          for key, value in zip(METRIC_KEYS, values):
+        query = urllib.parse.quote(parts.query, safe=safe_query)
-              stats[key] = value.strip()
+        fragment = urllib.parse.quote(parts.fragment, safe=safe_query)
-          return head, stats
+        return urllib.parse.urlunsplit((parts.scheme, parts.netloc, path, query, fragment))
 
-      def to_float(value):
+    def sanitize_cmd(cmd):
-          try:
+        return " ".join(shlex.quote(part) for part in cmd)
-              return float(value)
-          except (TypeError, ValueError):
-              return None
 
-      parser = argparse.ArgumentParser(description="Enhanced HTTP testing helper")
+    def extract_metrics(output: bytes):
-      parser.add_argument("--url", required=True)
+        marker = (METRIC_MARKER + ":").encode("ascii")
-      parser.add_argument("--method", default="GET")
+        if marker not in output:
-      parser.add_argument("--data", default="")
+            return output, {}
-      parser.add_argument("--headers", default="")
+        head, tail = output.rsplit(marker, 1)
-      parser.add_argument("--cookies", default="")
+        try:
-      parser.add_argument("--user-agent", dest="user_agent", default="")
+            tail_text = tail.decode("utf-8", errors="ignore")
-      parser.add_argument("--proxy", default="")
+        except UnicodeDecodeError:
-      parser.add_argument("--timeout", default="")
+            tail_text = ""
-      parser.add_argument("--repeat", type=int, default=1)
+        values = tail_text.strip().split("|")
-      parser.add_argument("--delay", default="0")
+        stats = {}
-      parser.add_argument("--additional-args", dest="additional_args", default="")
+        for key, value in zip(METRIC_KEYS, values):
-      parser.add_argument("--action", default="")
+            stats[key] = value.strip()
-      parser.add_argument("--include-headers", dest="include_headers", action="store_true")
+        return head, stats
-      parser.add_argument("--auto-encode-url", dest="auto_encode_url", action="store_true")
-      parser.add_argument("--follow-redirects", dest="follow_redirects", action="store_true")
-      parser.add_argument("--allow-insecure", dest="allow_insecure", action="store_true")
-      parser.add_argument("--verbose-output", dest="verbose_output", action="store_true")
-      parser.add_argument("--show-command", dest="show_command", action="store_true")
-      parser.add_argument("--show-summary", dest="show_summary", action="store_true")
-      args = parser.parse_args()
 
-      repeat = max(1, args.repeat)
+    def extract_declared_charset(data: bytes):
-      try:
+        if not data:
-          delay_between = float(args.delay or "0")
+            return ""
-          if delay_between < 0:
+        sample = data[:16384]
-              delay_between = 0.0
+        try:
-      except ValueError:
+            sample_text = sample.decode("iso-8859-1", errors="ignore")
-          delay_between = 0.0
+        except UnicodeDecodeError:
+            return ""
 
-      prepared_url = smart_encode_url(args.url) if args.auto_encode_url else args.url
+        for line in sample_text.splitlines():
-      curl_cmd = ["curl", "-sS"]
+            lowered = line.lower()
-      if args.include_headers:
+            if "content-type:" in lowered and "charset=" in lowered:
-          curl_cmd.append("-i")
+                charset_index = lowered.index("charset=") + len("charset=")
-      if args.verbose_output:
+                remainder = line[charset_index:]
-          curl_cmd.append("-v")
+                for separator in [";", " ", "\t"]:
-      method = (args.method or "GET").upper()
+                    remainder = remainder.split(separator)[0]
-      if method:
+                return remainder.strip().strip('"').strip("'")
-          curl_cmd.extend(["-X", method])
-      if args.cookies:
-          curl_cmd.extend(["-b", args.cookies])
-      if args.user_agent:
-          curl_cmd.extend(["-A", args.user_agent])
-      if args.timeout:
-          curl_cmd.extend(["--max-time", str(args.timeout)])
-      if args.follow_redirects:
-          curl_cmd.append("-L")
-      if args.allow_insecure:
-          curl_cmd.append("-k")
-      if args.proxy:
-          curl_cmd.extend(["-x", args.proxy])
-      for header in parse_headers(args.headers):
-          curl_cmd.extend(["-H", header])
-      if args.data:
-          curl_cmd.extend(["--data", args.data])
-      metrics_template = METRIC_MARKER + ":" + "|".join([
-          "%{time_namelookup}",
-          "%{time_connect}",
-          "%{time_appconnect}",
-          "%{time_pretransfer}",
-          "%{time_starttransfer}",
-          "%{time_total}",
-          "%{speed_download}",
-          "%{size_download}",
-          "%{http_code}",
-          "%{num_redirects}",
-      ])
-      curl_cmd.extend(["-w", f"\n{metrics_template}\n"])
-      if args.additional_args:
-          curl_cmd.extend(parse_additional(args.additional_args))
-      curl_cmd.append(prepared_url)
 
-      aggregate = {key: [] for key in METRIC_KEYS} if args.show_summary else None
+        meta_match = re.search(r'charset=["\']?([a-zA-Z0-9_\-.:]+)', sample_text, re.IGNORECASE)
-      if aggregate is not None:
+        if meta_match:
-          aggregate["wall_time"] = []
+            return meta_match.group(1)
-      exit_code = 0
+        return ""
 
-      for run_index in range(repeat):
+    def decode_body_bytes(data: bytes, user_encoding: str = ""):
-          if run_index > 0 and delay_between > 0:
+        declared = extract_declared_charset(data)
-              time.sleep(delay_between)
+        attempts = []
+        if user_encoding:
+            attempts.append(("user", user_encoding))
+        if declared:
+            attempts.append(("declared", declared))
 
-          run_cmd = list(curl_cmd)
+        for source, encoding in attempts:
-          start = time.perf_counter()
+            enc = (encoding or "").strip()
-          proc = subprocess.run(
+            if not enc:
-              run_cmd,
+                continue
-              capture_output=True,
+            try:
-              text=True,
+                return data.decode(enc), enc, source
-              encoding="utf-8",
+            except (LookupError, UnicodeDecodeError):
-              errors="replace",
+                continue
-          )
-          elapsed = time.perf_counter() - start
-          body, stats = extract_metrics(proc.stdout)
 
-          print(f"\n===== Response #{run_index + 1} =====")
+        if charset_from_bytes is not None and data:
-          output_body = body.rstrip()
+            best = charset_from_bytes(data).best()
-          if output_body:
+            if best and best.encoding:
-              print(output_body)
+                try:
-          else:
+                    return data.decode(best.encoding), best.encoding, "detected"
-              print("[no body]")
+                except (LookupError, UnicodeDecodeError):
+                    pass
 
-          print(f"\n----- Meta #{run_index + 1} -----")
+        if chardet is not None and data:
-          if args.show_command and run_index == 0:
+            detection = chardet.detect(data)
-              print("Command:", sanitize_cmd(run_cmd))
+            encoding = detection.get("encoding")
-          if args.show_summary:
+            if encoding:
-              if stats:
+                try:
-                  for key in METRIC_KEYS:
+                    return data.decode(encoding), encoding, "detected"
-                      label = key.replace("_", " ").title()
+                except (LookupError, UnicodeDecodeError):
-                      print(f"{label}: {stats.get(key, 'n/a')}")
+                    pass
-                      value = to_float(stats.get(key))
-                      if value is not None and aggregate is not None:
-                          aggregate[key].append(value)
-              else:
-                  print("Timing data unavailable (curl -w output missing).")
-              print(f"Wall Time (client): {elapsed:.6f}s")
-              if aggregate is not None:
-                  aggregate["wall_time"].append(elapsed)
-          else:
-              print("Summary disabled (--show-summary=false).")
-              print(f"Wall Time (client): {elapsed:.6f}s")
 
-          if proc.stderr.strip():
+        try:
-              print("\nstderr:")
+            return data.decode("utf-8"), "utf-8", "fallback"
-              print(proc.stderr.strip())
+        except UnicodeDecodeError:
+            return data.decode("utf-8", errors="replace"), "utf-8", "fallback"
 
-          if proc.returncode != 0:
+    def to_float(value):
-              exit_code = proc.returncode
+        try:
+            return float(value)
+        except (TypeError, ValueError):
+            return None
 
-      if args.show_summary and repeat > 1 and aggregate is not None:
+    parser = argparse.ArgumentParser(description="Enhanced HTTP testing helper")
-          def summarize(values):
+    parser.add_argument("--url", required=True)
-              if not values:
+    parser.add_argument("--method", default="GET")
-                  return None
+    parser.add_argument("--data", default="")
-              return (min(values), sum(values)/len(values), max(values))
+    parser.add_argument("--headers", default="")
+    parser.add_argument("--cookies", default="")
+    parser.add_argument("--user-agent", dest="user_agent", default="")
+    parser.add_argument("--proxy", default="")
+    parser.add_argument("--timeout", default="")
+    parser.add_argument("--repeat", type=int, default=1)
+    parser.add_argument("--delay", default="0")
+    parser.add_argument("--additional-args", dest="additional_args", default="")
+    parser.add_argument("--action", default="")
+    parser.add_argument("--include-headers", dest="include_headers", action="store_true")
+    parser.add_argument("--auto-encode-url", dest="auto_encode_url", action="store_true")
+    parser.add_argument("--follow-redirects", dest="follow_redirects", action="store_true")
+    parser.add_argument("--allow-insecure", dest="allow_insecure", action="store_true")
+    parser.add_argument("--verbose-output", dest="verbose_output", action="store_true")
+    parser.add_argument("--show-command", dest="show_command", action="store_true")
+    parser.add_argument("--show-summary", dest="show_summary", action="store_true")
+    parser.add_argument("--response-encoding", dest="response_encoding", default="")
+    args = parser.parse_args()
 
-          print("\n===== Aggregate Timing =====")
+    repeat = max(1, args.repeat)
-          for key, values in aggregate.items():
+    try:
-              summary = summarize(values)
+        delay_between = float(args.delay or "0")
-              if not summary:
+        if delay_between < 0:
-                  continue
+            delay_between = 0.0
-              label = key.replace("_", " ").title()
+    except ValueError:
-              min_v, avg_v, max_v = summary
+        delay_between = 0.0
-              print(f"{label}: min {min_v:.6f}s | avg {avg_v:.6f}s | max {max_v:.6f}s")
 
-      if exit_code != 0:
+    prepared_url = smart_encode_url(args.url) if args.auto_encode_url else args.url
-          sys.exit(exit_code)
+    curl_cmd = ["curl", "-sS"]
-      sys.exit(0)
+    if args.include_headers:
+        curl_cmd.append("-i")
+    if args.verbose_output:
+        curl_cmd.append("-v")
+    method = (args.method or "GET").upper()
+    if method:
+        curl_cmd.extend(["-X", method])
+    if args.cookies:
+        curl_cmd.extend(["-b", args.cookies])
+    if args.user_agent:
+        curl_cmd.extend(["-A", args.user_agent])
+    if args.timeout:
+        curl_cmd.extend(["--max-time", str(args.timeout)])
+    if args.follow_redirects:
+        curl_cmd.append("-L")
+    if args.allow_insecure:
+        curl_cmd.append("-k")
+    if args.proxy:
+        curl_cmd.extend(["-x", args.proxy])
+    for header in parse_headers(args.headers):
+        curl_cmd.extend(["-H", header])
+    if args.data:
+        curl_cmd.extend(["--data", args.data])
+    metrics_template = METRIC_MARKER + ":" + "|".join([
+        "%{time_namelookup}",
+        "%{time_connect}",
+        "%{time_appconnect}",
+        "%{time_pretransfer}",
+        "%{time_starttransfer}",
+        "%{time_total}",
+        "%{speed_download}",
+        "%{size_download}",
+        "%{http_code}",
+        "%{num_redirects}",
+    ])
+    curl_cmd.extend(["-w", f"\n{metrics_template}\n"])
+    if args.additional_args:
+        curl_cmd.extend(parse_additional(args.additional_args))
+    curl_cmd.append(prepared_url)
+
+    aggregate = {key: [] for key in METRIC_KEYS} if args.show_summary else None
+    if aggregate is not None:
+        aggregate["wall_time"] = []
+    exit_code = 0
+
+    for run_index in range(repeat):
+        if run_index > 0 and delay_between > 0:
+            time.sleep(delay_between)
+
+        run_cmd = list(curl_cmd)
+        start = time.perf_counter()
+        proc = subprocess.run(
+            run_cmd,
+            capture_output=True,
+        )
+        elapsed = time.perf_counter() - start
+        body_bytes, stats = extract_metrics(proc.stdout)
+        decoded_body, used_encoding, encoding_source = decode_body_bytes(
+            body_bytes,
+            user_encoding=args.response_encoding,
+        )
+
+        print(f"\n===== Response #{run_index + 1} =====")
+        output_body = decoded_body.rstrip()
+        if output_body:
+            print(output_body)
+        else:
+            print("[no body]")
+
+        print(f"\n----- Meta #{run_index + 1} -----")
+        if args.show_command and run_index == 0:
+            print("Command:", sanitize_cmd(run_cmd))
+        if args.show_summary:
+            if stats:
+                for key in METRIC_KEYS:
+                    label = key.replace("_", " ").title()
+                    print(f"{label}: {stats.get(key, 'n/a')}")
+                    value = to_float(stats.get(key))
+                    if value is not None and aggregate is not None:
+                        aggregate[key].append(value)
+            else:
+                print("Timing data unavailable (curl -w output missing).")
+            print(f"Wall Time (client): {elapsed:.6f}s")
+            if aggregate is not None:
+                aggregate["wall_time"].append(elapsed)
+        else:
+            print("Summary disabled (--show-summary=false).")
+            print(f"Wall Time (client): {elapsed:.6f}s")
+
+        print(f"Encoding Used: {used_encoding} ({encoding_source})")
+
+        stderr_text = proc.stderr.decode("utf-8", errors="replace").strip()
+        if stderr_text:
+            print("\nstderr:")
+            print(stderr_text)
+
+        if proc.returncode != 0:
+            exit_code = proc.returncode
+
+    if args.show_summary and repeat > 1 and aggregate is not None:
+        def summarize(values):
+            if not values:
+                return None
+            return (min(values), sum(values)/len(values), max(values))
+
+        print("\n===== Aggregate Timing =====")
+        for key, values in aggregate.items():
+            summary = summarize(values)
+            if not summary:
+                continue
+            label = key.replace("_", " ").title()
+            min_v, avg_v, max_v = summary
+            print(f"{label}: min {min_v:.6f}s | avg {avg_v:.6f}s | max {max_v:.6f}s")
+
+    if exit_code != 0:
+        sys.exit(exit_code)
+    sys.exit(0)
 enabled: true
 short_description: "增强的HTTP测试框架（带延时、编码、可观察性）"
 description: |
@@ -244,6 +327,7 @@ description: |
   - 自动URL编码：解决包含空格、引号等字符时curl报错的问题，必要时可手动关闭
   - 时延观测：采集 DNS / TCP / TLS / TTFB / 总耗时，可循环请求计算盲注延时
   - 详细输出：可选响应头、命令、stderr，方便排查
+  - 自动编码识别：支持响应内容编码自动检测，可额外指定强制编码
   - 扩展控制：支持代理、超时、重复次数、延迟间隔及原生curl参数透传
 parameters:
   - name: "url"
@@ -341,6 +425,11 @@ parameters:
     required: false
     default: true
     flag: "--show-summary"
+  - name: "response_encoding"
+    type: "string"
+    description: "强制响应解码使用的编码（默认自动检测，可用于指定GBK等场景）"
+    required: false
+    flag: "--response-encoding"
   - name: "action"
     type: "string"
     description: "保留字段：标识调用意图（request, spider等），当前脚本内部不使用"

tools/http-intruder.yaml

@@ -1,69 +1,130 @@
 name: "http-intruder"
-command: "ffuf"
+command: "python3"
+args:
+  - "-c"
+  - |
+    import json
+    import sys
+    import time
+    from urllib.parse import urlencode, urlparse, parse_qs, urlunparse
+
+    import requests
+
+    if len(sys.argv) < 3:
+        sys.stderr.write("需要至少URL和载荷\n")
+        sys.exit(1)
+
+    url = sys.argv[1]
+    method = (sys.argv[2] or "GET").upper()
+    location = (sys.argv[3] or "query").lower()
+    params_json = sys.argv[4] if len(sys.argv) > 4 else "{}"
+    payloads_json = sys.argv[5] if len(sys.argv) > 5 else "[]"
+    max_requests = int(sys.argv[6]) if len(sys.argv) > 6 and sys.argv[6] else 0
+
+    try:
+        params_template = json.loads(params_json) if params_json else {}
+    except json.JSONDecodeError as exc:
+        sys.stderr.write(f"参数模板解析失败: {exc}\n")
+        sys.exit(1)
+
+    try:
+        payloads = json.loads(payloads_json)
+    except json.JSONDecodeError as exc:
+        sys.stderr.write(f"载荷解析失败: {exc}\n")
+        sys.exit(1)
+
+    if not isinstance(payloads, list) or not payloads:
+        sys.stderr.write("载荷列表不能为空\n")
+        sys.exit(1)
+
+    param_names = list(params_template.keys())
+    if not param_names:
+        sys.stderr.write("参数模板不能为空\n")
+        sys.exit(1)
+
+    session = requests.Session()
+    sent = 0
+
+    def build_query(original_url, data):
+        parsed = urlparse(original_url)
+        existing = {k: v[0] for k, v in parse_qs(parsed.query, keep_blank_values=True).items()}
+        existing.update(data)
+        new_query = urlencode(existing, doseq=True)
+        return urlunparse(parsed._replace(query=new_query))
+
+    for param in param_names:
+        for payload in payloads:
+            if max_requests and sent >= max_requests:
+                break
+            payload_str = str(payload)
+            if location == "query":
+                new_url = build_query(url, {param: payload_str})
+                response = session.request(method, new_url)
+            elif location == "body":
+                body = params_template.copy()
+                body[param] = payload_str
+                response = session.request(method, url, data=body)
+            elif location == "headers":
+                headers = params_template.copy()
+                headers[param] = payload_str
+                response = session.request(method, url, headers=headers)
+            elif location == "cookie":
+                cookies = params_template.copy()
+                cookies[param] = payload_str
+                response = session.request(method, url, cookies=cookies)
+            else:
+                sys.stderr.write(f"不支持的位置: {location}\n")
+                sys.exit(1)
+
+            sent += 1
+            length = len(response.content)
+            print(f"[{sent}] {param} = {payload_str} -> {response.status_code} ({length} bytes)")
+        if max_requests and sent >= max_requests:
+            break
+
+    if sent == 0:
+        sys.stderr.write("未发送任何请求，请检查参数配置。\n")
 enabled: true
-
 short_description: "简单的Intruder（sniper）模糊测试工具"
-
 description: |
-  简单的Intruder（sniper）模糊测试，逐个参数迭代载荷。
+  轻量级HTTP“狙击手”模式模糊器，对每个参数逐一替换载荷并记录响应。
-  
-  **主要功能：**
-  - 参数模糊测试
-  - 载荷迭代
-  - 多种位置支持
-  - 批量请求
-  
-  **使用场景：**
-  - 参数模糊测试
-  - 载荷测试
-  - 安全测试
-  - 漏洞发现
-
 parameters:
   - name: "url"
     type: "string"
     description: "目标URL"
     required: true
-  
+    position: 0
+    format: "positional"
   - name: "method"
     type: "string"
-    description: "HTTP方法"
+    description: "HTTP方法（默认GET）"
     required: false
     default: "GET"
-  
+    position: 1
+    format: "positional"
   - name: "location"
     type: "string"
     description: "载荷位置（query, body, headers, cookie）"
     required: false
     default: "query"
-  
+    position: 2
+    format: "positional"
   - name: "params"
     type: "string"
-    description: "参数列表（JSON格式）"
+    description: "参数模板（JSON字典），指定要模糊的键及默认值"
-    required: false
+    required: true
-  
+    position: 3
+    format: "positional"
   - name: "payloads"
     type: "string"
-    description: "载荷列表（JSON格式）"
+    description: "载荷列表（JSON数组）"
-    required: false
+    required: true
-  
+    position: 4
+    format: "positional"
   - name: "max_requests"
     type: "int"
-    description: "最大请求数"
+    description: "最大请求数（0表示全部）"
-    required: false
-    default: 100
-
-  - name: "additional_args"
-    type: "string"
-    description: |
-      额外的http-intruder参数。用于传递未在参数列表中定义的http-intruder选项。
-      
-      **示例值：**
-      - 根据工具特性添加常用参数示例
-      
-      **注意事项：**
-      - 多个参数用空格分隔
-      - 确保参数格式正确，避免命令注入
-      - 此参数会直接追加到命令末尾
     required: false
+    default: 0
+    position: 5
     format: "positional"

tools/http-repeater.yaml

@@ -1,41 +1,81 @@
 name: "http-repeater"
-command: "curl"
+command: "python3"
+args:
+  - "-c"
+  - |
+    import json
+    import sys
+    import textwrap
+
+    import requests
+
+    if len(sys.argv) < 2:
+        sys.stderr.write("缺少 request_spec 参数\n")
+        sys.exit(1)
+
+    spec_raw = sys.argv[1]
+    repeat = int(sys.argv[2]) if len(sys.argv) > 2 and sys.argv[2] else 1
+    delay = float(sys.argv[3]) if len(sys.argv) > 3 and sys.argv[3] else 0.0
+
+    try:
+        spec = json.loads(spec_raw)
+    except json.JSONDecodeError as exc:
+        sys.stderr.write(f"请求规范解析失败: {exc}\n")
+        sys.exit(1)
+
+    url = spec.get("url")
+    if not url:
+        sys.stderr.write("request_spec 中缺少 url 字段\n")
+        sys.exit(1)
+
+    method = spec.get("method", "GET").upper()
+    headers = spec.get("headers") or {}
+    cookies = spec.get("cookies") or {}
+    data = spec.get("data")
+    json_data = spec.get("json")
+
+    session = requests.Session()
+
+    for idx in range(repeat):
+        response = session.request(
+            method,
+            url,
+            headers=headers,
+            cookies=cookies,
+            data=data,
+            json=json_data,
+            allow_redirects=False,
+        )
+        print(f"===== Response #{idx + 1} =====")
+        print(f"Status: {response.status_code}")
+        print(f"Headers:\n{textwrap.indent(str(dict(response.headers)), '  ')}")
+        print("Body:")
+        print(response.text)
+        if delay and idx + 1 < repeat:
+            import time
+            time.sleep(delay)
 enabled: true
-
 short_description: "发送精心制作的HTTP请求（Burp Repeater等效）"
-
 description: |
-  发送精心制作的HTTP请求，类似于Burp Suite的Repeater功能。
+  以JSON描述请求细节（URL/方法/头/正文），运行时可重复发送并查看响应。
-  
-  **主要功能：**
-  - 请求重放
-  - 请求修改
-  - 响应查看
-  - 多次发送
-  
-  **使用场景：**
-  - HTTP请求测试
-  - 请求重放
-  - 安全测试
-  - 漏洞验证
-
 parameters:
   - name: "request_spec"
     type: "string"
-    description: "请求规范（JSON格式，包含url, method, headers, cookies, data）"
+    description: "请求规范（JSON格式），支持 url, method, headers, cookies, data/json"
     required: true
-
+    position: 0
-  - name: "additional_args"
+    format: "positional"
+  - name: "repeat"
+    type: "int"
+    description: "重复发送次数（默认1）"
+    required: false
+    default: 1
+    position: 1
+    format: "positional"
+  - name: "delay"
     type: "string"
-    description: |
+    description: "重复发送的间隔秒数（默认0）"
-      额外的http-repeater参数。用于传递未在参数列表中定义的http-repeater选项。
-      
-      **示例值：**
-      - 根据工具特性添加常用参数示例
-      
-      **注意事项：**
-      - 多个参数用空格分隔
-      - 确保参数格式正确，避免命令注入
-      - 此参数会直接追加到命令末尾
     required: false
+    default: "0"
+    position: 2
     format: "positional"

tools/httpx.yaml

@@ -1,9 +1,7 @@
 name: "httpx"
 command: "httpx"
 enabled: true
-
 short_description: "快速HTTP探测和指纹识别工具"
-
 description: |
   HTTPx是一个快速HTTP探测工具，用于发现和验证HTTP服务。
 
@@ -18,23 +16,19 @@ description: |
   - 技术栈识别
   - Web应用发现
   - 安全测试
-
 parameters:
-  - name: "target"
+  - name: "url"
     type: "string"
-    description: "目标文件或单个URL"
+    description: "单个目标URL（使用 -u 选项）"
-    required: true
+    required: false
     flag: "-u"
     format: "flag"
-  
+  - name: "input_file"
-  - name: "probe"
+    type: "string"
-    type: "bool"
+    description: "包含多个目标的文件（使用 -l 选项）"
-    description: "启用探测"
     required: false
-    flag: "-probe"
+    flag: "-l"
     format: "flag"
-    default: true
-  
   - name: "tech_detect"
     type: "bool"
     description: "启用技术检测"
@@ -42,7 +36,6 @@ parameters:
     flag: "-td"
     format: "flag"
     default: false
-  
   - name: "status_code"
     type: "bool"
     description: "显示状态码"
@@ -50,7 +43,6 @@ parameters:
     flag: "-sc"
     format: "flag"
     default: false
-  
   - name: "content_length"
     type: "bool"
     description: "显示内容长度"
@@ -58,7 +50,6 @@ parameters:
     flag: "-cl"
     format: "flag"
     default: false
-  
   - name: "title"
     type: "bool"
     description: "显示页面标题"
@@ -66,7 +57,6 @@ parameters:
     flag: "-title"
     format: "flag"
     default: false
-  
   - name: "web_server"
     type: "bool"
     description: "显示Web服务器"
@@ -74,7 +64,6 @@ parameters:
     flag: "-server"
     format: "flag"
     default: false
-  
   - name: "threads"
     type: "int"
     description: "线程数"
@@ -82,7 +71,6 @@ parameters:
     flag: "-t"
     format: "flag"
     default: 50
-  
   - name: "additional_args"
     type: "string"
     description: |
@@ -100,4 +88,3 @@ parameters:
       - 此参数会直接追加到命令末尾
     required: false
     format: "positional"
-

tools/hydra.yaml

@@ -1,9 +1,7 @@
 name: "hydra"
 command: "hydra"
 enabled: true
-
 short_description: "密码暴力破解工具，支持多种协议和服务"
-
 description: |
   Hydra是一个快速的网络登录破解工具，支持多种协议和服务的密码暴力破解。
 
@@ -18,7 +16,6 @@ description: |
   - 渗透测试
   - 安全评估
   - 弱密码检测
-
 parameters:
   - name: "target"
     type: "string"
@@ -26,44 +23,38 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "service"
     type: "string"
     description: "服务类型（ssh, ftp, http等）"
     required: true
     position: 1
     format: "positional"
-  
   - name: "username"
     type: "string"
     description: "单个用户名"
     required: false
     flag: "-l"
     format: "flag"
-  
   - name: "username_file"
     type: "string"
     description: "用户名字典文件"
     required: false
     flag: "-L"
     format: "flag"
-  
   - name: "password"
     type: "string"
     description: "单个密码"
     required: false
     flag: "-p"
     format: "flag"
-  
   - name: "password_file"
     type: "string"
     description: "密码字典文件"
     required: false
     flag: "-P"
     format: "flag"
-  
   - name: "additional_args"
     type: "string"
     description: "额外的Hydra参数"
     required: false
-
+    format: "positional"

tools/impacket.yaml

@@ -1,9 +1,46 @@
 name: "impacket"
 command: "python3"
+args:
+  - "-c"
+  - |
+    import json
+    import shlex
+    import subprocess
+    import sys
+
+    if len(sys.argv) < 2:
+        sys.stderr.write("缺少Impacket脚本路径\n")
+        sys.exit(1)
+
+    script_path = sys.argv[1]
+    args_raw = sys.argv[2] if len(sys.argv) > 2 else ""
+    extra = sys.argv[3] if len(sys.argv) > 3 else ""
+
+    cmd = [script_path]
+
+    if args_raw:
+        parsed = []
+        try:
+            candidate = json.loads(args_raw)
+            if isinstance(candidate, list):
+                parsed = [str(item) for item in candidate]
+            elif isinstance(candidate, str):
+                parsed = shlex.split(candidate)
+        except (json.JSONDecodeError, ValueError):
+            parsed = shlex.split(args_raw)
+        cmd.extend(parsed)
+
+    if extra:
+        cmd.extend(shlex.split(extra))
+
+    proc = subprocess.run(cmd, capture_output=True, text=True)
+    if proc.stdout:
+        sys.stdout.write(proc.stdout)
+    if proc.stderr:
+        sys.stderr.write(proc.stderr)
+    sys.exit(proc.returncode)
 enabled: true
-
 short_description: "Impacket 网络协议工具集，用于网络协议攻击和横向移动"
-
 description: |
   Impacket 是一个 Python 工具集，用于处理网络协议，常用于渗透测试和横向移动。
 
@@ -33,7 +70,6 @@ description: |
   - 需要相应的凭据
   - 仅用于授权的安全测试
   - 工具路径通常在 /usr/share/doc/python3-impacket/examples/ 或通过 pip 安装
-
 parameters:
   - name: "script"
     type: "string"
@@ -41,13 +77,13 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "args"
     type: "string"
-    description: "脚本参数（JSON 格式的字符串，会被解析为多个参数）"
+    description: "脚本参数（JSON数组或空格分隔字符串）"
     required: false
+    default: ""
+    position: 1
     format: "positional"
-
   - name: "additional_args"
     type: "string"
     description: |
@@ -61,4 +97,6 @@ parameters:
       - 确保参数格式正确，避免命令注入
       - 此参数会直接追加到命令末尾
     required: false
+    default: ""
+    position: 2
     format: "positional"

tools/install-python-package.yaml

@@ -3,28 +3,28 @@ command: "/bin/bash"
 args:
   - "-c"
   - |
-      set -euo pipefail
+    set -euo pipefail
 
-      PACKAGE="$1"
+    PACKAGE="$1"
-      ENV_NAME="${2:-default}"
+    ENV_NAME="${2:-default}"
-      ADDITIONAL_ARGS="${3:-}"
+    ADDITIONAL_ARGS="${3:-}"
 
-      BASE_DIR="${HOME}/.cyberstrike/venvs"
+    BASE_DIR="${HOME}/.cyberstrike/venvs"
-      ENV_DIR="${BASE_DIR}/${ENV_NAME}"
+    ENV_DIR="${BASE_DIR}/${ENV_NAME}"
 
-      mkdir -p "$BASE_DIR"
+    mkdir -p "$BASE_DIR"
-      if [ ! -d "$ENV_DIR" ]; then
+    if [ ! -d "$ENV_DIR" ]; then
-        python3 -m venv "$ENV_DIR"
+      python3 -m venv "$ENV_DIR"
-      fi
+    fi
 
-      # shellcheck disable=SC1090
+    # shellcheck disable=SC1090
-      source "$ENV_DIR/bin/activate"
+    source "$ENV_DIR/bin/activate"
 
-      if [ -n "$ADDITIONAL_ARGS" ]; then
+    if [ -n "$ADDITIONAL_ARGS" ]; then
-        pip install "$PACKAGE" $ADDITIONAL_ARGS
+      pip install "$PACKAGE" $ADDITIONAL_ARGS
-      else
+    else
-        pip install "$PACKAGE"
+      pip install "$PACKAGE"
-      fi
+    fi
   - "_"
 enabled: true
 short_description: "在指定虚拟环境中创建/激活并安装Python依赖"

tools/jaeles.yaml

@@ -1,9 +1,8 @@
 name: "jaeles"
 command: "jaeles"
+args: ["scan"]
 enabled: true
-
 short_description: "高级漏洞扫描器，支持自定义签名"
-
 description: |
   Jaeles是一个高级漏洞扫描器，支持自定义签名进行漏洞检测。
 
@@ -18,7 +17,6 @@ description: |
   - Web应用安全测试
   - 自定义检测规则
   - 安全测试
-
 parameters:
   - name: "url"
     type: "string"
@@ -26,21 +24,18 @@ parameters:
     required: true
     flag: "-u"
     format: "flag"
-  
   - name: "signatures"
     type: "string"
     description: "自定义签名路径"
     required: false
     flag: "-s"
     format: "flag"
-  
   - name: "config"
     type: "string"
     description: "配置文件"
     required: false
     flag: "-c"
     format: "flag"
-  
   - name: "threads"
     type: "int"
     description: "线程数"
@@ -48,7 +43,6 @@ parameters:
     flag: "-t"
     format: "flag"
     default: 20
-  
   - name: "timeout"
     type: "int"
     description: "请求超时时间（秒）"
@@ -56,7 +50,6 @@ parameters:
     flag: "--timeout"
     format: "flag"
     default: 20
-
   - name: "additional_args"
     type: "string"
     description: |

tools/john.yaml

@@ -1,9 +1,7 @@
 name: "john"
 command: "john"
 enabled: true
-
 short_description: "John the Ripper密码破解工具"
-
 description: |
   John the Ripper是一个快速的密码破解工具，支持多种哈希算法。
 
@@ -18,7 +16,6 @@ description: |
   - 哈希破解
   - 安全测试
   - 取证分析
-
 parameters:
   - name: "hash_file"
     type: "string"
@@ -26,7 +23,6 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "wordlist"
     type: "string"
     description: "字典文件"
@@ -34,16 +30,14 @@ parameters:
     default: "/usr/share/wordlists/rockyou.txt"
     flag: "--wordlist"
     format: "flag"
-  
   - name: "format_type"
     type: "string"
     description: "哈希格式类型"
     required: false
     flag: "--format"
     format: "flag"
-  
   - name: "additional_args"
     type: "string"
     description: "额外的John参数"
     required: false
-
+    format: "positional"

tools/jwt-analyzer.yaml

@@ -1,9 +1,7 @@
 name: "jwt-analyzer"
 command: "jwt_tool"
 enabled: true
-
 short_description: "JWT令牌分析和漏洞测试工具"
-
 description: |
   高级JWT令牌分析和漏洞测试工具，用于检测JWT实现中的安全问题。
 
@@ -18,7 +16,6 @@ description: |
   - 令牌分析
   - 漏洞发现
   - 安全测试
-
 parameters:
   - name: "jwt_token"
     type: "string"
@@ -26,14 +23,12 @@ parameters:
     required: true
     flag: "-t"
     format: "flag"
-  
   - name: "target_url"
     type: "string"
     description: "用于测试令牌操作的可选目标URL"
     required: false
     flag: "-u"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/katana.yaml

@@ -1,9 +1,7 @@
 name: "katana"
 command: "katana"
 enabled: true
-
 short_description: "下一代Web爬虫和蜘蛛工具"
-
 description: |
   Katana是一个快速、智能的Web爬虫工具，用于发现Web应用中的端点和资源。
 
@@ -18,7 +16,6 @@ description: |
   - 端点发现
   - 内容爬取
   - 安全测试
-
 parameters:
   - name: "url"
     type: "string"
@@ -26,7 +23,6 @@ parameters:
     required: true
     flag: "-u"
     format: "flag"
-  
   - name: "depth"
     type: "int"
     description: "爬取深度"
@@ -34,15 +30,13 @@ parameters:
     flag: "-d"
     format: "flag"
     default: 3
-  
   - name: "js_crawl"
     type: "bool"
     description: "启用JavaScript爬取"
     required: false
-    flag: "-js-crawl"
+    flag: "-jc"
     format: "flag"
     default: true
-  
   - name: "form_extraction"
     type: "bool"
     description: "启用表单提取"
@@ -50,7 +44,6 @@ parameters:
     flag: "-forms"
     format: "flag"
     default: true
-  
   - name: "additional_args"
     type: "string"
     description: |
@@ -68,4 +61,3 @@ parameters:
       - 此参数会直接追加到命令末尾
     required: false
     format: "positional"
-

tools/kube-bench.yaml

@@ -1,9 +1,7 @@
 name: "kube-bench"
 command: "kube-bench"
 enabled: true
-
 short_description: "CIS Kubernetes基准检查工具"
-
 description: |
   Kube-bench是一个CIS Kubernetes基准检查工具，用于检查Kubernetes集群是否符合CIS基准。
 
@@ -18,7 +16,6 @@ description: |
   - 安全配置审计
   - CIS基准验证
   - 安全评估
-
 parameters:
   - name: "targets"
     type: "string"
@@ -26,21 +23,18 @@ parameters:
     required: false
     flag: "--targets"
     format: "flag"
-  
   - name: "version"
     type: "string"
     description: "Kubernetes版本"
     required: false
     flag: "--version"
     format: "flag"
-  
   - name: "config_dir"
     type: "string"
     description: "配置目录"
     required: false
     flag: "--config-dir"
     format: "flag"
-  
   - name: "output_format"
     type: "string"
     description: "输出格式（json, yaml）"
@@ -48,7 +42,6 @@ parameters:
     flag: "--output"
     format: "flag"
     default: "json"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/kube-hunter.yaml

@@ -1,9 +1,7 @@
 name: "kube-hunter"
 command: "kube-hunter"
 enabled: true
-
 short_description: "Kubernetes渗透测试工具"
-
 description: |
   Kube-hunter是一个Kubernetes渗透测试工具，用于发现Kubernetes集群中的安全问题。
 
@@ -18,7 +16,6 @@ description: |
   - 集群安全评估
   - 渗透测试
   - 安全审计
-
 parameters:
   - name: "target"
     type: "string"
@@ -26,21 +23,18 @@ parameters:
     required: false
     flag: "--remote"
     format: "flag"
-  
   - name: "cidr"
     type: "string"
     description: "CIDR范围扫描"
     required: false
     flag: "--cidr"
     format: "flag"
-  
   - name: "interface"
     type: "string"
     description: "网络接口扫描"
     required: false
     flag: "--interface"
     format: "flag"
-  
   - name: "active"
     type: "bool"
     description: "启用主动扫描（可能有风险）"
@@ -48,7 +42,6 @@ parameters:
     flag: "--active"
     format: "flag"
     default: false
-  
   - name: "report"
     type: "string"
     description: "报告格式（json, yaml）"
@@ -56,7 +49,6 @@ parameters:
     flag: "--report"
     format: "flag"
     default: "json"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/libc-database.yaml

@@ -1,9 +1,40 @@
 name: "libc-database"
-command: "libc-database"
+command: "python3"
+args:
+  - "-c"
+  - |
+    import shlex
+    import subprocess
+    import sys
+
+    if len(sys.argv) < 2:
+        sys.stderr.write("缺少操作类型（find/dump/download）\n")
+        sys.exit(1)
+
+    action = sys.argv[1]
+    symbols = sys.argv[2] if len(sys.argv) > 2 else ""
+    libc_id = sys.argv[3] if len(sys.argv) > 3 else ""
+    extra = sys.argv[4] if len(sys.argv) > 4 else ""
+
+    cmd = ["libc-database", action]
+
+    if symbols:
+        cmd.extend(shlex.split(symbols))
+
+    if libc_id:
+        cmd.append(libc_id)
+
+    if extra:
+        cmd.extend(shlex.split(extra))
+
+    proc = subprocess.run(cmd, capture_output=True, text=True)
+    if proc.stdout:
+        sys.stdout.write(proc.stdout)
+    if proc.stderr:
+        sys.stderr.write(proc.stderr)
+    sys.exit(proc.returncode)
 enabled: true
-
 short_description: "libc识别和偏移查找工具"
-
 description: |
   Libc-database是一个用于libc识别和偏移查找的工具。
 
@@ -18,23 +49,27 @@ description: |
   - 漏洞利用开发
   - libc识别
   - 安全研究
-
 parameters:
   - name: "action"
     type: "string"
     description: "要执行的操作（find, dump, download）"
     required: true
-  
+    position: 0
+    format: "positional"
   - name: "symbols"
     type: "string"
     description: "符号和偏移（格式：symbol1:offset1 symbol2:offset2）"
     required: false
-  
+    default: ""
+    position: 1
+    format: "positional"
   - name: "libc_id"
     type: "string"
     description: "Libc ID（用于dump/download操作）"
     required: false
-
+    default: ""
+    position: 2
+    format: "positional"
   - name: "additional_args"
     type: "string"
     description: |
@@ -48,4 +83,6 @@ parameters:
       - 确保参数格式正确，避免命令注入
       - 此参数会直接追加到命令末尾
     required: false
+    default: ""
+    position: 3
     format: "positional"

tools/linpeas.yaml

@@ -1,9 +1,7 @@
 name: "linpeas"
 command: "linpeas.sh"
 enabled: true
-
 short_description: "Linux 权限提升枚举脚本，自动检测常见提权路径"
-
 description: |
   LinPEAS (Linux Privilege Escalation Awesome Script) 是一个自动化权限提升枚举脚本，用于检测 Linux 系统中的常见提权路径。
 
@@ -27,7 +25,6 @@ description: |
   - 需要目标系统上已下载 linpeas.sh 脚本
   - 执行时间可能较长
   - 输出信息量大，建议保存到文件
-
 parameters:
   - name: "output"
     type: "string"
@@ -35,14 +32,12 @@ parameters:
     required: false
     flag: "-o"
     format: "flag"
-  
   - name: "fast"
     type: "bool"
     description: "快速模式，跳过耗时检查"
     required: false
     flag: "-fast"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/list-files.yaml

@@ -1,9 +1,7 @@
 name: "list-files"
 command: "ls"
 enabled: true
-
 short_description: "列出目录文件工具"
-
 description: |
   列出服务器上指定目录中的文件。
 
@@ -16,7 +14,6 @@ description: |
   - 目录浏览
   - 文件查找
   - 系统检查
-
 parameters:
   - name: "directory"
     type: "string"
@@ -25,7 +22,6 @@ parameters:
     default: "."
     position: 0
     format: "positional"
-  
   - name: "long_format"
     type: "bool"
     description: "显示详细信息（长格式）"
@@ -33,7 +29,6 @@ parameters:
     flag: "-l"
     format: "flag"
     default: false
-  
   - name: "recursive"
     type: "bool"
     description: "递归列出"
@@ -41,7 +36,6 @@ parameters:
     flag: "-R"
     format: "flag"
     default: false
-
   - name: "additional_args"
     type: "string"
     description: |

tools/masscan.yaml

@@ -1,9 +1,7 @@
 name: "masscan"
 command: "masscan"
 enabled: true
-
 short_description: "高速互联网级端口扫描工具"
-
 description: |
   Masscan是一个高速端口扫描工具，可以在几分钟内扫描整个互联网。
 
@@ -17,7 +15,6 @@ description: |
   - 大规模网络扫描
   - 互联网级扫描
   - 快速端口发现
-
 parameters:
   - name: "target"
     type: "string"
@@ -25,7 +22,6 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "ports"
     type: "string"
     description: "端口范围（如：1-65535）"
@@ -33,7 +29,6 @@ parameters:
     flag: "-p"
     format: "flag"
     default: "1-65535"
-  
   - name: "rate"
     type: "int"
     description: "每秒数据包数"
@@ -41,14 +36,12 @@ parameters:
     flag: "--rate"
     format: "flag"
     default: 1000
-  
   - name: "interface"
     type: "string"
     description: "网络接口"
     required: false
     flag: "-e"
     format: "flag"
-  
   - name: "banners"
     type: "bool"
     description: "启用Banner抓取"
@@ -56,7 +49,6 @@ parameters:
     flag: "--banners"
     format: "flag"
     default: false
-
   - name: "additional_args"
     type: "string"
     description: |

tools/metasploit.yaml

@@ -1,46 +1,60 @@
 name: "metasploit"
-command: "msfconsole"
+command: "python3"
+args:
+  - "-c"
+  - |
+    import json
+    import shlex
+    import subprocess
+    import sys
+
+    if len(sys.argv) < 2:
+        sys.stderr.write("缺少模块名称\n")
+        sys.exit(1)
+
+    module = sys.argv[1]
+    options_raw = sys.argv[2] if len(sys.argv) > 2 else "{}"
+    extra = sys.argv[3] if len(sys.argv) > 3 else ""
+
+    try:
+        options = json.loads(options_raw) if options_raw else {}
+    except json.JSONDecodeError as exc:
+        sys.stderr.write(f"选项解析失败: {exc}\n")
+        sys.exit(1)
+
+    commands = [f"use {module}"]
+    for key, value in options.items():
+        commands.append(f"set {key} {value}")
+    commands.append("run")
+    commands.append("exit")
+
+    cmd = ["msfconsole", "-q", "-x", "; ".join(commands)]
+    if extra:
+        cmd.extend(shlex.split(extra))
+
+    subprocess.run(cmd, check=False)
 enabled: true
-
 short_description: "Metasploit渗透测试框架"
-
 description: |
-  Metasploit是一个渗透测试框架，提供大量漏洞利用模块和辅助工具。
+  通过 `msfconsole -q -x` 非交互执行模块。可提供JSON格式的模块选项，脚本自动构建 `set` 与 `run` 指令。
-  
-  **主要功能：**
-  - 漏洞利用
-  - 载荷生成
-  - 后渗透模块
-  - 辅助工具
-  
-  **使用场景：**
-  - 渗透测试
-  - 漏洞利用
-  - 安全测试
-  - 安全研究
-
 parameters:
   - name: "module"
     type: "string"
-    description: "要使用的Metasploit模块"
+    description: "要使用的Metasploit模块（例如 exploit/windows/smb/ms17_010_eternalblue）"
     required: true
-  
+    position: 0
+    format: "positional"
   - name: "options"
     type: "string"
-    description: "模块选项（JSON格式）"
+    description: "模块选项（JSON对象，键值对应 set 指令）"
     required: false
-
+    default: "{}"
+    position: 1
+    format: "positional"
   - name: "additional_args"
     type: "string"
-    description: |
+    description: "额外的 msfconsole 参数（追加在命令末尾）"
-      额外的metasploit参数。用于传递未在参数列表中定义的metasploit选项。
-      
-      **示例值：**
-      - 根据工具特性添加常用参数示例
-      
-      **注意事项：**
-      - 多个参数用空格分隔
-      - 确保参数格式正确，避免命令注入
-      - 此参数会直接追加到命令末尾
     required: false
+    default: ""
+    position: 2
     format: "positional"

tools/mimikatz.yaml

@@ -1,9 +1,7 @@
 name: "mimikatz"
 command: "mimikatz.exe"
-enabled: true
+enabled: false
-
 short_description: "Windows 凭证提取工具，用于提取内存中的密码和哈希"
-
 description: |
   Mimikatz 是一个强大的 Windows 凭证提取工具，可以从内存中提取明文密码、哈希值、票据等敏感信息。
 
@@ -26,14 +24,12 @@ description: |
   - 可能被杀毒软件检测
   - 仅用于授权的安全测试
   - 使用前需要进入 mimikatz 交互式命令行
-
 parameters:
   - name: "command"
     type: "string"
     description: "Mimikatz 命令，例如 'privilege::debug sekurlsa::logonpasswords'"
     required: true
     format: "positional"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/msfvenom.yaml

@@ -1,9 +1,7 @@
 name: "msfvenom"
 command: "msfvenom"
 enabled: true
-
 short_description: "Metasploit载荷生成工具"
-
 description: |
   MSFVenom是Metasploit框架的载荷生成工具，用于创建各种类型的攻击载荷。
 
@@ -18,7 +16,6 @@ description: |
   - 载荷生成
   - 漏洞利用
   - 安全测试
-
 parameters:
   - name: "payload"
     type: "string"
@@ -26,35 +23,30 @@ parameters:
     required: true
     flag: "-p"
     format: "flag"
-  
   - name: "format_type"
     type: "string"
     description: "输出格式（exe, elf, raw等）"
     required: false
     flag: "-f"
     format: "flag"
-  
   - name: "output_file"
     type: "string"
     description: "输出文件路径"
     required: false
     flag: "-o"
     format: "flag"
-  
   - name: "encoder"
     type: "string"
     description: "编码器（如：x86/shikata_ga_nai）"
     required: false
     flag: "-e"
     format: "flag"
-  
   - name: "iterations"
     type: "string"
     description: "编码迭代次数"
     required: false
     flag: "-i"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/nbtscan.yaml

@@ -1,9 +1,7 @@
 name: "nbtscan"
 command: "nbtscan"
 enabled: true
-
 short_description: "NetBIOS名称扫描工具"
-
 description: |
   Nbtscan是一个NetBIOS名称扫描工具，用于发现网络中的Windows系统。
 
@@ -18,7 +16,6 @@ description: |
   - NetBIOS枚举
   - 网络映射
   - 渗透测试
-
 parameters:
   - name: "target"
     type: "string"
@@ -26,7 +23,6 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "verbose"
     type: "bool"
     description: "详细输出"
@@ -34,7 +30,6 @@ parameters:
     flag: "-v"
     format: "flag"
     default: false
-  
   - name: "timeout"
     type: "int"
     description: "超时时间（秒）"
@@ -42,7 +37,6 @@ parameters:
     flag: "-t"
     format: "flag"
     default: 2
-
   - name: "additional_args"
     type: "string"
     description: |

tools/netexec.yaml

@@ -1,9 +1,7 @@
 name: "netexec"
 command: "netexec"
 enabled: true
-
 short_description: "网络枚举和利用框架（原CrackMapExec）"
-
 description: |
   NetExec（原CrackMapExec）是一个网络枚举和利用框架，支持多种协议。
 
@@ -18,53 +16,46 @@ description: |
   - 域环境测试
   - 横向移动测试
   - 凭证验证
-
 parameters:
-  - name: "target"
-    type: "string"
-    description: "目标IP或网络"
-    required: true
-    position: 0
-    format: "positional"
-  
   - name: "protocol"
     type: "string"
     description: "协议类型（smb, ssh, winrm等）"
     required: false
     default: "smb"
-    flag: "-M"
+    position: 0
-    format: "flag"
+    format: "positional"
-  
+  - name: "target"
+    type: "string"
+    description: "目标IP或网络"
+    required: true
+    position: 1
+    format: "positional"
   - name: "username"
     type: "string"
     description: "用户名"
     required: false
     flag: "-u"
     format: "flag"
-  
   - name: "password"
     type: "string"
     description: "密码"
     required: false
     flag: "-p"
     format: "flag"
-  
   - name: "hash_value"
     type: "string"
     description: "NTLM哈希（用于Pass-the-Hash）"
     required: false
     flag: "-H"
     format: "flag"
-  
   - name: "module"
     type: "string"
     description: "要执行的模块"
     required: false
     flag: "-M"
     format: "flag"
-  
   - name: "additional_args"
     type: "string"
     description: "额外的NetExec参数"
     required: false
-
+    format: "positional"

tools/nikto.yaml

@@ -1,10 +1,8 @@
 name: "nikto"
 command: "nikto"
 enabled: true
-
 # 简短描述（用于工具列表，减少token消耗）
 short_description: "Web服务器扫描工具，用于检测Web服务器和应用程序中的已知漏洞和配置错误"
-
 # 工具详细描述
 description: |
   Web服务器扫描工具，用于检测Web服务器和应用程序中的已知漏洞、配置错误和潜在安全问题。
@@ -28,7 +26,6 @@ description: |
   - 某些扫描可能触发WAF或IDS告警
   - 建议在授权范围内使用
   - 扫描结果需要人工验证
-
 # 参数定义
 parameters:
   - name: "target"
@@ -55,7 +52,6 @@ parameters:
     required: true
     flag: "-h"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/nmap-advanced.yaml

@@ -1,9 +1,7 @@
 name: "nmap-advanced"
 command: "nmap"
 enabled: true
-
 short_description: "高级Nmap扫描，支持自定义NSE脚本和优化时序"
-
 description: |
   高级Nmap扫描工具，支持自定义NSE脚本、优化时序和多种扫描技术。
 
@@ -18,7 +16,6 @@ description: |
   - 深度安全评估
   - 渗透测试
   - 网络侦察
-
 parameters:
   - name: "target"
     type: "string"
@@ -26,37 +23,32 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "scan_type"
     type: "string"
     description: "扫描类型（-sS, -sT, -sU等）"
     required: false
-    flag: ""
+    format: "template"
-    format: "positional"
+    template: "{value}"
     default: "-sS"
-  
   - name: "ports"
     type: "string"
     description: "要扫描的端口"
     required: false
     flag: "-p"
     format: "flag"
-  
   - name: "timing"
     type: "string"
     description: "时序模板（T0-T5）"
     required: false
-    flag: "-T"
+    format: "template"
-    format: "flag"
+    template: "-T{value}"
-    default: "T4"
+    default: "4"
-  
   - name: "nse_scripts"
     type: "string"
     description: "要运行的自定义NSE脚本"
     required: false
     flag: "--script"
     format: "flag"
-  
   - name: "os_detection"
     type: "bool"
     description: "启用OS检测"
@@ -64,7 +56,6 @@ parameters:
     flag: "-O"
     format: "flag"
     default: false
-  
   - name: "version_detection"
     type: "bool"
     description: "启用版本检测"
@@ -72,7 +63,6 @@ parameters:
     flag: "-sV"
     format: "flag"
     default: false
-  
   - name: "aggressive"
     type: "bool"
     description: "启用激进扫描"
@@ -80,15 +70,6 @@ parameters:
     flag: "-A"
     format: "flag"
     default: false
-  
-  - name: "stealth"
-    type: "bool"
-    description: "启用隐蔽模式"
-    required: false
-    flag: "-sS"
-    format: "flag"
-    default: false
-
   - name: "additional_args"
     type: "string"
     description: |

tools/nmap.yaml

@@ -1,11 +1,9 @@
 name: "nmap"
 command: "nmap"
-args: ["-sT", "-sV", "-sC"]  # 固定参数：TCP连接扫描、版本检测、默认脚本
+args: ["-sT", "-sV", "-sC"] # 固定参数：TCP连接扫描、版本检测、默认脚本
 enabled: true
-
 # 简短描述（用于工具列表，减少token消耗）- 一句话说明工具用途
 short_description: "网络扫描工具，用于发现网络主机、开放端口和服务"
-
 # 工具详细描述 - 帮助大模型理解工具用途和使用场景
 description: |
   网络映射和端口扫描工具，用于发现网络中的主机、服务和开放端口。
@@ -28,7 +26,6 @@ description: |
   - 扫描速度取决于网络延迟和目标响应
   - 某些扫描可能被防火墙或IDS检测到
   - 请确保有权限扫描目标网络
-
 # 参数定义
 parameters:
   - name: "target"
@@ -48,9 +45,8 @@ parameters:
       - 确保目标地址格式正确
       - 必需参数，不能为空
     required: true
-    position: 0  # 位置参数，放在命令最后
+    position: 0 # 位置参数，放在命令最后
     format: "positional"
-  
   - name: "ports"
     type: "string"
     description: |
@@ -72,7 +68,6 @@ parameters:
     required: false
     flag: "-p"
     format: "flag"
-  
   - name: "scan_type"
     type: "string"
     description: |
@@ -91,9 +86,8 @@ parameters:
       - 默认已包含 "-sT -sV -sC"
       - 如果指定此参数，将替换默认的扫描类型
     required: false
-    flag: ""
+    format: "template"
-    format: "positional"
+    template: "{value}"
-  
   - name: "additional_args"
     type: "string"
     description: |
@@ -112,4 +106,3 @@ parameters:
       - 此参数会直接追加到命令末尾
     required: false
     format: "positional"
-

tools/nuclei.yaml

@@ -1,9 +1,7 @@
 name: "nuclei"
 command: "nuclei"
 enabled: true
-
 short_description: "快速漏洞扫描器，使用YAML模板进行漏洞检测"
-
 description: |
   Nuclei是一个基于模板的快速漏洞扫描器，使用社区维护的YAML模板进行漏洞检测。
 
@@ -19,7 +17,6 @@ description: |
   - 安全评估
   - 渗透测试
   - 漏洞验证
-
 parameters:
   - name: "target"
     type: "string"
@@ -27,30 +24,26 @@ parameters:
     required: true
     flag: "-u"
     format: "flag"
-  
   - name: "severity"
     type: "string"
     description: "严重程度过滤（critical,high,medium,low,info）"
     required: false
     flag: "-s"
     format: "flag"
-  
   - name: "tags"
     type: "string"
     description: "标签过滤（如cve,rce,lfi）"
     required: false
     flag: "-tags"
     format: "flag"
-  
   - name: "template"
     type: "string"
     description: "自定义模板路径"
     required: false
     flag: "-t"
     format: "flag"
-  
   - name: "additional_args"
     type: "string"
     description: "额外的Nuclei参数"
     required: false
-
+    format: "positional"

tools/objdump.yaml

@@ -1,9 +1,7 @@
 name: "objdump"
 command: "objdump"
 enabled: true
-
 short_description: "二进制文件反汇编工具"
-
 description: |
   Objdump是GNU binutils的一部分，用于反汇编二进制文件。
 
@@ -18,7 +16,6 @@ description: |
   - 逆向工程
   - 程序理解
   - 调试辅助
-
 parameters:
   - name: "binary"
     type: "string"
@@ -26,7 +23,6 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "disassemble"
     type: "bool"
     description: "反汇编二进制文件"
@@ -34,7 +30,6 @@ parameters:
     flag: "-d"
     format: "flag"
     default: true
-
   - name: "additional_args"
     type: "string"
     description: |

tools/one-gadget.yaml

@@ -1,9 +1,7 @@
 name: "one-gadget"
 command: "one_gadget"
 enabled: true
-
 short_description: "在libc中查找one-shot RCE gadget的工具"
-
 description: |
   One-gadget是一个用于在libc中查找one-shot RCE gadget的工具。
 
@@ -17,7 +15,6 @@ description: |
   - 漏洞利用开发
   - ROP链简化
   - 安全研究
-
 parameters:
   - name: "libc_path"
     type: "string"
@@ -25,7 +22,6 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "level"
     type: "int"
     description: "约束级别（0, 1, 2）"
@@ -33,7 +29,6 @@ parameters:
     flag: "-l"
     format: "flag"
     default: 1
-
   - name: "additional_args"
     type: "string"
     description: |

tools/pacu.yaml

@@ -1,9 +1,7 @@
 name: "pacu"
 command: "pacu"
-enabled: true
+enabled: false
-
 short_description: "AWS渗透测试框架"
-
 description: |
   Pacu是一个AWS渗透测试框架，用于测试AWS环境的安全性。
 
@@ -18,7 +16,6 @@ description: |
   - 渗透测试
   - 权限测试
   - 安全评估
-
 parameters:
   - name: "session_name"
     type: "string"
@@ -27,21 +24,18 @@ parameters:
     flag: "--session"
     format: "flag"
     default: "hexstrike_session"
-  
   - name: "modules"
     type: "string"
     description: "要运行的模块（逗号分隔）"
     required: false
     flag: "--modules"
     format: "flag"
-  
   - name: "regions"
     type: "string"
     description: "AWS区域（逗号分隔）"
     required: false
     flag: "--regions"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/paramspider.yaml

@@ -1,9 +1,7 @@
 name: "paramspider"
 command: "paramspider"
 enabled: true
-
 short_description: "从Web档案中挖掘参数"
-
 description: |
   ParamSpider从Web档案中挖掘参数，用于发现隐藏的参数。
 
@@ -18,7 +16,6 @@ description: |
   - Bug bounty侦察
   - Web应用安全测试
   - 安全测试
-
 parameters:
   - name: "domain"
     type: "string"
@@ -26,7 +23,6 @@ parameters:
     required: true
     flag: "-d"
     format: "flag"
-  
   - name: "level"
     type: "int"
     description: "挖掘深度级别"
@@ -34,21 +30,18 @@ parameters:
     flag: "-l"
     format: "flag"
     default: 2
-  
   - name: "exclude"
     type: "string"
     description: "要排除的文件扩展名"
     required: false
     flag: "-e"
     format: "flag"
-  
   - name: "output"
     type: "string"
     description: "输出文件路径"
     required: false
     flag: "-o"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/pdfcrack.yaml

@@ -1,9 +1,7 @@
 name: "pdfcrack"
 command: "pdfcrack"
 enabled: true
-
 short_description: "PDF 文件密码破解工具，支持暴力破解和字典攻击"
-
 description: |
   pdfcrack 是一个用于破解受密码保护的 PDF 文件密码的工具。
 
@@ -23,7 +21,6 @@ description: |
   - 破解时间取决于密码复杂度
   - 建议使用字典文件提高效率
   - 仅用于授权的安全测试
-
 parameters:
   - name: "file"
     type: "string"
@@ -31,28 +28,24 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "wordlist"
     type: "string"
     description: "字典文件路径"
     required: false
     flag: "-w"
     format: "flag"
-  
   - name: "min_length"
     type: "int"
     description: "最小密码长度"
     required: false
     flag: "-n"
     format: "flag"
-  
   - name: "max_length"
     type: "int"
     description: "最大密码长度"
     required: false
     flag: "-m"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/prowler.yaml

@@ -1,9 +1,7 @@
 name: "prowler"
 command: "prowler"
 enabled: true
-
 short_description: "云安全评估工具（AWS, Azure, GCP）"
-
 description: |
   Prowler是一个全面的云安全评估工具，支持AWS、Azure和GCP。
 
@@ -18,16 +16,14 @@ description: |
   - 合规性检查
   - 安全评估
   - 云配置审计
-
 parameters:
   - name: "provider"
     type: "string"
     description: "云提供商（aws, azure, gcp）"
     required: false
-    flag: "-p"
-    format: "flag"
     default: "aws"
-  
+    position: 0
+    format: "positional"
   - name: "profile"
     type: "string"
     description: "AWS配置文件"
@@ -35,21 +31,18 @@ parameters:
     flag: "-p"
     format: "flag"
     default: "default"
-  
   - name: "region"
     type: "string"
     description: "要扫描的特定区域"
     required: false
     flag: "-r"
     format: "flag"
-  
   - name: "checks"
     type: "string"
     description: "要运行的特定检查"
     required: false
     flag: "-c"
     format: "flag"
-  
   - name: "output_format"
     type: "string"
     description: "输出格式（json, csv, html）"
@@ -57,7 +50,6 @@ parameters:
     flag: "-M"
     format: "flag"
     default: "json"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/pwninit.yaml

@@ -1,9 +1,7 @@
 name: "pwninit"
 command: "pwninit"
 enabled: true
-
 short_description: "CTF二进制漏洞利用设置工具"
-
 description: |
   Pwninit是一个用于CTF二进制漏洞利用设置的工具，自动配置libc和loader。
 
@@ -18,7 +16,6 @@ description: |
   - 漏洞利用开发
   - 环境配置
   - 安全研究
-
 parameters:
   - name: "binary"
     type: "string"
@@ -26,21 +23,18 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "libc"
     type: "string"
     description: "libc文件路径"
     required: false
     flag: "--libc"
     format: "flag"
-  
   - name: "ld"
     type: "string"
     description: "Loader文件路径"
     required: false
     flag: "--ld"
     format: "flag"
-  
   - name: "template_type"
     type: "string"
     description: "模板类型（python, c）"
@@ -48,7 +42,6 @@ parameters:
     flag: "--template"
     format: "flag"
     default: "python"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/pwntools.yaml

@@ -1,62 +1,68 @@
 name: "pwntools"
 command: "python3"
+args:
+  - "-c"
+  - |
+    import os
+    import sys
+
+    if len(sys.argv) < 2:
+        sys.stderr.write("缺少脚本内容\n")
+        sys.exit(1)
+
+    script_content = sys.argv[1]
+    target_binary = sys.argv[2] if len(sys.argv) > 2 else ""
+    target_host = sys.argv[3] if len(sys.argv) > 3 else ""
+    target_port = sys.argv[4] if len(sys.argv) > 4 else ""
+    exploit_type = sys.argv[5] if len(sys.argv) > 5 else "local"
+
+    if target_binary:
+        os.environ["PWN_BINARY"] = target_binary
+    if target_host:
+        os.environ["PWN_HOST"] = target_host
+    if target_port:
+        os.environ["PWN_PORT"] = str(target_port)
+    if exploit_type:
+        os.environ["PWN_EXPLOIT_TYPE"] = exploit_type
+
+    exec(script_content, {})
 enabled: true
-
 short_description: "CTF和漏洞利用开发框架"
-
 description: |
-  Pwntools是一个CTF和漏洞利用开发框架，用于快速开发漏洞利用程序。
+  执行自定义pwntools脚本，并通过环境变量注入常用目标信息：
-  
+  - `PWN_BINARY`, `PWN_HOST`, `PWN_PORT`, `PWN_EXPLOIT_TYPE`
-  **主要功能：**
-  - 漏洞利用开发
-  - 自动化脚本
-  - 网络交互
-  - 二进制分析辅助
-  
-  **使用场景：**
-  - CTF挑战
-  - 漏洞利用开发
-  - 二进制分析
-  - 安全研究
-
 parameters:
   - name: "script_content"
     type: "string"
     description: "Python脚本内容（使用pwntools）"
     required: true
-  
+    position: 0
+    format: "positional"
   - name: "target_binary"
     type: "string"
-    description: "本地二进制文件路径"
+    description: "本地二进制文件路径（注入PWN_BINARY）"
     required: false
-  
+    default: ""
+    position: 1
+    format: "positional"
   - name: "target_host"
     type: "string"
-    description: "远程主机地址"
+    description: "远程主机地址（PWN_HOST）"
     required: false
-  
+    default: ""
+    position: 2
+    format: "positional"
   - name: "target_port"
-    type: "int"
+    type: "string"
-    description: "远程端口"
+    description: "远程端口（PWN_PORT）"
     required: false
-  
+    default: ""
+    position: 3
+    format: "positional"
   - name: "exploit_type"
     type: "string"
-    description: "漏洞利用类型（local, remote, format_string, rop）"
+    description: "漏洞利用类型标签（PWN_EXPLOIT_TYPE）"
     required: false
     default: "local"
-
+    position: 4
-  - name: "additional_args"
-    type: "string"
-    description: |
-      额外的pwntools参数。用于传递未在参数列表中定义的pwntools选项。
-      
-      **示例值：**
-      - 根据工具特性添加常用参数示例
-      
-      **注意事项：**
-      - 多个参数用空格分隔
-      - 确保参数格式正确，避免命令注入
-      - 此参数会直接追加到命令末尾
-    required: false
     format: "positional"

tools/qsreplace.yaml

@@ -1,9 +1,39 @@
 name: "qsreplace"
-command: "qsreplace"
+command: "python3"
+args:
+  - "-c"
+  - |
+    import shlex
+    import subprocess
+    import sys
+
+    if len(sys.argv) < 2:
+        sys.stderr.write("缺少URL列表\n")
+        sys.exit(1)
+
+    urls = sys.argv[1]
+    replacement = sys.argv[2] if len(sys.argv) > 2 else ""
+    extra = sys.argv[3] if len(sys.argv) > 3 else ""
+
+    cmd = ["qsreplace"]
+    if extra:
+        cmd.extend(shlex.split(extra))
+    if replacement:
+        cmd.append(replacement)
+
+    proc = subprocess.run(
+        cmd,
+        input=urls,
+        capture_output=True,
+        text=True,
+    )
+    if proc.stdout:
+        sys.stdout.write(proc.stdout)
+    if proc.stderr:
+        sys.stderr.write(proc.stderr)
+    sys.exit(proc.returncode)
 enabled: true
-
 short_description: "查询字符串参数替换工具"
-
 description: |
   Qsreplace是一个用于替换URL中查询字符串参数的工具，常用于模糊测试。
 
@@ -18,19 +48,20 @@ description: |
   - URL处理
   - 工具链集成
   - 安全测试
-
 parameters:
   - name: "urls"
     type: "string"
     description: "要处理的URL（每行一个）"
     required: true
-  
+    position: 0
+    format: "positional"
   - name: "replacement"
     type: "string"
     description: "替换字符串"
     required: false
-    default: "FUZZ"
+    default: ""
-  
+    position: 1
+    format: "positional"
   - name: "additional_args"
     type: "string"
     description: |
@@ -45,5 +76,6 @@ parameters:
       - 确保参数格式正确，避免命令注入
       - 此参数会直接追加到命令末尾
     required: false
+    default: ""
+    position: 2
     format: "positional"
-

tools/radare2.yaml

@@ -1,9 +1,7 @@
 name: "radare2"
 command: "r2"
 enabled: true
-
 short_description: "二进制分析和逆向工程框架，支持反汇编、调试和脚本分析"
-
 description: |
   Radare2是一个完整的二进制分析和逆向工程框架，支持多种架构和文件格式。
 
@@ -29,7 +27,6 @@ description: |
   - 可以使用 -q 参数静默模式（不显示启动信息）
   - 可以使用 -A 参数自动分析二进制文件
   - 可以使用 -d 参数附加到进程进行调试
-
 parameters:
   - name: "target"
     type: "string"
@@ -52,7 +49,6 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "commands"
     type: "string"
     description: |
@@ -82,7 +78,6 @@ parameters:
     required: false
     flag: "-c"
     format: "flag"
-  
   - name: "script_file"
     type: "string"
     description: |
@@ -101,7 +96,6 @@ parameters:
     required: false
     flag: "-i"
     format: "flag"
-  
   - name: "arch"
     type: "string"
     description: |
@@ -127,7 +121,6 @@ parameters:
     required: false
     flag: "-a"
     format: "flag"
-  
   - name: "bits"
     type: "int"
     description: |
@@ -144,7 +137,6 @@ parameters:
     required: false
     flag: "-b"
     format: "flag"
-  
   - name: "auto_analyze"
     type: "bool"
     description: |
@@ -161,7 +153,6 @@ parameters:
     flag: "-A"
     format: "flag"
     default: false
-  
   - name: "debug"
     type: "bool"
     description: |
@@ -178,7 +169,6 @@ parameters:
     flag: "-d"
     format: "flag"
     default: false
-  
   - name: "quiet"
     type: "bool"
     description: |
@@ -196,7 +186,6 @@ parameters:
     flag: "-q"
     format: "flag"
     default: false
-  
   - name: "seek"
     type: "string"
     description: |
@@ -217,7 +206,6 @@ parameters:
     required: false
     flag: "-s"
     format: "flag"
-  
   - name: "base_address"
     type: "string"
     description: |
@@ -236,7 +224,6 @@ parameters:
     required: false
     flag: "-B"
     format: "flag"
-  
   - name: "eval"
     type: "string"
     description: |
@@ -257,7 +244,6 @@ parameters:
     required: false
     flag: "-e"
     format: "flag"
-  
   - name: "project"
     type: "string"
     description: |
@@ -276,7 +262,6 @@ parameters:
     required: false
     flag: "-p"
     format: "flag"
-  
   - name: "additional_args"
     type: "string"
     description: |

tools/responder.yaml

@@ -1,74 +1,85 @@
 name: "responder"
-command: "responder"
+command: "python3"
+args:
+  - "-c"
+  - |
+    import shlex
+    import subprocess
+    import sys
+    import time
+
+    interface = sys.argv[1] if len(sys.argv) > 1 else "eth0"
+    analyze = sys.argv[2].lower() == "true" if len(sys.argv) > 2 else False
+    wpad = sys.argv[3].lower() == "true" if len(sys.argv) > 3 else True
+    fingerprint = sys.argv[4].lower() == "true" if len(sys.argv) > 4 else False
+    duration = int(sys.argv[5]) if len(sys.argv) > 5 and sys.argv[5] else 300
+    extra = sys.argv[6] if len(sys.argv) > 6 else ""
+
+    cmd = ["responder", "-I", interface]
+    if analyze:
+        cmd.append("-A")
+    if wpad:
+        cmd.append("-w")
+    if fingerprint:
+        cmd.append("-f")
+    if extra:
+        cmd.extend(shlex.split(extra))
+
+    proc = subprocess.Popen(cmd)
+    try:
+        if duration > 0:
+            time.sleep(duration)
+            proc.terminate()
+            proc.wait(timeout=10)
+        else:
+            proc.wait()
+    except KeyboardInterrupt:
+        proc.terminate()
+        proc.wait(timeout=10)
 enabled: true
-
 short_description: "LLMNR/NBT-NS/MDNS投毒和凭据收集工具"
-
 description: |
-  Responder是一个LLMNR/NBT-NS/MDNS投毒工具，用于收集网络凭据。
+  封装 Responder，支持自动在指定持续时间后停止进程，避免占用网络。
-  
-  **主要功能：**
-  - LLMNR/NBT-NS投毒
-  - 凭据收集
-  - WPAD代理
-  - 指纹识别
-  
-  **使用场景：**
-  - 网络渗透测试
-  - 凭据收集
-  - 横向移动
-  - 安全测试
-
 parameters:
   - name: "interface"
     type: "string"
-    description: "网络接口"
+    description: "网络接口（-I）"
     required: false
-    flag: "-I"
-    format: "flag"
     default: "eth0"
-  
+    position: 0
+    format: "positional"
   - name: "analyze"
     type: "bool"
-    description: "仅分析模式"
+    description: "仅分析模式（-A）"
     required: false
-    flag: "-A"
-    format: "flag"
     default: false
-  
+    position: 1
+    format: "positional"
   - name: "wpad"
     type: "bool"
-    description: "启用WPAD恶意代理"
+    description: "启用WPAD恶意代理（-w）"
     required: false
-    flag: "-w"
-    format: "flag"
     default: true
-  
+    position: 2
+    format: "positional"
   - name: "fingerprint"
     type: "bool"
-    description: "指纹识别模式"
+    description: "指纹识别模式（-f）"
     required: false
-    flag: "-f"
-    format: "flag"
     default: false
-  
+    position: 3
+    format: "positional"
   - name: "duration"
     type: "int"
-    description: "运行持续时间（秒）"
+    description: "运行持续时间（秒，0表示直到手动停止）"
     required: false
     default: 300
-
+    position: 4
+    format: "positional"
   - name: "additional_args"
     type: "string"
-    description: |
+    description: "额外的Responder参数（直接追加）"
-      额外的responder参数。用于传递未在参数列表中定义的responder选项。
-      
-      **示例值：**
-      - 根据工具特性添加常用参数示例
-      
-      **注意事项：**
-      - 多个参数用空格分隔
-      - 确保参数格式正确，避免命令注入
-      - 此参数会直接追加到命令末尾
     required: false
+    default: ""
+    position: 5
     format: "positional"

tools/ropgadget.yaml

@@ -1,9 +1,7 @@
 name: "ropgadget"
 command: "ROPgadget"
 enabled: true
-
 short_description: "ROP gadget搜索工具"
-
 description: |
   ROPgadget是一个用于在二进制文件中搜索ROP gadget的工具。
 
@@ -18,7 +16,6 @@ description: |
   - 漏洞利用开发
   - ROP链构建
   - 安全研究
-
 parameters:
   - name: "binary"
     type: "string"
@@ -26,14 +23,6 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
-  - name: "gadget_type"
-    type: "string"
-    description: "要搜索的gadget类型"
-    required: false
-    flag: "--gadgets"
-    format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/ropper.yaml

@@ -1,9 +1,7 @@
 name: "ropper"
 command: "ropper"
 enabled: true
-
 short_description: "高级ROP/JOP gadget搜索工具"
-
 description: |
   Ropper是一个高级ROP/JOP gadget搜索工具，用于漏洞利用开发。
 
@@ -18,7 +16,6 @@ description: |
   - ROP链构建
   - 二进制分析
   - 安全研究
-
 parameters:
   - name: "binary"
     type: "string"
@@ -26,7 +23,6 @@ parameters:
     required: true
     flag: "--file"
     format: "flag"
-  
   - name: "gadget_type"
     type: "string"
     description: "Gadget类型（rop, jop, sys, all）"
@@ -34,7 +30,6 @@ parameters:
     flag: "--type"
     format: "flag"
     default: "rop"
-  
   - name: "quality"
     type: "int"
     description: "Gadget质量级别（1-5）"
@@ -42,21 +37,18 @@ parameters:
     flag: "--quality"
     format: "flag"
     default: 1
-  
   - name: "arch"
     type: "string"
     description: "目标架构（x86, x86_64, arm等）"
     required: false
     flag: "--arch"
     format: "flag"
-  
   - name: "search_string"
     type: "string"
     description: "要搜索的特定gadget模式"
     required: false
     flag: "--search"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/rpcclient.yaml

@@ -1,9 +1,53 @@
 name: "rpcclient"
-command: "rpcclient"
+command: "python3"
+args:
+  - "-c"
+  - |
+    import shlex
+    import subprocess
+    import sys
+
+    if len(sys.argv) < 2:
+        sys.stderr.write("缺少目标地址\n")
+        sys.exit(1)
+
+    target = sys.argv[1]
+    username = sys.argv[2] if len(sys.argv) > 2 else ""
+    password = sys.argv[3] if len(sys.argv) > 3 else ""
+    domain = sys.argv[4] if len(sys.argv) > 4 else ""
+    commands = sys.argv[5] if len(sys.argv) > 5 else ""
+    extra = sys.argv[6] if len(sys.argv) > 6 else ""
+
+    cmd = ["rpcclient"]
+
+    if username:
+        cred = username
+        if password:
+            cred = f"{username}%{password}"
+        cmd.extend(["-U", cred])
+    elif password:
+        # 如果只提供了密码，仍然尝试以空用户名连接
+        cmd.extend(["-U", f"%{password}"])
+
+    if domain:
+        cmd.extend(["-W", domain])
+
+    if commands:
+        cmd.extend(["-c", commands])
+
+    if extra:
+        cmd.extend(shlex.split(extra))
+
+    cmd.append(target)
+
+    proc = subprocess.run(cmd, capture_output=True, text=True)
+    if proc.stdout:
+        sys.stdout.write(proc.stdout)
+    if proc.stderr:
+        sys.stderr.write(proc.stderr)
+    sys.exit(proc.returncode)
 enabled: true
-
 short_description: "RPC枚举工具"
-
 description: |
   Rpcclient是一个RPC客户端工具，用于枚举Windows/Samba系统信息。
 
@@ -18,7 +62,6 @@ description: |
   - Samba枚举
   - 域环境侦察
   - 安全测试
-
 parameters:
   - name: "target"
     type: "string"
@@ -26,34 +69,34 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "username"
     type: "string"
     description: "用户名"
     required: false
-    flag: "-U"
+    default: ""
-    format: "flag"
+    position: 1
-  
+    format: "positional"
   - name: "password"
     type: "string"
     description: "密码"
     required: false
-    flag: "-N"
+    default: ""
-    format: "flag"
+    position: 2
-  
+    format: "positional"
   - name: "domain"
     type: "string"
     description: "域名"
     required: false
-    flag: "-W"
+    default: ""
-    format: "flag"
+    position: 3
-  
+    format: "positional"
   - name: "commands"
     type: "string"
     description: "RPC命令（分号分隔）"
     required: false
     default: "enumdomusers;enumdomgroups;querydominfo"
-
+    position: 4
+    format: "positional"
   - name: "additional_args"
     type: "string"
     description: |
@@ -67,4 +110,6 @@ parameters:
       - 确保参数格式正确，避免命令注入
       - 此参数会直接追加到命令末尾
     required: false
+    default: ""
+    position: 5
     format: "positional"

tools/rustscan.yaml

@@ -1,9 +1,7 @@
 name: "rustscan"
 command: "rustscan"
 enabled: true
-
 short_description: "超快速端口扫描工具，使用Rust编写"
-
 description: |
   Rustscan是一个用Rust编写的超快速端口扫描工具，可以快速扫描大量端口。
 
@@ -17,7 +15,6 @@ description: |
   - 快速端口扫描
   - 大规模网络扫描
   - 渗透测试信息收集
-
 parameters:
   - name: "target"
     type: "string"
@@ -25,14 +22,12 @@ parameters:
     required: true
     flag: "-a"
     format: "flag"
-  
   - name: "ports"
     type: "string"
     description: "要扫描的端口（如：22,80,443或1-1000）"
     required: false
     flag: "-p"
     format: "flag"
-  
   - name: "ulimit"
     type: "int"
     description: "文件描述符限制"
@@ -40,7 +35,6 @@ parameters:
     flag: "-u"
     format: "flag"
     default: 5000
-  
   - name: "scripts"
     type: "bool"
     description: "在发现的端口上运行Nmap脚本"
@@ -48,7 +42,6 @@ parameters:
     flag: "--scripts"
     format: "flag"
     default: false
-
   - name: "additional_args"
     type: "string"
     description: |

tools/scout-suite.yaml

@@ -1,9 +1,7 @@
 name: "scout-suite"
 command: "scout"
 enabled: true
-
 short_description: "多云安全评估工具"
-
 description: |
   Scout Suite是一个多云安全评估工具，支持AWS、Azure、GCP、Aliyun和OCI。
 
@@ -18,7 +16,6 @@ description: |
   - 合规性检查
   - 安全评估
   - 云配置审计
-
 parameters:
   - name: "provider"
     type: "string"
@@ -27,7 +24,6 @@ parameters:
     flag: "--provider"
     format: "flag"
     default: "aws"
-  
   - name: "profile"
     type: "string"
     description: "AWS配置文件"
@@ -35,7 +31,6 @@ parameters:
     flag: "--profile"
     format: "flag"
     default: "default"
-  
   - name: "report_dir"
     type: "string"
     description: "报告保存目录"
@@ -43,14 +38,12 @@ parameters:
     flag: "--report-dir"
     format: "flag"
     default: "/tmp/scout-suite"
-  
   - name: "services"
     type: "string"
     description: "要评估的特定服务"
     required: false
     flag: "--services"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/smbmap.yaml

@@ -1,9 +1,7 @@
 name: "smbmap"
 command: "smbmap"
 enabled: true
-
 short_description: "SMB共享枚举和访问工具"
-
 description: |
   SMBMap是一个用于枚举SMB共享并提供文件访问功能的工具。
 
@@ -18,7 +16,6 @@ description: |
   - 文件共享审计
   - 渗透测试
   - 网络侦察
-
 parameters:
   - name: "target"
     type: "string"
@@ -26,30 +23,26 @@ parameters:
     required: true
     flag: "-H"
     format: "flag"
-  
   - name: "username"
     type: "string"
     description: "用户名"
     required: false
     flag: "-u"
     format: "flag"
-  
   - name: "password"
     type: "string"
     description: "密码"
     required: false
     flag: "-p"
     format: "flag"
-  
   - name: "domain"
     type: "string"
     description: "域名"
     required: false
     flag: "-d"
     format: "flag"
-  
   - name: "additional_args"
     type: "string"
     description: "额外的SMBMap参数"
     required: false
-
+    format: "positional"

tools/sqlmap.yaml

@@ -1,10 +1,8 @@
 name: "sqlmap"
 command: "sqlmap"
 enabled: true
-
 # 简短描述（用于工具列表，减少token消耗）
 short_description: "自动化SQL注入检测和利用工具，用于发现和利用SQL注入漏洞"
-
 # 工具详细描述
 description: |
   自动化SQL注入检测和利用工具，用于发现和利用SQL注入漏洞。
@@ -27,7 +25,6 @@ description: |
   - 某些操作可能对目标系统造成影响
   - 建议在测试环境中先验证
   - 使用 --batch 参数避免交互式提示
-
 # 参数定义
 parameters:
   - name: "url"
@@ -54,7 +51,6 @@ parameters:
     required: true
     flag: "-u"
     format: "flag"
-  
   - name: "batch"
     type: "bool"
     description: |
@@ -72,7 +68,6 @@ parameters:
     default: true
     flag: "--batch"
     format: "flag"
-  
   - name: "level"
     type: "int"
     description: |
@@ -96,8 +91,7 @@ parameters:
     required: false
     default: 3
     flag: "--level"
-    format: "combined"  # --level=3
+    format: "combined" # --level=3
-  
   - name: "data"
     type: "string"
     description: |
@@ -113,7 +107,6 @@ parameters:
     required: false
     flag: "--data"
     format: "flag"
-  
   - name: "cookie"
     type: "string"
     description: |
@@ -127,7 +120,6 @@ parameters:
     required: false
     flag: "--cookie"
     format: "flag"
-  
   - name: "additional_args"
     type: "string"
     description: |
@@ -148,4 +140,3 @@ parameters:
       - 此参数会直接追加到命令末尾
     required: false
     format: "positional"
-

tools/steghide.yaml

@@ -1,9 +1,7 @@
 name: "steghide"
 command: "steghide"
 enabled: true
-
 short_description: "隐写术分析工具"
-
 description: |
   Steghide是一个隐写术工具，用于在图像和音频文件中隐藏数据。
 
@@ -18,7 +16,6 @@ description: |
   - 数据隐藏检测
   - 取证分析
   - CTF挑战
-
 parameters:
   - name: "action"
     type: "string"
@@ -26,35 +23,30 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "cover_file"
     type: "string"
-    description: "载体文件路径"
+    description: "载体文件路径（embed/info操作使用 -cf）"
-    required: true
+    required: false
-    position: 1
+    flag: "-cf"
-    format: "positional"
+    format: "flag"
-  
   - name: "embed_file"
     type: "string"
     description: "要嵌入的文件（embed操作时）"
     required: false
     flag: "-ef"
     format: "flag"
-  
   - name: "passphrase"
     type: "string"
     description: "密码"
     required: false
     flag: "-p"
     format: "flag"
-  
+  - name: "stego_file"
-  - name: "output_file"
     type: "string"
-    description: "输出文件路径"
+    description: "隐写文件路径（embed时输出，extract时输入）"
     required: false
     flag: "-sf"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/stegsolve.yaml

@@ -1,9 +1,8 @@
 name: "stegsolve"
 command: "java"
+args: ["-jar"]
 enabled: true
-
 short_description: "图片隐写分析工具，用于分析图片中的隐写数据"
-
 description: |
   Stegsolve 是一个 Java 图片隐写分析工具，支持多种图片格式和隐写分析技术。
 
@@ -24,7 +23,6 @@ description: |
   - 需要 Java 环境
   - 通常以 GUI 形式运行
   - 可能需要通过命令行参数或脚本调用
-
 parameters:
   - name: "jar_file"
     type: "string"
@@ -32,14 +30,12 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "image"
     type: "string"
     description: "要分析的图片文件路径"
     required: false
     position: 1
     format: "positional"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/strings.yaml

@@ -1,9 +1,7 @@
 name: "strings"
 command: "strings"
 enabled: true
-
 short_description: "从二进制文件中提取字符串"
-
 description: |
   Strings工具用于从二进制文件中提取可打印字符串。
 
@@ -17,7 +15,6 @@ description: |
   - 恶意软件分析
   - 取证分析
   - 逆向工程
-
 parameters:
   - name: "file_path"
     type: "string"
@@ -25,7 +22,6 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "min_len"
     type: "int"
     description: "最小字符串长度"
@@ -33,7 +29,6 @@ parameters:
     flag: "-n"
     format: "flag"
     default: 4
-
   - name: "additional_args"
     type: "string"
     description: |

tools/subfinder.yaml

@@ -1,9 +1,7 @@
 name: "subfinder"
 command: "subfinder"
 enabled: true
-
 short_description: "被动子域名发现工具，使用多个数据源"
-
 description: |
   Subfinder是一个被动子域名发现工具，通过查询多个数据源来发现子域名。
 
@@ -18,7 +16,6 @@ description: |
   - 资产发现
   - Bug bounty侦察
   - 渗透测试信息收集
-
 parameters:
   - name: "domain"
     type: "string"
@@ -26,7 +23,6 @@ parameters:
     required: true
     flag: "-d"
     format: "flag"
-  
   - name: "silent"
     type: "bool"
     description: "静默模式"
@@ -34,7 +30,6 @@ parameters:
     default: true
     flag: "-silent"
     format: "flag"
-  
   - name: "all_sources"
     type: "bool"
     description: "使用所有数据源"
@@ -42,9 +37,8 @@ parameters:
     default: false
     flag: "-all"
     format: "flag"
-  
   - name: "additional_args"
     type: "string"
     description: "额外的Subfinder参数"
     required: false
-
+    format: "positional"

tools/terrascan.yaml

@@ -1,9 +1,7 @@
 name: "terrascan"
 command: "terrascan"
 enabled: true
-
 short_description: "基础设施即代码安全扫描工具"
-
 description: |
   Terrascan是一个基础设施即代码安全扫描工具，用于检测IaC配置中的安全问题。
 
@@ -18,7 +16,6 @@ description: |
   - 云配置审计
   - 安全策略检查
   - 合规性检查
-
 parameters:
   - name: "scan_type"
     type: "string"
@@ -27,7 +24,6 @@ parameters:
     flag: "--scan-type"
     format: "flag"
     default: "all"
-  
   - name: "iac_dir"
     type: "string"
     description: "IaC目录"
@@ -35,14 +31,12 @@ parameters:
     flag: "-d"
     format: "flag"
     default: "."
-  
   - name: "policy_type"
     type: "string"
     description: "要使用的策略类型"
     required: false
     flag: "--policy-type"
     format: "flag"
-  
   - name: "output_format"
     type: "string"
     description: "输出格式（json, yaml, xml）"
@@ -50,14 +44,12 @@ parameters:
     flag: "--output"
     format: "flag"
     default: "json"
-  
   - name: "severity"
     type: "string"
     description: "严重程度过滤（high, medium, low）"
     required: false
     flag: "--severity"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/trivy.yaml

@@ -1,9 +1,7 @@
 name: "trivy"
 command: "trivy"
 enabled: true
-
 short_description: "容器和文件系统漏洞扫描器"
-
 description: |
   Trivy是一个简单而全面的容器和文件系统漏洞扫描器。
 
@@ -18,28 +16,26 @@ description: |
   - CI/CD集成
   - 漏洞检测
   - 安全审计
-
 parameters:
   - name: "scan_type"
     type: "string"
     description: "扫描类型（image, fs, repo, config）"
     required: false
     default: "image"
-  
+    position: 0
+    format: "positional"
   - name: "target"
     type: "string"
     description: "扫描目标（镜像名、目录、仓库）"
     required: true
-    position: 0
+    position: 1
     format: "positional"
-  
   - name: "severity"
     type: "string"
     description: "严重程度过滤（UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL）"
     required: false
     flag: "--severity"
     format: "flag"
-  
   - name: "output_format"
     type: "string"
     description: "输出格式（json, table, sarif）"
@@ -47,7 +43,6 @@ parameters:
     flag: "--format"
     format: "flag"
     default: "json"
-  
   - name: "additional_args"
     type: "string"
     description: |
@@ -65,4 +60,3 @@ parameters:
       - 此参数会直接追加到命令末尾
     required: false
     format: "positional"
-

tools/uro.yaml

@@ -1,9 +1,36 @@
 name: "uro"
-command: "uro"
+command: "python3"
+args:
+  - "-c"
+  - |
+    import shlex
+    import subprocess
+    import sys
+
+    if len(sys.argv) < 2:
+        sys.stderr.write("缺少URL列表\n")
+        sys.exit(1)
+
+    urls = sys.argv[1]
+    extra = sys.argv[2] if len(sys.argv) > 2 else ""
+
+    cmd = ["uro"]
+    if extra:
+        cmd.extend(shlex.split(extra))
+
+    proc = subprocess.run(
+        cmd,
+        input=urls,
+        capture_output=True,
+        text=True,
+    )
+    if proc.stdout:
+        sys.stdout.write(proc.stdout)
+    if proc.stderr:
+        sys.stderr.write(proc.stderr)
+    sys.exit(proc.returncode)
 enabled: true
-
 short_description: "URL过滤工具，用于过滤相似的URL"
-
 description: |
   Uro是一个URL过滤工具，用于过滤掉相似的URL，去除重复项。
 
@@ -18,23 +45,13 @@ description: |
   - 结果过滤
   - 数据清理
   - 工具链集成
-
 parameters:
   - name: "urls"
     type: "string"
     description: "要过滤的URL（每行一个）"
     required: true
-  
+    position: 0
-  - name: "whitelist"
+    format: "positional"
-    type: "string"
-    description: "白名单模式"
-    required: false
-  
-  - name: "blacklist"
-    type: "string"
-    description: "黑名单模式"
-    required: false
-
   - name: "additional_args"
     type: "string"
     description: |
@@ -48,4 +65,6 @@ parameters:
       - 确保参数格式正确，避免命令注入
       - 此参数会直接追加到命令末尾
     required: false
+    default: ""
+    position: 1
     format: "positional"

tools/volatility.yaml

@@ -1,9 +1,7 @@
 name: "volatility"
 command: "volatility"
 enabled: true
-
 short_description: "内存取证分析工具"
-
 description: |
   Volatility是一个内存取证框架，用于从内存转储中提取数字证据。
 
@@ -18,7 +16,6 @@ description: |
   - 恶意软件分析
   - 事件响应
   - 数字取证
-
 parameters:
   - name: "memory_file"
     type: "string"
@@ -26,21 +23,18 @@ parameters:
     required: true
     flag: "-f"
     format: "flag"
-  
   - name: "plugin"
     type: "string"
     description: "要使用的Volatility插件"
     required: true
     position: 0
     format: "positional"
-  
   - name: "profile"
     type: "string"
     description: "内存配置文件"
     required: false
     flag: "--profile"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/volatility3.yaml

@@ -1,9 +1,7 @@
 name: "volatility3"
-command: "volatility"
+command: "volatility3"
 enabled: true
-
 short_description: "Volatility3内存取证分析工具"
-
 description: |
   Volatility3是Volatility框架的下一代版本，用于内存取证分析。
 
@@ -18,7 +16,6 @@ description: |
   - 恶意软件分析
   - 事件响应
   - 数字取证
-
 parameters:
   - name: "memory_file"
     type: "string"
@@ -26,21 +23,18 @@ parameters:
     required: true
     flag: "-f"
     format: "flag"
-  
   - name: "plugin"
     type: "string"
     description: "要执行的Volatility3插件"
     required: true
     position: 0
     format: "positional"
-  
   - name: "output_file"
     type: "string"
     description: "输出文件路径"
     required: false
     flag: "-o"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/wafw00f.yaml

@@ -1,9 +1,7 @@
 name: "wafw00f"
 command: "wafw00f"
 enabled: true
-
 short_description: "WAF识别和指纹识别工具"
-
 description: |
   Wafw00f是一个Web应用防火墙（WAF）识别和指纹识别工具。
 
@@ -18,7 +16,6 @@ description: |
   - 安全测试
   - 渗透测试
   - 安全评估
-
 parameters:
   - name: "target"
     type: "string"
@@ -26,7 +23,6 @@ parameters:
     required: true
     position: 0
     format: "positional"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/waybackurls.yaml

@@ -1,9 +1,7 @@
 name: "waybackurls"
 command: "waybackurls"
 enabled: true
-
 short_description: "从Wayback Machine获取历史URL"
-
 description: |
   Waybackurls从Wayback Machine获取目标域名的历史URL。
 
@@ -17,7 +15,6 @@ description: |
   - Bug bounty侦察
   - 安全测试
   - 内容发现
-
 parameters:
   - name: "domain"
     type: "string"
@@ -25,7 +22,6 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "get_versions"
     type: "bool"
     description: "获取所有版本的URL"
@@ -33,7 +29,6 @@ parameters:
     flag: "-get-versions"
     format: "flag"
     default: false
-  
   - name: "no_subs"
     type: "bool"
     description: "不包含子域名"
@@ -41,7 +36,6 @@ parameters:
     flag: "-no-subs"
     format: "flag"
     default: false
-
   - name: "additional_args"
     type: "string"
     description: |

tools/wfuzz.yaml

@@ -1,9 +1,7 @@
 name: "wfuzz"
 command: "wfuzz"
 enabled: true
-
 short_description: "Web应用模糊测试工具"
-
 description: |
   Wfuzz是一个Web应用模糊测试工具，用于发现Web应用中的漏洞。
 
@@ -18,7 +16,6 @@ description: |
   - 参数模糊测试
   - 目录枚举
   - 漏洞发现
-
 parameters:
   - name: "url"
     type: "string"
@@ -26,14 +23,12 @@ parameters:
     required: true
     flag: "-u"
     format: "flag"
-  
   - name: "wordlist"
     type: "string"
     description: "字典文件路径"
     required: false
     flag: "-w"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/winpeas.yaml

@@ -1,9 +1,7 @@
 name: "winpeas"
 command: "winPEAS.exe"
 enabled: true
-
 short_description: "Windows 权限提升枚举工具，自动检测常见提权路径"
-
 description: |
   WinPEAS (Windows Privilege Escalation Awesome Script) 是一个自动化权限提升枚举工具，用于检测 Windows 系统中的常见提权路径。
 
@@ -27,7 +25,6 @@ description: |
   - 需要目标系统上已下载 winPEAS.exe
   - 可能需要管理员权限
   - 输出信息量大，建议保存到文件
-
 parameters:
   - name: "quiet"
     type: "bool"
@@ -35,14 +32,12 @@ parameters:
     required: false
     flag: "-q"
     format: "flag"
-  
   - name: "notcolor"
     type: "bool"
     description: "禁用颜色输出"
     required: false
     flag: "-notcolor"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/wpscan.yaml

@@ -1,9 +1,7 @@
 name: "wpscan"
 command: "wpscan"
 enabled: true
-
 short_description: "WordPress安全扫描器，用于检测WordPress漏洞"
-
 description: |
   WPScan是专门用于WordPress安全扫描的工具，可以检测主题、插件和核心漏洞。
 
@@ -19,7 +17,6 @@ description: |
   - 漏洞扫描
   - 渗透测试
   - 安全审计
-
 parameters:
   - name: "url"
     type: "string"
@@ -27,9 +24,8 @@ parameters:
     required: true
     flag: "--url"
     format: "flag"
-  
   - name: "additional_args"
     type: "string"
     description: "额外的WPScan参数"
     required: false
-
+    format: "positional"

tools/x8.yaml

@@ -1,9 +1,7 @@
 name: "x8"
 command: "x8"
 enabled: true
-
 short_description: "隐藏参数发现工具"
-
 description: |
   X8是一个用于发现Web应用中隐藏参数的工具。
 
@@ -18,7 +16,6 @@ description: |
   - Web应用安全测试
   - Bug bounty侦察
   - 安全测试
-
 parameters:
   - name: "url"
     type: "string"
@@ -26,7 +23,6 @@ parameters:
     required: true
     flag: "--url"
     format: "flag"
-  
   - name: "wordlist"
     type: "string"
     description: "参数字典"
@@ -34,7 +30,6 @@ parameters:
     flag: "--wordlist"
     format: "flag"
     default: "/usr/share/wordlists/x8/params.txt"
-  
   - name: "method"
     type: "string"
     description: "HTTP方法"
@@ -42,21 +37,18 @@ parameters:
     flag: "--method"
     format: "flag"
     default: "GET"
-  
   - name: "body"
     type: "string"
     description: "请求体"
     required: false
     flag: "--body"
     format: "flag"
-  
   - name: "headers"
     type: "string"
     description: "自定义请求头"
     required: false
     flag: "--headers"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/xsser.yaml

@@ -1,9 +1,7 @@
 name: "xsser"
 command: "xsser"
 enabled: true
-
 short_description: "XSS漏洞测试工具"
-
 description: |
   XSSer是一个自动化XSS漏洞测试工具。
 
@@ -18,7 +16,6 @@ description: |
   - Web应用安全测试
   - 渗透测试
   - 漏洞验证
-
 parameters:
   - name: "url"
     type: "string"
@@ -26,14 +23,12 @@ parameters:
     required: true
     flag: "--url"
     format: "flag"
-  
   - name: "params"
     type: "string"
     description: "要测试的参数"
     required: false
     flag: "--Fp"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/xxd.yaml

@@ -1,9 +1,7 @@
 name: "xxd"
 command: "xxd"
 enabled: true
-
 short_description: "十六进制转储工具"
-
 description: |
   Xxd是一个十六进制转储工具，用于以十六进制格式显示文件内容。
 
@@ -18,7 +16,6 @@ description: |
   - 文件检查
   - 数据提取
   - 取证分析
-
 parameters:
   - name: "file_path"
     type: "string"
@@ -26,7 +23,6 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "offset"
     type: "string"
     description: "开始读取的偏移量"
@@ -34,14 +30,12 @@ parameters:
     flag: "-s"
     format: "flag"
     default: "0"
-  
   - name: "length"
     type: "string"
     description: "要读取的字节数"
     required: false
     flag: "-l"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/zap.yaml

@@ -1,9 +1,7 @@
 name: "zap"
 command: "zap-cli"
-enabled: true
+enabled: false
-
 short_description: "OWASP ZAP Web应用安全扫描器"
-
 description: |
   OWASP ZAP是一个Web应用安全扫描器，用于发现Web应用中的安全漏洞。
 
@@ -18,7 +16,6 @@ description: |
   - 漏洞扫描
   - 安全评估
   - 渗透测试
-
 parameters:
   - name: "target"
     type: "string"
@@ -26,7 +23,6 @@ parameters:
     required: true
     flag: "-t"
     format: "flag"
-  
   - name: "scan_type"
     type: "string"
     description: "扫描类型（baseline, full, api）"
@@ -34,14 +30,12 @@ parameters:
     flag: "--scan-type"
     format: "flag"
     default: "baseline"
-  
   - name: "api_key"
     type: "string"
     description: "ZAP API密钥"
     required: false
     flag: "--api-key"
     format: "flag"
-  
   - name: "daemon"
     type: "bool"
     description: "以守护进程模式运行"
@@ -49,7 +43,6 @@ parameters:
     flag: "--daemon"
     format: "flag"
     default: false
-  
   - name: "port"
     type: "string"
     description: "ZAP守护进程端口"
@@ -57,7 +50,6 @@ parameters:
     flag: "--port"
     format: "flag"
     default: "8090"
-  
   - name: "format_type"
     type: "string"
     description: "输出格式（xml, json, html）"
@@ -65,14 +57,12 @@ parameters:
     flag: "--format"
     format: "flag"
     default: "xml"
-  
   - name: "output_file"
     type: "string"
     description: "输出文件路径"
     required: false
     flag: "--output"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |

tools/zsteg.yaml

@@ -1,9 +1,7 @@
 name: "zsteg"
 command: "zsteg"
 enabled: true
-
 short_description: "LSB 隐写检测工具，用于检测 PNG/BMP 图片中的隐写数据"
-
 description: |
   zsteg 是一个用于检测 PNG 和 BMP 图片中 LSB (Least Significant Bit) 隐写的工具。
 
@@ -23,7 +21,6 @@ description: |
   - 需要 Ruby 环境
   - 支持 PNG 和 BMP 格式
   - 可以检测多种隐写算法
-
 parameters:
   - name: "file"
     type: "string"
@@ -31,21 +28,18 @@ parameters:
     required: true
     position: 0
     format: "positional"
-  
   - name: "all"
     type: "bool"
     description: "检测所有可能的隐写方法"
     required: false
     flag: "--all"
     format: "flag"
-  
   - name: "lsb"
     type: "bool"
     description: "只检测 LSB 隐写"
     required: false
     flag: "--lsb"
     format: "flag"
-
   - name: "additional_args"
     type: "string"
     description: |