diff options
Diffstat (limited to 'server/sonar-webserver-core/src')
2 files changed, 34 insertions, 40 deletions
diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/plugins/PluginsRiskConsentFilter.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/plugins/PluginsRiskConsentFilter.java index 355f060d6c6..8d7470f2a36 100644 --- a/server/sonar-webserver-core/src/main/java/org/sonar/server/plugins/PluginsRiskConsentFilter.java +++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/plugins/PluginsRiskConsentFilter.java @@ -21,25 +21,22 @@ package org.sonar.server.plugins; import java.io.IOException; import java.util.Set; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.sonar.api.config.Configuration; -import org.sonar.api.web.ServletFilter; +import org.sonar.api.server.http.HttpRequest; +import org.sonar.api.server.http.HttpResponse; +import org.sonar.api.web.FilterChain; +import org.sonar.api.web.HttpFilter; +import org.sonar.api.web.UrlPattern; import org.sonar.core.extension.PluginRiskConsent; import org.sonar.server.user.ThreadLocalUserSession; -import static org.sonar.api.web.ServletFilter.UrlPattern.Builder.staticResourcePatterns; +import static org.sonar.api.web.UrlPattern.Builder.staticResourcePatterns; import static org.sonar.core.config.CorePropertyDefinitions.PLUGINS_RISK_CONSENT; import static org.sonar.core.extension.PluginRiskConsent.NOT_ACCEPTED; import static org.sonar.core.extension.PluginRiskConsent.REQUIRED; import static org.sonar.server.authentication.AuthenticationRedirection.redirectTo; -public class PluginsRiskConsentFilter extends ServletFilter { +public class PluginsRiskConsentFilter extends HttpFilter { private static final String PLUGINS_RISK_CONSENT_PATH = "/admin/plugin_risk_consent"; //NOSONAR this path will be the same in every environment @@ -57,14 +54,12 @@ public class PluginsRiskConsentFilter extends ServletFilter { } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init() { //nothing to do } @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException { - HttpServletRequest request = (HttpServletRequest) servletRequest; - HttpServletResponse response = (HttpServletResponse) servletResponse; + public void doFilter(HttpRequest request, HttpResponse response, FilterChain chain) throws IOException{ PluginRiskConsent riskConsent = PluginRiskConsent.valueOf(config.get(PLUGINS_RISK_CONSENT).orElse(NOT_ACCEPTED.name())); if (userSession.hasSession() && userSession.isLoggedIn() diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/plugins/PluginsRiskConsentFilterTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/plugins/PluginsRiskConsentFilterTest.java index f7de78c4887..57528179457 100644 --- a/server/sonar-webserver-core/src/test/java/org/sonar/server/plugins/PluginsRiskConsentFilterTest.java +++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/plugins/PluginsRiskConsentFilterTest.java @@ -20,15 +20,14 @@ package org.sonar.server.plugins; import java.util.Optional; -import javax.servlet.FilterChain; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; import org.sonar.api.config.Configuration; -import org.sonar.api.web.ServletFilter; +import org.sonar.api.server.http.HttpRequest; +import org.sonar.api.server.http.HttpResponse; +import org.sonar.api.web.FilterChain; +import org.sonar.api.web.UrlPattern; import org.sonar.core.extension.PluginRiskConsent; import org.sonar.server.user.ThreadLocalUserSession; @@ -44,8 +43,8 @@ public class PluginsRiskConsentFilterTest { private Configuration configuration; private ThreadLocalUserSession userSession; - private ServletRequest servletRequest; - private HttpServletResponse servletResponse; + private HttpRequest request; + private HttpResponse response; private FilterChain chain; @Before @@ -54,8 +53,8 @@ public class PluginsRiskConsentFilterTest { when(configuration.get(PLUGINS_RISK_CONSENT)).thenReturn(Optional.of(PluginRiskConsent.REQUIRED.name())); userSession = mock(ThreadLocalUserSession.class); - servletRequest = mock(HttpServletRequest.class); - servletResponse = mock(HttpServletResponse.class); + request = mock(HttpRequest.class); + response = mock(HttpResponse.class); chain = mock(FilterChain.class); } @@ -65,9 +64,9 @@ public class PluginsRiskConsentFilterTest { when(userSession.hasSession()).thenReturn(true); - consentFilter.doFilter(servletRequest, servletResponse, chain); + consentFilter.doFilter(request, response, chain); - verify(servletResponse, times(0)).sendRedirect(Mockito.anyString()); + verify(response, times(0)).sendRedirect(Mockito.anyString()); } @Test @@ -77,9 +76,9 @@ public class PluginsRiskConsentFilterTest { when(userSession.hasSession()).thenReturn(true); when(userSession.isLoggedIn()).thenReturn(false); - consentFilter.doFilter(servletRequest, servletResponse, chain); + consentFilter.doFilter(request, response, chain); - verify(servletResponse, times(0)).sendRedirect(Mockito.anyString()); + verify(response, times(0)).sendRedirect(Mockito.anyString()); } @Test @@ -90,9 +89,9 @@ public class PluginsRiskConsentFilterTest { when(userSession.isLoggedIn()).thenReturn(false); when(configuration.get(PLUGINS_RISK_CONSENT)).thenReturn(Optional.of(PluginRiskConsent.REQUIRED.name())); - consentFilter.doFilter(servletRequest, servletResponse, chain); + consentFilter.doFilter(request, response, chain); - verify(servletResponse, times(0)).sendRedirect(Mockito.anyString()); + verify(response, times(0)).sendRedirect(Mockito.anyString()); } @Test @@ -103,9 +102,9 @@ public class PluginsRiskConsentFilterTest { when(userSession.isLoggedIn()).thenReturn(false); when(configuration.get(PLUGINS_RISK_CONSENT)).thenReturn(Optional.of(PluginRiskConsent.ACCEPTED.name())); - consentFilter.doFilter(servletRequest, servletResponse, chain); + consentFilter.doFilter(request, response, chain); - verify(servletResponse, times(0)).sendRedirect(Mockito.anyString()); + verify(response, times(0)).sendRedirect(Mockito.anyString()); } @Test @@ -116,9 +115,9 @@ public class PluginsRiskConsentFilterTest { when(userSession.isLoggedIn()).thenReturn(true); when(userSession.isSystemAdministrator()).thenReturn(false); - consentFilter.doFilter(servletRequest, servletResponse, chain); + consentFilter.doFilter(request, response, chain); - verify(servletResponse, times(0)).sendRedirect(Mockito.anyString()); + verify(response, times(0)).sendRedirect(Mockito.anyString()); } @Test @@ -130,9 +129,9 @@ public class PluginsRiskConsentFilterTest { when(userSession.isSystemAdministrator()).thenReturn(false); when(configuration.get(PLUGINS_RISK_CONSENT)).thenReturn(Optional.of(PluginRiskConsent.REQUIRED.name())); - consentFilter.doFilter(servletRequest, servletResponse, chain); + consentFilter.doFilter(request, response, chain); - verify(servletResponse, times(0)).sendRedirect(Mockito.anyString()); + verify(response, times(0)).sendRedirect(Mockito.anyString()); } @Test @@ -143,9 +142,9 @@ public class PluginsRiskConsentFilterTest { when(userSession.isLoggedIn()).thenReturn(true); when(userSession.isSystemAdministrator()).thenReturn(true); - consentFilter.doFilter(servletRequest, servletResponse, chain); + consentFilter.doFilter(request, response, chain); - verify(servletResponse, times(1)).sendRedirect(Mockito.anyString()); + verify(response, times(1)).sendRedirect(Mockito.anyString()); } @Test @@ -157,16 +156,16 @@ public class PluginsRiskConsentFilterTest { when(userSession.isSystemAdministrator()).thenReturn(true); when(configuration.get(PLUGINS_RISK_CONSENT)).thenReturn(Optional.of(PluginRiskConsent.ACCEPTED.name())); - consentFilter.doFilter(servletRequest, servletResponse, chain); + consentFilter.doFilter(request, response, chain); - verify(servletResponse, times(0)).sendRedirect(Mockito.anyString()); + verify(response, times(0)).sendRedirect(Mockito.anyString()); } @Test public void doGetPattern_excludesNotEmpty() { PluginsRiskConsentFilter consentFilter = new PluginsRiskConsentFilter(configuration, userSession); - ServletFilter.UrlPattern urlPattern = consentFilter.doGetPattern(); + UrlPattern urlPattern = consentFilter.doGetPattern(); assertThat(urlPattern.getExclusions()).isNotEmpty(); |