Skip to content

[Cherry-pick 4.8] Proactive auth: trust incoming token url conditionally #3533

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
stevengum merged 1 commit into from
Mar 11, 2020
Merged

[Cherry-pick 4.8] Proactive auth: trust incoming token url conditionally #3533

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
15 changes: 13 additions & 2 deletions libraries/Microsoft.Bot.Builder/BotFrameworkAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,10 +346,21 @@ public override async Task ContinueConversationAsync(ClaimsIdentity claimsIdenti
// Add audience to TurnContext.TurnState
context.TurnState.Add<string>(OAuthScopeKey, audience);

// Add the channel service URL to the trusted services list so we can send messages back.
var appIdFromClaims = JwtTokenValidation.GetAppIdFromClaims(claimsIdentity.Claims);

// If we receive a valid app id in the incoming token claims, add the
// channel service URL to the trusted services list so we can send messages back.
// the service URL for skills is trusted because it is applied by the SkillHandler based on the original request
// received by the root bot
AppCredentials.TrustServiceUrl(reference.ServiceUrl);
if (!string.IsNullOrEmpty(appIdFromClaims))
{
var isValidApp = await CredentialProvider.IsValidAppIdAsync(appIdFromClaims).ConfigureAwait(false);

if (isValidApp)
{
AppCredentials.TrustServiceUrl(reference.ServiceUrl);
}
}

var connectorClient = await CreateConnectorClientAsync(reference.ServiceUrl, claimsIdentity, audience, cancellationToken).ConfigureAwait(false);
context.TurnState.Add(connectorClient);
Expand Down