Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-15 17:56:17 +01:00
Code Issues Packages Projects Releases Activity

use apache shiro api for permission filter sub classes

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-08-30 10:48:18 +02:00
parent 909c1a6c6c
commit 38d57ff5cd
2 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scm-core/src/main/java/sonia/scm/web/filter/ProviderPermissionFilter.java
View File

@@ -67,6 +67,21 @@ public abstract class ProviderPermissionFilter extends PermissionFilter
//~--- constructors --------------------------------------------------------- //~--- constructors ---------------------------------------------------------
/**
* Constructs ...
*
*
* @param configuration
* @param repositoryProvider
* @since 1.21
*/
public ProviderPermissionFilter(ScmConfiguration configuration,
RepositoryProvider repositoryProvider)
{
super(configuration);
this.repositoryProvider = repositoryProvider;
}
/** /**
* Constructs ... * Constructs ...
* *
@@ -75,14 +90,14 @@ public abstract class ProviderPermissionFilter extends PermissionFilter
* @param configuration * @param configuration
* @param securityContextProvider * @param securityContextProvider
* @param repositoryProvider * @param repositoryProvider
* @deprecated
*/ */
public ProviderPermissionFilter( @Deprecated
ScmConfiguration configuration, public ProviderPermissionFilter(ScmConfiguration configuration,
Provider<WebSecurityContext> securityContextProvider, Provider<WebSecurityContext> securityContextProvider,
RepositoryProvider repositoryProvider) RepositoryProvider repositoryProvider)
{ {
super(configuration, securityContextProvider); this(configuration, repositoryProvider);
this.repositoryProvider = repositoryProvider;
} }
//~--- get methods ---------------------------------------------------------- //~--- get methods ----------------------------------------------------------
@@ -107,7 +122,7 @@ public abstract class ProviderPermissionFilter extends PermissionFilter
catch (ProvisionException ex) catch (ProvisionException ex)
{ {
Throwables.propagateIfInstanceOf(ex.getCause(), Throwables.propagateIfInstanceOf(ex.getCause(),
IllegalStateException.class); IllegalStateException.class);
if (logger.isErrorEnabled()) if (logger.isErrorEnabled())
{ {

26
scm-core/src/main/java/sonia/scm/web/filter/RegexPermissionFilter.java
View File

@@ -71,15 +71,31 @@ public abstract class RegexPermissionFilter extends PermissionFilter
* @param securityContextProvider * @param securityContextProvider
* @param repositoryManager * @param repositoryManager
*/ */
public RegexPermissionFilter( public RegexPermissionFilter(ScmConfiguration configuration,
ScmConfiguration configuration, RepositoryManager repositoryManager)
Provider<WebSecurityContext> securityContextProvider,
RepositoryManager repositoryManager)
{ {
super(configuration, securityContextProvider); super(configuration);
this.repositoryManager = repositoryManager; this.repositoryManager = repositoryManager;
} }
/**
* Constructs ...
*
*
*
* @param configuration
* @param securityContextProvider
* @param repositoryManager
* @deprecated
*/
@Deprecated
public RegexPermissionFilter(ScmConfiguration configuration,
Provider<WebSecurityContext> securityContextProvider,
RepositoryManager repositoryManager)
{
this(configuration, repositoryManager);
}
//~--- get methods ---------------------------------------------------------- //~--- get methods ----------------------------------------------------------
/** /**