T keithyao/batch purge Adds ABAC support for purge command with batched token requests #577

keithy1012 · 2026-02-05T21:56:01Z

Purpose of the PR

Implements batch processing logic for the purge command.
ABAC-enabled registries grant permissions at the repository level, not registry-wide. The current auth flow requests a wildcard scope, which fails for ABAC registries because they cannot grant blanket access to all repositories.
Solution: Detects ABAC registries by checking for aad_identity in the refresh token. Batch token requests for ABAC registries: instead of one wildcard token, request tokens scoped to batches of 10 repositories at a time. Non-ABAC registries continue using the existing wildcard flow.

Fixes #

microsoft-github-policy-service · 2026-02-05T21:56:12Z

@keithy1012 please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

(default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
(when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"

Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.

Definitions.
“Code” means the computer software code, whether in human-readable or machine-executable form,
that is delivered by You to Microsoft under this Agreement.
“Project” means any of the projects owned or managed by Microsoft and offered under a license
approved by the Open Source Initiative (www.opensource.org).
“Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
Project, including but not limited to communication on electronic mailing lists, source code control
systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
discussing and improving that Project, but excluding communication that is conspicuously marked or
otherwise designated in writing by You as “Not a Submission.”
“Submission” means the Code and any other copyrightable material Submitted by You, including any
associated comments and documentation.
Your Submission. You must agree to the terms of this Agreement before making a Submission to any
Project. This Agreement covers any and all Submissions that You, now or in the future (except as
described in Section 4 below), Submit to any Project.
Originality of Work. You represent that each of Your Submissions is entirely Your original work.
Should You wish to Submit materials that are not Your original work, You may Submit them separately
to the Project if You (a) retain all copyright and license information that was in the materials as You
received them, (b) in the description accompanying Your Submission, include the phrase “Submission
containing materials of a third party:” followed by the names of the third party and any licenses or other
restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
guidelines concerning Submissions.
Your Employer. References to “employer” in this Agreement include Your employer or anyone else
for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
Submission is made in the course of Your work for an employer or Your employer has intellectual
property rights in Your Submission by contract or applicable law, You must secure permission from Your
employer to make the Submission before signing this Agreement. In that case, the term “You” in this
Agreement will refer to You and the employer collectively. If You change employers in the future and
desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
and secure permission from the new employer before Submitting those Submissions.
Licenses.

Copyright License. You grant Microsoft, and those who receive the Submission directly or
indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
parties.
Patent License. You grant Microsoft, and those who receive the Submission directly or
indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
Your patent claims that are necessarily infringed by the Submission or the combination of the
Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
import or otherwise dispose of the Submission alone or with the Project.
Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
granted by implication, exhaustion, estoppel or otherwise.

Representations and Warranties. You represent that You are legally entitled to grant the above
licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
have disclosed under Section 3). You represent that You have secured permission from Your employer to
make the Submission in cases where Your Submission is made in the course of Your work for Your
employer or Your employer has intellectual property rights in Your Submission by contract or applicable
law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
You later become aware that would make Your representations in this Agreement inaccurate in any
respect.
Information about Submissions. You agree that contributions to Projects and information about
contributions may be maintained indefinitely and disclosed publicly, including Your name and other
information that You submit with Your Submission.
Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
defenses of lack of personal jurisdiction and forum non-conveniens.
Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
supersedes any and all prior agreements, understandings or communications, written or oral, between
the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

cmd/acr/purge.go

estebanreyl · 2026-02-06T00:16:58Z

internal/api/acrsdk.go

 }

 // newAcrCLIClientWithBasicAuth creates a client that uses basic authentication.
 func newAcrCLIClientWithBasicAuth(loginURL string, username string, password string) AcrCLIClient {


when you setup basic auth and you try to use purge on abac, does it work?

Yes, just tested and confirmed.

wangxiaoxuan273 · 2026-02-06T03:58:08Z

cmd/acr/purge.go

 	includeLocked bool) (deletedTagsCount int, deletedManifestsCount int, err error) {

+	// Parse the duration once instead of for every repository
+	agoDuration, err := parseDuration(tagDeletionSince)


What is tagDeletionSince? It's not a declared variable

cmd/acr/purge.go

lizMSFT

You could follow https://github.com/Azure/acr-cli/tree/main?tab=readme-ov-file#installation to build the binary or check https://github.com/Azure/acr-cli/blob/main/scripts/experimental/README-purge-testing.md#1-test-purge-allsh-consolidated-test-suite and test the changes locally first.

lizMSFT · 2026-02-06T20:12:51Z

cmd/acr/purge.go

+			// Process all repositories in this batch with the batched token
+			for _, repoName := range batch {
+				tagRegex := tagFilters[repoName]
+				singleDeletedTagsCount, manifestToTagsCountMap, err := purgeTags(ctx, acrClient, repoParallelism, loginURL, repoName, agoDuration, tagRegex, tagsToKeep, filterTimeout, dryRun, includeLocked)


tagsToKeep is undefined

lizMSFT · 2026-02-06T20:13:15Z

cmd/acr/purge.go

+				singleDeletedManifestsCount := 0
+				// If the untagged flag is set then also manifests are deleted.
+				if removeUtaggedManifests {
+					singleDeletedManifestsCount, err = purgeDanglingManifests(ctx, acrClient, repoParallelism, loginURL, repoName, agoDuration, manifestToTagsCountMap, dryRun, includeLocked)


The function signature requires keep int as the 7th parameter, but it's missing.

lizMSFT · 2026-02-06T20:24:38Z

internal/api/acrsdk.go

+	// Each repository needs pull, delete, and metadata permissions for purge operations.
+	// Format: "registry:catalog:* repository:repo1:pull repository:repo1:delete repository:repo1:metadata_read ..."
+	var scopeParts []string
+	scopeParts = append(scopeParts, "registry:catalog:*")


registry:catalog:* might not needed for checking the repository level permissions

lizMSFT · 2026-02-06T20:26:12Z

internal/api/acrsdk.go

+
+	// Build the scope string for all requested repositories.
+	// Each repository needs pull, delete, and metadata permissions for purge operations.
+	// Format: "registry:catalog:* repository:repo1:pull repository:repo1:delete repository:repo1:metadata_read ..."


should be repository:repo1:pull,delete,metadata_read,metadata_write

northtyphoon · 2026-02-08T00:31:40Z

internal/api/acrsdk.go

 	newAcrCLIClient := newAcrCLIClient(loginURL)
+
+	// Detect if this is an ABAC-enabled registry by checking for aad_identity claim
+	newAcrCLIClient.isAbac = hasAadIdentityClaim(refreshToken)


Can we first check abac from refreshToken and then constrcrt newAcrCLIClient?

northtyphoon · 2026-02-08T00:36:31Z

cmd/acr/purge.go

+			// Request a token that covers all repositories in this batch
+			// The token scope will include: repository:repo1:pull repository:repo1:delete ... for each repo
+			if err := acrClient.RefreshTokenForAbac(ctx, batch); err != nil {
+				return deletedTagsCount, deletedManifestsCount, fmt.Errorf("failed to authorize ABAC repositories batch: %w", err)


can we output the repository names in the batch?

northtyphoon · 2026-02-09T06:53:25Z

cmd/acr/purge.go

 	headerLink  = "Link"
+
+	// abacBatchSize is the number of repositories to batch together when requesting tokens for ABAC registries.
+	abacBatchSize = 10


I suggest we introudue an env to override it so that we can tune it in production environment. Something like ACR_CLI_ABAC_BATCH_SIZE

Implemented

Keith Yao added 3 commits February 5, 2026 06:03

Implemented Per-Repository Token Refresh method

02e4cf1

Added new testing

69c5fbb

Implemented option 2 batch processing for purge

e666217

Merge branch 'main' into t-keithyao/batch-purge

d6779aa

estebanreyl reviewed Feb 6, 2026

View reviewed changes

Refactored code

6b6b106

wangxiaoxuan273 reviewed Feb 6, 2026

View reviewed changes

cmd/acr/purge.go Outdated Show resolved Hide resolved

lizMSFT reviewed Feb 6, 2026

View reviewed changes

cmd/acr/purge.go Outdated Show resolved Hide resolved

Keith Yao added 2 commits February 6, 2026 18:30

Added token refresh check

7db0aea

Merge origin/main and fix conflicts

eb5ea3a

lizMSFT reviewed Feb 6, 2026

View reviewed changes

northtyphoon reviewed Feb 9, 2026

View reviewed changes

Keith Yao added 4 commits February 9, 2026 22:37

Made config for abacBatchSize

b857681

Check abac from token before constructing acrcliclient

8ad2ac8

Changed scope string

f9f0762

env var

6aa0c97

T keithyao/batch purge Adds ABAC support for purge command with batched token requests #577

Are you sure you want to change the base?

T keithyao/batch purge Adds ABAC support for purge command with batched token requests #577

Conversation

keithy1012 commented Feb 5, 2026

Uh oh!

microsoft-github-policy-service bot commented Feb 5, 2026

Contribution License Agreement

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

lizMSFT left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants