refactor: More explicit Provenance Handling

helper-cli/src/main/kotlin/utils/Extensions.kt

@@ -169,7 +169,9 @@ internal fun OrtResult.getLicenseFindingsById(
             packageConfigurationProvider.getPackageConfigurations(id, provenance).flatMap { it.licenseFindingCurations }
         }
 
-    getScanResultsForId(id).filter { it.provenance is KnownProvenance }.map {
+    getScanResultsForId(id).filter {
+        it.provenance is RepositoryProvenance || it.provenance is ArtifactProvenance
+    }.map {
         // If a VCS path curation has been applied after the scanning stage, it is possible to apply that
         // curation without re-scanning in case the new VCS path is a subdirectory of the scanned VCS path.
         // So, filter by VCS path to enable the user to see the effect on the detected license with a shorter

model/src/main/kotlin/ScannerRun.kt

@@ -108,7 +108,7 @@ data class ScannerRun(
 
     init {
         scanResults.forEach { scanResult ->
-            require(scanResult.provenance is KnownProvenance) {
+            require(scanResult.provenance is RepositoryProvenance || scanResult.provenance is ArtifactProvenance) {
                 "Found a scan result with an unknown provenance, which is not allowed."
             }
 

model/src/main/kotlin/config/PackageConfiguration.kt

@@ -77,6 +77,7 @@
             is UnknownProvenance -> false
             is ArtifactProvenance -> sourceArtifactUrl != null && sourceArtifactUrl == provenance.sourceArtifact.url
             is RepositoryProvenance -> vcs != null && vcs.matches(provenance)
+            else -> false
         }
     }
 }

model/src/main/kotlin/licenses/LicenseInfoResolver.kt

@@ -19,26 +19,26 @@
 
 package org.ossreviewtoolkit.model.licenses
 
+import org.ossreviewtoolkit.model.ArtifactProvenance
 import java.util.concurrent.ConcurrentHashMap
 
 import org.ossreviewtoolkit.model.CopyrightFinding
 import org.ossreviewtoolkit.model.Identifier
-import org.ossreviewtoolkit.model.KnownProvenance
 import org.ossreviewtoolkit.model.LicenseSource
 import org.ossreviewtoolkit.model.Provenance
 import org.ossreviewtoolkit.model.RepositoryProvenance
 import org.ossreviewtoolkit.model.TextLocation
 import org.ossreviewtoolkit.model.UnknownProvenance
 import org.ossreviewtoolkit.model.config.CopyrightGarbage
 import org.ossreviewtoolkit.model.config.LicenseFilePatterns
 import org.ossreviewtoolkit.model.config.PathExclude
 import org.ossreviewtoolkit.model.utils.FileArchiver
 import org.ossreviewtoolkit.model.utils.FindingCurationMatcher
 import org.ossreviewtoolkit.model.utils.FindingsMatcher
 import org.ossreviewtoolkit.model.utils.PathLicenseMatcher
 import org.ossreviewtoolkit.model.utils.prependedPath
 import org.ossreviewtoolkit.utils.ort.createOrtTempDir
 import org.ossreviewtoolkit.utils.spdx.SpdxSingleLicenseExpression
 
 class LicenseInfoResolver(
     private val provider: LicenseInfoProvider,
@@ -264,7 +264,9 @@
 
             when (provenance) {
                 is UnknownProvenance -> return@forEach
-                is KnownProvenance -> if (!archiver.unarchive(archiveDir, provenance)) return@forEach
+                is RepositoryProvenance -> if (!archiver.unarchive(archiveDir, provenance)) return@forEach
+                is ArtifactProvenance -> if (!archiver.unarchive(archiveDir, provenance)) return@forEach
+                else -> return@forEach
             }
 
             val directory = (provenance as? RepositoryProvenance)?.vcsInfo?.path.orEmpty()

model/src/main/kotlin/utils/FileProvenanceFileStorage.kt

@@ -81,6 +81,7 @@
     val key = when (this) {
         is ArtifactProvenance -> "${sourceArtifact.url}${sourceArtifact.hash.value}"
         is RepositoryProvenance -> "${vcsInfo.type}${vcsInfo.url}$resolvedRevision"
+        else -> ""
     }
 
     return HashAlgorithm.SHA1.calculate(key.toByteArray())

model/src/main/kotlin/utils/PostgresProvenanceFileStorage.kt

@@ -120,4 +120,5 @@
         is ArtifactProvenance -> "source-artifact|${sourceArtifact.url}|${sourceArtifact.hash}"
         // The trailing "|" is kept for backward compatibility because there used to be an additional parameter.
         is RepositoryProvenance -> "vcs|${vcsInfo.type}|${vcsInfo.url}|$resolvedRevision|"
+        else -> ""
     }

model/src/main/kotlin/utils/PurlExtensions.kt

@@ -106,6 +106,8 @@
         }
 
         is UnknownProvenance -> PurlExtras()
+
+        else -> PurlExtras()
     }
 
 /**

plugins/reporters/static-html/src/main/kotlin/StaticHtmlReporter.kt

@@ -687,7 +687,7 @@
     }
 
 private fun EM.provenanceLink(provenance: Provenance?) {
     if (provenance is ArtifactProvenance) {
         +" (from "
         a(href = provenance.sourceArtifact.url) { +"artifact" }
         +")"
@@ -695,6 +695,8 @@
         +" (from "
         a(href = provenance.vcsInfo.url) { +"VCS" }
         +")"
+    } else {
+        +""
     }
 }
 

scanner/src/funTest/kotlin/provenance/AbstractNestedProvenanceStorageFunTest.kt

@@ -23,7 +23,6 @@ import io.kotest.core.listeners.TestListener
 import io.kotest.core.spec.style.WordSpec
 import io.kotest.matchers.shouldBe
 
-import org.ossreviewtoolkit.model.KnownProvenance
 import org.ossreviewtoolkit.model.RepositoryProvenance
 import org.ossreviewtoolkit.model.VcsInfo
 import org.ossreviewtoolkit.model.VcsType
@@ -78,6 +77,6 @@ private fun createRepositoryProvenance(
 ) = RepositoryProvenance(vcsInfo, resolvedRevision)
 
 private fun createNestedProvenance(
-    root: KnownProvenance,
+    root: RepositoryProvenance,
     subRepositories: Map<String, RepositoryProvenance> = emptyMap()
 ) = NestedProvenance(root, subRepositories)

scanner/src/main/kotlin/provenance/NestedProvenanceResolver.kt

@@ -50,6 +50,7 @@
         return when (provenance) {
             is ArtifactProvenance -> NestedProvenance(root = provenance, subRepositories = emptyMap())
             is RepositoryProvenance -> resolveNestedRepository(provenance)
+            else -> NestedProvenance(root = provenance, subRepositories = emptyMap())
         }
     }
 

scanner/src/main/kotlin/storages/ProvenanceBasedFileStorage.kt

@@ -80,7 +80,7 @@ class ProvenanceBasedFileStorage(private val backend: FileStorage) : ProvenanceB
 
         requireEmptyVcsPath(provenance)
 
-        if (provenance !is KnownProvenance) {
+        if (provenance !is RepositoryProvenance && provenance !is ArtifactProvenance) {
             throw ScanStorageException("Scan result must have a known provenance, but it is $provenance.")
         }
 

scanner/src/main/kotlin/storages/ProvenanceBasedPostgresStorage.kt

@@ -136,7 +136,7 @@ class ProvenanceBasedPostgresStorage(
 
         requireEmptyVcsPath(provenance)
 
-        if (provenance !is KnownProvenance) {
+        if (provenance !is RepositoryProvenance && provenance !is ArtifactProvenance) {
             throw ScanStorageException("Scan result must have a known provenance, but it is $provenance.")
         }
 

utils/test/src/main/kotlin/Utils.kt

@@ -152,7 +152,9 @@ fun readOrtResult(file: File) = file.mapper().readValue<OrtResult>(patchExpected
 fun scannerRunOf(vararg pkgScanResults: Pair<Identifier, List<ScanResult>>): ScannerRun {
     val pkgScanResultsWithKnownProvenance = pkgScanResults.associate { (id, scanResultsForId) ->
         id to scanResultsForId.map { scanResult ->
-            scanResult.takeIf { scanResult.provenance is KnownProvenance } ?: scanResult.copy(
+            scanResult.takeIf {
+                scanResult.provenance is RepositoryProvenance || scanResult.provenance is ArtifactProvenance
+            } ?: scanResult.copy(
                 provenance = ArtifactProvenance(
                     sourceArtifact = RemoteArtifact(
                         url = id.toPurl(),