sawz/last30days-skill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #343 from Bortlesboat/codex/use-sandboxed-safari-cookie-path

Browse Source 
fix: prefer sandboxed Safari cookie path
This commit is contained in:
Trevin Chow
2026-05-17 00:47:32 -07:00
committed by GitHub
parent 5a625fda9f b78ce34922
commit 0f03a67166
2 changed files with 96 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skills/last30days/scripts/lib/safari_cookies.py
+12 -1
View File
@@ -107,7 +107,18 @@ def extract_safari_cookies_macos(
if sys.platform != "darwin":
return None
cookie_path = Path.home() / "Library" / "Cookies" / "Cookies.binarycookies"
cookie_paths = [
Path.home()
/ "Library"
/ "Containers"
/ "com.apple.Safari"
/ "Data"
/ "Library"
/ "Cookies"
/ "Cookies.binarycookies",
Path.home() / "Library" / "Cookies" / "Cookies.binarycookies",
]
cookie_path = next((path for path in cookie_paths if path.exists()), cookie_paths[0])
try:
raw = cookie_path.read_bytes()
tests/test_safari_cookies.py
+79 -9
View File
@@ -160,25 +160,95 @@ class TestErrorPaths:
result = extract_safari_cookies_macos("x.com", ["auth_token"])
assert result is None
def test_permission_denied(self, tmp_path: Path, capsys):
cookie_dir = tmp_path / "Library" / "Cookies"
cookie_dir.mkdir(parents=True)
cookie_file = cookie_dir / "Cookies.binarycookies"
cookie_file.write_bytes(b"cook")
cookie_file.chmod(0o000)
def test_prefers_sandboxed_safari_cookie_path(
self, tmp_path: Path, x_cookies_file: bytes
):
sandbox_dir = (
tmp_path
/ "Library"
/ "Containers"
/ "com.apple.Safari"
/ "Data"
/ "Library"
/ "Cookies"
)
sandbox_dir.mkdir(parents=True)
(sandbox_dir / "Cookies.binarycookies").write_bytes(x_cookies_file)
legacy_dir = tmp_path / "Library" / "Cookies"
legacy_dir.mkdir(parents=True)
legacy_data = _build_binary_cookies_file(
[_build_page([_build_cookie_record(".x.com", "auth_token", "legacy")])]
)
(legacy_dir / "Cookies.binarycookies").write_bytes(legacy_data)
with patch(
"scripts.lib.safari_cookies.Path.home", return_value=tmp_path
), patch("scripts.lib.safari_cookies.sys") as mock_sys:
mock_sys.platform = "darwin"
mock_sys.stderr = sys.stderr
result = extract_safari_cookies_macos("x.com", ["auth_token", "ct0"])
assert result is not None
assert result["auth_token"] == "test_auth_abc123"
assert result["ct0"] == "test_ct0_xyz789"
def test_falls_back_to_legacy_safari_cookie_path(self, tmp_path: Path):
# Sandboxed path is intentionally NOT created — only the legacy path exists.
legacy_dir = tmp_path / "Library" / "Cookies"
legacy_dir.mkdir(parents=True)
legacy_data = _build_binary_cookies_file(
[_build_page([_build_cookie_record(".x.com", "auth_token", "legacy_auth")])]
)
(legacy_dir / "Cookies.binarycookies").write_bytes(legacy_data)
sandbox_path = (
tmp_path
/ "Library"
/ "Containers"
/ "com.apple.Safari"
/ "Data"
/ "Library"
/ "Cookies"
/ "Cookies.binarycookies"
)
assert not sandbox_path.exists()
try:
with patch(
"scripts.lib.safari_cookies.Path.home", return_value=tmp_path
), patch("scripts.lib.safari_cookies.sys") as mock_sys:
mock_sys.platform = "darwin"
mock_sys.stderr = sys.stderr
result = extract_safari_cookies_macos("x.com", ["auth_token"])
assert result is not None
assert result["auth_token"] == "legacy_auth"
def test_permission_denied(self, tmp_path: Path, capsys):
cookie_dir = (
tmp_path
/ "Library"
/ "Containers"
/ "com.apple.Safari"
/ "Data"
/ "Library"
/ "Cookies"
)
cookie_dir.mkdir(parents=True)
cookie_file = cookie_dir / "Cookies.binarycookies"
cookie_file.write_bytes(b"cook")
with patch(
"scripts.lib.safari_cookies.Path.home", return_value=tmp_path
), patch("scripts.lib.safari_cookies.sys") as mock_sys, patch.object(
Path, "read_bytes", side_effect=PermissionError
):
mock_sys.platform = "darwin"
mock_sys.stderr = sys.stderr
result = extract_safari_cookies_macos("x.com", ["auth_token"])
assert result is None
captured = capsys.readouterr()
assert "Full Disk Access" in captured.err
finally:
cookie_file.chmod(0o644)
def test_truncated_magic_only(self):
result = _parse_binary_cookies(b"cook", "x.com", ["auth_token"])