adding the ability to define more than one predicate type per attestor

Signed-off-by: chaosinthecrd <[email protected]>
in-toto · Jun 24, 2024 · 37300d0 · 37300d0
1 parent 21299c3
commit 37300d0
Show file tree

Hide file tree

Showing 30 changed files with 161 additions and 136 deletions.
diff --git a/attestation/aws-iid/aws-iid.go b/attestation/aws-iid/aws-iid.go
@@ -69,12 +69,13 @@ C1haGgSI/A1uZUKs/Zfnph0oEI0/hu1IIJ/SKBDtN5lvmZ/IzbOPIJWirlsllQIQ
 // This is a hacky way to create a compile time error in case the attestor
 // doesn't implement the expected interfaces.
 var (
-	_ attestation.Attestor  = &Attestor{}
-	_ attestation.Subjecter = &Attestor{}
+	_     attestation.Attestor  = &Attestor{}
+	_     attestation.Subjecter = &Attestor{}
+	types                       = attestation.TypeSet{Type}
 )
 
 func init() {
-	attestation.RegisterAttestation(Name, Type, RunType, func() attestation.Attestor {
+	attestation.RegisterAttestation(Name, types, RunType, func() attestation.Attestor {
 		return New()
 	})
 }
@@ -106,8 +107,8 @@ func (a *Attestor) Name() string {
 	return Name
 }
 
-func (a *Attestor) Type() string {
-	return Type
+func (a *Attestor) Type() attestation.TypeSet {
+	return attestation.TypeSet{Type}
 }
 
 func (a *Attestor) RunType() attestation.RunType {

diff --git a/attestation/collection.go b/attestation/collection.go
@@ -42,8 +42,8 @@ func NewCollection(name string, attestors []CompletedAttestor) Collection {
 		Attestations: make([]CollectionAttestation, 0),
 	}
 
-	//move start/stop time to collection
-	//todo: this is a bit of a hack, but it's the easiest way to get the start/stop time
+	// move start/stop time to collection
+	// todo: this is a bit of a hack, but it's the easiest way to get the start/stop time
 
 	for _, completed := range attestors {
 		collection.Attestations = append(collection.Attestations, NewCollectionAttestation(completed))
@@ -54,7 +54,7 @@ func NewCollection(name string, attestors []CompletedAttestor) Collection {
 
 func NewCollectionAttestation(completed CompletedAttestor) CollectionAttestation {
 	return CollectionAttestation{
-		Type:        completed.Attestor.Type(),
+		Type:        completed.Attestor.Type().First(),
 		Attestation: completed.Attestor,
 		StartTime:   completed.StartTime,
 		EndTime:     completed.EndTime,

diff --git a/attestation/commandrun/commandrun.go b/attestation/commandrun/commandrun.go
@@ -35,21 +35,22 @@ const (
 // This is a hacky way to create a compile time error in case the attestor
 // doesn't implement the expected interfaces.
 var (
-	_ attestation.Attestor = &CommandRun{}
-	_ CommandRunAttestor   = &CommandRun{}
+	_     attestation.Attestor = &CommandRun{}
+	_     CommandRunAttestor   = &CommandRun{}
+	types                      = attestation.TypeSet{Type}
 )
 
 type CommandRunAttestor interface {
 	// Attestor
 	Name() string
-	Type() string
+	Type() attestation.TypeSet
 	RunType() attestation.RunType
 	Attest(ctx *attestation.AttestationContext) error
 	Data() *CommandRun
 }
 
 func init() {
-	attestation.RegisterAttestation(Name, Type, RunType, func() attestation.Attestor {
+	attestation.RegisterAttestation(Name, types, RunType, func() attestation.Attestor {
 		return New()
 	})
 }
@@ -152,8 +153,8 @@ func (rc *CommandRun) Name() string {
 	return Name
 }
 
-func (rc *CommandRun) Type() string {
-	return Type
+func (rc *CommandRun) Type() attestation.TypeSet {
+	return types
 }
 
 func (rc *CommandRun) RunType() attestation.RunType {

diff --git a/attestation/environment/environment.go b/attestation/environment/environment.go
@@ -33,21 +33,22 @@ const (
 // This is a hacky way to create a compile time error in case the attestor
 // doesn't implement the expected interfaces.
 var (
-	_ attestation.Attestor = &Attestor{}
-	_ EnvironmentAttestor  = &Attestor{}
+	_     attestation.Attestor = &Attestor{}
+	_     EnvironmentAttestor  = &Attestor{}
+	types                      = attestation.TypeSet{Type}
 )
 
 type EnvironmentAttestor interface {
 	// Attestor
 	Name() string
-	Type() string
+	Type() attestation.TypeSet
 	RunType() attestation.RunType
 	Attest(ctx *attestation.AttestationContext) error
 	Data() *Attestor
 }
 
 func init() {
-	attestation.RegisterAttestation(Name, Type, RunType, func() attestation.Attestor {
+	attestation.RegisterAttestation(Name, types, RunType, func() attestation.Attestor {
 		return New()
 	})
 }
@@ -85,8 +86,8 @@ func (a *Attestor) Name() string {
 	return Name
 }
 
-func (a *Attestor) Type() string {
-	return Type
+func (a *Attestor) Type() attestation.TypeSet {
+	return types
 }
 
 func (a *Attestor) RunType() attestation.RunType {

diff --git a/attestation/factory.go b/attestation/factory.go
@@ -30,12 +30,31 @@ var (
 
 type Attestor interface {
 	Name() string
-	Type() string
+	Type() TypeSet
 	RunType() RunType
 	Attest(ctx *AttestationContext) error
 	Schema() *jsonschema.Schema
 }
 
+type TypeSet []string
+
+func (s TypeSet) First() string {
+	if len(s) == 0 {
+		return ""
+	} else {
+		return s[0]
+	}
+}
+
+func (s TypeSet) Contains(t string) bool {
+	for _, v := range s {
+		if v == t {
+			return true
+		}
+	}
+	return false
+}
+
 // Subjecter allows attestors to expose bits of information that will be added to
 // the in-toto statement as subjects. External services such as Rekor and Archivista
 // use in-toto subjects as indexes back to attestations.
@@ -84,9 +103,11 @@ func (e ErrAttestorNotFound) Error() string {
 	return fmt.Sprintf("attestor not found: %v", string(e))
 }
 
-func RegisterAttestation(name, predicateType string, run RunType, factoryFunc registry.FactoryFunc[Attestor], opts ...registry.Configurer) {
+func RegisterAttestation(name string, predicateType TypeSet, run RunType, factoryFunc registry.FactoryFunc[Attestor], opts ...registry.Configurer) {
 	registrationEntry := attestorRegistry.Register(name, factoryFunc, opts...)
-	attestationsByType[predicateType] = registrationEntry
+	for _, t := range predicateType {
+		attestationsByType[t] = registrationEntry
+	}
 	attestationsByRun[run] = registrationEntry
 }
 

diff --git a/attestation/gcp-iit/gcp-iit.go b/attestation/gcp-iit/gcp-iit.go
@@ -50,12 +50,13 @@ const (
 // This is a hacky way to create a compile time error in case the attestor
 // doesn't implement the expected interfaces.
 var (
-	_ attestation.Attestor  = &Attestor{}
-	_ attestation.Subjecter = &Attestor{}
+	_     attestation.Attestor  = &Attestor{}
+	_     attestation.Subjecter = &Attestor{}
+	types                       = attestation.TypeSet{Type}
 )
 
 func init() {
-	attestation.RegisterAttestation(Name, Type, RunType, func() attestation.Attestor {
+	attestation.RegisterAttestation(Name, types, RunType, func() attestation.Attestor {
 		return New()
 	})
 }
@@ -91,8 +92,8 @@ func (a *Attestor) Name() string {
 	return Name
 }
 
-func (a *Attestor) Type() string {
-	return Type
+func (a *Attestor) Type() attestation.TypeSet {
+	return types
 }
 
 func (a *Attestor) RunType() attestation.RunType {

diff --git a/attestation/git/git.go b/attestation/git/git.go
@@ -37,16 +37,17 @@ const (
 // This is a hacky way to create a compile time error in case the attestor
 // doesn't implement the expected interfaces.
 var (
-	_ attestation.Attestor   = &Attestor{}
-	_ attestation.Subjecter  = &Attestor{}
-	_ attestation.BackReffer = &Attestor{}
-	_ GitAttestor            = &Attestor{}
+	_     attestation.Attestor   = &Attestor{}
+	_     attestation.Subjecter  = &Attestor{}
+	_     attestation.BackReffer = &Attestor{}
+	_     GitAttestor            = &Attestor{}
+	types                        = attestation.TypeSet{Type}
 )
 
 type GitAttestor interface {
 	// Attestor
 	Name() string
-	Type() string
+	Type() attestation.TypeSet
 	RunType() attestation.RunType
 	Attest(ctx *attestation.AttestationContext) error
 	Data() *Attestor
@@ -59,7 +60,7 @@ type GitAttestor interface {
 }
 
 func init() {
-	attestation.RegisterAttestation(Name, Type, RunType, func() attestation.Attestor {
+	attestation.RegisterAttestation(Name, types, RunType, func() attestation.Attestor {
 		return New()
 	})
 }
@@ -107,8 +108,8 @@ func (a *Attestor) Name() string {
 	return Name
 }
 
-func (a *Attestor) Type() string {
-	return Type
+func (a *Attestor) Type() attestation.TypeSet {
+	return types
 }
 
 func (a *Attestor) RunType() attestation.RunType {

diff --git a/attestation/github/github.go b/attestation/github/github.go
@@ -46,16 +46,17 @@ const (
 // This is a hacky way to create a compile time error in case the attestor
 // doesn't implement the expected interfaces.
 var (
-	_ attestation.Attestor   = &Attestor{}
-	_ attestation.Subjecter  = &Attestor{}
-	_ attestation.BackReffer = &Attestor{}
-	_ GitHubAttestor         = &Attestor{}
+	_     attestation.Attestor   = &Attestor{}
+	_     attestation.Subjecter  = &Attestor{}
+	_     attestation.BackReffer = &Attestor{}
+	_     GitHubAttestor         = &Attestor{}
+	types                        = attestation.TypeSet{Type}
 )
 
 type GitHubAttestor interface {
 	// Attestor
 	Name() string
-	Type() string
+	Type() attestation.TypeSet
 	RunType() attestation.RunType
 	Attest(ctx *attestation.AttestationContext) error
 	Data() *Attestor
@@ -69,7 +70,7 @@ type GitHubAttestor interface {
 
 // init registers the github attestor.
 func init() {
-	attestation.RegisterAttestation(Name, Type, RunType, func() attestation.Attestor {
+	attestation.RegisterAttestation(Name, types, RunType, func() attestation.Attestor {
 		return New()
 	})
 }
@@ -116,8 +117,8 @@ func (a *Attestor) Name() string {
 }
 
 // Type returns the type of the attestor.
-func (a *Attestor) Type() string {
-	return Type
+func (a *Attestor) Type() attestation.TypeSet {
+	return types
 }
 
 // RunType returns the run type of the attestor.

diff --git a/attestation/gitlab/gitlab.go b/attestation/gitlab/gitlab.go
@@ -36,16 +36,17 @@ const (
 // This is a hacky way to create a compile time error in case the attestor
 // doesn't implement the expected interfaces.
 var (
-	_ attestation.Attestor   = &Attestor{}
-	_ attestation.Subjecter  = &Attestor{}
-	_ attestation.BackReffer = &Attestor{}
-	_ GitLabAttestor         = &Attestor{}
+	_     attestation.Attestor   = &Attestor{}
+	_     attestation.Subjecter  = &Attestor{}
+	_     attestation.BackReffer = &Attestor{}
+	_     GitLabAttestor         = &Attestor{}
+	types                        = attestation.TypeSet{Type}
 )
 
 type GitLabAttestor interface {
 	// Attestor
 	Name() string
-	Type() string
+	Type() attestation.TypeSet
 	RunType() attestation.RunType
 	Attest(ctx *attestation.AttestationContext) error
 	Data() *Attestor
@@ -58,7 +59,7 @@ type GitLabAttestor interface {
 }
 
 func init() {
-	attestation.RegisterAttestation(Name, Type, RunType, func() attestation.Attestor {
+	attestation.RegisterAttestation(Name, types, RunType, func() attestation.Attestor {
 		return New()
 	})
 }
@@ -94,8 +95,8 @@ func (a *Attestor) Name() string {
 	return Name
 }
 
-func (a *Attestor) Type() string {
-	return Type
+func (a *Attestor) Type() attestation.TypeSet {
+	return types
 }
 
 func (a *Attestor) RunType() attestation.RunType {

diff --git a/attestation/jwt/jwt.go b/attestation/jwt/jwt.go
@@ -34,11 +34,12 @@ const (
 // This is a hacky way to create a compile time error in case the attestor
 // doesn't implement the expected interfaces.
 var (
-	_ attestation.Attestor = &Attestor{}
+	_     attestation.Attestor = &Attestor{}
+	types                      = attestation.TypeSet{Type}
 )
 
 func init() {
-	attestation.RegisterAttestation(Name, Type, RunType, func() attestation.Attestor {
+	attestation.RegisterAttestation(Name, types, RunType, func() attestation.Attestor {
 		return New()
 	})
 }
@@ -142,8 +143,8 @@ func (a *Attestor) Name() string {
 	return Name
 }
 
-func (a *Attestor) Type() string {
-	return Type
+func (a *Attestor) Type() attestation.TypeSet {
+	return types
 }
 
 func (a *Attestor) RunType() attestation.RunType {

diff --git a/attestation/link/link.go b/attestation/link/link.go
@@ -42,12 +42,13 @@ const (
 // This is a hacky way to create a compile time error in case the attestor
 // doesn't implement the expected interfaces.
 var (
-	_ attestation.Attestor  = &Link{}
-	_ attestation.Subjecter = &Link{}
+	_     attestation.Attestor  = &Link{}
+	_     attestation.Subjecter = &Link{}
+	types                       = attestation.TypeSet{Type}
 )
 
 func init() {
-	attestation.RegisterAttestation(Name, Type, RunType,
+	attestation.RegisterAttestation(Name, types, RunType,
 		func() attestation.Attestor { return New() },
 		registry.BoolConfigOption(
 			"export",
@@ -87,8 +88,8 @@ func (l *Link) Name() string {
 	return Name
 }
 
-func (l *Link) Type() string {
-	return Type
+func (l *Link) Type() attestation.TypeSet {
+	return types
 }
 
 func (l *Link) RunType() attestation.RunType {