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

throw ScmSecurityException instead of RepositoryException

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-02-19 18:32:02 +01:00
parent bd093ea032
commit d785dd5bb8
1 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,12 +55,11 @@ import sonia.scm.repository.RepositoryException;
import sonia.scm.repository.RepositoryHandler; import sonia.scm.repository.RepositoryHandler;
import sonia.scm.repository.RepositoryHandlerNotFoundException; import sonia.scm.repository.RepositoryHandlerNotFoundException;
import sonia.scm.security.ScmSecurityException; import sonia.scm.security.ScmSecurityException;
import sonia.scm.security.SecurityContext;
import sonia.scm.store.Store; import sonia.scm.store.Store;
import sonia.scm.store.StoreFactory; import sonia.scm.store.StoreFactory;
import sonia.scm.user.User;
import sonia.scm.util.AssertUtil; import sonia.scm.util.AssertUtil;
import sonia.scm.util.IOUtil; import sonia.scm.util.IOUtil;
import sonia.scm.util.SecurityUtil;
import sonia.scm.web.security.WebSecurityContext; import sonia.scm.web.security.WebSecurityContext;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
@@ -158,7 +157,7 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
repository.getType()); repository.getType());
} }
assertIsAdmin(); SecurityUtil.assertIsAdmin(securityContextProvider);
AssertUtil.assertIsValid(repository); AssertUtil.assertIsValid(repository);
if (repositoryDB.contains(repository)) if (repositoryDB.contains(repository))
@@ -490,20 +489,6 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
types.add(type); types.add(type);
} }
/**
* Method description
*
*
* @throws RepositoryException
*/
private void assertIsAdmin() throws RepositoryException
{
if (!getCurrentUser().isAdmin())
{
throw new RepositoryException("admin permsission required");
}
}
/** /**
* Method description * Method description
* *
@@ -540,25 +525,6 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
//~--- get methods ---------------------------------------------------------- //~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @return
*/
private User getCurrentUser()
{
SecurityContext context = securityContextProvider.get();
AssertUtil.assertIsNotNull(context);
User user = context.getUser();
AssertUtil.assertIsNotNull(user);
return user;
}
/** /**
* Method description * Method description
* *