sysadmin
4dee03b2aa
Reviewer found the MCP merge surface is gated but two local CLI scripts remain ungated merge paths that LLM automations in this project have been using. Close them (Option B — minimal safe fix; full gated CLI merge left to a follow-up): - review_pr.py: `--merge` now fails closed BEFORE any API call with a clear message directing callers to the gated `gitea_merge_pr` MCP workflow. The review-only path is unchanged. The merge execution block was removed. - merge_pr.py: main() is now a fail-closed no-op — reads no credentials and makes no merge API call; prints that merge is only available via the gated workflow. - README: the `review_pr.py` row and Quick Examples no longer advertise a CLI `--merge` path; added an audit-logging clarification that #16 returns structured gate/merge results but does not add durable audit logging, which is tracked by #18. Tests updated/added: - test_review_pr.py: `--merge` fails closed with no API call; message points to the gated workflow. - test_merge_pr.py: merge fails closed with no API call, even with --force/--do/--title/--message; message points to the gated workflow. - test_mcp_server.py: README no longer advertises the ungated CLI merge example. The gated MCP `gitea_merge_pr` is unchanged and still gated; `gitea_review_pr` still fails closed on merge=True; `gitea_submit_pr_review` still cannot merge. No secrets, auth headers, raw env, or credential paths are exposed. No Jenkins/Ops/GlitchTip/Release/deploy/CI behavior added. #17/#18 not started. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
56 lines
2.4 KiB
Python
Executable File
56 lines
2.4 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
"""Merge a Gitea pull request — DISABLED (#16).
|
|
|
|
Direct CLI merge is a fail-closed no-op. LLM automations in this project were
|
|
using this script as an ungated merge bypass, so it no longer performs a merge.
|
|
Merge is only available through the gated `gitea_merge_pr` MCP workflow (#16),
|
|
which enforces identity/profile/eligibility, explicit confirmation, expected
|
|
head SHA checking, and self-merge protection.
|
|
|
|
Usage (fails closed):
|
|
merge_pr.py --pr-number 84 --do squash --remote dadeschools
|
|
"""
|
|
import os
|
|
import sys
|
|
import json
|
|
import argparse
|
|
|
|
# Auto-execute using the project's local virtual environment Python
|
|
PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
|
|
venv_python = os.path.join(PROJECT_ROOT, "venv", "bin", "python3")
|
|
if os.path.exists(venv_python) and sys.executable != venv_python:
|
|
os.execv(venv_python, [venv_python] + sys.argv)
|
|
|
|
from gitea_auth import get_auth_header, resolve_remote, add_remote_args, api_request, repo_api_url
|
|
|
|
|
|
def main(argv=None):
|
|
parser = argparse.ArgumentParser(description="Merge a Gitea pull request.")
|
|
add_remote_args(parser)
|
|
parser.add_argument("--pr-number", type=int, required=True, help="PR number/index to merge.")
|
|
parser.add_argument("--do", choices=["merge", "squash", "rebase"], default="merge",
|
|
help="Merge method/style (default: merge).")
|
|
parser.add_argument("--title", help="Optional merge title.")
|
|
parser.add_argument("--message", help="Optional merge message.")
|
|
parser.add_argument("--force", action="store_true", help="Force merge, ignoring status checks.")
|
|
args = parser.parse_args(argv)
|
|
|
|
# Fail closed: direct CLI merge is disabled (#16). No credentials are read
|
|
# and no merge API call is made. Merge is only available through the gated
|
|
# `gitea_merge_pr` MCP workflow, which enforces identity/profile/eligibility,
|
|
# explicit confirmation, expected head SHA checking, and self-merge
|
|
# protection.
|
|
print(
|
|
f"Direct CLI merge is disabled (#16). PR #{args.pr_number} was NOT "
|
|
"merged. Merge is only available through the gated workflow (MCP tool "
|
|
"'gitea_merge_pr'), which enforces identity/profile/eligibility, "
|
|
"explicit confirmation, expected head SHA checking, and self-merge "
|
|
"protection.",
|
|
file=sys.stderr,
|
|
)
|
|
return 2
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|