Skip to content
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

fix(vulnerable-code): Fix search for Go package vulnerabilities #9299

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ class VulnerableCode(override val descriptor: PluginDescriptor, config: Vulnerab
override suspend fun retrievePackageFindings(packages: Set<Package>): Map<Package, AdvisorResult> {
val startTime = Instant.now()

val purls = packages.mapNotNull { pkg -> pkg.purl.ifEmpty { null } }
// VulnerableCode cannot deal with percent-encoded purls.
val purls = packages.mapNotNull { pkg ->
pkg.purl.replace("%2F", "/", ignoreCase = true).ifEmpty { null }
}

val chunks = purls.chunked(BULK_REQUEST_SIZE)

val allVulnerabilities = mutableMapOf<String, List<VulnerableCodeService.Vulnerability>>()
Expand Down Expand Up @@ -124,8 +128,9 @@ class VulnerableCode(override val descriptor: PluginDescriptor, config: Vulnerab

val endTime = Instant.now()

return packages.mapNotNullTo(mutableListOf()) { pkg ->
allVulnerabilities[pkg.purl]?.let { packageVulnerabilities ->
return packages.mapNotNull { pkg ->
val vcPurl = pkg.purl.replace("%2F", "/", ignoreCase = true)
allVulnerabilities[vcPurl]?.let { packageVulnerabilities ->
val vulnerabilities = packageVulnerabilities.map { it.toModel(issues) }
val summary = AdvisorSummary(startTime, endTime, issues)
pkg to AdvisorResult(details, summary, vulnerabilities = vulnerabilities)
Expand Down
Loading