Handle redirects better

By using a token for a host if we have one

Author: MarcoPolo

p2p/http/auth/client.go

@@ -86,6 +86,11 @@ func (a *ClientPeerIDAuth) AuthenticateWithRoundTripper(rt http.RoundTripper, re
 	return serverPeerID, resp, nil
 }
 
+func (a *ClientPeerIDAuth) HasToken(hostname string) bool {
+	_, hasToken := a.tm.get(hostname, a.TokenTTL)
+	return hasToken
+}
+
 func (a *ClientPeerIDAuth) runHandshake(rt http.RoundTripper, req *http.Request, b bodyMeta, hs *handshake.PeerIDAuthHandshakeClient) (peer.ID, *http.Response, error) {
 	maxSteps := 5 // Avoid infinite loops in case of buggy handshake. Shouldn't happen.
 	var resp *http.Response

p2p/http/libp2phttp.go

@@ -749,6 +749,18 @@ func (h *Host) RoundTrip(r *http.Request) (*http.Response, error) {
 	switch r.URL.Scheme {
 	case "http", "https":
 		h.initDefaultRT()
+		if r.Host == "" {
+			r.Host = r.URL.Host
+		}
+		if h.ClientPeerIDAuth != nil && h.ClientPeerIDAuth.HasToken(r.Host) {
+			serverID, resp, err := h.ClientPeerIDAuth.AuthenticateWithRoundTripper(h.DefaultClientRoundTripper, r)
+			if err != nil {
+				return nil, err
+			}
+			ctxWithServerID := context.WithValue(r.Context(), serverPeerIDContextKey{}, serverID)
+			resp.Request = resp.Request.WithContext(ctxWithServerID)
+			return resp, nil
+		}
 		return h.DefaultClientRoundTripper.RoundTrip(r)
 	case "multiaddr":
 		break
@@ -780,7 +792,12 @@ func (h *Host) RoundTrip(r *http.Request) (*http.Response, error) {
 
 		h.initDefaultRT()
 		rt := h.DefaultClientRoundTripper
-		if parsed.sni != parsed.host {
+		sni := parsed.sni
+		if sni == "" {
+			sni = parsed.host
+		}
+
+		if sni != parsed.host {
 			// We have a different host and SNI (e.g. using an IP address but specifying a SNI)
 			// We need to make our own transport to support this.
 			//
@@ -803,6 +820,8 @@ func (h *Host) RoundTrip(r *http.Request) (*http.Response, error) {
 			}
 
 			serverID, resp, err := h.ClientPeerIDAuth.AuthenticateWithRoundTripper(rt, r)
+			// c := http.Client{Transport: rt}
+			// serverID, resp, err := h.ClientPeerIDAuth.AuthenticatedDo(&c, r)
 			if err != nil {
 				return nil, err
 			}
@@ -1165,6 +1184,9 @@ func connectionCloseHeaderMiddleware(next http.Handler) http.Handler {
 // maybeDecorateContextWithAuth decorates the request context with
 // authentication information if serverAuth is provided.
 func maybeDecorateContextWithAuthMiddleware(serverAuth *httpauth.ServerPeerIDAuth, next http.Handler) http.Handler {
+	if next == nil {
+		return nil
+	}
 	if serverAuth == nil {
 		return next
 	}