Merge pull request #2001 from JonathanLevi/bTCertSubjectCommonName

Set the Subject.CommonName of each TCert to 'Transaction Certificate'
hyperledger · Jun 27, 2016 · d31b656 · d31b656
2 parents 6e3d2e3 + 5cbd76d
commit d31b656
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/membersrvc/ca/tca.go b/membersrvc/ca/tca.go
@@ -360,6 +360,7 @@ func (tcap *TCAP) createCertificateSet(ctx context.Context, raw []byte, in *pb.T
 	var err error
 	var id = in.Id.Id
 	var timestamp = in.Ts.Seconds
+	const TCERT_SUBJECT_COMMON_NAME_VALUE string = "Transaction Certificate"
 
 	if in.Attributes != nil && viper.GetBool("aca.enabled") {
 		attrs, err = tcap.requestAttributes(id, raw, in.Attributes)
@@ -444,7 +445,7 @@ func (tcap *TCAP) createCertificateSet(ctx context.Context, raw []byte, in *pb.T
 			return nil, err
 		}
 
-		spec := NewDefaultPeriodCertificateSpec(id, tcertid, &txPub, x509.KeyUsageDigitalSignature, extensions...)
+		spec := NewDefaultPeriodCertificateSpecWithCommonName(id, TCERT_SUBJECT_COMMON_NAME_VALUE, tcertid, &txPub, x509.KeyUsageDigitalSignature, extensions...)
 		if raw, err = tcap.tca.createCertificateFromSpec(spec, timestamp, kdfKey, false); err != nil {
 			Error.Println(err)
 			return nil, err

diff --git a/membersrvc/ca/tca_test.go b/membersrvc/ca/tca_test.go
@@ -68,6 +68,7 @@ func TestCreateCertificateSet(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	const EXPECTED_TCERT_SUBJECT_COMMON_NAME_VALUE string = "Transaction Certificate"
 	ncerts := 1
 	for nattributes := -1; nattributes < 1; nattributes++ {
 		certificateSetRequest, err := buildCertificateSetRequest(enrollmentID, priv, ncerts, nattributes)
@@ -103,6 +104,19 @@ func TestCreateCertificateSet(t *testing.T) {
 		if len(tcerts.Certs) != ncerts {
 			t.Fatal(fmt.Errorf("Invalid tcert size. Expected: %v, Actual: %v", ncerts, len(tcerts.Certs)))
 		}
+
+		for pos, eachTCert := range tcerts.Certs {
+			tcert, err := x509.ParseCertificate(eachTCert.Cert)
+			if err != nil {
+				t.Fatalf("Error: %v\nCould not x509.ParseCertificate %v", err, eachTCert.Cert)
+			}
+
+			t.Logf("Examining TCert[%d]'s Subject: %v", pos, tcert.Subject)
+			if tcert.Subject.CommonName != EXPECTED_TCERT_SUBJECT_COMMON_NAME_VALUE {
+				t.Fatalf("The TCert's Subject.CommonName is '%s' which is different than '%s'", tcert.Subject.CommonName, EXPECTED_TCERT_SUBJECT_COMMON_NAME_VALUE)
+			}
+			t.Logf("Successfully verified that TCert[%d].Subject.CommonName == '%s'", pos, tcert.Subject.CommonName)
+		}
 	}
 }