Skip to content

[npm] fix to preserve all_versions metadata from the lockfile #5846

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

Merged
mctofu merged 2 commits into from
Oct 10, 2022
Merged

[npm] fix to preserve all_versions metadata from the lockfile #5846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1b52da
Test case to show we aren't preserving all_versions metadata from the
mctofu Oct 7, 2022
1d6c772
Skip extra DependencySet conversion that was dropping all_version
mctofu Oct 7, 2022
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
2 changes: 1 addition & 1 deletion npm_and_yarn/lib/dependabot/npm_and_yarn/file_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def lockfile_parser
end

def lockfile_dependencies
DependencySet.new(lockfile_parser.parse)
lockfile_parser.parse_set
end

def build_dependency(file:, type:, name:, requirement:)
Expand Down
8 changes: 6 additions & 2 deletions npm_and_yarn/lib/dependabot/npm_and_yarn/file_parser/lockfile_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@ def initialize(dependency_files:)
@dependency_files = dependency_files
end

def parse
def parse_set
dependency_set = Dependabot::NpmAndYarn::FileParser::DependencySet.new
dependency_set += yarn_lock_dependencies if yarn_locks.any?
dependency_set += package_lock_dependencies if package_locks.any?
dependency_set += shrinkwrap_dependencies if shrinkwraps.any?

Helpers.dependencies_with_all_versions_metadata(dependency_set)
dependency_set
end

def parse
Helpers.dependencies_with_all_versions_metadata(parse_set)
end

def lockfile_details(dependency_name:, requirement:, manifest_name:)
Expand Down
8 changes: 4 additions & 4 deletions npm_and_yarn/spec/dependabot/npm_and_yarn/file_parser_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,15 +1406,15 @@
let(:files) { project_dependency_files("npm8/transitive_dependency_multiple_versions") }

it "stores all versions of the dependency in its metadata" do
name = "@dependabot-fixtures/npm-transitive-dependency"
name = "kind-of"
dependency = subject.find { |dep| dep.name == name }

expect(dependency.metadata[:all_versions]).to eq([
Dependabot::Dependency.new(
name: name,
version: "1.0.1",
version: "3.2.2",
requirements: [{
requirement: "1.0.1",
requirement: "^3.2.2",
file: "package.json",
groups: ["dependencies"],
source: { type: "registry", url: "https://registry.npmjs.org" }
Expand All @@ -1423,7 +1423,7 @@
),
Dependabot::Dependency.new(
name: name,
version: "1.0.0",
version: "6.0.2",
requirements: [],
package_manager: "npm_and_yarn"
)
Expand Down
85 changes: 54 additions & 31 deletions ...arn/spec/fixtures/projects/npm8/transitive_dependency_multiple_versions/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions ...and_yarn/spec/fixtures/projects/npm8/transitive_dependency_multiple_versions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
{
"name": "transitive-dependency-multiple-versions",
"name": "vuln-multiversion",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"@dependabot-fixtures/npm-intermediate-dependency": "0.0.1",
"@dependabot-fixtures/npm-transitive-dependency": "1.0.1"
"is-accessor-descriptor": "^1.0.0",
"kind-of": "^3.2.2"
}
}
}