Skip to content

azrepos: fall back to OAuth when org DisablePatCreationPolicyViolation policy is set #2346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
p00j4 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

azrepos: fall back to OAuth when org DisablePatCreationPolicyViolation policy is set #2346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 35 additions & 7 deletions src/shared/Microsoft.AzureRepos/AzureReposHostProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public class AzureReposHostProvider : DisposableObject, IHostProvider, IConfigur
private readonly IMicrosoftAuthentication _msAuth;
private readonly IAzureDevOpsAuthorityCache _authorityCache;
private readonly IAzureReposBindingManager _bindingManager;
// Set to true if PAT creation was blocked by org policy this invocation, forcing OAuth fallback.
private bool _forcedOAuth;
Copy link
Copy Markdown
Contributor

@mjcheetham mjcheetham Jun 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sadly this is an incomplete implementation. Because Git calls GCM multiple times, as a new process invocation each time, we 'forget' the value of _forcedOAuth here when it comes to the store call that Git does following a successful get + remote op.

Without first implementing the functionality of #2057, we'd be better just printing the error and resolution message (changing to OAuth mode).


public AzureReposHostProvider(ICommandContext context)
: this(context, new AzureDevOpsRestApi(context), new MicrosoftAuthentication(context),
Expand Down Expand Up @@ -118,20 +120,28 @@ public async Task<GetCredentialResult> GetCredentialAsync(InputArguments input)

// No existing credential was found, create a new one
_context.Trace.WriteLine("Creating new credential...");
credential = await GeneratePersonalAccessTokenAsync(input);
_context.Trace.WriteLine("Credential created.");
try
{
credential = await GeneratePersonalAccessTokenAsync(input);
_context.Trace.WriteLine("Credential created.");
return new GetCredentialResult(credential);
}
catch (Exception ex) when (IsPatPolicyViolation(ex))
{
HandlePatPolicyViolation();
// Fall through to OAuth path below
}
}
else
{
_context.Trace.WriteLine("Existing credential found.");
return new GetCredentialResult(credential);
}

return new GetCredentialResult(credential);
}
else
Copy link
Copy Markdown

@mr-otmarg mr-otmarg May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when removing this else you should clean up curly braces also or just leave the else.


// Include the username request here so that we may use it as an override
// for user account lookups when getting Azure Access Tokens.
{
// Include the username request here so that we may use it as an override
// for user account lookups when getting Azure Access Tokens.
var azureResult = await GetAzureAccessTokenAsync(input);
var azureCredential = new GitCredential(azureResult.AccountUpn, azureResult.AccessToken);
return new GetCredentialResult(azureCredential);
Expand Down Expand Up @@ -485,8 +495,26 @@ private static string GetAccountNameForCredentialQuery(InputArguments input)
/// Check if Azure DevOps Personal Access Tokens should be used or not.
/// </summary>
/// <returns>True if Personal Access Tokens should be used, false otherwise.</returns>
private static bool IsPatPolicyViolation(Exception ex) =>
ex.Message.Contains("DisablePatCreationPolicyViolation", StringComparison.OrdinalIgnoreCase);

private void HandlePatPolicyViolation()
{
_context.Trace.WriteLine("PAT creation blocked by org policy, falling back to OAuth for this request.");
_context.Streams.Error.WriteLine(
"warning: PAT creation is disabled by your Azure DevOps organization policy.");
_context.Streams.Error.WriteLine(
"hint: To permanently use OAuth, run:");
_context.Streams.Error.WriteLine(
$"hint: git config --global credential.{AzureDevOpsConstants.GitConfiguration.Credential.CredentialType} {AzureDevOpsConstants.OAuthCredentialType}");

_forcedOAuth = true;
}

private bool UsePersonalAccessTokens()
{
if (_forcedOAuth) return false;

// Default to using PATs except on DevBox where we prefer OAuth tokens
bool defaultValue = !PlatformUtils.IsDevBox();

Expand Down