Fix: SPDX decode error originator

json/reader_test.go

@@ -0,0 +1,30 @@
+package json
+
+import (
+	"os"
+	"testing"
+)
+
+// TestRead tests that the SPDX Reader can still parse json documents correctly
+// this protects against any of the custom unmarshalling code breaking given a new change set
+func TestRead(t *testing.T) {
+	tt := []struct {
+		filename string
+	}{
+		{"test_fixtures/spdx2_3.json"},
+	}
+
+	for _, tc := range tt {
+		t.Run(tc.filename, func(t *testing.T) {
+			file, err := os.Open(tc.filename)
+			if err != nil {
+				t.Errorf("error opening %s: %v", tc.filename, err)
+			}
+			defer file.Close()
+			_, err = Read(file)
+			if err != nil {
+				t.Errorf("error reading %s: %v", tc.filename, err)
+			}
+		})
+	}
+}

spdx/v2/common/package.go

@@ -70,15 +70,13 @@ func (o *Originator) UnmarshalJSON(data []byte) error {
 		return nil
 	}
 
-	originatorFields := strings.SplitN(originatorStr, ": ", 2)
-
+	originatorFields := strings.SplitN(originatorStr, ":", 2)
 	if len(originatorFields) != 2 {
 		return fmt.Errorf("failed to parse Originator '%s'", originatorStr)
 	}
 
 	o.OriginatorType = originatorFields[0]
-	o.Originator = originatorFields[1]
-
+	o.Originator = strings.TrimLeft(originatorFields[1], " \t")
 	return nil
 }
 

spdx/v2/common/package_test.go

@@ -0,0 +1,47 @@
+package common
+
+import "testing"
+
+func TestOriginator_UnmarshalJSON(t *testing.T) {
+	tt := []struct {
+		name    string
+		data    []byte
+		wantErr bool
+	}{
+		{
+			name:    "valid originator",
+			data:    []byte("\"Person: John Doe\""),
+			wantErr: false,
+		},
+		{
+			name:    "valid originator with no space",
+			data:    []byte("\"Person:John Doe\""),
+			wantErr: false,
+		},
+		{
+			name:    "valid originator with no space - organization",
+			data:    []byte("\"Organization:SPDX\""),
+			wantErr: false,
+		},
+		{
+			name:    "valid originator with email",
+			data:    []byte("\"Organization: ExampleCodeInspect ([email protected])\""),
+			wantErr: false,
+		},
+		{
+			name:    "invalid originator with no type",
+			data:    []byte("\"John Doe\""),
+			wantErr: true,
+		},
+	}
+
+	for _, tc := range tt {
+		t.Run(tc.name, func(t *testing.T) {
+			var o Originator
+			err := o.UnmarshalJSON(tc.data)
+			if (err != nil) != tc.wantErr {
+				t.Errorf("Originator.UnmarshalJSON() error = %v, wantErr %v", err, tc.wantErr)
+			}
+		})
+	}
+}