-
Notifications
You must be signed in to change notification settings - Fork 314
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
BlackDuck advisor PoC #9627
Draft
fviernau
wants to merge
5
commits into
main
Choose a base branch
from
black-duck-advisor-poc
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.
+689
−6
Draft
BlackDuck advisor PoC #9627
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
903bcbd
GRADLE: DROP THE -WEERROR COMPLIE OPTION
fviernau a243bbd
feat(advisor): Add BlackDuck as advisor
fviernau 6075439
feat(model): Add the attribute `blackDuckOrigin`
fviernau f2c994f
feat(model): Allow setting `blackDuckOrigin` via package curations
fviernau 57f5acc
WIP! feat(black-duck): Allow overriding querying by purl
fviernau 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 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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,57 @@ | ||
/* | ||
* Copyright (C) 2017 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>) | ||
* | ||
* 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 | ||
* | ||
* https://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. | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* License-Filename: LICENSE | ||
*/ | ||
|
||
package org.ossreviewtoolkit.model | ||
|
||
import com.fasterxml.jackson.annotation.JsonCreator | ||
import com.fasterxml.jackson.annotation.JsonValue | ||
|
||
/** | ||
* A reference to a BlackDuck Origin, see also | ||
* https://community.blackduck.com/s/article/What-is-an-Origin-and-Origin-ID-in-Blackduck. | ||
* Note: While the term Origin is still current, the properties `originId` and `originType` haven been deprecated in | ||
* favor of `externalNamespace` and `externalId`. | ||
*/ | ||
data class BlackDuckOriginReference( | ||
/** | ||
* The namespace such as 'maven', 'pypi' or 'github'. | ||
*/ | ||
val externalNamespace: String, | ||
|
||
/** | ||
* The component's identifier within the external namespace. | ||
*/ | ||
val externalId: String | ||
) { | ||
@JsonValue | ||
fun toCoordinates() = listOf(externalNamespace, externalId).joinToString(":") | ||
|
||
companion object { | ||
@JsonCreator | ||
fun parse(coordinates: String): BlackDuckOriginReference { | ||
val index = coordinates.indexOf(':') | ||
require(index != -1) | ||
|
||
return BlackDuckOriginReference( | ||
externalNamespace = coordinates.substring(0, index), | ||
externalId = coordinates.substring(index + 1, coordinates.length) | ||
) | ||
} | ||
} | ||
} |
This file contains 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
This file contains 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
This file contains 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,56 @@ | ||
/* | ||
* Copyright (C) 2020 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>) | ||
* | ||
* 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 | ||
* | ||
* https://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. | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* License-Filename: LICENSE | ||
*/ | ||
|
||
plugins { | ||
// Apply precompiled plugins. | ||
id("ort-plugin-conventions") | ||
|
||
// Apply third-party plugins. | ||
alias(libs.plugins.kotlinSerialization) | ||
} | ||
|
||
repositories { | ||
mavenCentral() | ||
maven { | ||
// com.blackducksoftware.bdio:bdio2 | ||
url = uri("https://sig-repo.synopsys.com/bds-bdio-release") | ||
} | ||
|
||
maven { // com.blackducksoftware.magpie:magpie | ||
url = uri("https://repo.blackduck.com/bds-integrations-release") | ||
} | ||
} | ||
|
||
dependencies { | ||
api(projects.advisor) | ||
api(projects.model) | ||
|
||
implementation(projects.utils.ortUtils) | ||
|
||
implementation(libs.blackduck.common) | ||
implementation(libs.blackduck.common.api) | ||
implementation(libs.bundles.ks3) | ||
implementation(libs.kotlinx.serialization.core) | ||
implementation(libs.kotlinx.serialization.json) | ||
|
||
implementation(projects.utils.commonUtils) | ||
implementation(projects.utils.ortUtils) | ||
|
||
ksp(projects.advisor) | ||
} |
29 changes: 29 additions & 0 deletions
29
plugins/advisors/black-duck/src/funTest/assets/retrieve-package-findings-expected-result.yml
This file contains 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,29 @@ | ||
--- | ||
Crate::sys-info:0.7.0: | ||
advisor: | ||
name: "BlackDuck" | ||
capabilities: | ||
- "VULNERABILITIES" | ||
summary: | ||
start_time: "1970-01-01T00:00:00Z" | ||
end_time: "1970-01-01T00:00:00Z" | ||
vulnerabilities: | ||
- id: "CVE-2020-36434" | ||
description: "An issue was discovered in the sys-info crate before 0.8.0 for Rust.\ | ||
\ sys_info::disk_info calls can trigger a double free." | ||
references: | ||
- url: "https://zeiss.app.blackduck.com/api/vulnerabilities/CVE-2020-36434" | ||
scoring_system: "CVSS:3.1" | ||
severity: "CRITICAL" | ||
score: 9.8 | ||
vector: "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H" | ||
- url: "https://zeiss.app.blackduck.com/api/cwes/CWE-415" | ||
scoring_system: "CVSS:3.1" | ||
severity: "CRITICAL" | ||
score: 9.8 | ||
vector: "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H" | ||
- url: "https://zeiss.app.blackduck.com/api/vulnerabilities/BDSA-2020-4804" | ||
scoring_system: "CVSS:3.1" | ||
severity: "CRITICAL" | ||
score: 9.8 | ||
vector: "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H" |
136 changes: 136 additions & 0 deletions
136
plugins/advisors/black-duck/src/funTest/kotlin/BlackDuckFunTest.kt
This file contains 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,136 @@ | ||
/* | ||
* Copyright (C) 2024 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>) | ||
* | ||
* 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 | ||
* | ||
* https://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. | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* License-Filename: LICENSE | ||
*/ | ||
|
||
package org.ossreviewtoolkit.plugins.advisors.blackduck | ||
|
||
import io.kotest.core.spec.style.WordSpec | ||
import io.kotest.inspectors.forAll | ||
import io.kotest.matchers.collections.beEmpty | ||
import io.kotest.matchers.collections.shouldContain | ||
import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder | ||
import io.kotest.matchers.collections.shouldNotContain | ||
import io.kotest.matchers.should | ||
import io.kotest.matchers.shouldBe | ||
import io.kotest.matchers.shouldNot | ||
|
||
import java.time.Instant | ||
|
||
import org.ossreviewtoolkit.advisor.normalizeVulnerabilityData | ||
import org.ossreviewtoolkit.model.AdvisorResult | ||
import org.ossreviewtoolkit.model.BlackDuckOriginReference | ||
import org.ossreviewtoolkit.model.Identifier | ||
import org.ossreviewtoolkit.model.readValue | ||
import org.ossreviewtoolkit.utils.test.getAssetFile | ||
import org.ossreviewtoolkit.utils.test.identifierToPackage | ||
|
||
class BlackDuckFunTest : WordSpec({ | ||
"retrievePackageFindings()" should { | ||
"return the vulnerabilities for the supported ecosystems" { | ||
val blackDuck = createBlackDuck() | ||
val packages = setOf( | ||
// TODO: Add hackage / pod | ||
"Crate::sys-info:0.7.0", | ||
"Gem::rack:2.0.4", | ||
"Maven:com.jfinal:jfinal:1.4", | ||
"NPM::rebber:1.0.0", | ||
"NuGet::Bunkum:4.0.0", | ||
"Pub::http:0.13.1", | ||
"PyPI::django:3.2" | ||
).mapTo(mutableSetOf()) { | ||
identifierToPackage(it) | ||
} | ||
|
||
val packageFindings = blackDuck.retrievePackageFindings(packages).mapKeys { it.key.id.toCoordinates() } | ||
|
||
packageFindings.keys shouldContainExactlyInAnyOrder packages.map { it.id.toCoordinates() } | ||
packageFindings.keys.forAll { id -> | ||
packageFindings.getValue(id).vulnerabilities shouldNot beEmpty() | ||
} | ||
} | ||
|
||
"return the expected result for the given package(s)" { | ||
val expectedResult = getAssetFile("retrieve-package-findings-expected-result.yml") | ||
.readValue<Map<Identifier, AdvisorResult>>() | ||
val blackDuck = createBlackDuck() | ||
val packages = setOf( | ||
// Package using CVSS 3.1 vector: | ||
"Crate::sys-info:0.7.0" | ||
// Todo: Add a package using CVSS 2 vector: | ||
).mapTo(mutableSetOf()) { | ||
identifierToPackage(it) | ||
} | ||
|
||
val packageFindings = blackDuck.retrievePackageFindings(packages).mapKeys { it.key.id } | ||
|
||
packageFindings.patchTimes() shouldBe expectedResult.patchTimes() | ||
} | ||
|
||
"return the vulnerabilities for the BlackDuck origin if specified, instead of for the purl" { | ||
val blackDuck = createBlackDuck() | ||
val pkg = identifierToPackage("Crate::sys-info:0.7.0").copy( | ||
blackDuckOrigin = BlackDuckOriginReference( | ||
externalNamespace = "gitlab", | ||
externalId = "libtiff/libtiff:v4.5.0" | ||
) | ||
) | ||
|
||
val advisorResult = blackDuck.retrievePackageFindings(setOf(pkg)).getValue(pkg) | ||
|
||
with(advisorResult.vulnerabilities.map { it.id }) { | ||
// Vulnerability in libtiff: | ||
this shouldContain "CVE-2024-7006" | ||
// Vulnerability in sysinfo, see also 'retrieve-package-findings-expected-result.yml'. | ||
this shouldNotContain "CVE-2020-36434" | ||
} | ||
} | ||
|
||
"return no vulnerabilities if the reference refers to a component, but not to a specific origin" { | ||
val blackDuck = createBlackDuck() | ||
val pkg = identifierToPackage("PyPI::django:3.2").copy( | ||
blackDuckOrigin = BlackDuckOriginReference( | ||
externalNamespace = "gitlab", | ||
externalId = "libtiff/libtiff" | ||
) | ||
) | ||
|
||
val advisorResult = blackDuck.retrievePackageFindings(setOf(pkg)).getValue(pkg) | ||
|
||
with(advisorResult) { | ||
vulnerabilities should beEmpty() | ||
// TODO: Report an issue | ||
} | ||
} | ||
} | ||
}) | ||
|
||
private fun createBlackDuck(): BlackDuck = | ||
BlackDuckFactory.create( | ||
serverUrl = System.getenv("BLACK_DUCK_SERVER_URL"), | ||
apiToken = System.getenv("BLACK_DUCK_API_TOKEN") | ||
) | ||
|
||
private fun Map<Identifier, AdvisorResult>.patchTimes(): Map<Identifier, AdvisorResult> = | ||
mapValues { (_, advisorResult) -> | ||
advisorResult.normalizeVulnerabilityData().copy( | ||
summary = advisorResult.summary.copy( | ||
startTime = Instant.EPOCH, | ||
endTime = Instant.EPOCH | ||
) | ||
) | ||
} |
Oops, something went wrong.
Oops, something went wrong.
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.
Check warning
Code scanning / QDJVMC
Unused symbol Warning