Skip to content

fix: eliminate TOCTOU races in catalog_fetch() #3910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Quratulain-bilal wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −6
Open

fix: eliminate TOCTOU races in catalog_fetch() #3910

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/specify_cli/bundler/services/adapters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,17 @@ def fetch(source: CatalogSource) -> dict:

if scheme == "file":
path = _file_url_to_path(parsed)
if not path.exists():
raise BundlerError(f"Catalog file not found: {path}")
return loads_json(path.read_text(encoding="utf-8"), origin=str(path))
try:
return loads_json(path.read_text(encoding="utf-8"), origin=str(path))
except FileNotFoundError:
raise BundlerError(f"Catalog file not found: {path}") from None

if scheme == "" or _is_windows_drive_path(url):
path = Path(url)
if not path.exists():
raise BundlerError(f"Catalog file not found: {path}")
return loads_json(path.read_text(encoding="utf-8"), origin=str(path))
try:
return loads_json(path.read_text(encoding="utf-8"), origin=str(path))
except FileNotFoundError:
raise BundlerError(f"Catalog file not found: {path}") from None

if scheme in ("http", "https"):
if not allow_network:
Expand Down