Skip to content

Commit

Permalink
Merge pull request #416 from liimaorg/feature_reload_permissions
Browse files Browse the repository at this point in the history 
REST: reload permissions & delete role
  • Loading branch information
@yvespp
yvespp authored Jul 18, 2018
2 parents 581f337 + 5deb12d commit 572e289
Show file tree
Hide file tree
Showing 9 changed files with 196 additions and 87 deletions.
66 changes: 47 additions & 19 deletions ...s/src/main/java/ch/puzzle/itc/mobiliar/business/security/boundary/PermissionBoundary.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,9 +428,12 @@ public void createAutoAssignedRestrictions(ResourceEntity resource) throws AMWEx
createAutoAssignedRestriction(getUserName(), Permission.RESOURCE_PROPERTY_DECRYPT.name(), resourceGroupId, Action.ALL, new RestrictionEntity());
createAutoAssignedRestriction(getUserName(), Permission.RESOURCE_TEMPLATE.name(), resourceGroupId, Action.ALL, new RestrictionEntity());
createAutoAssignedRestriction(getUserName(), Permission.RESOURCE_RELEASE_COPY_FROM_RESOURCE.name(), resourceGroupId, Action.ALL, new RestrictionEntity());
createAutoAssignedRestriction(getUserName(), Permission.RESOURCE_TEST_GENERATION.name(), resourceGroupId, Action.ALL, new RestrictionEntity());
createAutoAssignedRestriction(getUserName(), Permission.RESOURCE_TEST_GENERATION_RESULT.name(), resourceGroupId, Action.ALL, new RestrictionEntity());
createAutoAssignedRestriction(getUserName(), Permission.DEPLOYMENT.name(), resourceGroupId, Action.ALL, new RestrictionEntity());
if (resource.getResourceType().isApplicationServerResourceType()) {
createAutoAssignedRestriction(getUserName(), Permission.RESOURCE_TEST_GENERATION.name(), resourceGroupId, Action.ALL, new RestrictionEntity());
createAutoAssignedRestriction(getUserName(), Permission.RESOURCE_TEST_GENERATION_RESULT.name(), resourceGroupId, Action.ALL, new RestrictionEntity());
createAutoAssignedRestriction(getUserName(), Permission.DEPLOYMENT.name(), resourceGroupId, Action.ALL, new RestrictionEntity());
}
reloadCache();
}
}

Expand All @@ -449,12 +452,16 @@ public void createAutoAssignedRestrictions(ResourceEntity resource) throws AMWEx
*/
@HasPermission(oneOfPermission = { Permission.ASSIGN_REMOVE_PERMISSION, Permission.PERMISSION_DELEGATION }, action = Action.CREATE)
public Integer createRestriction(String roleName, String userName, String permissionName, Integer resourceGroupId, String resourceTypeName,
ResourceTypePermission resourceTypePermission, String contextName, Action action, boolean delegated)
ResourceTypePermission resourceTypePermission, String contextName, Action action, boolean delegated, boolean reload)
throws AMWException {
if (!delegated || canDelegateThisPermission(permissionName, resourceGroupId, resourceTypeName, contextName, action)) {
RestrictionEntity restriction = new RestrictionEntity();
return createRestriction(roleName, userName, permissionName, resourceGroupId, resourceTypeName, resourceTypePermission,
contextName, action, restriction);
Integer id = createRestriction(roleName, userName, permissionName, resourceGroupId, resourceTypeName,
resourceTypePermission, contextName, action, restriction);
if (reload) {
reloadCache();
}
return id;
}
throw new AMWException("No permission to create this permission");
}
Expand All @@ -475,22 +482,22 @@ public Integer createRestriction(String roleName, String userName, String permis
*/
@HasPermission(oneOfPermission = { Permission.ASSIGN_REMOVE_PERMISSION, Permission.PERMISSION_DELEGATION }, action = Action.CREATE)
public int createMultipleRestrictions(String roleName, List<String> userNames, List<String> permissionNames, List<Integer> resourceGroupIds, List<String> resourceTypeNames,
ResourceTypePermission resourceTypePermission, List<String> contextNames, List<Action> actions, boolean delegated) throws AMWException {
ResourceTypePermission resourceTypePermission, List<String> contextNames, List<Action> actions, boolean delegated, boolean reload) throws AMWException {
int count = 0;
if (resourceGroupIds != null && !resourceGroupIds.isEmpty() && resourceTypeNames != null && !resourceTypeNames.isEmpty()) {
throw new AMWException("Only ResourceGroupId(s) OR ResourceTypeName(s) must be set");
}
if (userNames == null) {
userNames = new ArrayList();
userNames = new ArrayList<>();
}
if (resourceGroupIds == null) {
resourceGroupIds = new ArrayList();
resourceGroupIds = new ArrayList<>();
}
if (resourceTypeNames == null) {
resourceTypeNames = new ArrayList();
resourceTypeNames = new ArrayList<>();
}
if (contextNames == null || contextNames.isEmpty()) {
contextNames = new ArrayList();
contextNames = new ArrayList<>();
contextNames.add(null);
}

Expand Down Expand Up @@ -522,6 +529,9 @@ public int createMultipleRestrictions(String roleName, List<String> userNames, L
}
}
}
if (reload) {
reloadCache();
}
return count;
}

Expand Down Expand Up @@ -562,9 +572,7 @@ private Integer createRestriction(String roleName, String userName, String permi
if (permissionService.identicalOrMoreGeneralRestrictionExists(restriction)) {
return null;
}
final Integer id = restrictionRepository.create(restriction);
permissionRepository.forceReloadingOfLists();
return id;
return restrictionRepository.create(restriction);
}

private Integer createAutoAssignedRestriction(String userName, String permissionName, Integer resourceGroupId, Action action, RestrictionEntity restriction)
Expand All @@ -574,7 +582,6 @@ private Integer createAutoAssignedRestriction(String userName, String permission
return null;
}
final Integer id = restrictionRepository.create(restriction);
permissionRepository.forceReloadingOfLists();
return id;
}

Expand All @@ -592,7 +599,7 @@ private Integer createAutoAssignedRestriction(String userName, String permission
@HasPermission(permission = Permission.ASSIGN_REMOVE_PERMISSION, action = Action.UPDATE)
public boolean updateRestriction(Integer id, String roleName, String userName, String permissionName, Integer resourceId,
String resourceTypeName, ResourceTypePermission resourceTypePermission,
String contextName, Action action) throws AMWException {
String contextName, Action action, boolean reload) throws AMWException {
if (id == null) {
throw new AMWException("Id must not be null");
}
Expand All @@ -606,17 +613,21 @@ public boolean updateRestriction(Integer id, String roleName, String userName, S
return false;
}
restrictionRepository.merge(restriction);
permissionRepository.forceReloadingOfLists();
if (reload) {
reloadCache();
}
return true;
}

@HasPermission(permission = Permission.ASSIGN_REMOVE_PERMISSION, action = Action.DELETE)
public void removeRestriction(Integer id) throws AMWException {
public void removeRestriction(Integer id, boolean reload) throws AMWException {
if (restrictionRepository.find(id) == null) {
throw new AMWException("Restriction not found");
}
restrictionRepository.deleteRestrictionById(id);
permissionRepository.forceReloadingOfLists();
if (reload) {
reloadCache();
}
}

/**
Expand Down Expand Up @@ -690,6 +701,19 @@ public List<RoleEntity> getAllRoles() {
return permissionRepository.getAllRoles();
}

/**
* Removes a role with all it's permissions
*
* @return List<RoleEntity>
*/
@HasPermission(permission = Permission.ASSIGN_REMOVE_PERMISSION)
public void deleteRole(String roleName, boolean reload) {
permissionRepository.deleteRole(roleName);
if (reload) {
reloadCache();
}
}

/**
* Returns a list of all PermissionEntities (used by REST)
*
Expand Down Expand Up @@ -837,4 +861,8 @@ protected boolean isValidName(String rawString) {
return false;
}

@HasPermission(permission = Permission.ASSIGN_REMOVE_PERMISSION)
public void reloadCache() {
permissionRepository.forceReloadingOfLists();
}
}
12 changes: 12 additions & 0 deletions .../src/main/java/ch/puzzle/itc/mobiliar/business/security/control/PermissionRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,18 @@ public RoleEntity createRole(String roleName) {
return roleEntity;
}

public void deleteRole(String roleName) {
RoleEntity role = getRoleByName(roleName);
if (role == null) {
throw new IllegalArgumentException("Role " + roleName + " doesn't exist!");
}
if (!role.isDeletable()) {
throw new IllegalArgumentException("Role " + roleName + " is not deletable!");
}
// leads to a cascade delete of the restrictions
entityManager.remove(role);
}

public boolean isReloadDeployableRoleList() {
return reloadDeployableRoleList;
}
Expand Down
Loading

0 comments on commit 572e289

Please sign in to comment.