Implement permission filters as decorator for servlets

This commit is contained in:
René Pfeuffer
2018-09-14 10:21:00 +02:00
parent 7de9f69061
commit e88639ab81
14 changed files with 122 additions and 71 deletions

View File

@@ -34,8 +34,8 @@
package sonia.scm.web;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
import sonia.scm.web.filter.PermissionFilter;
import javax.servlet.http.HttpServletRequest;
@@ -51,10 +51,9 @@ public class HgPermissionFilter extends PermissionFilter
private static final Set<String> READ_METHODS = ImmutableSet.of("GET", "HEAD", "OPTIONS", "TRACE");
@Inject
public HgPermissionFilter(ScmConfiguration configuration)
public HgPermissionFilter(ScmConfiguration configuration, ScmProviderHttpServlet delegate)
{
super(configuration);
super(configuration, delegate);
}
@Override

View File

@@ -0,0 +1,29 @@
package sonia.scm.web;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.plugin.Extension;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
import sonia.scm.repository.spi.ScmProviderHttpServletDecoratorFactory;
import javax.inject.Inject;
@Extension
public class HgPermissionFilterFactory implements ScmProviderHttpServletDecoratorFactory {
private final ScmConfiguration configuration;
@Inject
public HgPermissionFilterFactory(ScmConfiguration configuration) {
this.configuration = configuration;
}
@Override
public boolean handlesScmType(String type) {
return "hg".equals(type);
}
@Override
public ScmProviderHttpServlet createDecorator(ScmProviderHttpServlet delegate) {
return new HgPermissionFilter(configuration, delegate);
}
}

View File

@@ -14,8 +14,8 @@ import javax.inject.Singleton;
@Extension
public class HgScmProtocolProviderWrapper extends InitializingHttpScmProtocolWrapper {
@Inject
public HgScmProtocolProviderWrapper(@Hg Provider<ScmProviderHttpServlet> servletProvider, Provider<HgPermissionFilter> permissionFilter, Provider<ScmPathInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
super(servletProvider, permissionFilter, uriInfoStore, scmConfiguration);
public HgScmProtocolProviderWrapper(@Hg Provider<ScmProviderHttpServlet> servletProvider, Provider<ScmPathInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
super(servletProvider, uriInfoStore, scmConfiguration);
}
@Override