Handle missing request scope for url computation

scm-core/src/test/java/sonia/scm/MockProvider.java

@@ -0,0 +1,22 @@
+package sonia.scm;
+
+import javax.inject.Provider;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * A mockito implementation of CDI {@link javax.inject.Provider}.
+ */
+public class MockProvider {
+
+  private MockProvider() {}
+
+  public static <I> Provider<I> of(I instance) {
+    @SuppressWarnings("unchecked") // Can't make mockito return typed provider
+    Provider<I> provider = mock(Provider.class);
+    when(provider.get()).thenReturn(instance);
+    return provider;
+  }
+
+}

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

@@ -0,0 +1,143 @@
+package sonia.scm.repository.spi;
+
+import com.google.inject.ProvisionException;
+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.MockProvider;
+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;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+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.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+public class InitializingHttpScmProtocolWrapperTest {
+
+  private static final Repository REPOSITORY = new Repository("", "git", "space", "name");
+
+  @Mock
+  private ScmProviderHttpServlet delegateServlet;
+  @Mock
+  private PermissionFilter permissionFilter;
+  @Mock
+  private ScmPathInfoStore pathInfoStore;
+  @Mock
+  private ScmConfiguration scmConfiguration;
+  private Provider<ScmPathInfoStore> pathInfoStoreProvider;
+
+  @Mock
+  private HttpServletRequest request;
+  @Mock
+  private HttpServletResponse response;
+  @Mock
+  private ServletConfig servletConfig;
+
+  private InitializingHttpScmProtocolWrapper wrapper;
+
+  @Before
+  public void init() {
+    initMocks(this);
+    pathInfoStoreProvider = MockProvider.of(pathInfoStore);
+    wrapper = new InitializingHttpScmProtocolWrapper(MockProvider.of(this.delegateServlet), MockProvider.of(permissionFilter), pathInfoStoreProvider, scmConfiguration) {};
+    when(scmConfiguration.getBaseUrl()).thenReturn("http://example.com/scm");
+  }
+
+  @Test
+  public void shouldUsePathFromPathInfo() {
+    mockSetPathInfo();
+
+    HttpScmProtocol httpScmProtocol = wrapper.get(REPOSITORY);
+
+    assertEquals("http://example.com/scm/repo/space/name", httpScmProtocol.getUrl());
+  }
+
+  @Test
+  public void shouldUseConfigurationWhenPathInfoNotSet() {
+    HttpScmProtocol httpScmProtocol = wrapper.get(REPOSITORY);
+
+    assertEquals("http://example.com/scm/repo/space/name", httpScmProtocol.getUrl());
+  }
+
+  @Test
+  public void shouldUseConfigurationWhenNotInRequestScope() {
+    when(pathInfoStoreProvider.get()).thenThrow(new ProvisionException("test"));
+
+    HttpScmProtocol httpScmProtocol = wrapper.get(REPOSITORY);
+
+    assertEquals("http://example.com/scm/repo/space/name", httpScmProtocol.getUrl());
+  }
+
+  @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);
+
+    verify(delegateServlet).init(servletConfig);
+    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);
+    httpScmProtocol.serve(request, response, servletConfig);
+
+    verify(delegateServlet, times(1)).init(servletConfig);
+    verify(delegateServlet, times(2)).service(request, response, REPOSITORY);
+  }
+
+  private Answer proceedInvocation() {
+    return invocation -> {
+      ((PermissionFilter.ContinuationServlet) invocation.getArgument(3)).doService();
+      return null;
+    };
+  }
+
+  private OngoingStubbing<ScmPathInfo> mockSetPathInfo() {
+    return when(pathInfoStore.get()).thenReturn(new ScmPathInfo() {
+      @Override
+      public URI getApiRestUri() {
+        return URI.create("http://example.com/scm/api/rest/");
+      }
+    });
+  }
+
+}