Skip to content

Fix: OAuth callback/token policies and Weather MCP session validation #7

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

Draft
Bochenski wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix: OAuth callback/token policies and Weather MCP session validation #7

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
2 changes: 1 addition & 1 deletion labs/mcp-client-authorization/src/apim-oauth/consent.policy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ __COMMON_STYLES__
<set-header name="x-ms-version" exists-action="override">
<value>2018-12-31</value>
</set-header>
<set-header name="x-ms-partitionkey" exists-action="override">
<set-header name="x-ms-documentdb-partitionkey" exists-action="override">
<value>@($"[\"{context.Variables.GetValueOrDefault<string>("client_id")}\"]")</value>
</set-header>
<set-header name="Authorization" exists-action="override">
Expand Down
10 changes: 6 additions & 4 deletions labs/mcp-client-authorization/src/apim-oauth/oauth-callback.policy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,18 @@
<set-variable name="codeChallengeMethod" value="S256" />
<set-variable name="redirectUri" value="{{OAuthCallbackUri}}" />
<set-variable name="clientId" value="{{EntraIDClientId}}" />
<set-variable name="clientAssertionType" value="@(System.Net.WebUtility.UrlEncode("urn:ietf:params:oauth:client-assertion-type:jwt-bearer"))" />
<authentication-managed-identity resource="api://AzureADTokenExchange" client-id="{{EntraIDClientId}}" output-token-variable-name="ficToken"/>
<!-- Use confidential client secret for token exchange with Entra ID -->
<set-variable name="clientSecret" value="{{EntraIDClientSecret}}" />

<!-- STEP 4: Configure token request to Entra ID -->
<set-method>POST</set-method>
<set-header name="Content-Type" exists-action="override">
<value>application/x-www-form-urlencoded</value>
</set-header>
<set-body>@{
return $"client_id={context.Variables.GetValueOrDefault("clientId")}&grant_type=authorization_code&code={context.Variables.GetValueOrDefault("authCode")}&redirect_uri={context.Variables.GetValueOrDefault("redirectUri")}&scope=User.Read&code_verifier={context.Variables.GetValueOrDefault("codeVerifier")}&client_assertion_type={context.Variables.GetValueOrDefault("clientAssertionType")}&client_assertion={context.Variables.GetValueOrDefault("ficToken")}";
// Align scope with configured OAuth scopes used during authorize request
string scopes = "{{OAuthScopes}}";
return $"client_id={context.Variables.GetValueOrDefault("clientId")}&grant_type=authorization_code&code={context.Variables.GetValueOrDefault("authCode")}&redirect_uri={context.Variables.GetValueOrDefault("redirectUri")}&scope={System.Net.WebUtility.UrlEncode(scopes)}&code_verifier={context.Variables.GetValueOrDefault("codeVerifier")}&client_secret={System.Net.WebUtility.UrlEncode((string)context.Variables.GetValueOrDefault("clientSecret"))}";
}</set-body>
<rewrite-uri template="/token" />
</inbound>
Expand Down Expand Up @@ -237,4 +239,4 @@
<on-error>
<base />
</on-error>
</policies>
</policies>
4 changes: 2 additions & 2 deletions labs/mcp-client-authorization/src/apim-oauth/token.policy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
<set-header name="x-ms-version" exists-action="override">
<value>2018-12-31</value>
</set-header>
<set-header name="x-ms-partitionkey" exists-action="override">
<set-header name="x-ms-documentdb-partitionkey" exists-action="override">
<value>@($"[\"{context.Variables.GetValueOrDefault<string>("client_id")}\"]")</value>
</set-header>
<set-header name="Authorization" exists-action="override">
Expand Down Expand Up @@ -312,4 +312,4 @@
<on-error>
<base />
</on-error>
</policies>
</policies>
9 changes: 5 additions & 4 deletions labs/mcp-client-authorization/src/weather/apim-mcp-server/policy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,18 @@
byte[] decryptedBytes = inBytes.Decrypt("Aes", key, IV);
return Encoding.UTF8.GetString(decryptedBytes);
}" />
<!-- if decrypted Session Id does not match the session we should throw error-->
<!-- Validate session by checking APIM cache for an Entra token tied to this session ID -->
<cache-lookup-value key="@($"EntraToken-{context.Variables.GetValueOrDefault("decryptedSessionId", "")}")" variable-name="sessionEntry" />
<choose>
<when condition="@((string)context.Variables["decryptedSessionId"] != "sessionId123")">
<when condition="@(string.IsNullOrEmpty((string)context.Variables.GetValueOrDefault("sessionEntry", "")))">
<return-response>
<set-status code="401" reason="Unauthorized" />
<set-header name="WWW-Authenticate" exists-action="override">
<value>Bearer realm="example"</value>
</set-header>
<set-body>{
"error": "unauthorized",
"error_description": "token is not valid"
"error_description": "session not found or expired"
}</set-body>
</return-response>
</when>
Expand All @@ -72,4 +73,4 @@
<on-error>
<base />
</on-error>
</policies>
</policies>