-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
In Oauth2UserService, append authorities instead of override authorit…
…ies (#17838) * In XxxOAuth2UserService, append authorities instead of override authorities.
- Loading branch information
Rujun Chen
authored
Nov 26, 2020
1 parent
3986906
commit edf5460
Showing
6 changed files
with
147 additions
and
177 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
...ring/azure-spring-boot/src/main/java/com/azure/spring/aad/implementation/GraphClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT License. | ||
|
|
||
| package com.azure.spring.aad.implementation; | ||
|
|
||
| import com.azure.spring.autoconfigure.aad.AADAuthenticationProperties; | ||
| import com.azure.spring.autoconfigure.aad.JacksonObjectMapperFactory; | ||
| import com.azure.spring.autoconfigure.aad.Membership; | ||
| import com.azure.spring.autoconfigure.aad.Memberships; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.nimbusds.oauth2.sdk.http.HTTPResponse; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.springframework.http.HttpHeaders; | ||
| import org.springframework.http.HttpMethod; | ||
| import org.springframework.http.MediaType; | ||
|
|
||
| import java.io.BufferedReader; | ||
| import java.io.IOException; | ||
| import java.io.InputStreamReader; | ||
| import java.net.HttpURLConnection; | ||
| import java.net.URL; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.LinkedHashSet; | ||
| import java.util.Optional; | ||
| import java.util.Set; | ||
|
|
||
| public class GraphClient { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(GraphClient.class); | ||
|
|
||
| private final AADAuthenticationProperties properties; | ||
|
|
||
| public GraphClient(AADAuthenticationProperties properties) { | ||
| this.properties = properties; | ||
| } | ||
|
|
||
| public Set<String> getGroupsFromGraph(String accessToken) { | ||
| final Set<String> groups = new LinkedHashSet<>(); | ||
| final ObjectMapper objectMapper = JacksonObjectMapperFactory.getInstance(); | ||
| String aadMembershipRestUri = properties.getGraphMembershipUri(); | ||
| while (aadMembershipRestUri != null) { | ||
| Memberships memberships; | ||
| try { | ||
| String membershipsJson = getUserMemberships(accessToken, aadMembershipRestUri); | ||
| memberships = objectMapper.readValue(membershipsJson, Memberships.class); | ||
| } catch (IOException ioException) { | ||
| LOGGER.error("Can not get group information from graph server.", ioException); | ||
| break; | ||
| } | ||
| memberships.getValue() | ||
| .stream() | ||
| .filter(this::isGroupObject) | ||
| .map(Membership::getDisplayName) | ||
| .forEach(groups::add); | ||
| aadMembershipRestUri = Optional.of(memberships) | ||
| .map(Memberships::getOdataNextLink) | ||
| .orElse(null); | ||
| } | ||
| return groups; | ||
| } | ||
|
|
||
| private String getUserMemberships(String accessToken, String urlString) throws IOException { | ||
| URL url = new URL(urlString); | ||
| final HttpURLConnection connection = (HttpURLConnection) url.openConnection(); | ||
| connection.setRequestMethod(HttpMethod.GET.toString()); | ||
| connection.setRequestProperty(HttpHeaders.AUTHORIZATION, String.format("Bearer %s", accessToken)); | ||
| connection.setRequestProperty(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE); | ||
| connection.setRequestProperty(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE); | ||
| final String responseInJson = getResponseString(connection); | ||
| final int responseCode = connection.getResponseCode(); | ||
| if (responseCode == HTTPResponse.SC_OK) { | ||
| return responseInJson; | ||
| } else { | ||
| throw new IllegalStateException( | ||
| "Response is not " + HTTPResponse.SC_OK + ", response json: " + responseInJson); | ||
| } | ||
| } | ||
|
|
||
| private String getResponseString(HttpURLConnection connection) throws IOException { | ||
| try (BufferedReader reader = | ||
| new BufferedReader( | ||
| new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8) | ||
| ) | ||
| ) { | ||
| final StringBuilder stringBuffer = new StringBuilder(); | ||
| String line; | ||
| while ((line = reader.readLine()) != null) { | ||
| stringBuffer.append(line); | ||
| } | ||
| return stringBuffer.toString(); | ||
| } | ||
| } | ||
|
|
||
| private boolean isGroupObject(final Membership membership) { | ||
| return membership.getObjectType().equals(properties.getUserGroup().getValue()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.