github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

made extraction function less side-effect-ful

pull/1015/merge
Justin Richer 2017-03-03 17:20:15 -05:00
parent 00ecd3dd22
commit 98a4d56cdd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openid-connect-server/src/main/java/org/mitre/openid/connect/view/UserInfoView.java
View File

@ -145,11 +145,8 @@ public class UserInfoView extends AbstractView {
JsonObject obj = ui.toJson(); JsonObject obj = ui.toJson();
Set<String> allowedByScope = translator.getClaimsForScopeSet(scope); Set<String> allowedByScope = translator.getClaimsForScopeSet(scope);
Set<String> authorizedByClaims = new HashSet<>(); Set<String> authorizedByClaims = extractUserInfoClaimsIntoSet(authorizedClaims);
Set<String> requestedByClaims = new HashSet<>(); Set<String> requestedByClaims = extractUserInfoClaimsIntoSet(requestedClaims);
extractUserInfoClaimsIntoSet(authorizedClaims, authorizedByClaims);
extractUserInfoClaimsIntoSet(requestedClaims, requestedByClaims);
// Filter claims by performing a manual intersection of claims that are allowed by the given scope, requested, and authorized. // Filter claims by performing a manual intersection of claims that are allowed by the given scope, requested, and authorized.
// We cannot use Sets.intersection() or similar because Entry<> objects will evaluate to being unequal if their values are // We cannot use Sets.intersection() or similar because Entry<> objects will evaluate to being unequal if their values are
@ -171,7 +168,13 @@ public class UserInfoView extends AbstractView {
return result; return result;
} }
private void extractUserInfoClaimsIntoSet(JsonObject claims, Set<String> target) { /**
* Pull the claims that have been targeted into a set for processing.
* Returns an empty set if the input is null.
* @param claims the claims request to process
*/
private Set<String> extractUserInfoClaimsIntoSet(JsonObject claims) {
Set<String> target = new HashSet<>();
if (claims != null) { if (claims != null) {
JsonObject userinfoAuthorized = claims.getAsJsonObject("userinfo"); JsonObject userinfoAuthorized = claims.getAsJsonObject("userinfo");
if (userinfoAuthorized != null) { if (userinfoAuthorized != null) {
@ -180,5 +183,6 @@ public class UserInfoView extends AbstractView {
} }
} }
} }
return target;
} }
} }