Skip to content
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

Jump to bottom

Refactor entire policy validation into ValidatePolicy. #81

Merged
merged 1 commit into from
Jul 14, 2022
Merged

Refactor entire policy validation into ValidatePolicy. #81

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
34 changes: 14 additions & 20 deletions pkg/webhook/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,26 +267,6 @@ func validatePolicies(ctx context.Context, namespace string, ref name.Reference,
result := retChannelType{name: cipName}

result.policyResult, result.errors = ValidatePolicy(ctx, namespace, ref, cip, remoteOpts...)
// If there are authorities that validated in the CIP and there's
// a CIP level policy, apply it against the results of the
// successful Authorities outputs.
if result.policyResult != nil && cip.Policy != nil {
logging.FromContext(ctx).Infof("Validating CIP level policy for %s", cipName)
policyJSON, err := json.Marshal(result.policyResult)
if err != nil {
// nil out any policyResults since CIP level policy failed
result.policyResult = nil
result.errors = append(result.errors, err)
} else {
err = policy.EvaluatePolicyAgainstJSON(ctx, "ClusterImagePolicy", cip.Policy.Type, cip.Policy.Data, policyJSON)
if err != nil {
logging.FromContext(ctx).Warnf("Failed to validate CIP level policy against %s", string(policyJSON))
// nil out any policyResults since CIP level policy failed
result.policyResult = nil
result.errors = append(result.errors, err)
}
}
}
results <- result
}()
}
Expand Down Expand Up @@ -422,6 +402,20 @@ func ValidatePolicy(ctx context.Context, namespace string, ref name.Reference, c
if len(policyResult.AuthorityMatches) == 0 {
return nil, authorityErrors
}
// Ok, there's at least one valid authority that matched. If there's a CIP
// level policy, validate it here before returning.
if cip.Policy != nil {
logging.FromContext(ctx).Info("Validating CIP level policy")
policyJSON, err := json.Marshal(policyResult)
if err != nil {
return nil, append(authorityErrors, err)
}
err = policy.EvaluatePolicyAgainstJSON(ctx, "ClusterImagePolicy", cip.Policy.Type, cip.Policy.Data, policyJSON)
if err != nil {
logging.FromContext(ctx).Warnf("Failed to validate CIP level policy against %s", string(policyJSON))
return nil, append(authorityErrors, err)
}
}
return policyResult, authorityErrors
}

Expand Down