Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-21 03:21:36 +01:00
Code Issues Packages Projects Releases Activity

Implement permission filters as decorator for servlets

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

33
scm-core/src/test/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapperTest.java
View File

@@ -5,13 +5,11 @@ import com.google.inject.util.Providers;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.stubbing.Answer;
import org.mockito.stubbing.OngoingStubbing;
import sonia.scm.api.v2.resources.ScmPathInfo;
import sonia.scm.api.v2.resources.ScmPathInfoStore;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.repository.Repository;
import sonia.scm.web.filter.PermissionFilter;
import javax.inject.Provider;
import javax.servlet.ServletConfig;
@@ -22,12 +20,7 @@ import java.io.IOException;
import java.net.URI;
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -40,8 +33,6 @@ public class InitializingHttpScmProtocolWrapperTest {
@Mock
private ScmProviderHttpServlet delegateServlet;
@Mock
private PermissionFilter permissionFilter;
@Mock
private ScmPathInfoStore pathInfoStore;
@Mock
private ScmConfiguration scmConfiguration;
@@ -62,7 +53,7 @@ public class InitializingHttpScmProtocolWrapperTest {
pathInfoStoreProvider = mock(Provider.class);
when(pathInfoStoreProvider.get()).thenReturn(pathInfoStore);
wrapper = new InitializingHttpScmProtocolWrapper(Providers.of(this.delegateServlet), Providers.of(permissionFilter), pathInfoStoreProvider, scmConfiguration) {
wrapper = new InitializingHttpScmProtocolWrapper(Providers.of(this.delegateServlet), pathInfoStoreProvider, scmConfiguration) {
@Override
public String getType() {
return "git";
@@ -98,8 +89,6 @@ public class InitializingHttpScmProtocolWrapperTest {
@Test
public void shouldInitializeAndDelegateRequestThroughFilter() throws ServletException, IOException {
doAnswer(proceedInvocation()).
when(permissionFilter).executeIfPermitted(same(request), same(response), same(REPOSITORY), any());
HttpScmProtocol httpScmProtocol = wrapper.get(REPOSITORY);
httpScmProtocol.serve(request, response, servletConfig);
@@ -108,21 +97,8 @@ public class InitializingHttpScmProtocolWrapperTest {
verify(delegateServlet).service(request, response, REPOSITORY);
}
@Test
public void shouldNotDelegateRequestWhenFilterBlocks() throws ServletException, IOException {
doNothing().
when(permissionFilter).executeIfPermitted(same(request), same(response), same(REPOSITORY), any());
HttpScmProtocol httpScmProtocol = wrapper.get(REPOSITORY);
httpScmProtocol.serve(request, response, servletConfig);
verify(delegateServlet, never()).service(request, response, REPOSITORY);
}
@Test
public void shouldInitializeOnlyOnce() throws ServletException, IOException {
doAnswer(proceedInvocation()).
when(permissionFilter).executeIfPermitted(same(request), same(response), same(REPOSITORY), any());
HttpScmProtocol httpScmProtocol = wrapper.get(REPOSITORY);
httpScmProtocol.serve(request, response, servletConfig);
@@ -137,13 +113,6 @@ public class InitializingHttpScmProtocolWrapperTest {
HttpScmProtocol httpScmProtocol = wrapper.get(new Repository("", "other", "space", "name"));
}
private Answer proceedInvocation() {
return invocation -> {
((PermissionFilter.ContinuationServlet) invocation.getArgument(3)).doService();
return null;
};
}
private OngoingStubbing<ScmPathInfo> mockSetPathInfo() {
return when(pathInfoStore.get()).thenReturn(() -> URI.create("http://example.com/scm/api/rest/"));
}