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

Use existing permission filters in http servlet protocol

Browse Source 
Just as a POC, fix logging and public access.
This commit is contained in:
René Pfeuffer
2018-09-10 16:35:50 +02:00
parent d9d3167bbb
commit eb378de87f
9 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-core/src/main/java/sonia/scm/repository/spi/HttpScmProtocol.java
View File

@@ -32,4 +32,8 @@ public abstract class HttpScmProtocol implements ScmProtocol {
}
public abstract void serve(HttpServletRequest request, HttpServletResponse response, ServletConfig config) throws ServletException, IOException;
Repository getRepository() {
return repository;
}
}

39
scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java
View File

@@ -1,7 +1,13 @@
package sonia.scm.repository.spi;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.api.v2.resources.UriInfoStore;
import sonia.scm.repository.Repository;
import sonia.scm.web.filter.PermissionFilter;
import sonia.scm.web.filter.ProviderPermissionFilter;
import javax.inject.Provider;
import javax.servlet.ServletConfig;
@@ -13,14 +19,19 @@ import java.io.IOException;
public abstract class InitializingHttpScmProtocolWrapper {
private static final Logger logger =
LoggerFactory.getLogger(InitializingHttpScmProtocolWrapper.class);
private final Provider<? extends HttpServlet> delegateProvider;
private final Provider<? extends ProviderPermissionFilter> permissionFilterProvider;
private final Provider<UriInfoStore> uriInfoStore;
private volatile boolean isInitialized = false;
protected InitializingHttpScmProtocolWrapper(Provider<? extends HttpServlet> delegateProvider, Provider<UriInfoStore> uriInfoStore) {
protected InitializingHttpScmProtocolWrapper(Provider<? extends HttpServlet> delegateProvider, Provider<? extends ProviderPermissionFilter> permissionFilterProvider, Provider<UriInfoStore> uriInfoStore) {
this.delegateProvider = delegateProvider;
this.permissionFilterProvider = permissionFilterProvider;
this.uriInfoStore = uriInfoStore;
}
@@ -49,7 +60,33 @@ public abstract class InitializingHttpScmProtocolWrapper {
}
}
}
if (getRepository() != null)
{
Subject subject = SecurityUtils.getSubject();
PermissionFilter permissionFilter = permissionFilterProvider.get();
boolean writeRequest = permissionFilter.isWriteRequest(request);
if (permissionFilter.hasPermission(getRepository(), writeRequest))
{
// logger.trace("{} access to repository {} for user {} granted",
// getActionAsString(writeRequest), repository.getName(),
// getUserName(subject));
delegateProvider.get().service(request, response);
}
else
{
// logger.info("{} access to repository {} for user {} denied",
// getActionAsString(writeRequest), repository.getName(),
// getUserName(subject));
permissionFilter.sendAccessDenied(request, response, subject);
}
}
}
}
}

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

@@ -106,7 +106,7 @@ public abstract class PermissionFilter extends HttpFilter
*
* @return returns true if the current request is a write request
*/
protected abstract boolean isWriteRequest(HttpServletRequest request);
public abstract boolean isWriteRequest(HttpServletRequest request);
//~--- methods --------------------------------------------------------------
@@ -249,7 +249,7 @@ public abstract class PermissionFilter extends HttpFilter
*
* @throws IOException
*/
private void sendAccessDenied(HttpServletRequest request,
public void sendAccessDenied(HttpServletRequest request,
HttpServletResponse response, Subject subject)
throws IOException
{
@@ -328,7 +328,7 @@ public abstract class PermissionFilter extends HttpFilter
*
* @return true if the current user has the required permissions
*/
private boolean hasPermission(Repository repository, boolean writeRequest)
public boolean hasPermission(Repository repository, boolean writeRequest)
{
boolean permitted;

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitPermissionFilter.java
View File

@@ -98,7 +98,7 @@ public class GitPermissionFilter extends ProviderPermissionFilter
}
@Override
protected boolean isWriteRequest(HttpServletRequest request) {
public boolean isWriteRequest(HttpServletRequest request) {
return isReceivePackRequest(request) ||
isReceiveServiceRequest(request) ||
isLfsFileUpload(request);

4
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitScmProtocolProviderWrapper.java
View File

@@ -10,7 +10,7 @@ import javax.inject.Singleton;
@Singleton
public class GitScmProtocolProviderWrapper extends InitializingHttpScmProtocolWrapper {
@Inject
public GitScmProtocolProviderWrapper(Provider<ScmGitServlet> servletProvider, Provider<UriInfoStore> uriInfoStore) {
super(servletProvider, uriInfoStore);
public GitScmProtocolProviderWrapper(Provider<ScmGitServlet> servletProvider, Provider<GitPermissionFilter> permissionFilter, Provider<UriInfoStore> uriInfoStore) {
super(servletProvider, permissionFilter, uriInfoStore);
}
}

2
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgPermissionFilter.java
View File

@@ -74,7 +74,7 @@ public class HgPermissionFilter extends ProviderPermissionFilter
//~--- get methods ----------------------------------------------------------
@Override
protected boolean isWriteRequest(HttpServletRequest request)
public boolean isWriteRequest(HttpServletRequest request)
{
return !READ_METHODS.contains(request.getMethod());
}

4
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgScmProtocolProviderWrapper.java
View File

@@ -10,7 +10,7 @@ import javax.inject.Singleton;
@Singleton
public class HgScmProtocolProviderWrapper extends InitializingHttpScmProtocolWrapper {
@Inject
public HgScmProtocolProviderWrapper(Provider<HgCGIServlet> servletProvider, Provider<UriInfoStore> uriInfoStore) {
super(servletProvider, uriInfoStore);
public HgScmProtocolProviderWrapper(Provider<HgCGIServlet> servletProvider, Provider<HgPermissionFilter> permissionFilter, Provider<UriInfoStore> uriInfoStore) {
super(servletProvider, permissionFilter, uriInfoStore);
}
}

2
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnPermissionFilter.java
View File

@@ -126,7 +126,7 @@ public class SvnPermissionFilter extends ProviderPermissionFilter
* @return
*/
@Override
protected boolean isWriteRequest(HttpServletRequest request)
public boolean isWriteRequest(HttpServletRequest request)
{
return WRITEMETHOD_SET.contains(request.getMethod().toUpperCase());
}

4
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnScmProtocolProviderWrapper.java
View File

@@ -17,8 +17,8 @@ import static sonia.scm.web.SvnServletModule.PARAMETER_SVN_PARENTPATH;
@Singleton
public class SvnScmProtocolProviderWrapper extends InitializingHttpScmProtocolWrapper {
@Inject
public SvnScmProtocolProviderWrapper(Provider<SvnDAVServlet> servletProvider, Provider<UriInfoStore> uriInfoStore) {
super(servletProvider, uriInfoStore);
public SvnScmProtocolProviderWrapper(Provider<SvnDAVServlet> servletProvider, Provider<SvnPermissionFilter> permissionFilter, Provider<UriInfoStore> uriInfoStore) {
super(servletProvider, permissionFilter, uriInfoStore);
}
@Override