fix: parse porcelain status safely
This commit is contained in:
@@ -175,13 +175,15 @@ def git_run(repo: Path, args: list[str]) -> subprocess.CompletedProcess[str]:
|
|||||||
def git_publish(repo: Path, start: str, end: str, no_push: bool) -> str:
|
def git_publish(repo: Path, start: str, end: str, no_push: bool) -> str:
|
||||||
if not (repo / ".git").exists():
|
if not (repo / ".git").exists():
|
||||||
raise RuntimeError("仓库尚未初始化")
|
raise RuntimeError("仓库尚未初始化")
|
||||||
status = git_run(repo, ["status", "--porcelain", "--untracked-files=all"]).stdout.strip().splitlines()
|
status_output = git_run(repo, ["status", "--porcelain", "--untracked-files=all"]).stdout
|
||||||
|
status = status_output.splitlines()
|
||||||
allowed = re.compile(r"data/(?:index\.json|[0-9]{8}\.json)$")
|
allowed = re.compile(r"data/(?:index\.json|[0-9]{8}\.json)$")
|
||||||
allowed_paths = []
|
allowed_paths = []
|
||||||
unexpected = []
|
unexpected = []
|
||||||
for line in status:
|
for line in status:
|
||||||
path = line[3:] if len(line) >= 4 else ""
|
prefix = line[:2] if len(line) >= 2 else ""
|
||||||
if not allowed.fullmatch(path):
|
path = line[3:] if len(line) >= 4 and line[2] == " " else ""
|
||||||
|
if prefix not in {" M", "M ", "??", "D ", " D"} or not allowed.fullmatch(path):
|
||||||
unexpected.append(line)
|
unexpected.append(line)
|
||||||
else:
|
else:
|
||||||
allowed_paths.append(path)
|
allowed_paths.append(path)
|
||||||
|
|||||||
Reference in New Issue
Block a user