- check_deps_vuln: 包因依赖有洞被标记时,via 只有依赖名,原实现取不到 GHSA; 改为沿 via 追到链底公告,fdir/tinyglobby/vite/vitest 与 picomatch 都记同一编号。 - 例外表:GHSA-fc5q-39xc-vjpf 在 npm 上范围 <=4.0.7、4.0.7 已是最新,没有修复版本; 仅开发依赖、只解析本仓 glob,按策略记例外(到期 2027-02-15)。
This commit is contained in:
@@ -172,14 +172,43 @@ def npm_audit(args: list[str]) -> tuple[dict, str | None]:
|
||||
return {}, f"npm audit 输出解析不了(exit={p.returncode}):{(p.stdout or p.stderr)[:300]}"
|
||||
|
||||
|
||||
def advisory_ids(vulns: dict, name: str, seen: set[str] | None = None) -> list[str]:
|
||||
"""收集一个包命中的 GHSA 编号,沿 via 里的依赖链向上追。
|
||||
|
||||
为什么不能只看本包的 via:npm 对 fdir/tinyglobby/vite 这类"由于依赖了有洞的包"
|
||||
的条目,via 里只有依赖名(字符串),直接取 url 会得到空 id;空 id 的发现既没法
|
||||
写进例外表(例外要求 id 非空),也会让排查人以为"没有具体漏洞"。追到链底才是
|
||||
真正要豁免/修复的那条公告。
|
||||
"""
|
||||
seen = seen or set()
|
||||
if name in seen:
|
||||
return []
|
||||
seen.add(name)
|
||||
entry = vulns.get(name)
|
||||
if not isinstance(entry, dict):
|
||||
return []
|
||||
ids: list[str] = []
|
||||
for via in entry.get("via") or []:
|
||||
if isinstance(via, dict) and via.get("url"):
|
||||
ids.append(str(via["url"]).rsplit("/", 1)[-1])
|
||||
elif isinstance(via, str):
|
||||
ids.extend(advisory_ids(vulns, via, seen))
|
||||
# 去重但保持稳定顺序,便于例外表逐字核对
|
||||
out: list[str] = []
|
||||
for item in ids:
|
||||
if item and item not in out:
|
||||
out.append(item)
|
||||
return out
|
||||
|
||||
|
||||
def audit_findings(data: dict, scope: str) -> list[dict]:
|
||||
out = []
|
||||
for name, adv in (data.get("vulnerabilities") or {}).items():
|
||||
vulns = data.get("vulnerabilities") or {}
|
||||
for name, adv in vulns.items():
|
||||
if not isinstance(adv, dict):
|
||||
continue
|
||||
sev = str(adv.get("severity") or "").lower()
|
||||
ids = [v.get("url", "").rsplit("/", 1)[-1]
|
||||
for v in (adv.get("via") or []) if isinstance(v, dict) and v.get("url")]
|
||||
ids = advisory_ids(vulns, name)
|
||||
out.append({"tool": "npm-audit", "id": ids[0] if ids else "", "package": name,
|
||||
"severity": sev, "scope": scope,
|
||||
"detail": f"isDirect={adv.get('isDirect')} range={adv.get('range')}"})
|
||||
|
||||
@@ -14,5 +14,61 @@
|
||||
" expires_on : YYYY-MM-DD,过期当天即失效 —— 过期不是\"继续有效\",是\"重新走一遍审批\"",
|
||||
"纪律:例外是记账,不是免检。到期没人处理 ⇒ 门禁红 ⇒ 必须有人做决定。"
|
||||
],
|
||||
"exceptions": []
|
||||
}
|
||||
"exceptions": [
|
||||
{
|
||||
"tool": "npm-audit",
|
||||
"id": "GHSA-fc5q-39xc-vjpf",
|
||||
"package": "picomatch",
|
||||
"severity": "high",
|
||||
"scope": "dev",
|
||||
"reason": "picomatch ReDoS(GHSA-fc5q-39xc-vjpf)公告范围为 <=4.0.7,npm 上 4.0.7 已是最新、没有修复版本;该链路只在构建/测试工具里解析本仓自己的 glob 模式(vite/vitest/tinyglobby/fdir),不接受外部输入,运行时不加载,故按仅开发依赖记账。到期前若上游发布修复版本必须升级并删除本条。",
|
||||
"owner": "姚章浩",
|
||||
"approved_by": "姚章浩",
|
||||
"expires_on": "2027-02-15"
|
||||
},
|
||||
{
|
||||
"tool": "npm-audit",
|
||||
"id": "GHSA-fc5q-39xc-vjpf",
|
||||
"package": "fdir",
|
||||
"severity": "high",
|
||||
"scope": "dev",
|
||||
"reason": "picomatch ReDoS(GHSA-fc5q-39xc-vjpf)公告范围为 <=4.0.7,npm 上 4.0.7 已是最新、没有修复版本;该链路只在构建/测试工具里解析本仓自己的 glob 模式(vite/vitest/tinyglobby/fdir),不接受外部输入,运行时不加载,故按仅开发依赖记账。到期前若上游发布修复版本必须升级并删除本条。",
|
||||
"owner": "姚章浩",
|
||||
"approved_by": "姚章浩",
|
||||
"expires_on": "2027-02-15"
|
||||
},
|
||||
{
|
||||
"tool": "npm-audit",
|
||||
"id": "GHSA-fc5q-39xc-vjpf",
|
||||
"package": "tinyglobby",
|
||||
"severity": "high",
|
||||
"scope": "dev",
|
||||
"reason": "picomatch ReDoS(GHSA-fc5q-39xc-vjpf)公告范围为 <=4.0.7,npm 上 4.0.7 已是最新、没有修复版本;该链路只在构建/测试工具里解析本仓自己的 glob 模式(vite/vitest/tinyglobby/fdir),不接受外部输入,运行时不加载,故按仅开发依赖记账。到期前若上游发布修复版本必须升级并删除本条。",
|
||||
"owner": "姚章浩",
|
||||
"approved_by": "姚章浩",
|
||||
"expires_on": "2027-02-15"
|
||||
},
|
||||
{
|
||||
"tool": "npm-audit",
|
||||
"id": "GHSA-fc5q-39xc-vjpf",
|
||||
"package": "vite",
|
||||
"severity": "high",
|
||||
"scope": "dev",
|
||||
"reason": "picomatch ReDoS(GHSA-fc5q-39xc-vjpf)公告范围为 <=4.0.7,npm 上 4.0.7 已是最新、没有修复版本;该链路只在构建/测试工具里解析本仓自己的 glob 模式(vite/vitest/tinyglobby/fdir),不接受外部输入,运行时不加载,故按仅开发依赖记账。到期前若上游发布修复版本必须升级并删除本条。",
|
||||
"owner": "姚章浩",
|
||||
"approved_by": "姚章浩",
|
||||
"expires_on": "2027-02-15"
|
||||
},
|
||||
{
|
||||
"tool": "npm-audit",
|
||||
"id": "GHSA-fc5q-39xc-vjpf",
|
||||
"package": "vitest",
|
||||
"severity": "high",
|
||||
"scope": "dev",
|
||||
"reason": "picomatch ReDoS(GHSA-fc5q-39xc-vjpf)公告范围为 <=4.0.7,npm 上 4.0.7 已是最新、没有修复版本;该链路只在构建/测试工具里解析本仓自己的 glob 模式(vite/vitest/tinyglobby/fdir),不接受外部输入,运行时不加载,故按仅开发依赖记账。到期前若上游发布修复版本必须升级并删除本条。",
|
||||
"owner": "姚章浩",
|
||||
"approved_by": "姚章浩",
|
||||
"expires_on": "2027-02-15"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user