Skip to content

fix(libp2phttp): Fix relative to absolute multiaddr URI logic #3208

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.

Sign up for GitHub

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

Merged
MarcoPolo merged 2 commits into from
Feb 25, 2025
Merged

fix(libp2phttp): Fix relative to absolute multiaddr URI logic #3208

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b444754
fix(libp2phttp): Fix relative to absolute multiaddr URI logic
MarcoPolo Feb 24, 2025
8579af9
pr comments
MarcoPolo Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
pr comments
  • Loading branch information
@MarcoPolo
MarcoPolo committed Feb 25, 2025
commit 8579af913c1bcab3157d8acf8bda5c68daa276bf
6 changes: 3 additions & 3 deletions p2p/http/libp2phttp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,15 +523,15 @@ func (rt *streamRoundTripper) RoundTrip(r *http.Request) (*http.Response, error)
}
resp.Body = &streamReadCloser{resp.Body, s}

if resp.Request.URL.Scheme == "multiaddr" {
if r.URL.Scheme == "multiaddr" {
// This was a multiaddr uri, we may need to convert relative URI
// references to absolute multiaddr ones so that the next request
// knows how to reach the endpoint.
locationHeader := resp.Header.Get("Location")
if locationHeader != "" {
u, err := locationHeaderToMultiaddrURI(resp.Request.URL, locationHeader)
u, err := locationHeaderToMultiaddrURI(r.URL, locationHeader)
if err != nil {
return nil, err
return nil, fmt.Errorf("failed to convert location header (%s) from request (%s) to multiaddr uri: %w", locationHeader, r.URL, err)
}
// Update the location header to be an absolute multiaddr uri
resp.Header.Set("Location", u.String())
Expand Down
Loading