From f99620f61eaee7c2828b0b9ed20b438f822b0713 Mon Sep 17 00:00:00 2001 From: Matija Obreza Date: Fri, 26 Oct 2018 16:42:01 +0200 Subject: [PATCH] Fix: Throw NotFoundElement exception in Permissions API v1 --- .../org/genesys2/server/api/v1/PermissionController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/org/genesys2/server/api/v1/PermissionController.java b/src/main/java/org/genesys2/server/api/v1/PermissionController.java index b70ae1183..74a4c35e1 100644 --- a/src/main/java/org/genesys2/server/api/v1/PermissionController.java +++ b/src/main/java/org/genesys2/server/api/v1/PermissionController.java @@ -34,6 +34,7 @@ import org.genesys.blocks.security.serialization.AclEntriesToPermissions; import org.genesys.blocks.security.serialization.SidPermissions; import org.genesys.blocks.security.service.CustomAclService; import org.genesys2.server.api.ApiBaseController; +import org.genesys2.server.exception.NotFoundElement; import org.genesys2.server.model.UserRole; import org.genesys2.server.model.impl.User; import org.genesys2.server.service.UserService; @@ -114,6 +115,9 @@ public class PermissionController { @JsonView(JsonViews.Minimal.class) public AclObjectIdentityExt permissions(@PathVariable(value = "clazz") final String className, @PathVariable("id") final long id) { final AclObjectIdentity objectIdentity = aclService.getObjectIdentity(id, className); + if (objectIdentity == null) { + throw new NotFoundElement("No such ACL object"); + } return lazyLoadForJson(objectIdentity); } @@ -163,6 +167,10 @@ public class PermissionController { @JsonView(JsonViews.Minimal.class) public AclObjectIdentityExt permissions(@PathVariable(value = "aclObjectIdentityId") final long id) { final AclObjectIdentity objectIdentity = aclService.getObjectIdentity(id); + if (objectIdentity == null) { + throw new NotFoundElement("No such ACL object"); + } + return lazyLoadForJson(objectIdentity); } -- GitLab