ingress-nginx icon indicating copy to clipboard operation
ingress-nginx copied to clipboard

Use PCRE on proxy redirect property

Open leonardoramosantos opened this issue 7 months ago • 13 comments

NGINX accepts PCRE patterns on the proxy_redirect property. This PR introduces URLWithNginxVariableRegex, a validation to make sure that both proxy-redirect-from and proxy-redirect-to annotations accept this pattern. Added e2e tests to cover it.

What this PR does / why we need it:

This PR covers at least these two open issues: 12917 10698

Types of changes

  • [x] Bug fix (non-breaking change which fixes an issue)
  • [ ] New feature (non-breaking change which adds functionality)
  • [ ] CVE Report (Scanner found CVE and adding report)
  • [ ] Breaking change (fix or feature that would cause existing functionality to change)
  • [ ] Documentation only

Which issue/s this PR fixes

Fixes #12917 Fixes #10698

How Has This Been Tested?

Created e2e tests, after that: make kind-e2e-test.

Checklist:

  • [ ] My change requires a change to the documentation.
  • [ ] I have updated the documentation accordingly.
  • [x] I've read the CONTRIBUTION guide
  • [x] I have added unit and/or e2e tests to cover my changes.
  • [x] All new and existing tests passed.

leonardoramosantos avatar Apr 23 '25 12:04 leonardoramosantos

CLA Signed

The committers listed above are authorized under a signed CLA.

  • :white_check_mark: login: leonardoramosantos / name: Leonardo Ramos dos Santos (b22ae630bcf62115fe16895c8928aa5dbd6f0339, c9ad46ae100b3875da55020740d05adfa512fe50, 7e4e36077f8da964180f017c934fa48fea7abc1d)

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: leonardoramosantos Once this PR has been reviewed and has the lgtm label, please assign strongjz 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 avatar Apr 23 '25 12:04 k8s-ci-robot

Welcome @leonardoramosantos!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. 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/ingress-nginx 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. :smiley:

k8s-ci-robot avatar Apr 23 '25 12:04 k8s-ci-robot

Hi @leonardoramosantos. Thanks for your PR.

I'm waiting for a kubernetes 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 avatar Apr 23 '25 12:04 k8s-ci-robot

Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
Latest commit b22ae630bcf62115fe16895c8928aa5dbd6f0339
Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/6808df79e9593e0008501de2

netlify[bot] avatar Apr 23 '25 12:04 netlify[bot]

Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
Latest commit 7e4e36077f8da964180f017c934fa48fea7abc1d
Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/680921da9474740008b97ddf

netlify[bot] avatar Apr 23 '25 12:04 netlify[bot]

/retest

leonardoramosantos avatar Apr 23 '25 14:04 leonardoramosantos

@leonardoramosantos: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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 avatar Apr 23 '25 14:04 k8s-ci-robot

/ok-to-test /priority backlog /triage accepted /kind bug

strongjz avatar Apr 28 '25 13:04 strongjz

@Gacko is it too late to get this into the latest patch release?

strongjz avatar Apr 28 '25 14:04 strongjz

Yes. Also because I haven't reviewed it nor think it's just a patch.

Gacko avatar Apr 28 '25 14:04 Gacko

/hold

Gacko avatar Apr 28 '25 14:04 Gacko

Adding new chars to the annotations, increasing the risk/possibility to an escape, Can we increase the risk from Medium to High.

This will also be a breaking change once we do it, and need to let folks know that.

Then we can work on getting it into 1.13

strongjz avatar May 08 '25 15:05 strongjz

/uncc /unassign

strongjz avatar Sep 04 '25 18:09 strongjz