fix(auth): support ABAC-enabled registries by removing wildcard scopes

Author: balcsida

internal/api/acrsdk.go

@@ -6,6 +6,7 @@ package api
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"io/ioutil"
 	"strings"
 	"time"
@@ -93,7 +94,9 @@ func newAcrCLIClientWithBasicAuth(loginURL string, username string, password str
 func newAcrCLIClientWithBearerAuth(loginURL string, refreshToken string) (AcrCLIClient, error) {
 	newAcrCLIClient := newAcrCLIClient(loginURL)
 	ctx := context.Background()
-	accessTokenResponse, err := newAcrCLIClient.AutorestClient.GetAcrAccessToken(ctx, loginURL, "registry:catalog:* repository:*:*", refreshToken)
+	// For ABAC-enabled registries, only request catalog scope initially
+	// Repository-specific scopes will be requested when needed
+	accessTokenResponse, err := newAcrCLIClient.AutorestClient.GetAcrAccessToken(ctx, loginURL, "registry:catalog:*", refreshToken)
 	if err != nil {
 		return newAcrCLIClient, err
 	}
@@ -152,9 +155,9 @@ func GetAcrCLIClientWithAuth(loginURL string, username string, password string,
 	return &acrClient, nil
 }
 
-// refreshAcrCLIClientToken obtains a new token and gets its expiration time.
-func refreshAcrCLIClientToken(ctx context.Context, c *AcrCLIClient) error {
-	accessTokenResponse, err := c.AutorestClient.GetAcrAccessToken(ctx, c.loginURL, "repository:*:*", c.token.RefreshToken)
+// refreshAcrCLIClientToken obtains a new token with the specified scope and gets its expiration time.
+func refreshAcrCLIClientToken(ctx context.Context, c *AcrCLIClient, scope string) error {
+	accessTokenResponse, err := c.AutorestClient.GetAcrAccessToken(ctx, c.loginURL, scope, c.token.RefreshToken)
 	if err != nil {
 		return err
 	}
@@ -172,6 +175,19 @@ func refreshAcrCLIClientToken(ctx context.Context, c *AcrCLIClient) error {
 	return nil
 }
 
+// refreshTokenForRepository obtains a new token scoped to a specific repository with all permissions.
+// This supports both ABAC and non-ABAC registries.
+func refreshTokenForRepository(ctx context.Context, c *AcrCLIClient, repoName string) error {
+	// For specific repository operations, request full permissions on that repository
+	scope := fmt.Sprintf("repository:%s:*", repoName)
+	return refreshAcrCLIClientToken(ctx, c, scope)
+}
+
+// refreshTokenForCatalog obtains a new token with catalog access only.
+func refreshTokenForCatalog(ctx context.Context, c *AcrCLIClient) error {
+	return refreshAcrCLIClientToken(ctx, c, "registry:catalog:*")
+}
+
 // getExpiration is used to obtain the expiration out of a jwt token.
 func getExpiration(token string) (int64, error) {
 	parser := jwt.Parser{SkipClaimsValidation: true}
@@ -200,7 +216,7 @@ func (c *AcrCLIClient) isExpired() bool {
 // GetAcrTags list the tags of a repository with their attributes.
 func (c *AcrCLIClient) GetAcrTags(ctx context.Context, repoName string, orderBy string, last string) (*acrapi.RepositoryTagsType, error) {
 	if c.isExpired() {
-		if err := refreshAcrCLIClientToken(ctx, c); err != nil {
+		if err := refreshTokenForRepository(ctx, c, repoName); err != nil {
 			return nil, err
 		}
 	}
@@ -215,7 +231,7 @@ func (c *AcrCLIClient) GetAcrTags(ctx context.Context, repoName string, orderBy
 // DeleteAcrTag deletes the tag by reference.
 func (c *AcrCLIClient) DeleteAcrTag(ctx context.Context, repoName string, reference string) (*autorest.Response, error) {
 	if c.isExpired() {
-		if err := refreshAcrCLIClientToken(ctx, c); err != nil {
+		if err := refreshTokenForRepository(ctx, c, repoName); err != nil {
 			return nil, err
 		}
 	}
@@ -229,7 +245,7 @@ func (c *AcrCLIClient) DeleteAcrTag(ctx context.Context, repoName string, refere
 // GetAcrManifests list all the manifest in a repository with their attributes.
 func (c *AcrCLIClient) GetAcrManifests(ctx context.Context, repoName string, orderBy string, last string) (*acrapi.Manifests, error) {
 	if c.isExpired() {
-		if err := refreshAcrCLIClientToken(ctx, c); err != nil {
+		if err := refreshTokenForRepository(ctx, c, repoName); err != nil {
 			return nil, err
 		}
 	}
@@ -243,7 +259,7 @@ func (c *AcrCLIClient) GetAcrManifests(ctx context.Context, repoName string, ord
 // DeleteManifest deletes a manifest using the digest as a reference.
 func (c *AcrCLIClient) DeleteManifest(ctx context.Context, repoName string, reference string) (*autorest.Response, error) {
 	if c.isExpired() {
-		if err := refreshAcrCLIClientToken(ctx, c); err != nil {
+		if err := refreshTokenForRepository(ctx, c, repoName); err != nil {
 			return nil, err
 		}
 	}
@@ -258,7 +274,7 @@ func (c *AcrCLIClient) DeleteManifest(ctx context.Context, repoName string, refe
 // This is used when a manifest list is wanted, first the bytes are obtained and then unmarshalled into a new struct.
 func (c *AcrCLIClient) GetManifest(ctx context.Context, repoName string, reference string) ([]byte, error) {
 	if c.isExpired() {
-		if err := refreshAcrCLIClientToken(ctx, c); err != nil {
+		if err := refreshTokenForRepository(ctx, c, repoName); err != nil {
 			return nil, err
 		}
 	}
@@ -298,7 +314,7 @@ func (c *AcrCLIClient) GetManifest(ctx context.Context, repoName string, referen
 // GetAcrManifestAttributes gets the attributes of a manifest.
 func (c *AcrCLIClient) GetAcrManifestAttributes(ctx context.Context, repoName string, reference string) (*acrapi.ManifestAttributes, error) {
 	if c.isExpired() {
-		if err := refreshAcrCLIClientToken(ctx, c); err != nil {
+		if err := refreshTokenForRepository(ctx, c, repoName); err != nil {
 			return nil, err
 		}
 	}
@@ -312,7 +328,7 @@ func (c *AcrCLIClient) GetAcrManifestAttributes(ctx context.Context, repoName st
 // UpdateAcrTagAttributes updates tag attributes to enable/disable deletion and writing.
 func (c *AcrCLIClient) UpdateAcrTagAttributes(ctx context.Context, repoName string, reference string, value *acrapi.ChangeableAttributes) (*autorest.Response, error) {
 	if c.isExpired() {
-		if err := refreshAcrCLIClientToken(ctx, c); err != nil {
+		if err := refreshTokenForRepository(ctx, c, repoName); err != nil {
 			return nil, err
 		}
 	}
@@ -326,7 +342,7 @@ func (c *AcrCLIClient) UpdateAcrTagAttributes(ctx context.Context, repoName stri
 // UpdateAcrManifestAttributes updates manifest attributes to enable/disable deletion and writing.
 func (c *AcrCLIClient) UpdateAcrManifestAttributes(ctx context.Context, repoName string, reference string, value *acrapi.ChangeableAttributes) (*autorest.Response, error) {
 	if c.isExpired() {
-		if err := refreshAcrCLIClientToken(ctx, c); err != nil {
+		if err := refreshTokenForRepository(ctx, c, repoName); err != nil {
 			return nil, err
 		}
 	}

internal/api/acrsdk_test.go

@@ -78,7 +78,7 @@ func TestGetExpiration(t *testing.T) {
 
 func TestGetAcrCLIClientWithAuth(t *testing.T) {
 	var testLoginURL string
-	testTokenScope := "registry:catalog:* repository:*:*"
+	testTokenScope := "registry:catalog:*"
 	testAccessToken := strings.Join([]string{
 		base64.RawURLEncoding.EncodeToString([]byte(`{"alg":"RS256"}`)),
 		base64.RawURLEncoding.EncodeToString([]byte(`{"exp":1563910981}`)),