Skip to content

Fixes Unauthorized error when calling ContinueConversation #1312

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
merged 1 commit into from
Aug 4, 2020
Merged

Fixes Unauthorized error when calling ContinueConversation #1312

Show file tree
Hide file tree
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
16 changes: 12 additions & 4 deletions libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,18 @@ async def continue_conversation(
context.turn_state[BotAdapter.BOT_CALLBACK_HANDLER_KEY] = callback
context.turn_state[BotAdapter.BOT_OAUTH_SCOPE_KEY] = audience

# 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.trust_service_url(reference.service_url)
# 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
app_id_from_claims = JwtTokenValidation.get_app_id_from_claims(
claims_identity.claims
)
if app_id_from_claims:
if SkillValidation.is_skill_claim(
claims_identity.claims
) or await self._credential_provider.is_valid_appid(app_id_from_claims):
AppCredentials.trust_service_url(reference.service_url)

client = await self.create_connector_client(
reference.service_url, claims_identity, audience
Expand Down
12 changes: 12 additions & 0 deletions libraries/botbuilder-core/tests/test_bot_framework_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,8 +571,14 @@ async def callback(context: TurnContext):
scope = context.turn_state[BotFrameworkAdapter.BOT_OAUTH_SCOPE_KEY]
assert AuthenticationConstants.TO_CHANNEL_FROM_BOT_OAUTH_SCOPE == scope

# Ensure the serviceUrl was added to the trusted hosts
assert AppCredentials.is_trusted_service(channel_service_url)

refs = ConversationReference(service_url=channel_service_url)

# Ensure the serviceUrl is NOT in the trusted hosts
assert not AppCredentials.is_trusted_service(channel_service_url)

await adapter.continue_conversation(
refs, callback, claims_identity=skills_identity
)
Expand Down Expand Up @@ -629,8 +635,14 @@ async def callback(context: TurnContext):
scope = context.turn_state[BotFrameworkAdapter.BOT_OAUTH_SCOPE_KEY]
assert skill_2_app_id == scope

# Ensure the serviceUrl was added to the trusted hosts
assert AppCredentials.is_trusted_service(skill_2_service_url)

refs = ConversationReference(service_url=skill_2_service_url)

# Ensure the serviceUrl is NOT in the trusted hosts
assert not AppCredentials.is_trusted_service(skill_2_service_url)

await adapter.continue_conversation(
refs, callback, claims_identity=skills_identity, audience=skill_2_app_id
)
Expand Down