feat(spdx-utils): Validate also the characters in an SPDX ID

sschuberth · sschuberth · commit 015382f5645d · 2023-06-02T10:00:45.000+02:00
Signed-off-by: Sebastian Schuberth &lt;sschuberth@gmail.com&gt;
diff --git a/utils/spdx/src/main/kotlin/model/SpdxPackage.kt b/utils/spdx/src/main/kotlin/model/SpdxPackage.kt
@@ -192,6 +192,10 @@ data class SpdxPackage(
             "The SPDX ID '$spdxId' has to start with '${SpdxConstants.REF_PREFIX}'."
         }
 
+        require(spdxId.all { it.isLetterOrDigit() || it == '.' || it == '-' }) {
+            "The SPDX ID '$spdxId' is only allowed to contain letters, numbers, '.', and '-'."
+        }
+
         require(copyrightText.isNotBlank()) { "The copyright text must not be blank." }
 
         require(downloadLocation.isNotBlank()) { "The download location must not be blank." }

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,10 @@ data class SpdxPackage(`
`192`	`192`	`"The SPDX ID '$spdxId' has to start with '${SpdxConstants.REF_PREFIX}'."`
`193`	`193`	`}`
`194`	`194`
	`195`	`+ require(spdxId.all { it.isLetterOrDigit() \|\| it == '.' \|\| it == '-' }) {`
	`196`	`+ "The SPDX ID '$spdxId' is only allowed to contain letters, numbers, '.', and '-'."`
	`197`	`+ }`
	`198`	`+`
`195`	`199`	`require(copyrightText.isNotBlank()) { "The copyright text must not be blank." }`
`196`	`200`
`197`	`201`	`require(downloadLocation.isNotBlank()) { "The download location must not be blank." }`