Merge pull request goharbor#9887 from chlins/fix/replication-huawei-a…

…dapter-authorization fix(replication): huawei adapter multi authorization
zhiwenuil · Jan 17, 2020 · 8809b7a · 8809b7a
2 parents 2ea41ca + 130e406
commit 8809b7a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/replication/adapter/huawei/huawei_adapter.go b/src/replication/adapter/huawei/huawei_adapter.go
@@ -45,6 +45,10 @@ type adapter struct {
 	*native.Adapter
 	registry *model.Registry
 	client   *common_http.Client
+	// original http client with no modifer,
+	// huawei's some api interface with basic authorization,
+	// some with bearer token authorization.
+	oriClient *http.Client
 }
 
 // Info gets info about Huawei SWR
@@ -243,15 +247,19 @@ func newAdapter(registry *model.Registry) (adp.Adapter, error) {
 		modifiers = append(modifiers, authorizer)
 	}
 
+	transport := util.GetHTTPTransport(registry.Insecure)
 	return &adapter{
 		Adapter:  dockerRegistryAdapter,
 		registry: registry,
 		client: common_http.NewClient(
 			&http.Client{
-				Transport: util.GetHTTPTransport(registry.Insecure),
+				Transport: transport,
 			},
 			modifiers...,
 		),
+		oriClient: &http.Client{
+			Transport: transport,
+		},
 	}, nil
 
 }

diff --git a/src/replication/adapter/huawei/image_registry.go b/src/replication/adapter/huawei/image_registry.go
@@ -70,7 +70,7 @@ func (a *adapter) ManifestExist(repository, reference string) (exist bool, diges
 	r.Header.Add("content-type", "application/json; charset=utf-8")
 	r.Header.Add("Authorization", "Bearer "+token.Token)
 
-	resp, err := a.client.Do(r)
+	resp, err := a.oriClient.Do(r)
 	if err != nil {
 		return exist, digest, err
 	}
@@ -113,7 +113,7 @@ func (a *adapter) DeleteManifest(repository, reference string) error {
 	r.Header.Add("content-type", "application/json; charset=utf-8")
 	r.Header.Add("Authorization", "Bearer "+token.Token)
 
-	resp, err := a.client.Do(r)
+	resp, err := a.oriClient.Do(r)
 	if err != nil {
 		return err
 	}