-
Notifications
You must be signed in to change notification settings - Fork 1.1k
fix: read exact versions from Python lockfiles for OSV #263
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
Root-Aamir
wants to merge
1
commit into
NVIDIA:main
Choose a base branch
from
Root-Aamir:fix/osv-query-with-version
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.
+206
−4
Open
Changes from all commits
Commits
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
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
113 changes: 113 additions & 0 deletions
113
tests/nodes/analyzers/test_static_patterns_supply_chain_lockfiles.py
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 |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| from skillspector.nodes.analyzers import static_patterns_supply_chain as supply_chain | ||
|
|
||
|
|
||
| def _capture_osv_packages(monkeypatch): | ||
| seen = {} | ||
|
|
||
| def fake_query_batch(packages, ecosystem): | ||
| seen["packages"] = packages | ||
| seen["ecosystem"] = ecosystem | ||
| return [[] for _ in packages] | ||
|
|
||
| monkeypatch.setattr(supply_chain, "query_batch", fake_query_batch) | ||
| return seen | ||
|
|
||
|
|
||
| def test_uv_lock_versions_are_passed_to_osv(monkeypatch): | ||
| seen = _capture_osv_packages(monkeypatch) | ||
| content = """ | ||
| version = 1 | ||
| [[package]] | ||
| name = "mlx" | ||
| version = "0.31.2" | ||
| [[package]] | ||
| name = "requests" | ||
| version = "2.31.0" | ||
| """ | ||
| supply_chain._analyze_dependencies(content, "uv.lock") | ||
| assert seen["ecosystem"] == supply_chain.ECOSYSTEM_PYPI | ||
| assert ("mlx", "0.31.2") in seen["packages"] | ||
| assert ("requests", "2.31.0") in seen["packages"] | ||
|
|
||
|
|
||
| def test_poetry_lock_versions_are_passed_to_osv(monkeypatch): | ||
| seen = _capture_osv_packages(monkeypatch) | ||
| content = """ | ||
| [[package]] | ||
| name = "jinja2" | ||
| version = "3.1.6" | ||
| description = "A fast template engine." | ||
| """ | ||
| supply_chain._analyze_dependencies(content, "poetry.lock") | ||
| assert seen["ecosystem"] == supply_chain.ECOSYSTEM_PYPI | ||
| assert ("jinja2", "3.1.6") in seen["packages"] | ||
|
|
||
|
|
||
| def test_pyproject_unpinned_dependency_uses_locked_version_for_osv(monkeypatch): | ||
| seen = _capture_osv_packages(monkeypatch) | ||
| content = """ | ||
| [project] | ||
| dependencies = [ | ||
| "mlx", | ||
| ] | ||
| """ | ||
| supply_chain._analyze_dependencies(content, "pyproject.toml", {"mlx": "0.31.2"}) | ||
| assert ("mlx", "0.31.2") in seen["packages"] | ||
|
|
||
|
|
||
| def test_requirements_unpinned_dependency_uses_locked_version_for_osv(monkeypatch): | ||
| seen = _capture_osv_packages(monkeypatch) | ||
| content = """ | ||
| fastmcp | ||
| """ | ||
| supply_chain._analyze_dependencies(content, "requirements.txt", {"fastmcp": "3.3.1"}) | ||
| assert ("fastmcp", "3.3.1") in seen["packages"] | ||
|
|
||
|
|
||
| def test_toml_lock_parser_anchors_line_numbers_to_package_blocks(): | ||
| content = """ | ||
| [[package]] | ||
| name = "root" | ||
| version = "1.0.0" | ||
| dependencies = [ | ||
| { name = "requests" }, | ||
| ] | ||
| [[package]] | ||
| name = "requests" | ||
| version = "2.31.0" | ||
| """ | ||
| packages = supply_chain._extract_packages_from_toml_lock(content) | ||
| line_by_name = {name: line_num for name, _version, line_num in packages} | ||
| assert content.splitlines()[line_by_name["requests"] - 1].strip() == 'name = "requests"' | ||
|
|
||
|
|
||
| def test_toml_lock_parser_returns_empty_for_malformed_toml(): | ||
| content = """ | ||
| [[package] | ||
| name = "broken" | ||
| """ | ||
| assert supply_chain._extract_packages_from_toml_lock(content) == [] | ||
|
|
||
|
|
||
| def test_toml_lock_parser_keeps_package_without_version(): | ||
| content = """ | ||
| [[package]] | ||
| name = "local-package" | ||
| """ | ||
| packages = supply_chain._extract_packages_from_toml_lock(content) | ||
| assert packages[0][:2] == ("local-package", None) | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Coverage is happy-path only. Consider adding cases for: malformed TOML (returns [] rather than raising), a
[[package]]entry missingversion(name passed with version=None), and thenode()-level gate so auv.lockcomponent actually reaches_analyze_dependenciesend-to-end.