check permission in RepositoryManager

This commit is contained in:
Sebastian Sdorra
2010-11-26 17:57:05 +01:00
parent 2fdc1d3a7e
commit 0bf318e0fa
13 changed files with 187 additions and 36 deletions

View File

@@ -39,7 +39,7 @@ import com.google.inject.Singleton;
import sonia.scm.user.User;
import sonia.scm.util.Util;
import sonia.scm.web.security.SecurityContext;
import sonia.scm.web.security.WebSecurityContext;
//~--- JDK imports ------------------------------------------------------------
@@ -91,7 +91,7 @@ public class BasicAuthenticationFilter extends HttpFilter
*/
@Inject
public BasicAuthenticationFilter(
Provider<SecurityContext> securityContextProvider)
Provider<WebSecurityContext> securityContextProvider)
{
this.securityContextProvider = securityContextProvider;
}
@@ -114,7 +114,7 @@ public class BasicAuthenticationFilter extends HttpFilter
HttpServletResponse response, FilterChain chain)
throws IOException, ServletException
{
SecurityContext securityContext = securityContextProvider.get();
WebSecurityContext securityContext = securityContextProvider.get();
User user = null;
if (securityContext != null)
@@ -179,5 +179,5 @@ public class BasicAuthenticationFilter extends HttpFilter
//~--- fields ---------------------------------------------------------------
/** Field description */
private Provider<SecurityContext> securityContextProvider;
private Provider<WebSecurityContext> securityContextProvider;
}

View File

@@ -45,7 +45,7 @@ import sonia.scm.repository.PermissionUtil;
import sonia.scm.repository.Repository;
import sonia.scm.user.User;
import sonia.scm.util.AssertUtil;
import sonia.scm.web.security.SecurityContext;
import sonia.scm.web.security.WebSecurityContext;
//~--- JDK imports ------------------------------------------------------------
@@ -75,7 +75,7 @@ public abstract class PermissionFilter extends HttpFilter
*
* @param securityContextProvider
*/
public PermissionFilter(Provider<SecurityContext> securityContextProvider)
public PermissionFilter(Provider<WebSecurityContext> securityContextProvider)
{
this.securityContextProvider = securityContextProvider;
}
@@ -120,7 +120,7 @@ public abstract class PermissionFilter extends HttpFilter
HttpServletResponse response, FilterChain chain)
throws IOException, ServletException
{
SecurityContext securityContext = securityContextProvider.get();
WebSecurityContext securityContext = securityContextProvider.get();
AssertUtil.assertIsNotNull(securityContext);
@@ -179,5 +179,5 @@ public abstract class PermissionFilter extends HttpFilter
//~--- fields ---------------------------------------------------------------
/** Field description */
protected Provider<SecurityContext> securityContextProvider;
protected Provider<WebSecurityContext> securityContextProvider;
}

View File

@@ -39,7 +39,7 @@ import com.google.inject.Provider;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.web.security.SecurityContext;
import sonia.scm.web.security.WebSecurityContext;
//~--- JDK imports ------------------------------------------------------------
@@ -69,7 +69,7 @@ public abstract class RegexPermissionFilter extends PermissionFilter
* @param repositoryManager
*/
public RegexPermissionFilter(
Provider<SecurityContext> securityContextProvider,
Provider<WebSecurityContext> securityContextProvider,
RepositoryManager repositoryManager)
{
super(securityContextProvider);

View File

@@ -48,7 +48,7 @@ import javax.servlet.http.HttpServletResponse;
* @author Sebastian Sdorra
*/
@SessionScoped
public class BasicSecurityContext implements SecurityContext
public class BasicSecurityContext implements WebSecurityContext
{
/**

View File

@@ -29,10 +29,13 @@
*
*/
package sonia.scm.web.security;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.security.SecurityContext;
import sonia.scm.user.User;
//~--- JDK imports ------------------------------------------------------------
@@ -44,7 +47,7 @@ import javax.servlet.http.HttpServletResponse;
*
* @author Sebastian Sdorra
*/
public interface SecurityContext
public interface WebSecurityContext extends SecurityContext
{
/**
@@ -73,14 +76,6 @@ public interface SecurityContext
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @return
*/
public User getUser();
/**
* Method description
*