fix issue for token basic auth

Signed-off-by: yxxhero <[email protected]>
dragonflyoss · Apr 17, 2022 · e23ca07 · e23ca07
1 parent eb6db27
commit e23ca07
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/manager/job/preheat.go b/manager/job/preheat.go
@@ -228,7 +228,7 @@ func (p *preheat) getResolver(ctx context.Context, username, password string) re
 
 }
 
-func getAuthToken(ctx context.Context, header http.Header) (string, error) {
+func getAuthToken(ctx context.Context, header http.Header, preheatArgs types.PreheatArgs) (string, error) {
 	ctx, span := tracer.Start(ctx, config.SpanAuthWithRegistry, trace.WithSpanKind(trace.SpanKindProducer))
 	defer span.End()
 
@@ -241,6 +241,9 @@ func getAuthToken(ctx context.Context, header http.Header) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	if preheatArgs.Username != "" && preheatArgs.Password != "" {
+		req.SetBasicAuth(preheatArgs.Username, preheatArgs.Password)
+	}
 
 	client := &http.Client{
 		Timeout: timeout,
@@ -357,10 +360,6 @@ func (p *preheat) parseLayers(om ocispec.Manifest, preheatArgs types.PreheatArgs
 		return nil, err
 	}
 
-	if preheatArgs.Username != "" && preheatArgs.Password != "" {
-		req.SetBasicAuth(preheatArgs.Username, preheatArgs.Password)
-	}
-
 	client := &http.Client{
 		Timeout: timeout,
 		Transport: &http.Transport{
@@ -380,7 +379,7 @@ func (p *preheat) parseLayers(om ocispec.Manifest, preheatArgs types.PreheatArgs
 
 	layerHeader := httputils.MapToHeader(preheatArgs.Headers).Clone()
 	if resp.StatusCode == http.StatusUnauthorized {
-		token, err := getAuthToken(context.Background(), resp.Header)
+		token, err := getAuthToken(context.Background(), resp.Header, preheatArgs)
 		if err != nil {
 			return nil, err
 		}