Skip to content

Commit a1652ea

Browse files
lamppusschuberth
authored andcommitted
fix(dos): Edit downloading the source to be scanned
Use recursive downloading to ensure the whole source will be scanned. Signed-off-by: Johanna Lamppu <[email protected]>
1 parent 49c654a commit a1652ea

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

plugins/scanners/dos/src/main/kotlin/DosScanner.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class DosScanner internal constructor(
9696
val issues = mutableListOf<Issue>()
9797

9898
val scanResults = runBlocking {
99-
val provenance = nestedProvenance?.root ?: run {
99+
nestedProvenance?.root ?: run {
100100
logger.warn {
101101
val cleanPurls = context.coveredPackages.joinToString { it.purl }
102102
"Skipping scan as no provenance information is available for these packages: $cleanPurls"
@@ -105,7 +105,9 @@ class DosScanner internal constructor(
105105
return@runBlocking null
106106
}
107107

108-
val packages = context.coveredPackages.getDosPackages(provenance)
108+
val packages = nestedProvenance.allProvenances.flatMap {
109+
context.coveredPackages.getDosPackages(it)
110+
}
109111

110112
logger.info { "Packages requested for scanning: ${packages.joinToString { it.purl }}" }
111113

@@ -123,7 +125,7 @@ class DosScanner internal constructor(
123125
val downloader = DefaultProvenanceDownloader(DownloaderConfiguration(), DefaultWorkingTreeCache())
124126

125127
runCatching {
126-
downloader.download(provenance)
128+
downloader.downloadRecursively(nestedProvenance)
127129
}.mapCatching { sourceDir ->
128130
runBackendScan(packages, sourceDir, startTime, issues)
129131
}.onFailure {

0 commit comments

Comments
 (0)