Adds distinct CA attributes for WIT, fixes test to use these

Signed-off-by: Jason Costello <jason@cofide.io>

Author: Jason Costello

bundle/witbundle/bundle_test.go

@@ -263,9 +263,8 @@ func TestEqual(t *testing.T) {
 	empty := witbundle.New(td)
 	empty2 := witbundle.New(td2)
 
-	// TODO: Use witAuthorities with WITs
-	jwtAuthorities1 := witbundle.FromWITAuthorities(td, ca1.JWTAuthorities())
-	jwtAuthorities2 := witbundle.FromWITAuthorities(td, ca2.JWTAuthorities())
+	witAuthorities1 := witbundle.FromWITAuthorities(td, ca1.WITAuthorities())
+	witAuthorities2 := witbundle.FromWITAuthorities(td, ca2.WITAuthorities())
 
 	for _, tt := range []struct {
 		name        string
@@ -287,20 +286,20 @@ func TestEqual(t *testing.T) {
 		},
 		{
 			name:        "WIT authorities equal",
-			a:           jwtAuthorities1,
-			b:           jwtAuthorities1,
+			a:           witAuthorities1,
+			b:           witAuthorities1,
 			expectEqual: true,
 		},
 		{
 			name:        "WIT authorities empty and not empty",
 			a:           empty,
-			b:           jwtAuthorities1,
+			b:           witAuthorities1,
 			expectEqual: false,
 		},
 		{
 			name:        "WIT authorities not empty but not equal",
-			a:           jwtAuthorities1,
-			b:           jwtAuthorities2,
+			a:           witAuthorities1,
+			b:           witAuthorities2,
 			expectEqual: false,
 		},
 	} {

internal/test/ca.go

@@ -36,6 +36,8 @@ type CA struct {
 	key    crypto.Signer
 	jwtKey crypto.Signer
 	jwtKid string
+	witKey crypto.Signer
+	witKid string
 }
 
 func NewCA(tb testing.TB, td spiffeid.TrustDomain) *CA {
@@ -47,6 +49,8 @@ func NewCA(tb testing.TB, td spiffeid.TrustDomain) *CA {
 		key:    key,
 		jwtKey: NewEC256Key(tb),
 		jwtKid: NewKeyID(tb),
+		witKey: NewEC256Key(tb),
+		witKid: NewKeyID(tb),
 	}
 }
 
@@ -59,6 +63,8 @@ func (ca *CA) ChildCA(options ...SVIDOption) *CA {
 		key:    key,
 		jwtKey: NewEC256Key(ca.tb),
 		jwtKid: NewKeyID(ca.tb),
+		witKey: NewEC256Key(ca.tb),
+		witKid: NewKeyID(ca.tb),
 	}
 }
 
@@ -124,6 +130,12 @@ func (ca *CA) JWTAuthorities() map[string]crypto.PublicKey {
 	}
 }
 
+func (ca *CA) WITAuthorities() map[string]crypto.PublicKey {
+	return map[string]crypto.PublicKey{
+		ca.witKid: ca.witKey.Public(),
+	}
+}
+
 func (ca *CA) Bundle() *spiffebundle.Bundle {
 	bundle := spiffebundle.New(ca.td)
 	bundle.SetX509Authorities(ca.X509Authorities())