From 53d44fdfc5b45f6a9ad6f7877ae10b15bc70ae1d Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 2 Sep 2012 17:48:09 +0200 Subject: [PATCH] permission type enum is always upper case --- .../scm/security/RepositoryPermissionResolver.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/security/RepositoryPermissionResolver.java b/scm-webapp/src/main/java/sonia/scm/security/RepositoryPermissionResolver.java index 9c217136f0..549f85dbc4 100644 --- a/scm-webapp/src/main/java/sonia/scm/security/RepositoryPermissionResolver.java +++ b/scm-webapp/src/main/java/sonia/scm/security/RepositoryPermissionResolver.java @@ -35,7 +35,6 @@ package sonia.scm.security; import com.google.common.base.Splitter; -import org.apache.shiro.authz.Permission; import org.apache.shiro.authz.permission.PermissionResolver; import org.slf4j.Logger; @@ -46,6 +45,7 @@ import sonia.scm.repository.PermissionType; //~--- JDK imports ------------------------------------------------------------ import java.util.Iterator; +import java.util.Locale; /** * @@ -74,7 +74,7 @@ public class RepositoryPermissionResolver implements PermissionResolver * @return */ @Override - public Permission resolvePermission(String permissionString) + public RepositoryPermission resolvePermission(String permissionString) { RepositoryPermission permission = null; Iterator permissionIt = @@ -120,7 +120,11 @@ public class RepositoryPermissionResolver implements PermissionResolver { try { - PermissionType type = PermissionType.valueOf(permissionIt.next()); + String typeString = permissionIt.next(); + + typeString = typeString.trim().toUpperCase(Locale.ENGLISH); + + PermissionType type = PermissionType.valueOf(typeString); permission = new RepositoryPermission(repositoryId, type); }