libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

[KEYCLOAK-3135] - Fixing permission test

Browse source
This commit is contained in:
Pedro Igor 2017-04-07 16:02:50 -03:00
parent 55f747ecd0
commit 0b8fc3d6e1
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java
View file

@ -70,6 +70,10 @@ public class PolicyResourceService {
public Response update(String payload) {
this.auth.requireManage();
if (policy == null) {
return Response.status(Status.NOT_FOUND).build();
}
doUpdate(policy, payload);
return Response.status(Status.CREATED).build();
@ -102,6 +106,11 @@ public class PolicyResourceService {
@DELETE
public Response delete() {
this.auth.requireManage();
if (policy == null) {
return Response.status(Status.NOT_FOUND).build();
}
StoreFactory storeFactory = authorization.getStoreFactory();
PolicyStore policyStore = storeFactory.getPolicyStore();
PolicyProviderAdminService resource = getPolicyProviderAdminResource(policy.getType());
@ -132,6 +141,11 @@ public class PolicyResourceService {
@NoCache
public Response findById() {
this.auth.requireView();
if (policy == null) {
return Response.status(Status.NOT_FOUND).build();
}
return Response.ok(toRepresentation(policy)).build();
}
@ -145,6 +159,11 @@ public class PolicyResourceService {
@NoCache
public Response getDependentPolicies() {
this.auth.requireView();
if (policy == null) {
return Response.status(Status.NOT_FOUND).build();
}
List<Policy> policies = authorization.getStoreFactory().getPolicyStore().findDependentPolicies(policy.getId(), resourceServer.getId());
return Response.ok(policies.stream().map(policy -> {
@ -164,6 +183,11 @@ public class PolicyResourceService {
@NoCache
public Response getScopes() {
this.auth.requireView();
if (policy == null) {
return Response.status(Status.NOT_FOUND).build();
}
return Response.ok(policy.getScopes().stream().map(scope -> {
ScopeRepresentation representation = new ScopeRepresentation();
@ -181,6 +205,10 @@ public class PolicyResourceService {
public Response getResources() {
this.auth.requireView();
if (policy == null) {
return Response.status(Status.NOT_FOUND).build();
}
return Response.ok(policy.getResources().stream().map(resource -> {
ResourceRepresentation representation = new ResourceRepresentation();
@ -198,6 +226,10 @@ public class PolicyResourceService {
public Response getAssociatedPolicies() {
this.auth.requireView();
if (policy == null) {
return Response.status(Status.NOT_FOUND).build();
}
return Response.ok(policy.getAssociatedPolicies().stream().map(policy -> {
PolicyRepresentation representation1 = new PolicyRepresentation();

5
services/src/main/java/org/keycloak/authorization/admin/PolicyService.java
View file

@ -72,7 +72,6 @@ public class PolicyService {
@Path("{type}")
public Object getResource(@PathParam("type") String type) {
this.auth.requireManage();
PolicyProviderFactory providerFactory = authorization.getProviderFactory(type);
if (providerFactory != null) {
@ -81,10 +80,6 @@ public class PolicyService {
Policy policy = authorization.getStoreFactory().getPolicyStore().findById(type, resourceServer.getId());
if (policy == null) {
return Response.status(Status.NOT_FOUND).build();
}
return doCreatePolicyResource(policy);
}