Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-04-01 09:50:16 +02:00
Code Issues Packages Projects Releases Activity

improve PermissionUtil

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-01-06 12:44:18 +01:00
parent d9f496d425
commit dfef03f074
8 changed files with 229 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
scm-core/src/main/java/sonia/scm/repository/PermissionUtil.java
View File

@@ -35,8 +35,11 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.inject.Provider;
import sonia.scm.user.User;
import sonia.scm.util.AssertUtil;
import sonia.scm.web.security.WebSecurityContext;
//~--- JDK imports ------------------------------------------------------------
@@ -54,18 +57,33 @@ public class PermissionUtil
*
*
* @param repository
* @param user
* @param securityContext
* @param pt
*/
public static void assertPermission(Repository repository, User user,
PermissionType pt)
public static void assertPermission(Repository repository,
WebSecurityContext securityContext, PermissionType pt)
{
if (!hasPermission(repository, user, pt))
if (!hasPermission(repository, securityContext, pt))
{
throw new IllegalStateException("action denied");
}
}
/**
* Method description
*
*
* @param repository
* @param securityContextProvider
* @param pt
*/
public static void assertPermission(Repository repository,
Provider<WebSecurityContext> securityContextProvider,
PermissionType pt)
{
assertPermission(repository, securityContextProvider.get(), pt);
}
//~--- get methods ----------------------------------------------------------
/**
@@ -73,14 +91,32 @@ public class PermissionUtil
*
*
* @param repository
* @param user
* @param securityContextProvider
* @param pt
*
* @return
*/
public static boolean hasPermission(Repository repository, User user,
public static boolean hasPermission(Repository repository,
Provider<WebSecurityContext> securityContextProvider,
PermissionType pt)
{
return hasPermission(repository, securityContextProvider.get(), pt);
}
/**
* Method description
*
*
* @param repository
* @param securityContext
* @param pt
*
* @return
*/
public static boolean hasPermission(Repository repository,
WebSecurityContext securityContext, PermissionType pt)
{
User user = securityContext.getUser();
String username = user.getName();
AssertUtil.assertIsNotEmpty(username);

2
scm-core/src/main/java/sonia/scm/web/filter/PermissionFilter.java
View File

@@ -140,7 +140,7 @@ public abstract class PermissionFilter extends HttpFilter
boolean writeRequest = isWriteRequest(request);
if (PermissionUtil.hasPermission(repository,
securityContext.getUser(),
securityContext,
writeRequest
? PermissionType.WRITE
: PermissionType.READ))