Skip to content

Commit fd64cfd

Browse files
committed
fix: retain bounded publisher permission requirements
Parse only server-advertised requirements for comment failures. Preserve HTTP errors and write reconciliation while rejecting malformed or unsafe header data. Agent-assisted-by: Codex (author) Signed-off-by: GUOGUO <xwdong1998@163.com>
1 parent fafbe63 commit fd64cfd

2 files changed

Lines changed: 195 additions & 1 deletion

File tree

‎tests/test_skill_eval_pr_http.py‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import subprocess
66
import sys
77
import traceback
8+
from email.message import Message
89
from unittest.mock import Mock
910
from urllib.error import HTTPError
1011
from urllib.parse import urlsplit
@@ -70,6 +71,138 @@ def test_only_allowlisted_metadata_is_retained(monkeypatch):
7071
assert "Authorization" not in text and "Set-Cookie" not in text
7172

7273

74+
def accepted_permissions(text):
75+
return json.loads(text.split(" accepted_permissions=", 1)[1])
76+
77+
78+
@pytest.mark.parametrize("method,path", [
79+
("POST", "/issues/7/comments"), ("PATCH", "/issues/comments/9"),
80+
])
81+
@pytest.mark.parametrize("value,sets", [
82+
("issues=write", [{"issues": "write"}]),
83+
("pull_requests=write", [{"pull_requests": "write"}]),
84+
("issues=write; pull_requests=write", [{"issues": "write"}, {"pull_requests": "write"}]),
85+
("\tissues \t= write, contents=read ; metadata=read\t",
86+
[{"issues": "write", "contents": "read"}, {"metadata": "read"}]),
87+
("issues=read;issues=write;pull_requests=read;pull_requests=write",
88+
[{"issues": "read"}, {"issues": "write"},
89+
{"pull_requests": "read"}, {"pull_requests": "write"}]),
90+
("issues=write,pull_requests=read,contents=write,metadata=read",
91+
[{"issues": "write", "pull_requests": "read", "contents": "write", "metadata": "read"}]),
92+
(";".join(("issues=write,pull_requests=write,contents=write,metadata=read",
93+
"issues=read,pull_requests=write,contents=write,metadata=read",
94+
"issues=write,pull_requests=read,contents=write,metadata=read",
95+
"issues=write,pull_requests=write,contents=read,metadata=read")),
96+
[{"issues": "write", "pull_requests": "write", "contents": "write", "metadata": "read"},
97+
{"issues": "read", "pull_requests": "write", "contents": "write", "metadata": "read"},
98+
{"issues": "write", "pull_requests": "read", "contents": "write", "metadata": "read"},
99+
{"issues": "write", "pull_requests": "write", "contents": "read", "metadata": "read"}]),
100+
("issues=write".ljust(256), [{"issues": "write"}]),
101+
])
102+
def test_accepted_permissions_preserve_bounded_and_or_requirements(
103+
monkeypatch, method, path, value, sets,
104+
):
105+
headers = Message()
106+
headers["x-accepted-github-permissions"] = value
107+
body = b'{"message":"Resource not accessible by integration"}'
108+
text = request_failure(monkeypatch, http_error(body=body, headers=headers),
109+
method=method, path=path)
110+
assert accepted_permissions(text) == {"status": "available", "sets": sets}
111+
assert '"category": "permission"' in text and '"http_status": 403' in text
112+
assert headers["X-Accepted-GitHub-Permissions"] == value
113+
114+
115+
@pytest.mark.parametrize("value", [
116+
"", " \t", "Issues=write", "issues=WRITE", "issues=none", "metadata=write",
117+
"checks=write", "issues=write;authorization=write", "issues=write,",
118+
";issues=write", "issues=write;", "issues=write,,contents=read",
119+
"issues=write;;contents=read", "issues:write", 'issues="write"', "issues==write",
120+
"issues=write,issues=write", "issues=read,issues=write", "issues=write;issues=write",
121+
"issues=write,contents=read;contents=read,issues=write",
122+
"issues=read;issues=write;pull_requests=read;pull_requests=write;metadata=read",
123+
"issues=write,pull_requests=write,contents=read,metadata=read,issues=read",
124+
"issues=write".ljust(257), "issues=write;" + SECRET * 30,
125+
"issues=write\r\nAuthorization: " + SECRET, "issues=write\n", "issues=write\x00",
126+
"issues=write\x7f", "issues=write\v", "issues=write;\u00e9=read",
127+
"issues=write\uff1bcontents=read", "https://example.invalid/" + SECRET,
128+
None, 0, b"issues=write", ["issues=write"], {"issues": "write"},
129+
])
130+
def test_invalid_accepted_permissions_are_wholly_unavailable_without_leaks(monkeypatch, value):
131+
text = request_failure(monkeypatch, http_error(headers={
132+
"X-Accepted-GitHub-Permissions": value}))
133+
assert accepted_permissions(text) == {"status": "unavailable"}
134+
assert '"category": "unknown"' in text
135+
136+
137+
def test_duplicate_accepted_permission_headers_are_unavailable(monkeypatch):
138+
headers = Message()
139+
headers["X-Accepted-GitHub-Permissions"] = "issues=write"
140+
headers["x-accepted-github-permissions"] = "pull_requests=write"
141+
text = request_failure(monkeypatch, http_error(headers=headers))
142+
assert accepted_permissions(text) == {"status": "unavailable"}
143+
144+
145+
@pytest.mark.parametrize("mode", ["raise", "wrong-type", "multiple", "attribute", "get"])
146+
def test_hostile_accepted_permission_headers_do_not_mask_http_failure(monkeypatch, mode):
147+
class Headers(dict):
148+
@property
149+
def get_all(self):
150+
if mode == "attribute":
151+
raise RuntimeError(SECRET)
152+
if mode == "get":
153+
return None
154+
if mode == "raise":
155+
return Mock(side_effect=RuntimeError(SECRET))
156+
return Mock(return_value="issues=write" if mode == "wrong-type"
157+
else ["issues=write", SECRET])
158+
159+
def get(self, name, default=""):
160+
if mode == "get":
161+
raise RuntimeError(SECRET)
162+
return super().get(name, default)
163+
164+
text = request_failure(monkeypatch, http_error(headers=Headers({"present": True})))
165+
assert accepted_permissions(text) == {"status": "unavailable"}
166+
assert '"http_status": 403' in text
167+
168+
169+
@pytest.mark.parametrize("failure", ["parser", "serialization"])
170+
def test_permission_diagnostic_failure_preserves_original_http_error(monkeypatch, failure):
171+
replacement = (Mock(side_effect=RuntimeError(SECRET)) if failure == "parser"
172+
else Mock(return_value={"unexpected": object()}))
173+
monkeypatch.setattr(integration, "comment_permission_requirements", replacement)
174+
text = request_failure(monkeypatch, http_error(
175+
body=b'{"message":"Resource not accessible by integration"}'))
176+
assert accepted_permissions(text) == {"status": "unavailable"}
177+
assert '"category": "permission"' in text and '"http_status": 403' in text
178+
179+
180+
@pytest.mark.parametrize("method,path", [
181+
("GET", "/issues/7/comments"), ("GET", "/issues/comments/9"),
182+
("POST", "/actions/runs/7"), ("PATCH", "/pulls/7"),
183+
("PATCH", "/issues/7/comments"), ("POST", "/issues/comments/9"),
184+
("POST", "/private/" + SECRET),
185+
])
186+
def test_accepted_permission_header_is_only_read_for_comment_writes(monkeypatch, method, path):
187+
headers = Message()
188+
headers["X-GitHub-Request-Id"] = "ABCD:1234"
189+
headers.get_all = Mock(side_effect=AssertionError(SECRET))
190+
text = request_failure(monkeypatch, http_error(headers=headers), method=method, path=path)
191+
assert " accepted_permissions=" not in text
192+
headers.get_all.assert_not_called()
193+
194+
195+
@pytest.mark.parametrize("status,category", [(403, "unknown"), (429, "rate-limit"),
196+
(503, "unknown")])
197+
def test_accepted_requirements_do_not_establish_granted_access_or_failure_cause(
198+
monkeypatch, status, category,
199+
):
200+
text = request_failure(monkeypatch, http_error(status, headers={
201+
"X-Accepted-GitHub-Permissions": "issues=write"}))
202+
assert accepted_permissions(text) == {"status": "available", "sets": [{"issues": "write"}]}
203+
assert f'"category": "{category}"' in text
204+
205+
73206
@pytest.mark.parametrize("value", [SECRET, "9" * 81, "-1", "3\n" + SECRET, None, 0])
74207
def test_hostile_metadata_is_not_echoed_or_used_as_rate_evidence(monkeypatch, value):
75208
headers = {name: value for name in (
@@ -129,6 +262,7 @@ def test_endpoint_is_a_template_without_queries_or_private_path(monkeypatch, pat
129262
def test_missing_body_and_headers_do_not_mask_failure(monkeypatch):
130263
error = HTTPError("https://example.invalid/?token=" + SECRET, 403, SECRET, None, None)
131264
text = request_failure(monkeypatch, error)
265+
assert accepted_permissions(text) == {"status": "absent"}
132266
assert '"category": "unknown"' in text
133267

134268

‎tools/skill_eval_pr.py‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,58 @@ def summary(plan, results, evidence_url, expires_at, now):
293293
return "\n".join(lines)
294294

295295

296+
def comment_permission_requirements(headers):
297+
"""Parse bounded server-advertised requirements, never granted permissions."""
298+
if headers is None:
299+
return {"status": "absent"}
300+
name = "X-Accepted-GitHub-Permissions"
301+
get_all = getattr(headers, "get_all", None)
302+
if callable(get_all):
303+
values = get_all(name, [])
304+
if type(values) is not list:
305+
return {"status": "unavailable"}
306+
if not values:
307+
return {"status": "absent"}
308+
if len(values) != 1:
309+
return {"status": "unavailable"}
310+
raw = values[0]
311+
else:
312+
missing = object()
313+
raw = headers.get(name, missing)
314+
if raw is missing:
315+
return {"status": "absent"}
316+
# ASCII makes the character bound a byte bound. Never parse a truncated prefix.
317+
if type(raw) is not str or len(raw) > 256 or not raw.isascii():
318+
return {"status": "unavailable"}
319+
# Commas join requirements; semicolons separate alternative permission sets.
320+
alternatives = raw.split(";")
321+
if len(alternatives) > 4:
322+
return {"status": "unavailable"}
323+
allowed = {"issues": ("read", "write"), "pull_requests": ("read", "write"),
324+
"contents": ("read", "write"), "metadata": ("read",)}
325+
sets, seen = [], set()
326+
for alternative in alternatives:
327+
entries = alternative.split(",")
328+
if len(entries) > 4:
329+
return {"status": "unavailable"}
330+
group = {}
331+
for entry in entries:
332+
match = re.fullmatch(r"[ \t]*([a-z_]+)[ \t]*=[ \t]*(read|write)[ \t]*", entry)
333+
if not match:
334+
return {"status": "unavailable"}
335+
permission, level = match.groups()
336+
if (permission not in allowed or level not in allowed[permission]
337+
or permission in group):
338+
return {"status": "unavailable"}
339+
group[permission] = level
340+
identity = tuple(sorted(group.items()))
341+
if identity in seen:
342+
return {"status": "unavailable"}
343+
seen.add(identity)
344+
sets.append(group)
345+
return {"status": "available", "sets": sets}
346+
347+
296348
def publication_http_error(error, method, path):
297349
"""Reuse the existing allowlist formatter, without its client's retry behavior."""
298350
code = error.code if type(error.code) is int and 100 <= error.code <= 599 else 0
@@ -327,7 +379,15 @@ def publication_http_error(error, method, path):
327379
# Always retain the original HTTP failure instead of failing in the formatter.
328380
failure = OSError("GitHub API " + json.dumps(
329381
{"http_status": code, "category": "unknown"}, sort_keys=True))
330-
failure.args = (str(failure) + " request=" + canonical(context),)
382+
permissions = ""
383+
if (method, endpoint) in (("POST", "/issues/{number}/comments"),
384+
("PATCH", "/issues/comments/{id}")):
385+
try:
386+
permissions = " accepted_permissions=" + canonical(
387+
comment_permission_requirements(error.headers))
388+
except Exception:
389+
permissions = ' accepted_permissions={"status":"unavailable"}'
390+
failure.args = (str(failure) + " request=" + canonical(context) + permissions,)
331391
return failure
332392
finally:
333393
try:

0 commit comments

Comments
 (0)