Skip to content

Make UserPrincipalManager#getRoles more robust #31803

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
chenrujun merged 1 commit into from
Oct 31, 2022
Merged

Make UserPrincipalManager#getRoles more robust #31803

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
21 changes: 15 additions & 6 deletions ...e/src/main/java/com/azure/spring/cloud/autoconfigure/aad/filter/UserPrincipalManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.text.ParseException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

/**
* A user principal manager to load user info from JWT.
Expand Down Expand Up @@ -153,11 +154,19 @@ public UserPrincipal buildUserPrincipal(String aadIssuedBearerToken) throws Pars
}

Set<String> getRoles(JWTClaimsSet set) {
return Optional.of(set)
.map(p -> p.getClaim(AadJwtClaimNames.ROLES))
.map(Collection.class::cast)
.map(Collection<Object>::stream)
.orElseGet(Stream::empty)
if (set == null) {
return Collections.emptySet();
}
Object rolesClaim = set.getClaim(AadJwtClaimNames.ROLES);
if (rolesClaim == null) {
return Collections.emptySet();
}
if (rolesClaim instanceof Iterable<?>) {
return StreamSupport.stream(((Iterable<?>) rolesClaim).spliterator(), false)
.map(Object::toString)
.collect(Collectors.toSet());
}
return Stream.of(rolesClaim)
.map(Object::toString)
.collect(Collectors.toSet());
}
Expand Down
22 changes: 16 additions & 6 deletions .../test/java/com/azure/spring/cloud/autoconfigure/aad/filter/UserPrincipalManagerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@
import java.nio.file.Paths;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Stream;

Expand Down Expand Up @@ -77,14 +80,21 @@ void nullIssuer() {
}

@Test
void testRolesExtracted() {
void getRolesTest() {
rolesExtractedAsExpected(null, new ArrayList<>());
rolesExtractedAsExpected("role1", Arrays.asList("role1"));
rolesExtractedAsExpected(Arrays.asList("role1", "role2"), Arrays.asList("role1", "role2"));
rolesExtractedAsExpected(new HashSet<>(Arrays.asList("role1", "role2")), Arrays.asList("role1", "role2"));
}

private void rolesExtractedAsExpected(Object rolesClaimValue, Collection<String> expected) {
JWTClaimsSet set = new JWTClaimsSet.Builder()
.claim("roles", Arrays.asList("role1", "role2"))
.claim("roles", rolesClaimValue)
.build();
Set<String> result = new UserPrincipalManager(null).getRoles(set);
assertEquals(2, result.size());
assertTrue(result.contains("role1"));
assertTrue(result.contains("role2"));
Set<String> actual = new UserPrincipalManager(null).getRoles(set);
assertEquals(expected.size(), actual.size());
assertTrue(expected.containsAll(actual));
assertTrue(actual.containsAll(expected));
}

private String readJwtValidIssuerTxt() {
Expand Down