-
Notifications
You must be signed in to change notification settings - Fork 48
Potential fix for code scanning alert no. 141: Full server-side request forgery #8093
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.
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
grantfitzsimmons
wants to merge
4
commits into
main
Choose a base branch
from
alert-autofix-141
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+27
−1
Open
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
39c8d90
Potential fix for code scanning alert no. 141: Full server-side reque…
grantfitzsimmons ecfcf4b
fix: clarify local-source validation for default tree JSON loading
Copilot cc978b4
Add timeout to default tree JSON remote fetch
Copilot 837970e
Merge branch 'main' into alert-autofix-141
grantfitzsimmons File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,6 +36,26 @@ def _config_dir() -> Path: | |
| def _is_remote_source(source: str | Path) -> bool: | ||
| return urlparse(str(source)).scheme in ('http', 'https') | ||
|
|
||
|
|
||
| def _is_allowed_remote_mapping_url(source: str) -> bool: | ||
| parsed = urlparse(source.strip()) | ||
| if parsed.scheme != 'https' or parsed.netloc != 'files.specifysoftware.org': | ||
| return False | ||
|
|
||
| if parsed.path in KNOWN_REMOTE_DEFAULT_TREE_PATHS: | ||
| return True | ||
|
|
||
| if parsed.path.startswith('/treerows/'): | ||
| stem = Path(unquote(parsed.path)).stem.lower() | ||
|
grantfitzsimmons marked this conversation as resolved.
|
||
| match = re.fullmatch(r'col\d+_(.+)', stem) | ||
| if match is not None: | ||
| stem = match.group(1) | ||
| stem = TREE_ROW_DISCIPLINE_ALIASES.get(stem, stem) | ||
| return bool(re.fullmatch(r'[a-z0-9_]+', stem)) | ||
|
|
||
| return False | ||
|
|
||
|
|
||
| def _resolve_in_config(relative_path: Path) -> Optional[Path]: | ||
| config_dir = _config_dir() | ||
| if relative_path.is_absolute(): | ||
|
|
@@ -106,6 +126,12 @@ def load_default_tree_json(source: str) -> Any: | |
| if not _is_remote_source(source): | ||
| raise FileNotFoundError(local_path) | ||
|
|
||
| if not _is_remote_source(source): | ||
| raise ValueError('Default tree source is not allowed.') | ||
|
|
||
| if not _is_allowed_remote_mapping_url(source): | ||
| raise ValueError('Remote mapping URL is not allowed.') | ||
|
grantfitzsimmons marked this conversation as resolved.
|
||
|
|
||
| response = requests.get(source) | ||
| response.raise_for_status() | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added an explicit timeout to this request call to avoid hanging workers ( |
||
| return response.json() | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.