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

allow client to specify scopes as part of token request.

multiparty
Justin Richer 2015-12-23 09:59:30 -05:00
parent 3734e76578
commit 24291040b6
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
uma-server/src/main/java/org/mitre/uma/token/RequestingPartyTokenGranter.java
View File

@ -166,10 +166,36 @@ public class RequestingPartyTokenGranter extends AbstractTokenGranter {
Set<String> ticketScopes = ticket.getPermission().getScopes();
Set<String> policyScopes = result.getMatched().getScopes();
Set<String> requestScopes = tokenRequest.getScope();
Set<String> clientScopes = clientEntity.getScope();
Set<String> permissionScopes = new HashSet<>();
// start with the scopes the client requested
permissionScopes.addAll(requestScopes);
if (permissionScopes.isEmpty()) {
// if none were requested by the client, see if the ticket has any
permissionScopes.addAll(ticketScopes);
}
if (permissionScopes.isEmpty()) {
// if still none are requested, go with what the client is registered for by default
permissionScopes.addAll(clientScopes);
}
if (permissionScopes.isEmpty()) {
// if still none are requested, just go with the matched policy set
permissionScopes.addAll(policyScopes);
} else {
// if there were some requested scopes, make sure the final result contains only the subset given by the fulfilled policy
permissionScopes.retainAll(policyScopes);
}
Permission perm = new Permission();
perm.setResourceSet(ticket.getPermission().getResourceSet());
perm.setScopes(new HashSet<>(Sets.intersection(ticketScopes, policyScopes)));
perm.setScopes(permissionScopes);
token.setPermissions(Sets.newHashSet(perm));