Skip to content

🌱 validate group names in webhooks. #1144

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.

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

Closed

Conversation

guettli
Copy link

@guettli guettli commented Feb 4, 2025

This PR makes controller-gen fail, if there is an invalid group name in a kubebuilder:webhook comment.

This helps to detect typos early.

TODO: I am unsure if the regex to validate an api group name is correct.

Related: #1143

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: guettli
Once this PR has been reviewed and has the lgtm label, please assign vincepri for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 4, 2025
@k8s-ci-robot k8s-ci-robot requested a review from vincepri February 4, 2025 07:06
@k8s-ci-robot
Copy link
Contributor

Welcome @guettli!

It looks like this is your first PR to kubernetes-sigs/controller-tools 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/controller-tools has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Feb 4, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @guettli. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 4, 2025
@guettli guettli mentioned this pull request Feb 4, 2025
@@ -448,6 +449,8 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
var mutatingWebhookCfgs admissionregv1.MutatingWebhookConfiguration
var validatingWebhookCfgs admissionregv1.ValidatingWebhookConfiguration

groupRegex := regexp.MustCompile(`^[a-z][-a-z0-9.]*[a-z0-9]$`)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe worth to have some positive and negative unit tests for this to ensure we (don't) error out on the right ones.

@JoelSpeed
Copy link
Contributor

Which specific field within the mutating/validating webhook configuration does the group end up in? Have we compared this new validation with validation applied during the admission of those resources?

@guettli
Copy link
Author

guettli commented Feb 6, 2025

This manifest got created, and it seems to get applied successfully:

apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration
metadata:
  name: validating-webhook-configuration
webhooks:
- admissionReviewVersions:
  - v1
  - v1beta1
  clientConfig:
    service:
      name: webhook-service
      namespace: system
      path: /validate-foo-example-com-v1beta1-foocluster
  failurePolicy: Fail
  name: validation.foocluster.foo.example.com
  rules:
  - apiGroups:
    - foo.example.com/iiiiinvalid              # <------------------------
    apiVersions:
    - v1beta1
    operations:
    - CREATE
    - UPDATE
    resources:
    - fooclusters
  sideEffects: None

I am thinking about this again, and maybe the better fix is to disallow that in Kubernetes.

In my envTests this gets applied successfully. Fixing that in Kubernetes would help more users.

Is there a valid use-case for using an apiGroup which contains a slash?

Which regex could get used to validate an apiGroup?

@JoelSpeed
Copy link
Contributor

JoelSpeed commented Feb 6, 2025

So there isn't any validation in the admission of a VWC that checks for the pattern to match.

But for a CRD, the group is validated to be a DNS1123Subdomain, so perhaps we can leverage that validation, combined with validation for the built-in groups?

Maybe also worth checking with sig-apimachinery if they have any thoughts

@guettli
Copy link
Author

guettli commented Feb 6, 2025

I asked in #api-machinery ...

Copy link
Member

@alvaroaleman alvaroaleman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As christian already pointed out this needs tests

@@ -493,6 +496,14 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
if err != nil {
return err
}
for _, group := range cfg.Groups {
if group == "" { // aka "core"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why would we continue? There must be a groupname

if group == "" { // aka "core"
continue
}
if !groupRegex.MatchString(group) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This error will be very frustrating for anyone that runs into it - Please include the string of the regex used for validation

@guettli
Copy link
Author

guettli commented Feb 9, 2025

Thank you for your feedback. I think Make ValidatingWebhookConfiguration validate rule.APIGroups makes more sense.

Validating in controller-tools has the benefit that it fails earlier, but validating at the api server has the benefit that it fails for all ValidatingWebhookConfigurations (created via controller-gen or by hand).

I am closing my PR. Feel free to re-open if you want to continue.

@guettli guettli closed this Feb 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants