Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 15:35:49 +01: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

11
scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java
View File

@@ -62,6 +62,7 @@ import sonia.scm.store.StoreFactory;
import sonia.scm.user.User;
import sonia.scm.util.AssertUtil;
import sonia.scm.util.IOUtil;
import sonia.scm.web.security.WebSecurityContext;
//~--- JDK imports ------------------------------------------------------------
@@ -103,7 +104,7 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
*/
@Inject
public XmlRepositoryManager(
Provider<SecurityContext> securityContextProvider,
Provider<WebSecurityContext> securityContextProvider,
StoreFactory storeFactory, Set<RepositoryHandler> handlerSet)
{
this.securityContextProvider = securityContextProvider;
@@ -469,7 +470,7 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
*/
private void assertIsOwner(Repository repository)
{
PermissionUtil.assertPermission(repository, getCurrentUser(),
PermissionUtil.assertPermission(repository, securityContextProvider,
PermissionType.OWNER);
}
@@ -481,7 +482,7 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
*/
private void assertIsReader(Repository repository)
{
PermissionUtil.assertPermission(repository, getCurrentUser(),
PermissionUtil.assertPermission(repository, securityContextProvider,
PermissionType.READ);
}
@@ -555,7 +556,7 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
*/
private boolean isReader(Repository repository)
{
return PermissionUtil.hasPermission(repository, getCurrentUser(),
return PermissionUtil.hasPermission(repository, securityContextProvider,
PermissionType.READ);
}
@@ -571,7 +572,7 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
private XmlRepositoryDatabase repositoryDB;
/** Field description */
private Provider<SecurityContext> securityContextProvider;
private Provider<WebSecurityContext> securityContextProvider;
/** Field description */
private Set<Type> types;

6
scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserManager.java
View File

@@ -45,7 +45,6 @@ import org.slf4j.LoggerFactory;
import sonia.scm.HandlerEvent;
import sonia.scm.SCMContextProvider;
import sonia.scm.security.ScmSecurityException;
import sonia.scm.security.SecurityContext;
import sonia.scm.store.Store;
import sonia.scm.store.StoreFactory;
import sonia.scm.user.AbstractUserManager;
@@ -56,6 +55,7 @@ import sonia.scm.util.AssertUtil;
import sonia.scm.util.IOUtil;
import sonia.scm.util.SecurityUtil;
import sonia.scm.util.Util;
import sonia.scm.web.security.WebSecurityContext;
//~--- JDK imports ------------------------------------------------------------
@@ -104,7 +104,7 @@ public class XmlUserManager extends AbstractUserManager
* @param storeFactory
*/
@Inject
public XmlUserManager(Provider<SecurityContext> scurityContextProvider,
public XmlUserManager(Provider<WebSecurityContext> scurityContextProvider,
StoreFactory storeFactory)
{
this.scurityContextProvider = scurityContextProvider;
@@ -428,7 +428,7 @@ public class XmlUserManager extends AbstractUserManager
//~--- fields ---------------------------------------------------------------
/** Field description */
private Provider<SecurityContext> scurityContextProvider;
private Provider<WebSecurityContext> scurityContextProvider;
/** Field description */
private Store<XmlUserDatabase> store;