From 1449f4c51394c0773aa94030acd814aa4ab73952 Mon Sep 17 00:00:00 2001 From: kicer Date: Mon, 28 Sep 2026 10:40:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sheet-edit=20output=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=BF=85=E6=AD=BB=20bug=EF=BC=88=E7=BA=BF?= =?UTF-8?q?=E4=B8=8A=E9=A6=96=E7=82=B8=E5=A4=8D=E7=9B=98=EF=BC=89=EF=BC=9A?= =?UTF-8?q?=E4=B8=8A=E4=B8=80=E8=BD=AE=E5=8A=A0=E7=9A=84=E3=80=8Coutput=20?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=98=AF=E6=96=87=E4=BB=B6=E5=90=8D=E3=80=8D?= =?UTF-8?q?=E6=B6=88=E6=AF=92=E4=B8=8E=20skills.js=20=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=A2=84=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E2=80=94=E2=80=94absolutizeValue=20=E5=AF=B9=20out|dest|target?= =?UTF-8?q?|save=20=E7=B1=BB=E9=94=AE=E8=87=AA=E5=8A=A8=E6=8C=89=E4=BC=9A?= =?UTF-8?q?=E8=AF=9D=E7=9B=AE=E5=BD=95=E8=A7=A3=E6=9E=90=E6=88=90=E7=BB=9D?= =?UTF-8?q?=E5=AF=B9=E8=B7=AF=E5=BE=84=EF=BC=88=E6=9C=AC=E6=84=8F=E6=98=AF?= =?UTF-8?q?=E8=AE=A9=E6=8A=80=E8=83=BD=E8=84=9A=E6=9C=AC=E5=AF=B9=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=97=A0=E6=84=9F=E7=9F=A5=EF=BC=89=EF=BC=8C=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=20run.py=20=E6=94=B6=E5=88=B0=E7=9A=84=E6=B0=B8?= =?UTF-8?q?=E8=BF=9C=E6=98=AF=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E3=80=81?= =?UTF-8?q?=E5=90=AB=20/=20=E4=B8=80=E5=BE=8B=E8=A2=AB=E6=8B=92=EF=BC=8C?= =?UTF-8?q?=E8=A3=B8=E6=96=87=E4=BB=B6=E5=90=8D=20output=20=E5=8F=98?= =?UTF-8?q?=E6=88=90=E4=BC=A0=E5=95=A5=E9=83=BD=E6=8A=A5=E9=94=99=E3=80=82?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=EF=BC=9A=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=8E=9F=E6=A0=B7=E6=8E=A5=E5=8F=97=EF=BC=88=E9=98=B2=E8=B6=8A?= =?UTF-8?q?=E6=9D=83=E6=9C=AC=E6=9D=A5=E5=B0=B1=E8=AF=A5=E7=94=B1=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=AE=B9=E5=99=A8=E7=9A=84=E4=BC=9A=E8=AF=9D=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E6=8B=85=E8=B4=A3=EF=BC=8C=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E5=B1=82=E9=9D=A2=E9=98=B2=E4=B8=8D=E4=BD=8F=EF=BC=89=EF=BC=8C?= =?UTF-8?q?=E7=9B=B8=E5=AF=B9=E5=90=8D=E7=BB=B4=E6=8C=81=E5=90=8C=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E8=AF=AD=E4=B9=89=EF=BC=88=E7=9B=B4=E8=B0=83=20run.py?= =?UTF-8?q?=20=E5=85=BC=E5=AE=B9=EF=BC=89=EF=BC=8C=E4=BB=85=E6=8B=92=20'.'?= =?UTF-8?q?/'..'=EF=BC=9BSKILL.md=20output=20=E8=AF=B4=E6=98=8E=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E3=80=82=E5=AE=9E=E6=B5=8B=E5=A4=8D=E5=88=BB=E7=BA=BF?= =?UTF-8?q?=E4=B8=8A=E5=85=A5=E5=8F=82=EF=BC=88.xls+=E9=A2=84=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=EF=BC=89=E9=80=9A?= =?UTF-8?q?=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skills/sheet-edit/SKILL.md | 2 +- skills/sheet-edit/lib/ops.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/skills/sheet-edit/SKILL.md b/skills/sheet-edit/SKILL.md index ef6509b..20cb7d9 100644 --- a/skills/sheet-edit/SKILL.md +++ b/skills/sheet-edit/SKILL.md @@ -99,7 +99,7 @@ description: 结构化修改表格文件。内容定位(列名 + 值),最 - `file`(必填) - `changes`(必填):改动清单 - `header_row`(可选,默认 1) -- `output`(可选):输出文件名(只能是文件名,不能含路径),默认原文件名加「(已改)」 +- `output`(可选):输出文件名(放原文件同目录;平台预处理成会话目录下的绝对路径也接受),默认原文件名加「(已改)」 ### 定位 diff --git a/skills/sheet-edit/lib/ops.py b/skills/sheet-edit/lib/ops.py index 26d487b..b9bf6cf 100644 --- a/skills/sheet-edit/lib/ops.py +++ b/skills/sheet-edit/lib/ops.py @@ -514,10 +514,12 @@ def _pos_int(args, key, default): def _out_path(file: Path, output): if output: name = str(output) - # 输出名消毒:只允许文件名,防目录越权(会话目录之外不可写) - if '/' in name or '\\' in name or name in ('.', '..') or Path(name).name != name: - raise UserError(f"output 只能是文件名(不能含路径分隔符或目录): {name!r}") - return file.parent / name + if name in ('.', '..'): + raise UserError(f"output 无效: {name!r}") + p = Path(name) + # 绝对路径原样用:skills.js 会把 output 这类路径参数预处理成会话目录下的绝对路径, + # 拒含分隔符反而把平台惯例变成必死参数;防越权由执行容器自身的会话隔离担责。 + return p if p.is_absolute() else file.parent / p return file.parent / f"{file.stem}(已改){file.suffix}"