fix: more lenient colon-separated field parsing (#254)

Signed-off-by: Yukihiro KAWADA <[email protected]>
spdx · Dec 27, 2024 · d09396a · d09396a
1 parent f6e45fd
commit d09396a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/spdx/v2/common/annotation.go b/spdx/v2/common/annotation.go
@@ -22,14 +22,14 @@ func (a *Annotator) UnmarshalJSON(data []byte) error {
 	annotatorStr := string(data)
 	annotatorStr = strings.Trim(annotatorStr, "\"")
 
-	annotatorFields := strings.SplitN(annotatorStr, ": ", 2)
+	annotatorFields := strings.SplitN(annotatorStr, ":", 2)
 
 	if len(annotatorFields) != 2 {
 		return fmt.Errorf("failed to parse Annotator '%s'", annotatorStr)
 	}
 
-	a.AnnotatorType = annotatorFields[0]
-	a.Annotator = annotatorFields[1]
+	a.AnnotatorType = strings.TrimSpace(annotatorFields[0])
+	a.Annotator = strings.TrimSpace(annotatorFields[1])
 
 	return nil
 }

diff --git a/spdx/v2/common/creation_info.go b/spdx/v2/common/creation_info.go
@@ -22,14 +22,14 @@ type Creator struct {
 func (c *Creator) UnmarshalJSON(data []byte) error {
 	str := string(data)
 	str = strings.Trim(str, "\"")
-	fields := strings.SplitN(str, ": ", 2)
+	fields := strings.SplitN(str, ":", 2)
 
 	if len(fields) != 2 {
 		return fmt.Errorf("failed to parse Creator '%s'", str)
 	}
 
-	c.CreatorType = fields[0]
-	c.Creator = fields[1]
+	c.CreatorType = strings.TrimSpace(fields[0])
+	c.Creator = strings.TrimSpace(fields[1])
 
 	return nil
 }

diff --git a/spdx/v2/common/package.go b/spdx/v2/common/package.go
@@ -28,14 +28,14 @@ func (s *Supplier) UnmarshalJSON(data []byte) error {
 		return nil
 	}
 
-	supplierFields := strings.SplitN(supplierStr, ": ", 2)
+	supplierFields := strings.SplitN(supplierStr, ":", 2)
 
 	if len(supplierFields) != 2 {
 		return fmt.Errorf("failed to parse Supplier '%s'", supplierStr)
 	}
 
-	s.SupplierType = supplierFields[0]
-	s.Supplier = supplierFields[1]
+	s.SupplierType = strings.TrimSpace(supplierFields[0])
+	s.Supplier = strings.TrimSpace(supplierFields[1])
 
 	return nil
 }