恢复http base auth. 并在请求认证失败后，定位读取指针至末端。

kycheng · May 25, 2020 · cbd7e19 · cbd7e19
1 parent 4653320
commit cbd7e19
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/registry/registry.go b/registry/registry.go
@@ -71,14 +71,14 @@ func WrapTransport(transport http.RoundTripper, url, username, password string)
 		Username:  username,
 		Password:  password,
 	}
-	//basicAuthTransport := &BasicTransport{
-	//	Transport: tokenTransport,
-	//	URL:       url,
-	//	Username:  username,
-	//	Password:  password,
-	//}
-	errorTransport := &ErrorTransport{
+	basicAuthTransport := &BasicTransport{
 		Transport: tokenTransport,
+		URL:       url,
+		Username:  username,
+		Password:  password,
+	}
+	errorTransport := &ErrorTransport{
+		Transport: basicAuthTransport,
 	}
 	return errorTransport
 }

diff --git a/registry/tokentransport.go b/registry/tokentransport.go
@@ -3,6 +3,7 @@ package registry
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 )
@@ -20,6 +21,9 @@ func (t *TokenTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	}
 	if authService := isTokenDemand(resp); authService != nil {
 		resp.Body.Close()
+		if req.Body != nil {
+			ioutil.ReadAll(req.Body)
+		}
 		resp, err = t.authAndRetry(authService, req)
 	}
 	return resp, err