security: strip cookies on cross-origin redirects and fix response connection leaks#2169
Open
insaf021 wants to merge 1 commit into
Open
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Cross-Origin Cookie Removal on Redirects
Problem: When
HttpRequestfollows a redirect to a different origin (different scheme, host, or effective port), sensitiveCookieheaders could be forwarded to the redirect destination, potentially exposing session credentials.Fix: Updated
handleRedirect()to compare the redirect target's scheme, host, and effective port with the current request URL. If the redirect is cross-origin, theCookieheader is removed before following the redirect. Same-origin redirects continue to preserve cookies.Resource Cleanup on Response Construction Failure
Problem: If
new HttpResponse(this, lowLevelHttpResponse)throws an exception before the response is fully constructed, the underlyingLowLevelHttpResponsemay not be released, potentially leaving underlying HTTP resources open.Fix: Updated the cleanup logic in the
finallyblock ofexecute()to close the response content (when present) and invokedisconnect()onlowLevelHttpResponsewhen response construction fails, ensuring cleanup exceptions do not mask the original exception.Tests Added
Added
testHandleRedirect_crossOriginCookieRemovalto verify that cookies are removed for cross-origin redirects while remaining intact for same-origin redirects, including cases involving implicit and explicit default ports. AddedtestExecute_disconnectOnResponseConstructionFailureto verify thatdisconnect()is invoked when response construction fails and that the original exception is preserved during cleanup.Verification
All 45 tests in
HttpRequestTestpassed successfully. A fullmvn clean installalso completed successfully across all 15 modules withBUILD SUCCESS, confirming the changes behave as expected and do not introduce regressions.