Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions docs/changelog/142848.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
area: Security
issues:
- 142743
pr: 142848
summary: Disable CAE in microsoft-graph-authz plugin
type: bug
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,13 @@ private static GraphServiceClient buildClient(RealmConfig config) {

return new GraphServiceClient(
new BaseGraphRequestAdapter(
new AzureIdentityAuthenticationProvider(credentialProvider, Strings.EMPTY_ARRAY, "https://graph.microsoft.com/.default"),
new AzureIdentityAuthenticationProvider(
credentialProvider,
Strings.EMPTY_ARRAY,
null,
false,
"https://graph.microsoft.com/.default"
),
config.getSetting(MicrosoftGraphAuthzRealmSettings.API_HOST),
httpClient
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,15 @@ private void registerGetAccessTokenHandler() {
);
return;
}
final var claims = formFields.get("claims");
if (claims != null && claims.toLowerCase(java.util.Locale.ROOT).contains("cp1")) {
graphError(
exchange,
RestStatus.BAD_REQUEST,
"Token request must not advertise cp1 CAE capability for client_credentials flow"
);
return;
}

final var token = XContentBuilder.builder(XContentType.JSON.xContent());
token.startObject();
Expand Down