Skip to content

fix: maven component analysis xml wrong parsing of x.0 versions ( x >=0) #145

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
merged 2 commits into from
Jul 7, 2024
Merged

fix: maven component analysis xml wrong parsing of x.0 versions ( x >=0) #145

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
00f5b59
fix: maven component analysis xml wrong parsing of x.0 versions ( x >=0)
zvigrinberg Jul 7, 2024
b61215f
fix: broken Integration tests
zvigrinberg Jul 7, 2024
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
5 changes: 4 additions & 1 deletion src/providers/java_maven.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,10 @@ export default class Java_maven extends Base_java {
// build xml parser with options
let parser = new XMLParser({
commentPropName: '#comment', // mark comments with #comment
isArray: (_, jpath) => 'project.dependencies.dependency' === jpath // load deps as array
isArray: (_, jpath) => 'project.dependencies.dependency' === jpath,
numberParseOptions: {
skipLike: /[0-9]+[.]0/
}
})
// read manifest pom.xml file into buffer
let buf = fs.readFileSync(manifest)
Expand Down
6 changes: 3 additions & 3 deletions test/it/end-to-end.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ suite('Integration Tests', () => {
let pomPath = `test/it/test_manifests/${packageManager}/${manifestName}`
let providedDataForStack = await index.stackAnalysis(pomPath)
console.log(JSON.stringify(providedDataForStack,null , 4))
let providers = ["osv-nvd"]
let providers = ["osv"]
providers.forEach(provider => expect(extractTotalsGeneralOrFromProvider(providedDataForStack, provider)).greaterThan(0))
//TO DO - if sources doesn't exists, add "scanned" instead
// python transitive count for stack analysis is awaiting fix in exhort backend
Expand Down Expand Up @@ -104,7 +104,7 @@ suite('Integration Tests', () => {
}
finally
{
parsedStatusFromHtmlOsvNvd = reportParsedFromHtml.providers["osv-nvd"].status
parsedStatusFromHtmlOsvNvd = reportParsedFromHtml.providers["osv"].status
expect(parsedStatusFromHtmlOsvNvd.code).equals(200)
parsedScannedFromHtml = reportParsedFromHtml.scanned
expect( typeof html).equals("string")
Expand All @@ -128,7 +128,7 @@ suite('Integration Tests', () => {

expect(analysisReport.scanned.total).greaterThan(0)
expect(analysisReport.scanned.transitive).equal(0)
let providers = ["osv-nvd"]
let providers = ["osv"]
providers.forEach(provider => expect(extractTotalsGeneralOrFromProvider(analysisReport,provider)).greaterThan(0))
providers.forEach(provider => expect(analysisReport.providers[provider].status.code).equals(200))
}).timeout(20000);
Expand Down
10 changes: 5 additions & 5 deletions ...iders/tst_manifests/maven/pom_with_multiple_modules/component_analysis_expected_sbom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,10 @@
{
"group": "javax.enterprise",
"name": "cdi-api",
"version": "2",
"purl": "pkg:maven/javax.enterprise/cdi-api@2",
"version": "2.0",
"purl": "pkg:maven/javax.enterprise/cdi-api@2.0",
"type": "library",
"bom-ref": "pkg:maven/javax.enterprise/cdi-api@2"
"bom-ref": "pkg:maven/javax.enterprise/cdi-api@2.0"
},
{
"group": "commons-configuration",
Expand Down Expand Up @@ -221,7 +221,7 @@
"pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.16.0",
"pkg:maven/com.google.code.findbugs/jsr305@3.0.2",
"pkg:maven/com.github.spotbugs/spotbugs-annotations@4.8.3",
"pkg:maven/javax.enterprise/cdi-api@2",
"pkg:maven/javax.enterprise/cdi-api@2.0",
"pkg:maven/commons-configuration/commons-configuration@1.1",
"pkg:maven/com.squareup.okhttp3/okhttp@4.12.0",
"pkg:maven/org.projectlombok/lombok@1.18.30"
Expand Down Expand Up @@ -300,7 +300,7 @@
"dependsOn": []
},
{
"ref": "pkg:maven/javax.enterprise/cdi-api@2",
"ref": "pkg:maven/javax.enterprise/cdi-api@2.0",
"dependsOn": []
},
{
Expand Down