fix: Fix registry authentication when URL has slash suffix (#331)

* fix: Fix registry authentication when URL has slash suffix

Signed-off-by: jannfis <[email protected]>

* Fix format string

Signed-off-by: jannfis <[email protected]>

Author: jannfis

pkg/registry/client.go

@@ -261,11 +261,16 @@ func (client *registryClient) TagMetadata(manifest distribution.Manifest) (*tag.
 // Without this, tokenHandler and AuthorizationHandler won't work
 func ping(manager challenge.Manager, endpoint *RegistryEndpoint, versionHeader string) ([]auth.APIVersion, error) {
 	httpc := &http.Client{Transport: endpoint.GetTransport()}
-	resp, err := httpc.Get(endpoint.RegistryAPI + "/v2/")
+	url := endpoint.RegistryAPI + "/v2/"
+	resp, err := httpc.Get(url)
 	if err != nil {
 		return nil, err
 	}
 	defer resp.Body.Close()
+	// Let's consider only HTTP 200 and 401 valid responses for the inital request
+	if resp.StatusCode != 200 && resp.StatusCode != 401 {
+		return nil, fmt.Errorf("endpoint %s does not seem to be a valid v2 Docker Registry API (received HTTP code %d for GET %s)", endpoint.RegistryAPI, resp.StatusCode, url)
+	}
 
 	if err := manager.AddResponse(resp); err != nil {
 		return nil, err

pkg/registry/endpoints.go

@@ -135,11 +135,10 @@ func AddRegistryEndpoint(prefix, name, apiUrl, credentials, defaultNS string, in
 	if limit <= 0 {
 		limit = RateLimitNone
 	}
-	log.Debugf("rate limit for %s is %d", apiUrl, limit)
 	registries[prefix] = &RegistryEndpoint{
 		RegistryName:   name,
 		RegistryPrefix: prefix,
-		RegistryAPI:    apiUrl,
+		RegistryAPI:    strings.TrimSuffix(apiUrl, "/"),
 		Credentials:    credentials,
 		CredsExpire:    credsExpire,
 		Cache:          cache.NewMemCache(),
@@ -148,6 +147,15 @@ func AddRegistryEndpoint(prefix, name, apiUrl, credentials, defaultNS string, in
 		TagListSort:    tagListSort,
 		Limiter:        ratelimit.New(limit),
 	}
+
+	logCtx := log.WithContext()
+	logCtx.AddField("registry", registries[prefix].RegistryAPI)
+	logCtx.AddField("prefix", registries[prefix].RegistryPrefix)
+	if limit != RateLimitNone {
+		logCtx.Debugf("setting rate limit to %d requests per second", limit)
+	} else {
+		logCtx.Debugf("rate limiting is disabled")
+	}
 	return nil
 }