Skip to content

Fix bug of CAE new request disposing #17214

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

Merged
dolauli merged 4 commits into from
Feb 23, 2022
Merged

Fix bug of CAE new request disposing #17214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3893a1
Fix bug of CAE new request disposing
Feb 21, 2022
369e246
Address review comments
Feb 22, 2022
eebe7e9
Comment out the cmdlet thats cause authentication error
Feb 22, 2022
e213ce9
Merge branch 'release-2022-03-01' into jinlei/cae_fix
VeryEarly Feb 23, 2022
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
37 changes: 21 additions & 16 deletions src/Accounts/Accounts/CommonModule/ContextAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,30 +195,35 @@ public object GetParameterValue(string resourceId, string moduleName, Invocation
internal async Task<HttpResponseMessage> AuthenticationHelper(IAzureContext context, string endpointResourceIdKey, string endpointSuffixKey, HttpRequestMessage request, CancellationToken cancelToken, Action cancelAction, SignalDelegate signal, NextDelegate next, TokenAudienceConverterDelegate tokenAudienceConverter = null)
{
IAccessToken accessToken = await AuthorizeRequest(context, request, cancelToken, endpointResourceIdKey, endpointSuffixKey, tokenAudienceConverter);
var newRequest = await request.CloneWithContentAndDispose(request.RequestUri, request.Method);
var response = await next(request, cancelToken, cancelAction, signal);

if (response.MatchClaimsChallengePattern())
using (var newRequest = await request.CloneWithContent(request.RequestUri, request.Method))
Copy link
Collaborator

@VeryEarly VeryEarly Feb 23, 2022

Choose a reason for hiding this comment

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

Suggested change
using (var newRequest = await request.CloneWithContent(request.RequestUri, request.Method))
using (var newRequest = await request.CloneWithContent(request.RequestUri, request.Method))
using (var response = await next(request, cancelToken, cancelAction, signal))

Copy link
Contributor Author

@msJinLei msJinLei Feb 23, 2022

Choose a reason for hiding this comment

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

Refer to the implementation of pipeline, the original request and response will be disposed finally.

{
//get token again with claims challenge
if (accessToken is IClaimsChallengeProcessor processor)
var response = await next(request, cancelToken, cancelAction, signal);

if (response.MatchClaimsChallengePattern())
{
try
//get token again with claims challenge
if (accessToken is IClaimsChallengeProcessor processor)
{
var claimsChallenge = ClaimsChallengeUtilities.GetClaimsChallenge(response);
if (!string.IsNullOrEmpty(claimsChallenge))
try
{
await processor.OnClaimsChallenageAsync(newRequest, claimsChallenge, cancelToken).ConfigureAwait(false);
response = await next(newRequest, cancelToken, cancelAction, signal);
var claimsChallenge = ClaimsChallengeUtilities.GetClaimsChallenge(response);
if (!string.IsNullOrEmpty(claimsChallenge))
{
await processor.OnClaimsChallenageAsync(newRequest, claimsChallenge, cancelToken).ConfigureAwait(false);
using (var previousReponse = response)
{
response = await next(newRequest, cancelToken, cancelAction, signal);
}
}
}
catch (AuthenticationFailedException e)
{
throw e.WithAdditionalMessage(response?.GetWwwAuthenticateMessage());
}
}
catch (AuthenticationFailedException e)
{
throw e.WithAdditionalMessage(response?.GetWwwAuthenticateMessage());
}
}
return response;
}
return response;
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion tools/Test/SmokeTest/RmCoreSmokeTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ $resourceTestCommands = @(
@{Name = "Az.StorageSync"; Command = {Get-AzStorageSyncService -ErrorAction Stop}},
@{Name = "Az.Support"; Command = {Get-AzSupportTicket -ErrorAction Stop}},
@{Name = "Az.Resources [Tags]"; Command = {Get-AzTag -ErrorAction Stop}},
@{Name = "Az.Resources [MSGraph]"; Command = {Get-AzAdGroup -First 1 -ErrorAction Stop}},
#@{Name = "Az.Resources [MSGraph]"; Command = {Get-AzAdGroup -First 1 -ErrorAction Stop}},
@{Name = "Az.TrafficManager"; Command = {Get-AzTrafficManagerProfile -ErrorAction Stop}},
@{Name = "Az.Billing [UsageAggregates]"; Command = {Get-UsageAggregates -ReportedStartTime '1/1/2018' -ReportedEndTime '1/2/2018' -ErrorAction Stop}},
@{Name = "Az.Websites"; Command = {Get-AzWebApp -ErrorAction Stop}}
Expand Down