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

Make protocol auth filter available for legacy paths

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-07-26 15:07:40 +02:00
parent 8901e240d9
commit bc37ccef57
4 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scm-webapp/src/main/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilter.java → scm-core/src/main/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilterBase.java
View File

@@ -1,16 +1,11 @@
package sonia.scm.web.filter; package sonia.scm.web.filter;
import sonia.scm.Priority;
import sonia.scm.config.ScmConfiguration; import sonia.scm.config.ScmConfiguration;
import sonia.scm.filter.Filters;
import sonia.scm.filter.WebElement;
import sonia.scm.util.HttpUtil; import sonia.scm.util.HttpUtil;
import sonia.scm.web.UserAgent; import sonia.scm.web.UserAgent;
import sonia.scm.web.UserAgentParser; import sonia.scm.web.UserAgentParser;
import sonia.scm.web.WebTokenGenerator; import sonia.scm.web.WebTokenGenerator;
import sonia.scm.web.protocol.HttpProtocolServlet;
import javax.inject.Inject;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -18,14 +13,11 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.Set; import java.util.Set;
@Priority(Filters.PRIORITY_AUTHENTICATION) public class HttpProtocolServletAuthenticationFilterBase extends AuthenticationFilter {
@WebElement(value = HttpProtocolServlet.PATTERN)
public class HttpProtocolServletAuthenticationFilter extends AuthenticationFilter {
private final UserAgentParser userAgentParser; private final UserAgentParser userAgentParser;
@Inject protected HttpProtocolServletAuthenticationFilterBase(
public HttpProtocolServletAuthenticationFilter(
ScmConfiguration configuration, ScmConfiguration configuration,
Set<WebTokenGenerator> tokenGenerators, Set<WebTokenGenerator> tokenGenerators,
UserAgentParser userAgentParser) { UserAgentParser userAgentParser) {

6
scm-webapp/src/test/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilterTest.java → scm-core/src/test/java/sonia/scm/web/filter/HttpProtocolServletAuthenticationFilterBaseTest.java
View File

@@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)
class HttpProtocolServletAuthenticationFilterTest { class HttpProtocolServletAuthenticationFilterBaseTest {
private ScmConfiguration configuration = new ScmConfiguration(); private ScmConfiguration configuration = new ScmConfiguration();
@@ -32,7 +32,7 @@ class HttpProtocolServletAuthenticationFilterTest {
@Mock @Mock
private UserAgentParser userAgentParser; private UserAgentParser userAgentParser;
private HttpProtocolServletAuthenticationFilter authenticationFilter; private HttpProtocolServletAuthenticationFilterBase authenticationFilter;
@Mock @Mock
private HttpServletRequest request; private HttpServletRequest request;
@@ -48,7 +48,7 @@ class HttpProtocolServletAuthenticationFilterTest {
@BeforeEach @BeforeEach
void setUpObjectUnderTest() { void setUpObjectUnderTest() {
authenticationFilter = new HttpProtocolServletAuthenticationFilter(configuration, tokenGenerators, userAgentParser); authenticationFilter = new HttpProtocolServletAuthenticationFilterBase(configuration, tokenGenerators, userAgentParser);
} }
@Test @Test

22
scm-plugins/scm-legacy-plugin/src/main/java/sonia/scm/legacy/LegacyProtocolServletAuthenticationFilter.java Normal file
View File

@@ -0,0 +1,22 @@
package sonia.scm.legacy;
import sonia.scm.Priority;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.filter.Filters;
import sonia.scm.filter.WebElement;
import sonia.scm.web.UserAgentParser;
import sonia.scm.web.WebTokenGenerator;
import sonia.scm.web.filter.HttpProtocolServletAuthenticationFilterBase;
import javax.inject.Inject;
import java.util.Set;
@Priority(Filters.PRIORITY_AUTHENTICATION)
@WebElement(value = "/git/*", morePatterns = {"/hg/*", "/svn/*"})
public class LegacyProtocolServletAuthenticationFilter extends HttpProtocolServletAuthenticationFilterBase {
@Inject
public LegacyProtocolServletAuthenticationFilter(ScmConfiguration configuration, Set<WebTokenGenerator> tokenGenerators, UserAgentParser userAgentParser) {
super(configuration, tokenGenerators, userAgentParser);
}
}

22
scm-webapp/src/main/java/sonia/scm/web/filter/DefaultHttpProtocolServletAuthenticationFilter.java Normal file
View File

@@ -0,0 +1,22 @@
package sonia.scm.web.filter;
import sonia.scm.Priority;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.filter.Filters;
import sonia.scm.filter.WebElement;
import sonia.scm.web.UserAgentParser;
import sonia.scm.web.WebTokenGenerator;
import sonia.scm.web.protocol.HttpProtocolServlet;
import javax.inject.Inject;
import java.util.Set;
@Priority(Filters.PRIORITY_AUTHENTICATION)
@WebElement(value = HttpProtocolServlet.PATTERN)
public class DefaultHttpProtocolServletAuthenticationFilter extends HttpProtocolServletAuthenticationFilterBase {
@Inject
public DefaultHttpProtocolServletAuthenticationFilter(ScmConfiguration configuration, Set<WebTokenGenerator> tokenGenerators, UserAgentParser userAgentParser) {
super(configuration, tokenGenerators, userAgentParser);
}
}