Skip to content

fix: pass allowed hostnames during group verification #2336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
migmartri merged 1 commit into from
Aug 11, 2025
Merged

fix: pass allowed hostnames during group verification #2336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/attestation/crafter/crafter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ func (c *Crafter) addMaterial(ctx context.Context, m *schemaapi.CraftingSchema_M
})

// Validate policy groups
pgv := policies.NewPolicyGroupVerifier(c.CraftingState.InputSchema, c.attClient, c.Logger)
pgv := policies.NewPolicyGroupVerifier(c.CraftingState.InputSchema, c.attClient, c.Logger, policies.WithAllowedHostnames(c.CraftingState.Attestation.PoliciesAllowedHostnames...))
policyGroupResults, err := pgv.VerifyMaterial(ctx, mt, value)
if err != nil {
return nil, fmt.Errorf("error applying policy groups to material: %w", err)
Expand Down Expand Up @@ -657,13 +657,13 @@ func (c *Crafter) addMaterial(ctx context.Context, m *schemaapi.CraftingSchema_M
// EvaluateAttestationPolicies evaluates the attestation-level policies and stores them in the attestation state
func (c *Crafter) EvaluateAttestationPolicies(ctx context.Context, attestationID string, statement *intoto.Statement) error {
// evaluate attestation-level policies
pv := policies.NewPolicyVerifier(c.CraftingState.InputSchema, c.attClient, c.Logger)
pv := policies.NewPolicyVerifier(c.CraftingState.InputSchema, c.attClient, c.Logger, policies.WithAllowedHostnames(c.CraftingState.Attestation.PoliciesAllowedHostnames...))
policyEvaluations, err := pv.VerifyStatement(ctx, statement)
if err != nil {
return fmt.Errorf("evaluating policies in statement: %w", err)
}

pgv := policies.NewPolicyGroupVerifier(c.CraftingState.InputSchema, c.attClient, c.Logger)
pgv := policies.NewPolicyGroupVerifier(c.CraftingState.InputSchema, c.attClient, c.Logger, policies.WithAllowedHostnames(c.CraftingState.Attestation.PoliciesAllowedHostnames...))
policyGroupResults, err := pgv.VerifyStatement(ctx, statement)
if err != nil {
return fmt.Errorf("evaluating policy groups in statement: %w", err)
Expand Down
4 changes: 2 additions & 2 deletions pkg/policies/policy_groups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ type PolicyGroupVerifier struct {

var _ Verifier = (*PolicyGroupVerifier)(nil)

func NewPolicyGroupVerifier(schema *v1.CraftingSchema, client v13.AttestationServiceClient, logger *zerolog.Logger) *PolicyGroupVerifier {
func NewPolicyGroupVerifier(schema *v1.CraftingSchema, client v13.AttestationServiceClient, logger *zerolog.Logger, opts ...PolicyVerifierOption) *PolicyGroupVerifier {
return &PolicyGroupVerifier{schema: schema, client: client, logger: logger,
PolicyVerifier: NewPolicyVerifier(schema, client, logger)}
PolicyVerifier: NewPolicyVerifier(schema, client, logger, opts...)}
}

// VerifyMaterial evaluates a material against groups of policies defined in the schema
Expand Down
Loading