Skip to content

Conversation

@agrawroh
Copy link
Member

Description

This PR restores the original behavior prior to #31831, by explicitly setting skip_xff_append to true, as appending the XFF header from the custom header extension is not required.

See #37171 for more details.


Commit Message: original_ip_detection: revert unintended XFF header appending behavior in CustomHeaderIPDetection
Additional Description: This PR restores the pre #31831 behavior by explicitly setting skip_xff_append to true, as appending the XFF header from the custom header extension is not required.
Risk Level: Low
Testing: Added Unit Tests
Docs Changes: N/A
Release Notes: Added

@RyanTheOptimist
Copy link
Contributor

I think something is wrong with this PR. It contains 290 commits and 1,278 changed files (including lots of merge conflicts). In the current state, I can't review it.

@agrawroh
Copy link
Member Author

I think something is wrong with this PR. It contains 290 commits and 1,278 changed files (including lots of merge conflicts). In the current state, I can't review it.

Sorry, was tracking main. Fixed it to track from the correct branch.

@phlax
Copy link
Member

phlax commented Nov 18, 2024

@agrawroh this needs to be addressed on main first and then backported

@agrawroh
Copy link
Member Author

@agrawroh this needs to be addressed on main first and then backported

Yes, here is the PR for main:
#37194

@soulxu
Copy link
Member

soulxu commented Nov 19, 2024

/assign @wbpcode

@wbpcode wbpcode changed the title original_ip_detection: revert unintended XFF header appending behavior in CustomHeaderIPDetection bp/1.32: original_ip_detection: revert unintended XFF header appending behavior in CustomHeaderIPDetection Nov 19, 2024
@wbpcode
Copy link
Member

wbpcode commented Nov 19, 2024

LGTM to the code and backport. But the status of PR is weird.

@wbpcode
Copy link
Member

wbpcode commented Nov 19, 2024

cc @phlax could you take a look at this when you get some free time? Thanks.

…r in CustomHeaderIPDetection (envoyproxy#37194)

This PR restores the original behavior prior to envoyproxy#31831, by explicitly
setting `skip_xff_append` to `true`, as appending the `XFF` header from
the custom header extension is not required.

See envoyproxy#37171 for more details.

---

**Commit Message:** original_ip_detection: revert unintended XFF header
appending behavior in CustomHeaderIPDetection
**Additional Description:** This PR restores the pre envoyproxy#31831 behavior by
explicitly setting `skip_xff_append` to `true`, as appending the `XFF`
header from the custom header extension is not required.
**Risk Level:** Low
**Testing:** Added Unit Tests
**Docs Changes:** N/A
**Release Notes:** Added

Signed-off-by: Rohit Agrawal <[email protected]>
Copy link
Member

@phlax phlax left a comment

Choose a reason for hiding this comment

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

lgtm, thanks @agrawroh

@phlax phlax merged commit fb36016 into envoyproxy:release/v1.32 Nov 19, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants