Skip to content
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

libp2phttp: don't initialise ServeMux if not nil #2548

Merged
merged 2 commits into from
Sep 1, 2023
Merged

libp2phttp: don't initialise ServeMux if not nil #2548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
996d50b
libp2phttp: don't initialse ServeMux if not nil
sukunrt Aug 31, 2023
80d32e4
add test
sukunrt Aug 31, 2023
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
4 changes: 3 additions & 1 deletion p2p/http/libp2phttp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,9 @@ func (h *Host) httpTransportInit() {

func (h *Host) serveMuxInit() {
h.initializeServeMux.Do(func() {
h.ServeMux = http.NewServeMux()
if h.ServeMux == nil {
h.ServeMux = http.NewServeMux()
}
})
}

Expand Down
29 changes: 29 additions & 0 deletions p2p/http/libp2phttp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,3 +390,32 @@ func selfSignedTLSConfig(t *testing.T) *tls.Config {
}
return tlsConfig
}

func TestCustomServeMux(t *testing.T) {
serveMux := http.NewServeMux()
serveMux.Handle("/ping/", httpping.Ping{})

server := libp2phttp.Host{
ListenAddrs: []ma.Multiaddr{ma.StringCast("/ip4/127.0.0.1/tcp/0/http")},
ServeMux: serveMux,
InsecureAllowHTTP: true,
}
server.WellKnownHandler.AddProtocolMeta(httpping.PingProtocolID, libp2phttp.ProtocolMeta{Path: "/ping/"})
go func() {
server.Serve()
}()
defer server.Close()

addrs := server.Addrs()
require.Equal(t, len(addrs), 1)
var clientHttpHost libp2phttp.Host
rt, err := clientHttpHost.NewConstrainedRoundTripper(peer.AddrInfo{Addrs: addrs}, libp2phttp.PreferHTTPTransport)
require.NoError(t, err)

client := &http.Client{Transport: rt}
body := [32]byte{}
req, _ := http.NewRequest(http.MethodPost, "/ping/", bytes.NewReader(body[:]))
resp, err := client.Do(req)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
}