fix(http11): pin retry fallback to HTTP/1.1 transport#2440
Open
Tianlin0725 wants to merge 1 commit intoprojectdiscovery:devfrom
Open
fix(http11): pin retry fallback to HTTP/1.1 transport#2440Tianlin0725 wants to merge 1 commit intoprojectdiscovery:devfrom
Tianlin0725 wants to merge 1 commit intoprojectdiscovery:devfrom
Conversation
Neo - PR Security ReviewNo security issues found Highlights
Hardening Notes
Comment |
WalkthroughThe changes add protocol pinning logic to prevent HTTP/2 fallback when HTTP/1.1 is explicitly requested in the HTTPX client initialization, along with a test to validate that retry mechanisms still work without switching transports. Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Poem
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Tip Try Coding Plans. Let us write the prompt for your AI agent so you can ship faster (with fewer bugs). Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (1)
common/httpx/http11_fallback_test.go (1)
20-22: Prefer a behavior-based assertion over internal pointer equality.
require.Sameproves the constructor wired two fields together, but it doesn't prove the malformed-HTTP/2 retry path actually stays on HTTP/1.1. A regression inretryablehttp-go's fallback logic could still slip through this test.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@common/httpx/http11_fallback_test.go` around lines 20 - 22, The test currently uses require.Same(ht.client.HTTPClient, ht.client.HTTPClient2) which only asserts pointer equality; change this to a behavior-based assertion that the malformed-HTTP/2 retry actually used HTTP/1.1: trigger the retry path via the existing test harness (ht and ht.client), capture the actual request/response metadata from the server or the client's RoundTripper hook, and assert the protocol used (e.g., check Request.Proto or a recorded transport tag) equals "HTTP/1.1" and that the retry went through the original client/transport rather than an HTTP/2 transport; update assertions in http11_fallback_test.go to reference ht, ht.client, and the recorded request/transport info instead of require.Same.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@common/httpx/http11_fallback_test.go`:
- Around line 9-14: TestNew_HTTP11DisablesRetryableHTTP2Fallback calls New which
mutates the process-wide GODEBUG; save the original GODEBUG value before calling
New and restore it after the test (use os.Getenv to capture and defer restoring
with os.Setenv or os.Unsetenv as appropriate) so the test does not leak
http2client=0 to other tests; update
TestNew_HTTP11DisablesRetryableHTTP2Fallback to perform this save/restore around
the call to New.
---
Nitpick comments:
In `@common/httpx/http11_fallback_test.go`:
- Around line 20-22: The test currently uses require.Same(ht.client.HTTPClient,
ht.client.HTTPClient2) which only asserts pointer equality; change this to a
behavior-based assertion that the malformed-HTTP/2 retry actually used HTTP/1.1:
trigger the retry path via the existing test harness (ht and ht.client), capture
the actual request/response metadata from the server or the client's
RoundTripper hook, and assert the protocol used (e.g., check Request.Proto or a
recorded transport tag) equals "HTTP/1.1" and that the retry went through the
original client/transport rather than an HTTP/2 transport; update assertions in
http11_fallback_test.go to reference ht, ht.client, and the recorded
request/transport info instead of require.Same.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 73a38d4b-c683-4b3e-94d6-0be407fb6efb
📒 Files selected for processing (2)
common/httpx/http11_fallback_test.gocommon/httpx/httpx.go
Comment on lines
+9
to
+14
| func TestNew_HTTP11DisablesRetryableHTTP2Fallback(t *testing.T) { | ||
| opts := DefaultOptions | ||
| opts.Protocol = HTTP11 | ||
|
|
||
| ht, err := New(&opts) | ||
| require.NoError(t, err) |
There was a problem hiding this comment.
Restore GODEBUG after this test.
New mutates the process-wide GODEBUG when HTTP11 is forced, so this test can leak http2client=0 into later cases and make the suite order-dependent.
💡 Proposed fix
import (
+ "os"
"testing"
"github.com/stretchr/testify/require"
)
func TestNew_HTTP11DisablesRetryableHTTP2Fallback(t *testing.T) {
+ origGODEBUG, hadGODEBUG := os.LookupEnv("GODEBUG")
+ t.Cleanup(func() {
+ if hadGODEBUG {
+ _ = os.Setenv("GODEBUG", origGODEBUG)
+ } else {
+ _ = os.Unsetenv("GODEBUG")
+ }
+ })
+
opts := DefaultOptions
opts.Protocol = HTTP11
ht, err := New(&opts)📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| func TestNew_HTTP11DisablesRetryableHTTP2Fallback(t *testing.T) { | |
| opts := DefaultOptions | |
| opts.Protocol = HTTP11 | |
| ht, err := New(&opts) | |
| require.NoError(t, err) | |
| import ( | |
| "os" | |
| "testing" | |
| "github.com/stretchr/testify/require" | |
| ) | |
| func TestNew_HTTP11DisablesRetryableHTTP2Fallback(t *testing.T) { | |
| origGODEBUG, hadGODEBUG := os.LookupEnv("GODEBUG") | |
| t.Cleanup(func() { | |
| if hadGODEBUG { | |
| _ = os.Setenv("GODEBUG", origGODEBUG) | |
| } else { | |
| _ = os.Unsetenv("GODEBUG") | |
| } | |
| }) | |
| opts := DefaultOptions | |
| opts.Protocol = HTTP11 | |
| ht, err := New(&opts) | |
| require.NoError(t, err) |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@common/httpx/http11_fallback_test.go` around lines 9 - 14,
TestNew_HTTP11DisablesRetryableHTTP2Fallback calls New which mutates the
process-wide GODEBUG; save the original GODEBUG value before calling New and
restore it after the test (use os.Getenv to capture and defer restoring with
os.Setenv or os.Unsetenv as appropriate) so the test does not leak http2client=0
to other tests; update TestNew_HTTP11DisablesRetryableHTTP2Fallback to perform
this save/restore around the call to New.
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
1 participant
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
This PR fixes #2240 by ensuring
-pr http11remains protocol-pinned even on retry fallback paths.Problem
When HTTP/1.1 is forced, retryablehttp could still switch to its
HTTPClient2fallback on malformed HTTP/2 errors, which breaks explicit protocol pinning expectations.Solution
GODEBUG=http2client=0+TLSNextProtodisable).Protocol == HTTP11:httpx.client.HTTPClient2 = httpx.client.HTTPClientThis preserves retry behavior while preventing unintended protocol upgrade fallback.
Tests
Added unit test:
TestNew_HTTP11DisablesRetryableHTTP2FallbackLocal verification:
go test ./common/httpx -run TestNew_HTTP11DisablesRetryableHTTP2Fallback -count=1go test ./common/httpx -count=1/claim #2240
Summary by CodeRabbit