Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

improve error handling of permission system

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-06-07 15:11:48 +02:00
parent e79c0fb91b
commit 75a539367e
2 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scm-webapp/src/main/java/sonia/scm/security/DefaultSecuritySystem.java
View File

@@ -30,11 +30,14 @@
*/ */
package sonia.scm.security; package sonia.scm.security;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.ImmutableList.Builder;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
@@ -125,6 +128,7 @@ public class DefaultSecuritySystem implements SecuritySystem
public StoredAssignedPermission addPermission(AssignedPermission permission) public StoredAssignedPermission addPermission(AssignedPermission permission)
{ {
assertIsAdmin(); assertIsAdmin();
validatePermission(permission);
String id = store.put(permission); String id = store.put(permission);
@@ -234,6 +238,7 @@ public class DefaultSecuritySystem implements SecuritySystem
public void modifyPermission(StoredAssignedPermission permission) public void modifyPermission(StoredAssignedPermission permission)
{ {
assertIsAdmin(); assertIsAdmin();
validatePermission(permission);
synchronized (store) synchronized (store)
{ {
@@ -424,6 +429,20 @@ public class DefaultSecuritySystem implements SecuritySystem
availablePermissions = builder.build(); availablePermissions = builder.build();
} }
/**
* Method description
*
*
* @param perm
*/
private void validatePermission(AssignedPermission perm)
{
Preconditions.checkArgument(!Strings.isNullOrEmpty(perm.getName()),
"name is required");
Preconditions.checkArgument(!Strings.isNullOrEmpty(perm.getPermission()),
"permission is required");
}
//~--- get methods ---------------------------------------------------------- //~--- get methods ----------------------------------------------------------
/** /**

10
scm-webapp/src/main/java/sonia/scm/security/RepositoryPermissionResolver.java
View File

@@ -36,6 +36,7 @@ package sonia.scm.security;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import org.apache.shiro.authz.permission.PermissionResolver; import org.apache.shiro.authz.permission.PermissionResolver;
@@ -76,6 +77,9 @@ public class RepositoryPermissionResolver implements PermissionResolver
public RepositoryPermission resolvePermission(String permissionString) public RepositoryPermission resolvePermission(String permissionString)
{ {
RepositoryPermission permission = null; RepositoryPermission permission = null;
if (!Strings.isNullOrEmpty(permissionString))
{
Iterator<String> permissionIt = Iterator<String> permissionIt =
Splitter.on(':').omitEmptyStrings().trimResults().split( Splitter.on(':').omitEmptyStrings().trimResults().split(
permissionString).iterator(); permissionString).iterator();
@@ -94,6 +98,12 @@ public class RepositoryPermissionResolver implements PermissionResolver
permissionString); permissionString);
} }
} }
}
else
{
logger.warn(
"permision string is empty, could not resolve empty permission");
}
return permission; return permission;
} }